fix: rebase master against next (#1499)

---------

Co-authored-by: Guilherme Souza <[email protected]>
Co-authored-by: avallete <[email protected]>
Co-authored-by: Andrew Valleteau <[email protected]>
Co-authored-by: Stojan Dimitrovski <[email protected]>

Author: 4 people

package-lock.json

@@ -39,7 +39,7 @@
     "test:watch": "jest --watch --verbose false --silent false",
     "test:node:playwright": "cd test/integration/node-browser && npm install && cp ../../../dist/umd/supabase.js . && npm run test",
     "test:bun": "cd test/integration/bun && bun install && bun test",
-    "test:types": "run-s build:module && tsd --files test/types/*.test-d.ts",
+    "test:types": "run-s build:module && tsd --files test/types/*.test-d.ts && jsr publish --dry-run",
     "docs": "typedoc --entryPoints src/index.ts --out docs/v2 --includes src/**/*.ts",
     "docs:json": "typedoc --entryPoints src/index.ts --includes src/**/*.ts --json docs/v2/spec.json --excludeExternals",
     "serve:coverage": "npm run test:coverage && serve test/coverage",
@@ -50,10 +50,10 @@
     "update:test-deps:bun": "npm run build && npm pack && cp supabase-supabase-js-*.tgz test/integration/bun/supabase-supabase-js-0.0.0-automated.tgz && cd test/integration/bun && bun install"
   },
   "dependencies": {
-    "@supabase/auth-js": "2.70.0",
+    "@supabase/auth-js": "2.71.0",
     "@supabase/functions-js": "2.4.5",
     "@supabase/node-fetch": "2.6.15",
-    "@supabase/postgrest-js": "1.21.0",
+    "@supabase/postgrest-js": "1.19.4",
     "@supabase/realtime-js": "2.12.2",
     "@supabase/storage-js": "2.7.1"
   },
@@ -63,6 +63,7 @@
     "@types/jest": "^29.2.5",
     "husky": "^4.3.8",
     "jest": "^29.3.1",
+    "jsr": "^0.13.5",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "pretty-quick": "^3.1.3",

package.json

