Fix: missing type from SvelteKit and remix package (#557)

supabase · May 23, 2023 · 3bda304 · 3bda304
1 parent a128b9e
commit 3bda304
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/packages/remix/src/createSupabaseClient.ts b/packages/remix/src/createSupabaseClient.ts
@@ -9,6 +9,7 @@ import {
 	SupabaseClientOptionsWithoutAuth
 } from '@supabase/auth-helpers-shared';
 import { SupabaseClient } from '@supabase/supabase-js';
+import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
 
 /**
  * ## Authenticated Supabase client
@@ -90,7 +91,10 @@ export function createBrowserClient<
 	Database = any,
 	SchemaName extends string & keyof Database = 'public' extends keyof Database
 		? 'public'
-		: string & keyof Database
+		: string & keyof Database,
+	Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+		? Database[SchemaName]
+		: any
 >(
 	supabaseUrl: string,
 	supabaseKey: string,
@@ -101,14 +105,14 @@ export function createBrowserClient<
 		options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
 		cookieOptions?: CookieOptionsWithName;
 	} = {}
-): SupabaseClient<Database, SchemaName> {
+): SupabaseClient<Database, SchemaName, Schema> {
 	if (!supabaseUrl || !supabaseKey) {
 		throw new Error(
 			'supabaseUrl and supabaseKey are required to create a Supabase client! Find these under `Settings` > `API` in your Supabase dashboard.'
 		);
 	}
 
-	return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
 			...options?.global,
@@ -159,7 +163,10 @@ export function createServerClient<
 	Database = any,
 	SchemaName extends string & keyof Database = 'public' extends keyof Database
 		? 'public'
-		: string & keyof Database
+		: string & keyof Database,
+	Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+		? Database[SchemaName]
+		: any
 >(
 	supabaseUrl: string,
 	supabaseKey: string,
@@ -174,7 +181,7 @@ export function createServerClient<
 		options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
 		cookieOptions?: CookieOptionsWithName;
 	}
-): SupabaseClient<Database, SchemaName> {
+): SupabaseClient<Database, SchemaName, Schema> {
 	if (!supabaseUrl || !supabaseKey) {
 		throw new Error(
 			'supabaseUrl and supabaseKey are required to create a Supabase client! Find these under `Settings` > `API` in your Supabase dashboard.'
@@ -187,7 +194,7 @@ export function createServerClient<
 		);
 	}
 
-	return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
 			...options?.global,

diff --git a/packages/shared/src/createClient.ts b/packages/shared/src/createClient.ts
@@ -2,12 +2,16 @@ import { createClient } from '@supabase/supabase-js';
 import { SupabaseClientOptionsWithoutAuth } from './types';
 import { isBrowser } from './utils';
 import { StorageAdapter } from './cookieAuthStorageAdapter';
+import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
 
 export function createSupabaseClient<
 	Database = any,
 	SchemaName extends string & keyof Database = 'public' extends keyof Database
 		? 'public'
-		: string & keyof Database
+		: string & keyof Database,
+	Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+		? Database[SchemaName]
+		: any
 >(
 	supabaseUrl: string,
 	supabaseKey: string,
@@ -20,7 +24,7 @@ export function createSupabaseClient<
 ) {
 	const bowser = isBrowser();
 
-	return createClient(supabaseUrl, supabaseKey, {
+	return createClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		auth: {
 			flowType: 'pkce',

diff --git a/packages/sveltekit/src/supabaseLoadClient.ts b/packages/sveltekit/src/supabaseLoadClient.ts
@@ -7,6 +7,7 @@ import {
 import { Session, SupabaseClient } from '@supabase/supabase-js';
 import { LoadEvent } from '@sveltejs/kit';
 import { SvelteKitLoadAuthStorageAdapter } from './loadStorageAdapter';
+import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
 
 let cachedBrowserClient: SupabaseClient<any, string> | undefined;
 
@@ -52,7 +53,10 @@ export function createSupabaseLoadClient<
 	Database = any,
 	SchemaName extends string & keyof Database = 'public' extends keyof Database
 		? 'public'
-		: string & keyof Database
+		: string & keyof Database,
+	Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+		? Database[SchemaName]
+		: any
 >({
 	supabaseUrl,
 	supabaseKey,
@@ -73,13 +77,13 @@ export function createSupabaseLoadClient<
 	serverSession: Session | null;
 	options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
 	cookieOptions?: CookieOptionsWithName;
-}): SupabaseClient<Database, SchemaName> {
+}): SupabaseClient<Database, SchemaName, Schema> {
 	const browser = isBrowser();
 	if (browser && cachedBrowserClient) {
-		return cachedBrowserClient as SupabaseClient<Database, SchemaName>;
+		return cachedBrowserClient as SupabaseClient<Database, SchemaName, Schema>;
 	}
 
-	const client = createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+	const client = createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
 			fetch: event.fetch,

diff --git a/packages/sveltekit/src/supabaseServerClient.ts b/packages/sveltekit/src/supabaseServerClient.ts
@@ -5,6 +5,8 @@ import {
 } from '@supabase/auth-helpers-shared';
 import { RequestEvent } from '@sveltejs/kit';
 import { SvelteKitServerAuthStorageAdapter } from './serverStorageAdapter';
+import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
+import { SupabaseClient } from '@supabase/supabase-js';
 
 /**
  * ## Authenticated Supabase client
@@ -61,7 +63,10 @@ export function createSupabaseServerClient<
 	Database = any,
 	SchemaName extends string & keyof Database = 'public' extends keyof Database
 		? 'public'
-		: string & keyof Database
+		: string & keyof Database,
+	Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+		? Database[SchemaName]
+		: any
 >({
 	supabaseUrl,
 	supabaseKey,
@@ -76,8 +81,8 @@ export function createSupabaseServerClient<
 	options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
 	cookieOptions?: CookieOptionsWithName;
 	expiryMargin?: number;
-}) {
-	const client = createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+}): SupabaseClient<Database, SchemaName, Schema> {
+	const client = createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
 			...options?.global,