fix(types): added explicit types annotations for `serverSupabaseClien…

…t` and `serverSupabaseServiceRole` (#411)
nuxt-modules · Sep 3, 2024 · 3f98640 · 3f98640
1 parent de06f15
commit 3f98640
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -183,6 +183,7 @@ export default defineNuxtModule<ModuleOptions>({
         inline: [resolve('./runtime')],
       })
       nitroConfig.alias['#supabase/server'] = resolveRuntimeModule('./server/services')
+      nitroConfig.alias['#supabase/database'] = resolve(nitroConfig.buildDir!, 'types/supabase-database')
     })
 
     addTemplate({

diff --git a/src/runtime/server/services/serverSupabaseClient.ts b/src/runtime/server/services/serverSupabaseClient.ts
@@ -3,9 +3,10 @@ import { createServerClient, parseCookieHeader, type CookieOptions } from '@supa
 import { getHeader, setCookie, type H3Event } from 'h3'
 import { fetchWithRetry } from '../../utils/fetch-retry'
 import { useRuntimeConfig } from '#imports'
-import type { Database } from '#build/types/supabase-database'
+// @ts-expect-error - `#supabase/database` is a runtime alias
+import type { Database } from '#supabase/database'
 
-export const serverSupabaseClient = async <T = Database>(event: H3Event): Promise<SupabaseClient<T>> => {
+export const serverSupabaseClient: <T = Database>(event: H3Event) => Promise<SupabaseClient<T>> = async <T = Database>(event: H3Event) => {
   // No need to recreate client if exists in request context
   if (!event.context._supabaseClient) {
     // get settings from runtime config
@@ -38,5 +39,5 @@ export const serverSupabaseClient = async <T = Database>(event: H3Event): Promis
     })
   }
 
-  return event.context._supabaseClient
+  return event.context._supabaseClient as SupabaseClient<T>
 }
diff --git a/src/runtime/server/services/serverSupabaseServiceRole.ts b/src/runtime/server/services/serverSupabaseServiceRole.ts
@@ -2,9 +2,10 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import { createClient } from '@supabase/supabase-js'
 import type { H3Event } from 'h3'
 import { useRuntimeConfig } from '#imports'
-import type { Database } from '#build/types/supabase-database'
+// @ts-expect-error - `#supabase/database` is a runtime alias
+import type { Database } from '#supabase/database'
 
-export const serverSupabaseServiceRole = <T = Database>(event: H3Event): SupabaseClient<T> => {
+export const serverSupabaseServiceRole: <T = Database>(event: H3Event) => SupabaseClient<T> = <T = Database>(event: H3Event) => {
   const {
     supabase: { serviceKey },
     public: {