prostgles-client 4.0.360 → 4.0.362

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "prostgles-client",
-  "version": "4.0.360",
+  "version": "4.0.362",
   "description": "Reactive client for Postgres",
-  "main": "dist/prostgles-full.js",
-  "types": "dist/prostgles-full.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/prostgles/prostgles-client-js.git"
@@ -32,7 +32,6 @@
     "socket.io-client": "^4.8.3"
   },
   "devDependencies": {
-    "@types/node": "^14.18.63",
     "@types/react": "^18.3.28",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.2",

package/tsconfig.json

@@ -1,14 +1,8 @@
 {
-  "files": ["lib/prostgles-full.ts"],
+  "files": ["lib/index.ts"],
   "compilerOptions": {
-    "baseUrl": ".",
-    "target": "es2019",
-    "lib": [
-      "es6",
-      "dom", 
-      "es2017",
-      "es2019"
-    ],
+    "target": "ES2022",
+    "lib": ["es6", "dom", "es2017", "es2019", "es2022"],
     "strict": true,
     "module": "commonjs",
     "resolveJsonModule": true,
@@ -27,9 +21,5 @@
     "noUncheckedIndexedAccess": true
   },
   "include": ["lib"],
-  "exclude": [
-    "./dist",
-    "./tests",
-    "node_modules"
-  ]
-}
+  "exclude": ["./dist", "./tests", "node_modules"]
+}

package/webpack.dev.js

@@ -1,31 +1,30 @@
-
-const path = require('path');
+const path = require("path");
 
 module.exports = {
-  entry: './lib/prostgles-full.ts',
-  devtool: 'inline-source-map',
-  mode: 'development',
+  entry: "./lib/index.ts",
+  devtool: "inline-source-map",
+  mode: "development",
   module: {
     rules: [
       {
         test: /\.tsx?$/,
-        use: 'ts-loader',
+        use: "ts-loader",
         exclude: /node_modules/,
       },
     ],
   },
   resolve: {
-    extensions: [ '.tsx', '.ts', '.js' ],
+    extensions: [".tsx", ".ts", ".js"],
   },
   output: {
-    filename: 'prostgles.dev.js',
-    path: path.resolve(__dirname, 'dist'),
-    libraryTarget: 'umd',
-    globalObject: 'this',
+    filename: "prostgles.dev.js",
+    path: path.resolve(__dirname, "dist"),
+    libraryTarget: "umd",
+    globalObject: "this",
   },
   watch: true,
-  watchOptions:  {
+  watchOptions: {
     aggregateTimeout: 200,
-    poll: 1000
-  }
-};
+    poll: 1000,
+  },
+};

package/webpack.prod.js

