fix: resolve TypeScript issues by improving null checks and type handling

Author: JoachimLK

app/pages/index.vue

@@ -87,8 +87,9 @@ async function tryDemo() {
     // Activate the demo org before navigating
     const orgsResult = await authClient.organization.list()
     const orgs = orgsResult.data
-    if (orgs && orgs.length > 0) {
-      await authClient.organization.setActive({ organizationId: orgs[0].id })
+    const firstOrg = orgs?.[0]
+    if (firstOrg) {
+      await authClient.organization.setActive({ organizationId: firstOrg.id })
     }
 
     // Hard navigation to avoid hydration mismatches between dark landing and light dashboard

app/pages/onboarding/create-org.vue

@@ -29,10 +29,13 @@ const autoSwitched = ref(false)
 watch([orgs, isOrgsLoading], async ([orgList, loading]) => {
   if (loading || autoSwitched.value || showCreateForm.value) return
   if (orgList.length === 1) {
+    const firstOrg = orgList[0]
+    if (!firstOrg) return
+
     autoSwitched.value = true
     isLoading.value = true
     try {
-      await switchOrg(orgList[0].id)
+      await switchOrg(firstOrg.id)
     }
     catch {
       isLoading.value = false

server/api/__sitemap__/urls.ts

@@ -1,4 +1,5 @@
 import { eq } from 'drizzle-orm'
+import { queryCollection } from '@nuxt/content/server'
 import { job } from '../../database/schema'
 
 /**

server/middleware/demo-guard.ts

@@ -52,12 +52,16 @@ export default defineEventHandler(async (event) => {
 
   // Check if the current session belongs to the demo org
   const session = await auth.api.getSession({ headers: event.headers })
-  if (!session?.session.activeOrganizationId) return
+  const activeOrganizationId = session
+    ? (session.session as { activeOrganizationId?: string }).activeOrganizationId
+    : undefined
+
+  if (!activeOrganizationId) return
 
   const guardedOrgId = await getDemoOrgId()
   if (!guardedOrgId) return
 
-  if (session.session.activeOrganizationId === guardedOrgId) {
+  if (activeOrganizationId === guardedOrgId) {
     throw createError({
       statusCode: 403,
       statusMessage: 'Demo mode — this action is disabled. Deploy your own instance to get full access.',

server/plugins/migrations.ts

@@ -18,9 +18,10 @@ export default defineNitroPlugin(async () => {
 
   try {
     // pg_try_advisory_lock returns true if lock acquired, false if another process holds it
-    const [{ locked }] = await db.execute<{ locked: boolean }>(
+    const lockResult = await db.execute<{ locked: boolean }>(
       `SELECT pg_try_advisory_lock(${MIGRATION_LOCK_ID}) as locked`
     )
+    const locked = lockResult[0]?.locked ?? false
 
     if (!locked) {
       console.log('[Applirank] Another instance is running migrations, skipping')

server/utils/db.ts

@@ -41,7 +41,12 @@ function getDB(): DB {
 export const db: DB = new Proxy({} as DB, {
   get(_, prop) {
     const instance = getDB()
-    const value = (instance as Record<string, unknown>)[prop]
+
+    if (typeof prop !== 'string') {
+      return Reflect.get(instance as object, prop)
+    }
+
+    const value = (instance as unknown as Record<string, unknown>)[prop]
     // Bind methods so they keep the correct `this` context
     return typeof value === 'function' ? value.bind(instance) : value
   },

server/utils/requireAuth.ts

@@ -1,5 +1,12 @@
 import type { H3Event } from 'h3'
 
+type AuthSession = NonNullable<Awaited<ReturnType<typeof auth.api.getSession>>>
+type AuthSessionWithActiveOrg = Omit<AuthSession, 'session'> & {
+  session: AuthSession['session'] & {
+    activeOrganizationId: string
+  }
+}
+
 /**
  * Require an authenticated session with an active organization.
  * Throws 401 if not authenticated, 403 if no active organization selected.
@@ -16,9 +23,17 @@ export async function requireAuth(event: H3Event) {
     throw createError({ statusCode: 401, statusMessage: 'Unauthorized' })
   }
 
-  if (!session.session.activeOrganizationId) {
+  const activeOrganizationId = (session.session as { activeOrganizationId?: string }).activeOrganizationId
+
+  if (!activeOrganizationId) {
     throw createError({ statusCode: 403, statusMessage: 'No active organization' })
   }
 
-  return session
+  return {
+    ...session,
+    session: {
+      ...session.session,
+      activeOrganizationId,
+    },
+  } as AuthSessionWithActiveOrg
 }