prostgles-client 4.0.421 → 4.0.424

package/dist/getAuthHandler.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authRequest = exports.getAuthHandler = void 0;
+exports.getAuthHandler = exports.authRequest = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const prostgles_1 = require("./prostgles");
+const getAuthCalls_1 = require("./auth/getAuthCalls");
+var authRequest_1 = require("./auth/authRequest");
+Object.defineProperty(exports, "authRequest", { enumerable: true, get: function () { return authRequest_1.authRequest; } });
 const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...authOpts }) => {
     const urlWithEndpointAndSearch = (route) => {
         const search = typeof window !== "undefined" ? window.location.search : "";
@@ -11,6 +14,12 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
             url = `${endpoint}${url}`;
         return url;
     };
+    const authCalls = (0, getAuthCalls_1.getAuthCalls)({
+        login: authConfig?.login?.loginRoute,
+        register: authConfig?.signupWithEmailAndPassword?.url,
+        magicLinkOrOTP: authConfig?.signupWithEmailAndPassword?.emailConfirmationRoute,
+        logout: authConfig?.login?.logoutRoute,
+    }, urlWithEndpointAndSearch, authOpts);
     if (authConfig?.pathGuard && prostgles_1.isClientSide) {
         const doReload = (res) => {
             if (res?.shouldReload) {
@@ -51,21 +60,10 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
                     };
                     return acc;
                 }, {}));
-        loginSignupOptions.login =
-            login &&
-                (async (params) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(login.loginRoute), params, "POST", authOpts);
-                });
+        loginSignupOptions.login = login && authCalls.login;
         loginSignupOptions.signupWithEmailAndPassword =
-            signupWithEmailAndPassword &&
-                ((params) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(signupWithEmailAndPassword.url), params, "POST", authOpts);
-                });
-        loginSignupOptions.confirmEmail =
-            signupWithEmailAndPassword &&
-                ((data) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(signupWithEmailAndPassword.emailConfirmationRoute), data, "POST", authOpts);
-                });
+            signupWithEmailAndPassword && authCalls.register;
+        loginSignupOptions.confirmEmail = signupWithEmailAndPassword && authCalls.magicLinkOrOTP;
     }
     if (!authConfig?.user) {
         return {
@@ -77,44 +75,8 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
     return {
         isLoggedin: true,
         user: authConfig.user,
-        logout: async () => {
-            const { logoutRoute } = authConfig.login ?? {};
-            if (!logoutRoute)
-                throw new Error("Unexpected");
-            return (0, exports.authRequest)(urlWithEndpointAndSearch(logoutRoute), {}, "POST", authOpts);
-        },
+        logout: () => authCalls.logout({}),
         ...loginSignupOptions,
     };
 };
 exports.getAuthHandler = getAuthHandler;
-const authRequest = async (path, data, method, { credentials, redirect }) => {
-    const rawResponse = await fetch(path, {
-        method: method,
-        headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json",
-        },
-        ...(method !== "GET" && { body: JSON.stringify(data) }),
-        credentials,
-        redirect,
-    });
-    if (!rawResponse.ok) {
-        const error = await rawResponse
-            .json()
-            .catch(() => rawResponse.text())
-            .catch(() => rawResponse.statusText);
-        if (typeof error === "string") {
-            return { success: false, code: "something-went-wrong", message: error };
-        }
-        return error;
-    }
-    const responseObject = await rawResponse
-        .json()
-        .catch(async () => ({ message: await rawResponse.text() }))
-        .catch(() => ({ message: rawResponse.statusText }));
-    if (rawResponse.redirected) {
-        return { ...responseObject, success: true, redirect_url: rawResponse.url };
-    }
-    return responseObject;
-};
-exports.authRequest = authRequest;

package/dist/getDbHandler.d.ts

@@ -1,12 +1,12 @@
 import { type DBSchemaTable } from "prostgles-types";
 import type { getSubscriptionHandler } from "./getSubscriptionHandler";
