@supabase/supabase-js 1.35.3 → 1.36.0-next.10

package/dist/main/lib/SupabaseRealtimeClient.js

@@ -3,14 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupabaseRealtimeClient = void 0;
 const realtime_js_1 = require("@supabase/realtime-js");
 class SupabaseRealtimeClient {
-    constructor(socket, headers, schema, tableName) {
-        const chanParams = {};
-        const topic = tableName === '*' ? `realtime:${schema}` : `realtime:${schema}:${tableName}`;
-        const userToken = headers['Authorization'].split(' ')[1];
-        if (userToken) {
-            chanParams['user_token'] = userToken;
-        }
-        this.subscription = socket.channel(topic, chanParams);
+    constructor(socket, name, opts = {}) {
+        this.socket = socket;
+        this.channel = socket.channel(`realtime:${name}`, opts);
     }
     getPayloadRecords(payload) {
         const records = {
@@ -29,36 +24,55 @@ class SupabaseRealtimeClient {
      * The event you want to listen to.
      *
      * @param event The event
+     * @param filter An object that specifies what you want to listen to from the event.
      * @param callback A callback function that is called whenever the event occurs.
      */
-    on(event, callback) {
-        this.subscription.on(event, (payload) => {
-            let enrichedPayload = {
-                schema: payload.schema,
-                table: payload.table,
-                commit_timestamp: payload.commit_timestamp,
-                eventType: payload.type,
-                new: {},
-                old: {},
-                errors: payload.errors,
-            };
-            enrichedPayload = Object.assign(Object.assign({}, enrichedPayload), this.getPayloadRecords(payload));
-            callback(enrichedPayload);
+    on(event, filter, callback) {
+        this.channel.on(event, filter !== null && filter !== void 0 ? filter : {}, ({ payload }) => {
+            let enrichedPayload = payload;
+            if (event === 'realtime') {
+                const { schema, table, commit_timestamp, type, errors } = enrichedPayload;
+                enrichedPayload = {
+                    schema: schema,
+                    table: table,
+                    commit_timestamp: commit_timestamp,
+                    eventType: type,
+                    new: {},
+                    old: {},
+                    errors: errors,
+                };
+                enrichedPayload = Object.assign(Object.assign({}, enrichedPayload), this.getPayloadRecords(payload));
+            }
+            callback && callback(enrichedPayload);
         });
         return this;
     }
     /**
-     * Enables the subscription.
+     * Enables the channel.
      */
     subscribe(callback = () => { }) {
-        this.subscription.onError((e) => callback('SUBSCRIPTION_ERROR', e));
-        this.subscription.onClose(() => callback('CLOSED'));
-        this.subscription
+        // if the socket already has a good accessToken
+        // we can just use it straight away
+        if (this.socket.accessToken) {
+            this.channel.updateJoinPayload({
+                user_token: this.socket.accessToken,
+            });
+        }
+        this.channel.onError((e) => callback('CHANNEL_ERROR', e));
+        this.channel.onClose(() => callback('CLOSED'));
+        this.channel
             .subscribe()
-            .receive('ok', () => callback('SUBSCRIBED'))
-            .receive('error', (e) => callback('SUBSCRIPTION_ERROR', e))
+            .receive('ok', () => {
+            callback('SUBSCRIBED');
+            // re-set the accessToken again in case it was set while
+            // the subscription was isJoining
+            if (this.socket.accessToken) {
+                this.socket.setAuth(this.socket.accessToken);
+            }
+        })
+            .receive('error', (e) => callback('CHANNEL_ERROR', e))
             .receive('timeout', () => callback('RETRYING_AFTER_TIMEOUT'));
-        return this.subscription;
+        return this.channel;
     }
 }
 exports.SupabaseRealtimeClient = SupabaseRealtimeClient;

package/dist/main/lib/SupabaseRealtimeClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SupabaseRealtimeClient.js","sourceRoot":"","sources":["../../../src/lib/SupabaseRealtimeClient.ts"],"names":[],"mappings":";;;AAAA,uDAA0F;AAG1F,MAAa,sBAAsB;IAGjC,YAAY,MAAsB,EAAE,OAAsB,EAAE,MAAc,EAAE,SAAiB;QAC3F,MAAM,UAAU,GAAkB,EAAE,CAAA;QACpC,MAAM,KAAK,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC,YAAY,MAAM,IAAI,SAAS,EAAE,CAAA;QAC1F,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAExD,IAAI,SAAS,EAAE;YACb,UAAU,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;SACrC;QAED,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAyB,CAAA;IAC/E,CAAC;IAEO,iBAAiB,CAAC,OAAY;QACpC,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,EAAE;YACP,GAAG,EAAE,EAAE;SACR,CAAA;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1D,OAAO,CAAC,GAAG,GAAG,0BAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;SAC9E;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1D,OAAO,CAAC,GAAG,GAAG,0BAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;SAClF;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED;;;;;OAKG;IACH,EAAE,CAAC,KAAyB,EAAE,QAAyD;QACrF,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,OAAY,EAAE,EAAE;YAC3C,IAAI,eAAe,GAAiC;gBAClD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,SAAS,EAAE,OAAO,CAAC,IAAI;gBACvB,GAAG,EAAE,EAAE;gBACP,GAAG,EAAE,EAAE;gBACP,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAA;YAED,eAAe,mCAAQ,eAAe,GAAK,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAE,CAAA;YAE5E,QAAQ,CAAC,eAAe,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,WAAqB,GAAG,EAAE,GAAE,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAA;QAC1E,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnD,IAAI,CAAC,YAAY;aACd,SAAS,EAAE;aACX,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;aAC3C,OAAO,CAAC,OAAO,EAAE,CAAC,CAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;aACjE,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAC,YAAY,CAAA;IAC1B,CAAC;CACF;AAtED,wDAsEC"}
+{"version":3,"file":"SupabaseRealtimeClient.js","sourceRoot":"","sources":["../../../src/lib/SupabaseRealtimeClient.ts"],"names":[],"mappings":"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"}

package/dist/main/lib/constants.d.ts

@@ -1,5 +1,4 @@
 export declare const DEFAULT_HEADERS: {
     'X-Client-Info': string;
 };
-export declare const STORAGE_KEY = "supabase.auth.token";
 //# sourceMappingURL=constants.d.ts.map

package/dist/main/lib/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe;;CAAgD,CAAA;AAC5E,eAAO,MAAM,WAAW,wBAAwB,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe;;CAAgD,CAAA"}

package/dist/main/lib/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STORAGE_KEY = exports.DEFAULT_HEADERS = void 0;
+exports.DEFAULT_HEADERS = void 0;
 // constants.ts
 const version_1 = require("./version");
 exports.DEFAULT_HEADERS = { 'X-Client-Info': `supabase-js/${version_1.version}` };
-exports.STORAGE_KEY = 'supabase.auth.token';
 //# sourceMappingURL=constants.js.map

package/dist/main/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAAmC;AACtB,QAAA,eAAe,GAAG,EAAE,eAAe,EAAE,eAAe,iBAAO,EAAE,EAAE,CAAA;AAC/D,QAAA,WAAW,GAAG,qBAAqB,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uCAAmC;AACtB,QAAA,eAAe,GAAG,EAAE,eAAe,EAAE,eAAe,iBAAO,EAAE,EAAE,CAAA"}

package/dist/main/lib/fetch.d.ts

@@ -0,0 +1,9 @@
+declare type Fetch = typeof fetch;
+export declare const resolveFetch: (customFetch?: typeof fetch | undefined) => Fetch;
+export declare const resolveHeadersConstructor: () => {
+    new (init?: HeadersInit | undefined): Headers;
+    prototype: Headers;
+};
+export declare const fetchWithAuth: (supabaseKey: string, getAccessToken: () => Promise<string | null>, customFetch?: typeof fetch | undefined) => Fetch;
+export {};
+//# sourceMappingURL=fetch.d.ts.map

package/dist/main/lib/fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAEA,aAAK,KAAK,GAAG,OAAO,KAAK,CAAA;AAEzB,eAAO,MAAM,YAAY,8CAA0B,KAUlD,CAAA;AAED,eAAO,MAAM,yBAAyB;;;CAMrC,CAAA;AAED,eAAO,MAAM,aAAa,gBACX,MAAM,kBACH,MAAM,QAAQ,MAAM,GAAG,IAAI,CAAC,6CAE3C,KAkBF,CAAA"}

package/dist/main/lib/fetch.js

@@ -0,0 +1,75 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchWithAuth = exports.resolveHeadersConstructor = exports.resolveFetch = void 0;
+const cross_fetch_1 = __importStar(require("cross-fetch"));
+const resolveFetch = (customFetch) => {
+    let _fetch;
+    if (customFetch) {
+        _fetch = customFetch;
+    }
+    else if (typeof fetch === 'undefined') {
+        _fetch = cross_fetch_1.default;
+    }
+    else {
+        _fetch = fetch;
+    }
+    return (...args) => _fetch(...args);
+};
+exports.resolveFetch = resolveFetch;
+const resolveHeadersConstructor = () => {
+    if (typeof Headers === 'undefined') {
+        return cross_fetch_1.Headers;
+    }
+    return Headers;
+};
+exports.resolveHeadersConstructor = resolveHeadersConstructor;
+const fetchWithAuth = (supabaseKey, getAccessToken, customFetch) => {
+    const fetch = (0, exports.resolveFetch)(customFetch);
+    const HeadersConstructor = (0, exports.resolveHeadersConstructor)();
+    return (input, init) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const accessToken = (_a = (yield getAccessToken())) !== null && _a !== void 0 ? _a : supabaseKey;
+        let headers = new HeadersConstructor(init === null || init === void 0 ? void 0 : init.headers);
+        if (!headers.has('apikey')) {
+            headers.set('apikey', supabaseKey);
+        }
+        if (!headers.has('Authorization')) {
+            headers.set('Authorization', `Bearer ${accessToken}`);
+        }
+        return fetch(input, Object.assign(Object.assign({}, init), { headers }));
+    });
+};
+exports.fetchWithAuth = fetchWithAuth;
+//# sourceMappingURL=fetch.js.map

package/dist/main/lib/fetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAsE;AAI/D,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAS,EAAE;IACzD,IAAI,MAAa,CAAA;IACjB,IAAI,WAAW,EAAE;QACf,MAAM,GAAG,WAAW,CAAA;KACrB;SAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACvC,MAAM,GAAG,qBAA8B,CAAA;KACxC;SAAM;QACL,MAAM,GAAG,KAAK,CAAA;KACf;IACD,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;AACrC,CAAC,CAAA;AAVY,QAAA,YAAY,gBAUxB;AAEM,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC5C,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAClC,OAAO,qBAAiB,CAAA;KACzB;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AANY,QAAA,yBAAyB,6BAMrC;AAEM,MAAM,aAAa,GAAG,CAC3B,WAAmB,EACnB,cAA4C,EAC5C,WAAmB,EACZ,EAAE;IACT,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,WAAW,CAAC,CAAA;IACvC,MAAM,kBAAkB,GAAG,IAAA,iCAAyB,GAAE,CAAA;IAEtD,OAAO,CAAO,KAAK,EAAE,IAAI,EAAE,EAAE;;QAC3B,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,cAAc,EAAE,CAAC,mCAAI,WAAW,CAAA;QAC3D,IAAI,OAAO,GAAG,IAAI,kBAAkB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,WAAW,EAAE,CAAC,CAAA;SACtD;QAED,OAAO,KAAK,CAAC,KAAK,kCAAO,IAAI,KAAE,OAAO,IAAG,CAAA;IAC3C,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AAtBY,QAAA,aAAa,iBAsBzB"}

package/dist/main/lib/types.d.ts

@@ -3,39 +3,44 @@ import { RealtimeClientOptions } from '@supabase/realtime-js';
 declare type GoTrueClientOptions = ConstructorParameters<typeof GoTrueClient>[0];
 export interface SupabaseAuthClientOptions extends GoTrueClientOptions {
 }
-export declare type GenericObject = {
-    [key: string]: string;
-};
 export declare type Fetch = typeof fetch;
-export declare type SupabaseClientOptions = {
+export declare type SupabaseClientOptions<SchemaName> = {
     /**
      * The Postgres schema which your tables belong to. Must be on the list of exposed schemas in Supabase. Defaults to 'public'.
      */
-    schema?: string;
-    /**
-     * Optional headers for initializing the client.
-     */
-    headers?: GenericObject;
-    /**
-     * Automatically refreshes the token for logged in users.
-     */
-    autoRefreshToken?: boolean;
-    /**
-     * Allows to enable/disable multi-tab/window events
-     */
-    multiTab?: boolean;
-    /**
-     * Whether to persist a logged in session to storage.
-     */
-    persistSession?: boolean;
-    /**
-     * Detect a session from the URL. Used for OAuth login callbacks.
-     */
-    detectSessionInUrl?: boolean;
-    /**
-     * A storage provider. Used to store the logged in session.
-     */
-    localStorage?: SupabaseAuthClientOptions['localStorage'];
+    db?: {
+        schema?: SchemaName;
+    };
+    auth?: {
+        /**
+         * Automatically refreshes the token for logged in users.
+         */
+        autoRefreshToken?: boolean;
+        /**
+         * Optional key name used for storing tokens in local storage
+         */
+        storageKey?: string;
+        /**
+         * Whether to persist a logged in session to storage.
+         */
+        persistSession?: boolean;
+        /**
+         * Detect a session from the URL. Used for OAuth login callbacks.
+         */
+        detectSessionInUrl?: boolean;
+        /**
+         * A storage provider. Used to store the logged in session.
+         */
+        localStorage?: SupabaseAuthClientOptions['localStorage'];
+        /**
+         * Options passed to the gotrue-js instance
+         */
+        cookieOptions?: SupabaseAuthClientOptions['cookieOptions'];
+        /**
+         * Allows to enable/disable multi-tab/window events
+         */
+        multiTab?: boolean;
+    };
     /**
      * Options passed to the realtime-js instance
      */
@@ -45,13 +50,13 @@ export declare type SupabaseClientOptions = {
      */
     fetch?: Fetch;
     /**
-     * Throw errors, instead of returning them.
+     * Optional headers for initializing the client.
      */
-    shouldThrowOnError?: boolean;
+    headers?: Record<string, string>;
     /**
-     * Options passed to the gotrue-js instance
+     * Throw errors, instead of returning them.
      */
-    cookieOptions?: SupabaseAuthClientOptions['cookieOptions'];
+    shouldThrowOnError?: boolean;
 };
 export declare type SupabaseRealtimePayload<T> = {
     commit_timestamp: string;
@@ -64,6 +69,18 @@ export declare type SupabaseRealtimePayload<T> = {
     old: T;
     errors: string[] | null;
 };
-export declare type SupabaseEventTypes = 'INSERT' | 'UPDATE' | 'DELETE' | '*';
+export declare type GenericTable = {
+    Row: Record<string, unknown>;
+    Insert: Record<string, unknown>;
+    Update: Record<string, unknown>;
+};
+export declare type GenericFunction = {
+    Args: Record<string, unknown>;
+    Returns: unknown;
+};
+export declare type GenericSchema = {
+    Tables: Record<string, GenericTable>;
+    Functions: Record<string, GenericFunction>;
+};
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/main/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,aAAK,mBAAmB,GAAG,qBAAqB,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;AAExE,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;CAAG;AAEzE,oBAAY,aAAa,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAErD,oBAAY,KAAK,GAAG,OAAO,KAAK,CAAA;AAEhC,oBAAY,qBAAqB,GAAG;IAClC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;OAEG;IACH,YAAY,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAA;IAExD;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAEhC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;IAEb;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,aAAa,CAAC,EAAE,yBAAyB,CAAC,eAAe,CAAC,CAAA;CAC3D,CAAA;AAED,oBAAY,uBAAuB,CAAC,CAAC,IAAI;IACvC,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,gEAAgE;IAChE,GAAG,EAAE,CAAC,CAAA;IACN,qEAAqE;IACrE,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CACxB,CAAA;AAED,oBAAY,kBAAkB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,GAAG,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,aAAK,mBAAmB,GAAG,qBAAqB,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;AAExE,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;CAAG;AAEzE,oBAAY,KAAK,GAAG,OAAO,KAAK,CAAA;AAEhC,oBAAY,qBAAqB,CAAC,UAAU,IAAI;IAC9C;;OAEG;IACH,EAAE,CAAC,EAAE;QACH,MAAM,CAAC,EAAE,UAAU,CAAA;KACpB,CAAA;IAED,IAAI,CAAC,EAAE;QACL;;WAEG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;QAC1B;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB;;WAEG;QACH,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;QAC5B;;WAEG;QACH,YAAY,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAA;QACxD;;WAEG;QACH,aAAa,CAAC,EAAE,yBAAyB,CAAC,eAAe,CAAC,CAAA;QAC1D;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAA;KACnB,CAAA;IACD;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;IACb;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,oBAAY,uBAAuB,CAAC,CAAC,IAAI;IACvC,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,gEAAgE;IAChE,GAAG,EAAE,CAAC,CAAA;IACN,qEAAqE;IACrE,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CACxB,CAAA;AAED,oBAAY,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC,CAAA;AAED,oBAAY,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,oBAAY,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAC3C,CAAA"}

package/dist/main/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.35.3";
+export declare const version = "1.36.0-next.10";
 //# sourceMappingURL=version.d.ts.map

package/dist/main/lib/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '1.35.3';
+exports.version = '1.36.0-next.10';
 //# sourceMappingURL=version.js.map

package/dist/module/SupabaseClient.d.ts

@@ -1,29 +1,30 @@
-import { Fetch, SupabaseClientOptions } from './lib/types';
-import { SupabaseAuthClient } from './lib/SupabaseAuthClient';
-import { SupabaseQueryBuilder } from './lib/SupabaseQueryBuilder';
-import { SupabaseStorageClient } from '@supabase/storage-js';
 import { FunctionsClient } from '@supabase/functions-js';
-import { RealtimeClient, RealtimeSubscription, RealtimeChannel } from '@supabase/realtime-js';
+import { PostgrestClient, PostgrestFilterBuilder, PostgrestQueryBuilder } from '@supabase/postgrest-js';
+import { RealtimeChannel, RealtimeClient } from '@supabase/realtime-js';
+import { SupabaseStorageClient } from '@supabase/storage-js';
+import { SupabaseAuthClient } from './lib/SupabaseAuthClient';
+import { SupabaseRealtimeClient } from './lib/SupabaseRealtimeClient';
+import { Fetch, GenericSchema, SupabaseClientOptions } from './lib/types';
 /**
  * Supabase Client.
  *
  * An isomorphic Javascript client for interacting with Postgres.
  */
-export default class SupabaseClient {
+export default class SupabaseClient<Database = any, SchemaName extends string & keyof Database = 'public' extends keyof Database ? 'public' : string & keyof Database, Schema extends GenericSchema = Database[SchemaName] extends GenericSchema ? Database[SchemaName] : any> {
     protected supabaseUrl: string;
     protected supabaseKey: string;
     /**
      * Supabase Auth allows you to create and manage user sessions for access to data that is secured by access policies.
      */
     auth: SupabaseAuthClient;
-    protected schema: string;
-    protected restUrl: string;
     protected realtimeUrl: string;
     protected authUrl: string;
     protected storageUrl: string;
     protected functionsUrl: string;
     protected realtime: RealtimeClient;
+    protected rest: PostgrestClient<Database, SchemaName>;
     protected multiTab: boolean;
+    protected storageKey: string;
     protected fetch?: Fetch;
     protected changedAccessToken: string | undefined;
     protected shouldThrowOnError: boolean;
@@ -43,7 +44,7 @@ export default class SupabaseClient {
      * @param options.multiTab Set to "false" if you want to disable multi-tab/window events.
      * @param options.fetch A custom fetch implementation.
      */
-    constructor(supabaseUrl: string, supabaseKey: string, options?: SupabaseClientOptions);
+    constructor(supabaseUrl: string, supabaseKey: string, options?: SupabaseClientOptions<SchemaName>);
     /**
      * Supabase Functions allows you to deploy and invoke edge functions.
      */
@@ -57,7 +58,7 @@ export default class SupabaseClient {
      *
      * @param table The table name to operate on.
      */
-    from<T = any>(table: string): SupabaseQueryBuilder<T>;
+    from<TableName extends string & keyof Schema['Tables'], Table extends Schema['Tables'][TableName]>(table: TableName): PostgrestQueryBuilder<Table>;
     /**
      * Perform a function call.
      *
@@ -67,25 +68,23 @@ export default class SupabaseClient {
      * @param count  Count algorithm to use to count rows in a table.
      *
      */
-    rpc<T = any>(fn: string, params?: object, { head, count, }?: {
+    rpc<FunctionName extends string & keyof Schema['Functions'], Function_ extends Schema['Functions'][FunctionName]>(fn: FunctionName, args?: Function_['Args'], options?: {
         head?: boolean;
-        count?: null | 'exact' | 'planned' | 'estimated';
-    }): import("@supabase/postgrest-js").PostgrestFilterBuilder<T>;
+        count?: 'exact' | 'planned' | 'estimated';
+    }): PostgrestFilterBuilder<Function_['Returns'] extends any[] ? Function_['Returns'][number] extends Record<string, unknown> ? Function_['Returns'][number] : never : never, Function_['Returns']>;
     /**
      * Creates a channel with Broadcast and Presence.
-     * Activated when vsndate query param is present in the WebSocket URL.
      */
-    channel(name: string, opts: {
-        selfBroadcast: boolean;
+    channel(name: string, opts?: {
         [key: string]: any;
-    }): RealtimeChannel;
+    }): SupabaseRealtimeClient;
     /**
-     * Closes and removes all subscriptions and returns a list of removed
-     * subscriptions and their errors.
+     * Closes and removes all channels and returns a list of removed
+     * channels and their errors.
      */
-    removeAllSubscriptions(): Promise<{
+    removeAllChannels(): Promise<{
         data: {
-            subscription: RealtimeSubscription;
+            channels: RealtimeChannel;
         };
         error: Error | null;
     }[]>;
@@ -100,27 +99,15 @@ export default class SupabaseClient {
         };
         error: Error | null;
     }>;
+    private _getAccessToken;
+    private _closeChannel;
+    private _unsubscribeChannel;
     /**
-     * Closes and removes a subscription and returns the number of open subscriptions.
-     *
-     * @param subscription The subscription you want to close and remove.
-     */
-    removeSubscription(subscription: RealtimeSubscription): Promise<{
-        data: {
-            openSubscriptions: number;
-        };
-        error: Error | null;
-    }>;
-    private _closeSubscription;
-    private _unsubscribeSubscription;
-    /**
-     * Returns an array of all your subscriptions.
+     * Returns an array of all your channels.
      */
-    getSubscriptions(): RealtimeSubscription[];
+    getChannels(): RealtimeChannel[];
     private _initSupabaseAuthClient;
     private _initRealtimeClient;
-    private _initPostgRESTClient;
-    private _getAuthHeaders;
     private _listenForMultiTabEvents;
     private _listenForAuthEvents;
     private _handleTokenChanged;

package/dist/module/SupabaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SupabaseClient.d.ts","sourceRoot":"","sources":["../../src/SupabaseClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAGxD,OAAO,EACL,cAAc,EACd,oBAAoB,EAEpB,eAAe,EAChB,MAAM,uBAAuB,CAAA;AAW9B;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IAoC/B,SAAS,CAAC,WAAW,EAAE,MAAM;IAC7B,SAAS,CAAC,WAAW,EAAE,MAAM;IApC/B;;OAEG;IACH,IAAI,EAAE,kBAAkB,CAAA;IAExB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,WAAW,EAAE,MAAM,CAAA;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAA;IAC5B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAA;IAClC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC3B,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAA;IACvB,SAAS,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAA;IAChD,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAA;IAErC,SAAS,CAAC,OAAO,EAAE;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IAED;;;;;;;;;;;;OAYG;gBAES,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EAC7B,OAAO,CAAC,EAAE,qBAAqB;IAuCjC;;OAEG;IACH,IAAI,SAAS,oBAKZ;IAED;;OAEG;IACH,IAAI,OAAO,0BAEV;IAED;;;;OAIG;IACH,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC,CAAC,CAAC;IAYrD;;;;;;;;OAQG;IACH,GAAG,CAAC,CAAC,GAAG,GAAG,EACT,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,EACf,EACE,IAAY,EACZ,KAAY,GACb,GAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAA;KAAO;IAM9E;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,eAAe;IAU5F;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CACrC;QAAE,IAAI,EAAE;YAAE,YAAY,EAAE,oBAAoB,CAAA;SAAE,CAAC;QAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;KAAE,EAAE,CACxE;IAaD;;;;OAIG;IACG,aAAa,CACjB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;QAAE,IAAI,EAAE;YAAE,YAAY,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;KAAE,CAAC;IAUnE;;;;OAIG;IACG,kBAAkB,CACtB,YAAY,EAAE,oBAAoB,GACjC,OAAO,CAAC;QAAE,IAAI,EAAE;YAAE,iBAAiB,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;KAAE,CAAC;YAU1D,kBAAkB;IAehC,OAAO,CAAC,wBAAwB;IAYhC;;OAEG;IACH,gBAAgB,IAAI,oBAAoB,EAAE;IAI1C,OAAO,CAAC,uBAAuB;IA2B/B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,mBAAmB;CAsB5B"}
+{"version":3,"file":"SupabaseClient.d.ts","sourceRoot":"","sources":["../../src/SupabaseClient.ts"],"names":[],"mappings":"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"}