@supabase/supabase-js 2.50.5-next.3 → 2.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supabase/supabase-js",
-  "version": "2.50.5-next.3",
+  "version": "2.51.0",
   "description": "Isomorphic Javascript client for Supabase",
   "keywords": [
     "javascript",
@@ -23,7 +23,6 @@
   "scripts": {
     "clean": "rimraf dist docs/v2",
     "format": "prettier --write \"{src,test}/**/*.ts\"",
-    "check:jsr": "jsr publish --dry-run",
     "build": "run-s clean format build:*",
     "build:main": "tsc -p tsconfig.json",
     "build:module": "tsc -p tsconfig.module.json",
@@ -39,7 +38,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,11 +49,11 @@
     "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/realtime-js": "2.12.2",
+    "@supabase/postgrest-js": "1.19.4",
+    "@supabase/realtime-js": "2.11.15",
     "@supabase/storage-js": "2.7.1"
   },
   "devDependencies": {
@@ -63,6 +62,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/src/SupabaseClient.ts

@@ -1,11 +1,9 @@
 import { FunctionsClient } from '@supabase/functions-js'
-import { AuthChangeEvent, Subscription } from '@supabase/auth-js'
+import { AuthChangeEvent } from '@supabase/auth-js'
 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
@@ -138,7 +131,7 @@ export default class SupabaseClient<
     })
 
     if (!settings.accessToken) {
-      setTimeout(() => this._listenForAuthEvents(), 0)
+      this._listenForAuthEvents()
     }
   }
 
@@ -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)
   }
@@ -278,7 +268,7 @@ export default class SupabaseClient<
     return this.realtime.removeAllChannels()
   }
 
-  protected async _getAccessToken(): Promise<string | null> {
+  private async _getAccessToken() {
     if (this.accessToken) {
       return await this.accessToken()
     }
@@ -288,7 +278,7 @@ export default class SupabaseClient<
     return data.session?.access_token ?? null
   }
 
-  protected _initSupabaseAuthClient(
+  private _initSupabaseAuthClient(
     {
       autoRefreshToken,
       persistSession,
@@ -301,7 +291,7 @@ export default class SupabaseClient<
     }: SupabaseAuthClientOptions,
     headers?: Record<string, string>,
     fetch?: Fetch
-  ): SupabaseAuthClient {
+  ) {
     const authHeaders = {
       Authorization: `Bearer ${this.supabaseKey}`,
       apikey: `${this.supabaseKey}`,
@@ -324,23 +314,21 @@ export default class SupabaseClient<
     })
   }
 
-  protected _initRealtimeClient(options: RealtimeClientOptions): RealtimeClient {
+  private _initRealtimeClient(options: RealtimeClientOptions) {
     return new RealtimeClient(this.realtimeUrl.href, {
       ...options,
       params: { ...{ apikey: this.supabaseKey }, ...options?.params },
     })
   }
 
-  protected async _listenForAuthEvents(): Promise<{ data: { subscription: Subscription } }> {
-    return await this.auth.onAuthStateChange((event, session) => {
-      setTimeout(
-        async () => await this._handleTokenChanged(event, 'CLIENT', session?.access_token),
-        0
-      )
+  private _listenForAuthEvents() {
+    let data = this.auth.onAuthStateChange((event, session) => {
+      this._handleTokenChanged(event, 'CLIENT', session?.access_token)
     })
+    return data
   }
 
-  protected async _handleTokenChanged(
+  private _handleTokenChanged(
     event: AuthChangeEvent,
     source: 'CLIENT' | 'STORAGE',
     token?: string
@@ -350,16 +338,10 @@ export default class SupabaseClient<
       this.changedAccessToken !== token
     ) {
       this.changedAccessToken = token
-      this.realtime.setAuth(token)
     } else if (event === 'SIGNED_OUT') {
-      try {
-        await this.realtime.setAuth()
-        if (source == 'STORAGE') this.auth.signOut()
-      } catch (error) {
-        console.log('Failed to set auth for realtime client:', error)
-      } finally {
-        this.changedAccessToken = undefined
-      }
+      this.realtime.setAuth()
+      if (source == 'STORAGE') this.auth.signOut()
+      this.changedAccessToken = undefined
     }
   }
 }

package/src/index.ts

@@ -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)
 }

package/src/lib/version.ts

@@ -1 +1 @@
-export const version = '2.50.5-next.3'
+export const version = '2.51.0'