-import type { getSyncHandlerV2 } from "./getSyncHandlerV2";
+import type { getSyncHandler } from "./getSyncHandler";
 import { type DBHandlerClient, type InitOptions } from "./prostgles";
 type Args = {
     tableSchema: DBSchemaTable[] | undefined;
     onDebug: InitOptions["onDebug"];
     socket: InitOptions["socket"];
-    syncHandlerV2: ReturnType<typeof getSyncHandlerV2>;
+    syncHandlerV2: ReturnType<typeof getSyncHandler>;
     subscriptionHandler: ReturnType<typeof getSubscriptionHandler>;
 };
 export declare const getDB: <DBSchema = void>({ tableSchema, onDebug, syncHandlerV2, subscriptionHandler, socket, }: Args) => {

package/dist/getDbHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAWrB,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;IACnD,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,uEAMpC,IAAI;QAuLc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}
+{"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAYrB,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,aAAa,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IACjD,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,uEAMpC,IAAI;QA0Lc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}

package/dist/getDbHandler.js

@@ -34,7 +34,7 @@ const getDB = ({ tableSchema, onDebug, syncHandlerV2, subscriptionHandler, socke
                     throw `Table ${tableName} does not have syncConfig in publishInfo.select`;
                 }
                 dboTable._syncInfo = { ...syncConfig };
-                const syncOne = (async (basicFilter, options = { handlesOnData: true }, onChange) => {
+                const syncOne = (async (basicFilter, options = { handlesOnData: true }, onChange, onError) => {
                     await onDebug?.({
                         type: "table",
                         command: "syncOne",
@@ -42,9 +42,9 @@ const getDB = ({ tableSchema, onDebug, syncHandlerV2, subscriptionHandler, socke
                         data: { basicFilter, options },
                     });
                     checkSubscriptionArgs(basicFilter, options, onChange);
-                    return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSyncOne(basicFilter, options, onChange);
+                    return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSyncOne(basicFilter, options, onChange, onError);
                 });
-                const sync = (async (basicFilter, options = { handlesOnData: true }, onChange) => {
+                const sync = (async (basicFilter, options = { handlesOnData: true }, onChange, onError) => {
                     await onDebug?.({
                         type: "table",
                         command: "sync",
@@ -52,7 +52,7 @@ const getDB = ({ tableSchema, onDebug, syncHandlerV2, subscriptionHandler, socke
                         data: { basicFilter, options },
                     });
                     checkSubscriptionArgs(basicFilter, options, onChange);
-                    return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSync(basicFilter, options, onChange);
+                    return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSync(basicFilter, options, onChange, onError);
                 });
                 dboTable.sync = sync;
                 dboTable.syncOne = syncOne;

package/dist/{getSyncHandlerV2.d.ts → getSyncHandler.d.ts}

@@ -1,7 +1,7 @@
-import { type AnyObject, type ValidatedColumnInfo } from "prostgles-types";
+import { type AnyObject, type DBSchemaTable, type ValidatedColumnInfo } from "prostgles-types";
 import type { DBHandlerClient, InitOptions } from "./prostgles";
 import type { Sync, SyncOne } from "./SyncedTable/SyncedTable";
-export declare const getSyncHandlerV2: ({ socket, onDebug }: Pick<InitOptions, "socket" | "onDebug">) => {
+export declare const getSyncHandler: ({ socket, onDebug }: Pick<InitOptions, "socket" | "onDebug">) => {
     getTableSyncFunctions: ({ db, tableName, columns, }: {
         db: Partial<DBHandlerClient>;
         tableName: string;
@@ -10,6 +10,6 @@ export declare const getSyncHandlerV2: ({ socket, onDebug }: Pick<InitOptions, "
         addSync: Sync<AnyObject>;
         addSyncOne: SyncOne<AnyObject>;
     }>;
-    reAttachAll: () => Promise<void>;
+    reAttachAll: (db: Partial<DBHandlerClient>, tables?: DBSchemaTable[]) => Promise<void>;
 };
-//# sourceMappingURL=getSyncHandlerV2.d.ts.map
+//# sourceMappingURL=getSyncHandler.d.ts.map

package/dist/getSyncHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSyncHandler.d.ts","sourceRoot":"","sources":["../lib/getSyncHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,aAAa,EAGlB,KAAK,mBAAmB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEhE,OAAO,KAAK,EAAwB,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAErF,eAAO,MAAM,cAAc,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;yDAmDtF;QACD,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;KAChC;;;;sBAgB8B,OAAO,CAAC,eAAe,CAAC,WAAU,aAAa,EAAE;CAajF,CAAC"}

package/dist/{getSyncHandlerV2.js → getSyncHandler.js}

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSyncHandlerV2 = void 0;
+exports.getSyncHandler = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const createSync_1 = require("./SyncedTable/createSync");
-const getSyncHandlerV2 = ({ socket, onDebug }) => {
+const getSyncHandler = ({ socket, onDebug }) => {
+    let currentSchema;
     const syncs = new Map();
     const upsertSync = async (db, columns, tableName, filter, select) => {
+        db = currentSchema?.db ?? db;
+        columns = currentSchema?.tables.find((table) => table.name === tableName)?.columns ?? columns;
+        if (!db[tableName]?._syncInfo) {
+            throw new Error(`Table ${tableName} does not support sync`);
+        }
         const channelName = (0, prostgles_types_1.getSyncChannelName)({
             filter,
             select,
@@ -26,20 +32,22 @@ const getSyncHandlerV2 = ({ socket, onDebug }) => {
         return syncConfig.sync;
     };
     const getTableSyncFunctions = async ({ db, tableName, columns, }) => {
-        const addSync = (async (filter, opts, onChange) => {
+        const addSync = (async (filter, opts, onChange, onError) => {
             const { sync } = await upsertSync(db, columns, tableName, filter, opts.select);
-            return sync(onChange, opts.handlesOnData);
+            return sync(onChange, opts.handlesOnData, onError);
         });
-        const addSyncOne = (async (filter, opts, onChange) => {
+        const addSyncOne = (async (filter, opts, onChange, onError) => {
             const { syncOne } = await upsertSync(db, columns, tableName, filter, opts.select);
-            return syncOne(filter, onChange, opts.handlesOnData);
+            return syncOne(filter, onChange, opts.handlesOnData, onError);
         });
         return { addSync, addSyncOne };
     };
-    const reAttachAll = async () => {
-        for (const { sync } of syncs.values()) {
+    const reAttachAll = async (db, tables = []) => {
+        currentSchema = { db, tables };
+        for (const { sync, options } of syncs.values()) {
             try {
-                await (await sync).reAttach();
+                const columns = tables.find((table) => table.name === options.tableName)?.columns ?? [];
+                await (await sync).reAttach({ db, columns });
             }
             catch (error) {
                 console.error("Failed to reattach sync", error);
@@ -48,4 +56,4 @@ const getSyncHandlerV2 = ({ socket, onDebug }) => {
     };
     return { getTableSyncFunctions, reAttachAll };
 };
-exports.getSyncHandlerV2 = getSyncHandlerV2;
+exports.getSyncHandler = getSyncHandler;