@@ -3,10 +3,9 @@ const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 
 module.exports = {
   entry: {
-    index: "./dist/prostgles-full-cdn.js", //  './lib/prostgles-full-cdn.ts
-    "index.no-sync": "./dist/prostgles.js", //    './lib/prostgles.ts'
+    "index.umd": "./dist/index.umd.js",
   },
-  mode: "production", // "development",//
+  mode: "production",
   module: {
     rules: [
       {

package/dist/SyncedTable/getMultiSyncSubscription.d.ts

@@ -1,12 +0,0 @@
-import type { AnyObject } from "prostgles-types";
-import type { MultiChangeListener, MultiSyncHandles, SubscriptionMulti, SyncedTable } from "./SyncedTable";
-type Args = {
-    onChange: MultiChangeListener<AnyObject>;
-    handlesOnData: boolean;
-};
-export declare function getMultiSyncSubscription(this: SyncedTable, { onChange, handlesOnData }: Args): {
-    sub: SubscriptionMulti<AnyObject>;
-    handles: MultiSyncHandles<AnyObject>;
-};
-export {};
-//# sourceMappingURL=getMultiSyncSubscription.d.ts.map

package/dist/SyncedTable/getMultiSyncSubscription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getMultiSyncSubscription.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/getMultiSyncSubscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAEV,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB,KAAK,IAAI,GAAG;IACV,QAAQ,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACzC,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AACF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,IAAI;;;EA2D5F"}

package/dist/SyncedTable/getMultiSyncSubscription.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMultiSyncSubscription = getMultiSyncSubscription;
-function getMultiSyncSubscription({ onChange, handlesOnData }) {
-    const handles = {
-        $unsync: () => {
-            return this.unsubscribe(onChange);
-        },
-        getItems: () => {
-            return this.getItems();
-        },
-        $upsert: (newData) => {
-            if (!newData) {
-                throw "No data provided for upsert";
-            }
-            const prepareOne = (d) => {
-                return {
-                    idObj: this.getIdObj(d),
-                    delta: d,
-                };
-            };
-            if (Array.isArray(newData)) {
-                this.upsert(newData.map((d) => prepareOne(d)));
-            }
-            else {
-                this.upsert([prepareOne(newData)]);
-            }
-        },
-    };
-    const sub = {
-        _onChange: onChange,
-        handlesOnData,
-        handles,
-        notify: (_allItems, _allDeltas) => {
-            let allItems = [..._allItems];
-            const allDeltas = [..._allDeltas];
-            if (handlesOnData) {
-                allItems = allItems.map((item, i) => {
-                    const getItem = (d, idObj) => ({
-                        ...d,
-                        ...this.makeSingleSyncHandles(idObj, onChange),
-                        $get: () => getItem(this.getItem(idObj), idObj),
-                        $find: (idObject) => getItem(this.getItem(idObject), idObject),
-                        $update: (newData, opts) => {
-                            return this.upsert([{ idObj, delta: newData, opts }]);
-                        },
-                        $delete: async () => {
-                            return this.delete(idObj);
-                        },
-                        $cloneMultiSync: (onChange) => this.sync(onChange, handlesOnData),
-                    });
-                    const idObj = this.getIdObj(item);
-                    return getItem(item, idObj);
-                });
-            }
-            return onChange(allItems, allDeltas);
-        },
-    };
-    return { sub, handles };
-}

package/dist/SyncedTable/getSingleSyncSubscription.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=getSingleSyncSubscription.d.ts.map

package/dist/SyncedTable/getSingleSyncSubscription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSingleSyncSubscription.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/getSingleSyncSubscription.ts"],"names":[],"mappings":""}

package/dist/SyncedTable/getSingleSyncSubscription.js

@@ -1 +0,0 @@
-"use strict";

package/dist/getSyncHandler.d.ts

@@ -1,10 +0,0 @@
-import { type ClientSyncHandles } from "prostgles-types";
-import type { InitOptions, SyncParams } from "./prostgles";
-import type { SyncedTable } from "./SyncedTable/SyncedTable";
-export declare const getSyncHandler: ({ socket, onDebug }: Pick<InitOptions, "socket" | "onDebug">) => {
-    destroySyncs: () => Promise<void>;
-    syncedTables: Map<string, Promise<SyncedTable>>;
-    addSync: (params: SyncParams, triggers: ClientSyncHandles) => Promise<any>;
-    reAttachAll: () => Promise<void>;
-};
-//# sourceMappingURL=getSyncHandler.d.ts.map

package/dist/getSyncHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSyncHandler.d.ts","sourceRoot":"","sources":["../lib/getSyncHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAe,WAAW,EAAY,UAAU,EAAE,MAAM,aAAa,CAAC;AAElF,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ1E,eAAO,MAAM,cAAc,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;;;sBA4E1D,UAAU,YAAY,iBAAiB,KAAG,OAAO,CAAC,GAAG,CAAC;;CAgJtF,CAAC"}

package/dist/getSyncHandler.js

@@ -1,199 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSyncHandler = void 0;
-const prostgles_types_1 = require("prostgles-types");
-const FunctionQueuer_1 = require("./FunctionQueuer");
-const prostgles_1 = require("./prostgles");
-const getSyncHandler = ({ socket, onDebug }) => {
-    const syncedTables = new Map();
-    const syncs = new Map();
-    const destroySyncs = async () => {
-        (0, prostgles_1.debug)("destroySyncs", { syncedTables });
-        syncs.clear();
-        Array.from(syncedTables.values()).forEach((s) => {
-            s.then((s) => s.destroy());
-        });
-        syncedTables.clear();
-    };
-    function _unsync(channelName, triggers) {
-        (0, prostgles_1.debug)("_unsync", { channelName, triggers });
-        return new Promise((resolve, reject) => {
-            const sync = syncs.get(channelName);
-            if (sync) {
-                sync.clientSyncHandles = sync.clientSyncHandles.filter((tr) => tr.onPullRequest !== triggers.onPullRequest &&
-                    tr.onSyncRequest !== triggers.onSyncRequest &&
-                    tr.onUpdates !== triggers.onUpdates);
-                if (!sync.clientSyncHandles.length) {
-                    socket.emit(channelName + "unsync", {}, (err, res) => {
-                        if (err)
-                            reject(err);
-                        else
-                            resolve(res);
-                    });
-                    socket.removeListener(channelName, sync.onCall);
-                    syncs.delete(channelName);
-                }
-            }
-        });
-    }
-    function addServerSync({ tableName, command, param1 = {}, param2 }, onSyncRequest) {
-        return new Promise((resolve, reject) => {
-            socket.emit(prostgles_types_1.CHANNEL_PREFIX, {
-                tableName,
-                command,
-                param1,
-                param2,
-            }, (err, syncInfo) => {
-                onDebug === null || onDebug === void 0 ? void 0 : onDebug({
-                    type: "table",
-                    command: "sync",
-                    tableName,
-                    data: { param1, param2 },
-                });
-                if (err) {
-                    console.error(err);
-                    reject(err);
-                }
-                else if (syncInfo) {
-                    const { id_fields, synced_field, channelName } = syncInfo;
-                    socket.emit(channelName, { onSyncRequest: onSyncRequest({}) }, (response) => {
-                        console.log(response);
-                    });
-                    resolve({ id_fields, synced_field, channelName });
-                }
-            });
-        });
-    }
-    const addSyncQueuer = new FunctionQueuer_1.FunctionQueuer(_addSync, ([{ tableName }]) => tableName);
-    async function addSync(params, triggers) {
-        return addSyncQueuer.run([params, triggers]);
-    }
-    async function _addSync({ tableName, command, param1, param2 }, clientSyncHandlers) {
-        const { onSyncRequest } = clientSyncHandlers;
-        function makeHandler(channelName) {
-            const unsync = function () {
-                _unsync(channelName, clientSyncHandlers);
-            };
-            const syncData = function (data, deleted, cb) {
-                socket.emit(channelName, {
-                    onSyncRequest: {
-                        ...onSyncRequest({}),
-                        ...{ data },
-                        ...{ deleted },
-                    },
-                }, !cb ? null : ((response) => {
-                    cb(response);
-                }));
-            };
-            return Object.freeze({ unsync, syncData });
-        }
-        const matchingSync = Array.from(syncs.entries()).find(([ch, s]) => {
-            return (s.tableName === tableName &&
-                (0, prostgles_types_1.isEqual)(s.param1, param1) &&
-                (0, prostgles_types_1.isEqual)(s.param2.select, param2.select));
-        });
-        if (matchingSync) {
-            const [existingChannel, existingSync] = matchingSync;
-            existingSync.clientSyncHandles.push(clientSyncHandlers);
-            return makeHandler(existingChannel);
-        }
-        else {
-            const sync_info = await addServerSync({ tableName, command, param1, param2 }, onSyncRequest);
-            const { channelName } = sync_info;
-            const onCall = function (data, cb) {
-                /*
-                    Client will:
-                    1. Send last_synced     on(onSyncRequest)
-                    2. Send data >= server_synced   on(onPullRequest)
-                    3. Send data on CRUD    emit(data.data)
-                    4. Upsert data.data     on(data.data)
-                */
-                if (!data)
-                    return;
-                const matchingSync = syncs.get(channelName);
-                if (!matchingSync)
-                    return;
-                matchingSync.clientSyncHandles.map(({ onUpdates, onSyncRequest, onPullRequest }) => {
-                    // syncedTables.get(channelName)?.then((syncedTable) => {
-                    //   onDebug?.({
-                    //     type: "sync",
-                    //     command:
-                    //       data.data ? "onUpdates"
-                    //       : data.onSyncRequest ? "onSyncRequest"
-                    //       : "onPullRequest",
-                    //     tableName,
-                    //     channelName,
-                    //     data,
-                    //     options: { n filter, select },
-                    //   });
-                    // });
-                    if (data.data) {
-                        Promise.resolve(onUpdates(data))
-                            .then(() => {
-                            cb({ ok: true });
-                        })
-                            .catch((err) => {
-                            cb({ err });
-                        });
-                    }
-                    else if (data.onSyncRequest) {
-                        Promise.resolve(onSyncRequest(data.onSyncRequest))
-                            .then((res) => cb({ onSyncRequest: res }))
-                            .catch((err) => {
-                            cb({ err });
-                        });
-                    }
-                    else if (data.onPullRequest) {
-                        Promise.resolve(onPullRequest(data.onPullRequest))
-                            .then((result) => {
-                            cb(result);
-                        })
-                            .catch((err) => {
-                            cb({ err });
-                        });
-                    }
-                    else {
-                        console.log("unexpected response");
-                    }
-                });
-            };
-            syncs.set(channelName, {
-                tableName,
-                command,
-                param1,
-                param2,
-                clientSyncHandles: [clientSyncHandlers],
-                syncInfo: sync_info,
-                onCall,
-            });
-            socket.on(channelName, onCall);
-            return makeHandler(channelName);
-        }
-    }
-    const reAttachAll = async () => {
-        let reAttached = 0;
-        Array.from(syncs.entries()).forEach(async ([ch, s]) => {
-            const firstTrigger = s.clientSyncHandles[0];
-            if (firstTrigger) {
-                try {
-                    await addServerSync(s, firstTrigger.onSyncRequest);
-                    socket.on(ch, s.onCall);
-                    reAttached++;
-                }
-                catch (err) {
-                    console.error("There was an issue reconnecting olf subscriptions", err);
-                }
-            }
-        });
-        if (reAttached) {
-            console.log("reAttached", reAttached, " syncs", syncs);
-        }
-    };
-    return {
-        destroySyncs,
-        syncedTables,
-        addSync,
-        reAttachAll,
-    };
-};
-exports.getSyncHandler = getSyncHandler;