prostgles-client 4.0.211 → 4.0.212

package/dist/getDbHandler.d.ts

@@ -1,8 +1,8 @@
 import { type DBSchemaTable, type TableSchemaForClient } from "prostgles-types";
-import { type InitOptions, type DBHandlerClient } from "./prostgles";
-import { type SyncedTable } from "./SyncedTable/SyncedTable";
-import type { getSyncHandler } from "./getSyncHandler";
 import type { getSubscriptionHandler } from "./getSubscriptionHandler";
+import type { getSyncHandler } from "./getSyncHandler";
+import { type DBHandlerClient, type InitOptions } from "./prostgles";
+import { type SyncedTable } from "./SyncedTable/SyncedTable";
 type Args = {
     schema: TableSchemaForClient;
     tableSchema: DBSchemaTable[] | undefined;

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,EAKlB,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,eAAe,EAIrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEvE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,MAAM,6FAQhB,IAAI;;CAuNN,CAAC"}
+{"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAKlB,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAKjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,MAAM,6FAQhB,IAAI;;CAwNN,CAAC"}

package/dist/getDbHandler.js

@@ -81,11 +81,12 @@ const getDBO = ({ schema, tableSchema, onDebug, syncedTable, syncHandler, subscr
                     };
                     dboTable.sync = sync;
                     dboTable.syncOne = syncOne;
+                    dboTable.useSync = (basicFilter, options, hookOptions) => 
                     // eslint-disable-next-line react-hooks/rules-of-hooks
-                    dboTable.useSync = (basicFilter, options) => (0, prostgles_1.useSync)(sync, basicFilter, options);
-                    dboTable.useSyncOne = (basicFilter, options) => 
+                    (0, prostgles_1.useSync)(sync, basicFilter, options, hookOptions);
+                    dboTable.useSyncOne = (basicFilter, options, hookOptions) => 
                     // eslint-disable-next-line react-hooks/rules-of-hooks
-                    (0, prostgles_1.useSync)(syncOne, basicFilter, options);
+                    (0, prostgles_1.useSync)(syncOne, basicFilter, options, hookOptions);
                 }
                 dboTable._sync = async function (param1, param2, syncHandles) {
                     await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({
@@ -117,9 +118,9 @@ const getDBO = ({ schema, tableSchema, onDebug, syncedTable, syncHandler, subscr
                     : command === "subscribeOne" ? "useSubscribeOne"
                         : undefined;
                 if (handlerName) {
-                    dboTable[handlerName] = (filter, options) => 
+                    dboTable[handlerName] = (filter, options, hookOptions) => 
                     // eslint-disable-next-line react-hooks/rules-of-hooks
-                    (0, prostgles_1.useSubscribe)(subFunc, command === SUBONE, filter, options);
+                    (0, prostgles_1.useSubscribe)(subFunc, command === SUBONE, filter, options, hookOptions);
                 }
                 if (command === SUBONE || !subscribeCommands.includes(SUBONE)) {
                     dboTable[SUBONE] = async function (param1, param2, onChange, onError) {
@@ -169,9 +170,9 @@ const getDBO = ({ schema, tableSchema, onDebug, syncedTable, syncHandler, subscr
                             : command === "size" ? "useSize"
                                 : undefined;
                 if (methodName) {
-                    dboTable[methodName] = (param1, param2, param3) => 
+                    dboTable[methodName] = (param1, param2, hookOptions) => 
                     // eslint-disable-next-line react-hooks/rules-of-hooks
-                    (0, prostgles_1.useFetch)(method, [param1, param2, param3]);
+                    (0, prostgles_1.useFetch)(method, [param1, param2], hookOptions);
                 }
             }
         });

package/dist/getSubscriptionHandler.d.ts

@@ -1,6 +1,6 @@
 import { type SubscriptionChannels, type SubscriptionHandler } from "prostgles-types";
 import { type AnyFunction, type CoreParams, type InitOptions } from "./prostgles";
-type Subscription = CoreParams & {
+export type Subscription = CoreParams & {
     lastData: any;
     onCall: AnyFunction;
     handlers: AnyFunction[];

package/dist/getSubscriptionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSubscriptionHandler.d.ts","sourceRoot":"","sources":["../lib/getSubscriptionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAEzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAS,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzF,KAAK,YAAY,GAAG,UAAU,GAAG;IAC/B,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,aAAa,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,sBAAsB,aAAc,KAAK,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;kBAkF/E,GAAG,UACA,UAAU,YACR,WAAW,aACV,WAAW,KACrB,QAAQ,mBAAmB,CAAC;;4DA1B5B,UAAU,KAAG,QAAQ,oBAAoB,CAAC;gCAzC9B,MAAM,gBACL,MAAM,WACX,WAAW,KACnB,QAAQ,IAAI,CAAC;;CA0MjB,CAAC"}
+{"version":3,"file":"getSubscriptionHandler.d.ts","sourceRoot":"","sources":["../lib/getSubscriptionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAEzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAS,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzF,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,aAAa,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,sBAAsB,aAAc,KAAK,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;kBAkF/E,GAAG,UACA,UAAU,YACR,WAAW,aACV,WAAW,KACrB,QAAQ,mBAAmB,CAAC;;4DA1B5B,UAAU,KAAG,QAAQ,oBAAoB,CAAC;gCAzC9B,MAAM,gBACL,MAAM,WACX,WAAW,KACnB,QAAQ,IAAI,CAAC;;CA4MjB,CAAC"}

package/dist/getSubscriptionHandler.js

@@ -23,12 +23,18 @@ const getSubscriptionHandler = (initOpts) => {
     };
     function _unsubscribe(channelName, unsubChannel, handler) {
         (0, prostgles_1.debug)("_unsubscribe", { channelName, handler });
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             const sub = subscriptions[channelName];
             if (sub) {
                 sub.handlers = sub.handlers.filter((h) => h !== handler);
+                onDebug === null || onDebug === void 0 ? void 0 : onDebug({
+                    type: "table",
+                    command: "unsubscribe",
+                    tableName: sub.tableName,
+                    unsubChannel,
+                    handlers: sub.handlers,
+                });
                 if (!sub.handlers.length) {
-                    onDebug === null || onDebug === void 0 ? void 0 : onDebug({ type: "table", command: "unsubscribe", tableName: sub.tableName });
                     removeServerSub(unsubChannel);
                     socket.removeListener(channelName, sub.onCall);
                     delete subscriptions[channelName];
@@ -36,12 +42,6 @@ const getSubscriptionHandler = (initOpts) => {
                     resolve(true);
                 }
                 else {
-                    onDebug === null || onDebug === void 0 ? void 0 : onDebug({
-                        type: "table",
-                        command: "unsubscribe",
-                        tableName: sub.tableName,
-                        unsubChannel,
-                    });
                     resolve(true);
                 }
             }
@@ -178,6 +178,7 @@ const getSubscriptionHandler = (initOpts) => {
      * Used when connection is lost and re-established or schema changes
      */
     const reAttachAll = async () => {
+        await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({ type: "subscriptions", command: "reAttachAll.start", subscriptions }));
         for await (const s of Object.values(subscriptions)) {
             try {
                 await s.reAttach();
@@ -187,6 +188,7 @@ const getSubscriptionHandler = (initOpts) => {
                 Object.values(s.errorHandlers).forEach((h) => h === null || h === void 0 ? void 0 : h(err));
             }
         }
+        await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({ type: "subscriptions", command: "reAttachAll.end", subscriptions }));
     };
     return {
         addSub,