@@ -4,8 +4,6 @@ import {
   PostgrestClient,
   PostgrestFilterBuilder,
   PostgrestQueryBuilder,
-  ClientServerOptions as PostgrestClientServerOption,
-  GetGenericDatabaseWithOptions,
 } from '@supabase/postgrest-js'
 import {
   RealtimeChannel,
@@ -30,18 +28,13 @@ import { Fetch, GenericSchema, SupabaseClientOptions, SupabaseAuthClientOptions
  *
  * An isomorphic Javascript client for interacting with Postgres.
  */
-
-export type ServicesOptions = PostgrestClientServerOption & {}
-
 export default class SupabaseClient<
   Database = any,
-  ClientOptions extends ServicesOptions = { PostgrestVersion: '12' },
-  SchemaName extends string &
-    keyof GetGenericDatabaseWithOptions<Database>['db'] = 'public' extends keyof GetGenericDatabaseWithOptions<Database>['db']
+  SchemaName extends string & keyof Database = 'public' extends keyof Database
     ? 'public'
-    : string & keyof GetGenericDatabaseWithOptions<Database>['db'],
-  Schema extends GenericSchema = GetGenericDatabaseWithOptions<Database>['db'][SchemaName] extends GenericSchema
-    ? GetGenericDatabaseWithOptions<Database>['db'][SchemaName]
+    : string & keyof Database,
+  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+    ? Database[SchemaName]
     : any
 > {
   /**
@@ -54,7 +47,7 @@ export default class SupabaseClient<
   protected authUrl: URL
   protected storageUrl: URL
   protected functionsUrl: URL
-  protected rest: PostgrestClient<Database, ClientOptions, SchemaName, Schema>
+  protected rest: PostgrestClient<Database, SchemaName, Schema>
   protected storageKey: string
   protected fetch?: Fetch
   protected changedAccessToken?: string
@@ -163,16 +156,16 @@ export default class SupabaseClient<
   from<
     TableName extends string & keyof Schema['Tables'],
     Table extends Schema['Tables'][TableName]
-  >(relation: TableName): PostgrestQueryBuilder<ClientOptions, Schema, Table, TableName>
+  >(relation: TableName): PostgrestQueryBuilder<Schema, Table, TableName>
   from<ViewName extends string & keyof Schema['Views'], View extends Schema['Views'][ViewName]>(
     relation: ViewName
-  ): PostgrestQueryBuilder<ClientOptions, Schema, View, ViewName>
+  ): PostgrestQueryBuilder<Schema, View, ViewName>
   /**
    * Perform a query on a table or a view.
    *
    * @param relation - The table or view name to query
    */
-  from(relation: string): PostgrestQueryBuilder<ClientOptions, Schema, any, any> {
+  from(relation: string): PostgrestQueryBuilder<Schema, any, any> {
     return this.rest.from(relation)
   }
 
@@ -184,11 +177,10 @@ export default class SupabaseClient<
    *
    * @param schema - The schema to query
    */
-  schema<DynamicSchema extends string & keyof GetGenericDatabaseWithOptions<Database>['db']>(
+  schema<DynamicSchema extends string & keyof Database>(
     schema: DynamicSchema
   ): PostgrestClient<
     Database,
-    ClientOptions,
     DynamicSchema,
     Database[DynamicSchema] extends GenericSchema ? Database[DynamicSchema] : any
   > {
@@ -228,7 +220,6 @@ export default class SupabaseClient<
       count?: 'exact' | 'planned' | 'estimated'
     } = {}
   ): PostgrestFilterBuilder<
-    ClientOptions,
     Schema,
     Fn['Returns'] extends any[]
       ? Fn['Returns'][number] extends Record<string, unknown>
@@ -237,8 +228,7 @@ export default class SupabaseClient<
       : never,
     Fn['Returns'],
     FnName,
-    null,
-    'RPC'
+    null
   > {
     return this.rest.rpc(fn, args, options)
   }

pnpm-lock.yaml

@@ -1,7 +1,5 @@
 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'
@@ -28,28 +26,16 @@ export type { SupabaseClientOptions, QueryResult, QueryData, QueryError } from '
  */
 export const createClient = <
   Database = any,
-  ClientOptions extends ServicesOptions = GetGenericDatabaseWithOptions<Database>['options'],
-  SchemaName extends string &
-    keyof GetGenericDatabaseWithOptions<Database>['db'] = 'public' extends keyof GetGenericDatabaseWithOptions<Database>['db']
+  SchemaName extends string & keyof Database = 'public' extends keyof Database
     ? 'public'
-    : string & keyof GetGenericDatabaseWithOptions<Database>['db'],
-  Schema = GetGenericDatabaseWithOptions<Database>['db'][SchemaName] extends GenericSchema
-    ? GetGenericDatabaseWithOptions<Database>['db'][SchemaName]
+    : string & keyof Database,
+  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+    ? Database[SchemaName]
     : any
 >(
   supabaseUrl: string,
   supabaseKey: string,
   options?: SupabaseClientOptions<SchemaName>
-): SupabaseClient<
-  Database,
-  ClientOptions,
-  SchemaName,
-  Schema extends GenericSchema ? Schema : any
-> => {
-  return new SupabaseClient<
-    Database,
-    ClientOptions,
-    SchemaName,
-    Schema extends GenericSchema ? Schema : any
-  >(supabaseUrl, supabaseKey, options)
+): SupabaseClient<Database, SchemaName, Schema> => {
+  return new SupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, options)
 }

src/SupabaseClient.ts

@@ -59,15 +59,15 @@ Deno.test(
         const { error: deleteError } = await supabase
           .from('todos')
           .delete()
-          .eq('id', createdTodo!.id as string)
+          .eq('id', createdTodo!.id)
 
         assertEquals(deleteError, null)
 
         // Verify the todo was deleted
         const { data: fetchedTodo, error: fetchError } = await supabase
           .from('todos')
           .select('*')
-          .eq('id', createdTodo!.id as string)
+          .eq('id', createdTodo!.id)
           .single()
 
         assertExists(fetchError)