chore: sync types

Author: avallete

src/SupabaseClient.ts

@@ -5,6 +5,7 @@ import {
   PostgrestFilterBuilder,
   PostgrestQueryBuilder,
   ClientServerOptions as PostgrestClientServerOption,
+  GetGenericDatabaseWithOptions,
 } from '@supabase/postgrest-js'
 import {
   RealtimeChannel,
@@ -34,12 +35,13 @@ export type ServicesOptions = PostgrestClientServerOption & {}
 
 export default class SupabaseClient<
   Database = any,
-  ClientOptions extends ServicesOptions = { postgrestVersion: 12 },
-  SchemaName extends string & keyof Database = 'public' extends keyof Database
+  ClientOptions extends ServicesOptions = { PostgrestVersion: '12' },
+  SchemaName extends string &
+    keyof GetGenericDatabaseWithOptions<Database>['db'] = 'public' extends keyof GetGenericDatabaseWithOptions<Database>['db']
     ? 'public'
-    : string & keyof Database,
-  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
-    ? Database[SchemaName]
+    : string & keyof GetGenericDatabaseWithOptions<Database>['db'],
+  Schema extends GenericSchema = GetGenericDatabaseWithOptions<Database>['db'][SchemaName] extends GenericSchema
+    ? GetGenericDatabaseWithOptions<Database>['db'][SchemaName]
     : any
 > {
   /**
@@ -180,7 +182,7 @@ export default class SupabaseClient<
    *
    * @param schema - The schema to query
    */
-  schema<DynamicSchema extends string & keyof Database>(
+  schema<DynamicSchema extends string & keyof GetGenericDatabaseWithOptions<Database>['db']>(
     schema: DynamicSchema
   ): PostgrestClient<
     Database,
@@ -233,7 +235,8 @@ export default class SupabaseClient<
       : never,
     Fn['Returns'],
     FnName,
-    null
+    null,
+    'RPC'
   > {
     return this.rest.rpc(fn, args, options)
   }

src/index.ts

@@ -1,6 +1,7 @@
 import SupabaseClient from './SupabaseClient'
 import type { GenericSchema, SupabaseClientOptions } from './lib/types'
 import type { ServicesOptions } from './SupabaseClient'
+import type { GetGenericDatabaseWithOptions } from '@supabase/postgrest-js'
 
 export * from '@supabase/auth-js'
 export type { User as AuthUser, Session as AuthSession } from '@supabase/auth-js'
@@ -27,12 +28,13 @@ export type { SupabaseClientOptions, QueryResult, QueryData, QueryError } from '
  */
 export const createClient = <
   Database = any,
-  ClientOptions extends ServicesOptions = { postgrestVersion: 12 },
-  SchemaName extends string & keyof Database = 'public' extends keyof Database
+  ClientOptions extends ServicesOptions = { PostgrestVersion: '12' },
+  SchemaName extends string &
+    keyof GetGenericDatabaseWithOptions<Database>['db'] = 'public' extends keyof GetGenericDatabaseWithOptions<Database>['db']
     ? 'public'
-    : string & keyof Database,
-  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
-    ? Database[SchemaName]
+    : string & keyof GetGenericDatabaseWithOptions<Database>['db'],
+  Schema extends GenericSchema = GetGenericDatabaseWithOptions<Database>['db'][SchemaName] extends GenericSchema
+    ? GetGenericDatabaseWithOptions<Database>['db'][SchemaName]
     : any
 >(
   supabaseUrl: string,

test/client.test.ts

@@ -35,10 +35,10 @@ describe('Custom Headers', () => {
 
     const request = createClient(URL, KEY, { global: { headers: customHeader } }).rpc('')
 
-    // @ts-ignore
-    const getHeaders = request.headers
+    //@ts-expect-error headers is protected attribute
+    const requestHeader = request.headers.get('X-Test-Header')
 
-    expect(getHeaders).toHaveProperty('X-Test-Header', 'value')
+    expect(requestHeader).toBe(customHeader['X-Test-Header'])
   })
 })
 
@@ -80,13 +80,13 @@ describe('Dynamic schema', () => {
 })
 
 describe('Postgrest 13 client', () => {
-  test('should be able to declare specific postgrestVersion ', async () => {
-    // Note: The template argument properties (postgrestVersion) will not be autocompleted
+  test('should be able to declare specific PostgrestVersion ', async () => {
+    // Note: The template argument properties (PostgrestVersion) will not be autocompleted
     // due to a Typescript bug tracked here: https://github.com/microsoft/TypeScript/issues/56299
-    createClient<Database, { postgrestVersion: 13 }>('HTTP://localhost:3000', KEY)
-    createClient<Database, { postgrestVersion: 12 }>('HTTP://localhost:3000', KEY)
+    createClient<Database, { PostgrestVersion: '13' }>('HTTP://localhost:3000', KEY)
+    createClient<Database, { PostgrestVersion: '12' }>('HTTP://localhost:3000', KEY)
     // @ts-expect-error should raise error if provinding invalid version
-    createClient<Database, { postgrestVersion: 42 }>('HTTP://localhost:3000', KEY)
+    createClient<Database, { PostgrestVersion: 42 }>('HTTP://localhost:3000', KEY)
   })
 })