prostgles-client 4.0.94 → 4.0.95

package/lib/{SyncedTable.ts → SyncedTable/SyncedTable.ts}

@@ -1,5 +1,6 @@
 import { FieldFilter, getTextPatch, isEmpty, WAL, WALItem, AnyObject, ClientSyncHandles, SyncBatchParams, ClientSyncInfo, getKeys, isObject, TableHandler, EqualityFilter } from "prostgles-types";
-import { DBHandlerClient } from "./prostgles";
+import { DBHandlerClient } from "../prostgles";
+import { getMultiSyncSubscription } from "./getMultiSyncSubscription";
 
 const DEBUG_KEY = "DEBUG_SYNCEDTABLE";
 const hasWnd = typeof window !== "undefined";
@@ -77,7 +78,7 @@ export type CloneMultiSync<T extends AnyObject> = (
   onError?: (error: any) => void
 ) => MultiSyncHandles<T>;
 
-type $UpdateOpts = {
+export type $UpdateOpts = {
   deepMerge: boolean
 }
 type DeepPartial<T> = T extends Array<any> ? T : T extends object ? {
@@ -128,7 +129,7 @@ const STORAGE_TYPES = {
 
 export type MultiChangeListener<T extends AnyObject = AnyObject> = (items: SyncDataItem<T>[], delta: DeepPartial<T>[]) => any;
 export type SingleChangeListener<T extends AnyObject = AnyObject, Full extends boolean = false> = (item: SyncDataItem<T, Full>, delta?: DeepPartial<T>) => any;
-
+type StorageType = keyof typeof STORAGE_TYPES;
 export type SyncedTableOptions = {
   name: string;
   filter?: AnyObject;
@@ -138,11 +139,11 @@ export type SyncedTableOptions = {
   pushDebounce?: number;
   skipFirstTrigger?: boolean;
   select?: "*" | {};
-  storageType: keyof typeof STORAGE_TYPES;
+  storageType?: StorageType;
 
   /* If true then only the delta of text field is sent to server */
-  patchText: boolean;
-  patchJSON: boolean;
+  patchText?: boolean;
+  patchJSON?: boolean;
   onReady: () => any;
   skipIncomingDeltaCheck?: boolean;
   onDebug?: (event: SyncDebugEvent, tbl: SyncedTable) => Promise<void>;
@@ -196,7 +197,7 @@ export class SyncedTable {
 
   dbSync?: DbTableSync;
   items: AnyObject[] = [];
-  storageType: string;
+  storageType?: StorageType;
   itemsObj: AnyObject = {};
   patchText: boolean;
   patchJSON: boolean;
@@ -371,7 +372,7 @@ export class SyncedTable {
    * This will send less data to server
    * @param walData 
    */
-  private updatePatches = async (walData: WALItem[]) => {
+  updatePatches = async (walData: WALItem[]) => {
     let remaining: any[] = walData.map(d => d.current);
     let patched: [any, any][] = [],
       patchedItems: any[] = [];
@@ -430,7 +431,7 @@ export class SyncedTable {
     return remaining.filter(d => d);
   }
 
-  static create(opts: SyncedTableOptions): Promise<SyncedTable> {
+  static create(opts: Omit<SyncedTableOptions, "onReady">): Promise<SyncedTable> {
     return new Promise((resolve, reject) => {
       try {
         const res = new SyncedTable({
@@ -453,60 +454,10 @@ export class SyncedTable {
    * @param handlesOnData If true then $upsert and $unsync handles will be added on each data item. True by default;
    */
   sync<T extends AnyObject = AnyObject>(onChange: MultiChangeListener<T>, handlesOnData = true): MultiSyncHandles<T> {
-    const handles: MultiSyncHandles<T> = {
-      $unsync: () => {
-        return this.unsubscribe(onChange)
-      },
-      getItems: () => { return this.getItems(); },
-      $upsert: (newData) => {
-        if (newData) {
-          const prepareOne = (d: AnyObject) => {
-            return ({
-              idObj: this.getIdObj(d),
-              delta: d
-            });
-          }
-
-          if (Array.isArray(newData)) {
-            this.upsert(newData.map(d => prepareOne(d)));
-          } else {
-            this.upsert([prepareOne(newData)]);
-          }
-        }
-
-        // this.upsert(newData, newData)
-      }
-    },
-      sub: SubscriptionMulti<T> = {
-        _onChange: onChange,
-        handlesOnData,
-        handles,
-        notify: (_allItems, _allDeltas) => {
-          let allItems = [..._allItems],
-            allDeltas = [..._allDeltas];
-          if (handlesOnData) {
-            allItems = allItems.map((item, i) => {
-
-              const getItem = (d: AnyObject, idObj: Partial<T>) => ({
-                ...d,
-                ...this.makeSingleSyncHandles(idObj, onChange),
-                $get: () => getItem(this.getItem(idObj).data!, idObj),
-                $find: (idObject: Partial<T>) => getItem(this.getItem(idObject).data!, idObject),
-                $update: (newData: AnyObject, opts: $UpdateOpts): Promise<boolean> => {
-                  return this.upsert([{ idObj, delta: newData, opts }]).then(r => true);
-                },
-                $delete: async (): Promise<boolean> => {
-                  return this.delete(idObj);
-                },
-                $cloneMultiSync: (onChange: MultiChangeListener) => this.sync(onChange, handlesOnData)
-              })
-              const idObj = this.getIdObj(item) as Partial<T>;
-              return getItem(item, idObj);
-            }) as any;
-          }
-          return onChange(allItems, allDeltas)
-        }
-      };
+    const { sub, handles } = getMultiSyncSubscription.bind(this)({ 
+      onChange: onChange as MultiChangeListener<AnyObject>, 
+      handlesOnData 
+    });
 
     this.multiSubscriptions.push(sub as any);
     if (!this.skipFirstTrigger) {
@@ -518,7 +469,7 @@ export class SyncedTable {
     return Object.freeze({ ...handles });
   }
 
-  private makeSingleSyncHandles<T extends AnyObject = AnyObject, Full extends boolean = false>(idObj: Partial<T>, onChange: SingleChangeListener<T, Full> | MultiChangeListener<T>): SingleSyncHandles<T, Full> {
+  makeSingleSyncHandles<T extends AnyObject = AnyObject, Full extends boolean = false>(idObj: Partial<T>, onChange: SingleChangeListener<T, Full> | MultiChangeListener<T>): SingleSyncHandles<T, Full> {
     if (!idObj || !onChange) throw `syncOne(idObj, onChange) -> MISSING idObj or onChange`;
 
     const handles: SingleSyncHandles<T, Full> = {
@@ -598,7 +549,7 @@ export class SyncedTable {
    * Notifies multi subs with ALL data + deltas. Attaches handles on data if required
    * @param newData -> updates. Must include id_fields + updates
    */
-  private _notifySubscribers = (changes: Pick<ItemUpdated, "idObj" | "newItem" | "delta">[] = []) => {
+  _notifySubscribers = (changes: Pick<ItemUpdated, "idObj" | "newItem" | "delta">[] = []) => {
     if (!this.isSynced) return;
 
     /* Deleted items (changes = []) do not trigger singleSubscriptions notify because it might break things */
@@ -662,17 +613,17 @@ export class SyncedTable {
     return "ok";
   }
 
-  private getIdStr(d: AnyObject) {
+  getIdStr(d: AnyObject) {
     return this.id_fields.sort().map(key => `${d[key] || ""}`).join(".");
   }
-  private getIdObj(d: AnyObject) {
+  getIdObj(d: AnyObject) {
     let res: AnyObject = {};
     this.id_fields.sort().map(key => {
       res[key] = d[key];
     });
     return res;
   }
-  private getRowSyncObj(d: AnyObject): AnyObject {
+  getRowSyncObj(d: AnyObject): AnyObject {
     let res: AnyObject = {};
     [this.synced_field, ...this.id_fields].sort().map(key => {
       res[key] = d[key];
@@ -693,7 +644,7 @@ export class SyncedTable {
     this.onChange = undefined;
   }
 
-  private matchesFilter(item: AnyObject) {
+  matchesFilter(item: AnyObject) {
     return Boolean(
       item &&
       (
@@ -703,12 +654,12 @@ export class SyncedTable {
       )
     );
   }
-  private matchesIdObj(a: AnyObject, b: AnyObject) {
+  matchesIdObj(a: AnyObject, b: AnyObject) {
     return Boolean(a && b && !this.id_fields.sort().find(k => a[k] !== b[k]));
   }
 
   // TODO: offline-first deletes if allow_delete = true
-  // private setDeleted(idObj, fullArray){
+  // setDeleted(idObj, fullArray){
   //     let deleted: object[] = [];
 
   //     if(fullArray) deleted = fullArray;
@@ -718,11 +669,11 @@ export class SyncedTable {
   //     }
   //     if(hasWnd) window.localStorage.setItem(this.name + "_$$psql$$_deleted", <any>deleted);
   // }
-  // private getDeleted(){
+  // getDeleted(){
   //     const delStr = if(hasWnd) window.localStorage.getItem(this.name + "_$$psql$$_deleted") || '[]';
   //     return JSON.parse(delStr);
   // }
-  // private syncDeleted = async () => {
+  // syncDeleted = async () => {
   //     try {
   //         await Promise.all(this.getDeleted().map(async idObj => {
   //             return this.db[this.name].delete(idObj);
@@ -739,7 +690,7 @@ export class SyncedTable {
    * @param o current full data item
    * @param n new data item
    */
-  private getDelta(o: AnyObject, n: AnyObject): AnyObject {
+  getDelta(o: AnyObject, n: AnyObject): AnyObject {
     if (isEmpty(o)) return { ...n };
     return Object.keys({ ...o, ...n })
       .filter(k => !this.id_fields.includes(k))
@@ -765,7 +716,7 @@ export class SyncedTable {
     this.getItems().map(d => this.delete(d));
   }
 
-  private get tableHandler(): Pick<TableHandler, "update" | "updateBatch" | "delete"> | undefined {
+  get tableHandler(): Pick<TableHandler, "update" | "updateBatch" | "delete"> | undefined {
     const tblHandler = this.db[this.name];
     if(tblHandler?.update && tblHandler.updateBatch){
       return tblHandler as any;
@@ -774,7 +725,7 @@ export class SyncedTable {
     return undefined;
   }
 
-  private delete = async (item: AnyObject, from_server = false) => {
+  delete = async (item: AnyObject, from_server = false) => {
 
     const idObj = this.getIdObj(item);
     this.setItem(idObj, undefined, true, true);
@@ -788,7 +739,7 @@ export class SyncedTable {
   /** 
    * Ensures that all object keys match valid column names 
    */
-  private checkItemCols = (item: AnyObject) => {
+  checkItemCols = (item: AnyObject) => {
     if (this.columns && this.columns.length) {
       const badCols = Object.keys({ ...item })
         .filter(k =>

package/lib/SyncedTable/getMultiSyncSubscription.ts

@@ -0,0 +1,67 @@
+import { AnyObject } from "prostgles-types";
+import { $UpdateOpts, MultiChangeListener, MultiSyncHandles, SubscriptionMulti, SyncedTable } from "./SyncedTable";
+
+type Args = {
+  onChange: MultiChangeListener<AnyObject>;
+  handlesOnData: boolean;
+}
+export function getMultiSyncSubscription(this: SyncedTable, { onChange, handlesOnData }: Args){
+
+  const handles: MultiSyncHandles<AnyObject> = {
+    $unsync: () => {
+      return this.unsubscribe(onChange)
+    },
+    getItems: () => { return this.getItems(); },
+    $upsert: (newData) => {
+      if (!newData) {
+        throw "No data provided for upsert";
+      }
+
+      const prepareOne = (d: AnyObject) => {
+        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: SubscriptionMulti<AnyObject> = {
+    _onChange: onChange,
+    handlesOnData,
+    handles,
+    notify: (_allItems, _allDeltas) => {
+      let allItems = [..._allItems],
+        allDeltas = [..._allDeltas];
+      if (handlesOnData) {
+        allItems = allItems.map((item, i) => {
+
+          const getItem = (d: AnyObject, idObj: Partial<AnyObject>) => ({
+            ...d,
+            ...this.makeSingleSyncHandles(idObj, onChange),
+            $get: () => getItem(this.getItem(idObj).data!, idObj),
+            $find: (idObject: Partial<AnyObject>) => getItem(this.getItem(idObject).data!, idObject),
+            $update: (newData: AnyObject, opts: $UpdateOpts): Promise<boolean> => {
+              return this.upsert([{ idObj, delta: newData, opts }]).then(r => true);
+            },
+            $delete: async (): Promise<boolean> => {
+              return this.delete(idObj);
+            },
+            $cloneMultiSync: (onChange: MultiChangeListener) => this.sync(onChange, handlesOnData)
+          })
+          const idObj = this.getIdObj(item) as Partial<AnyObject>;
+          return getItem(item, idObj);
+        });
+      }
+      return onChange(allItems, allDeltas)
+    }
+  };
+
+  return { sub, handles }
+}

package/lib/prostgles-full-cdn.ts

@@ -1,5 +1,5 @@
 import { prostgles as pgls, InitOptions } from "./prostgles";
-import { SyncedTable } from "./SyncedTable";
+import { SyncedTable } from "./SyncedTable/SyncedTable";
 export function prostgles (params: InitOptions) {
     return pgls(params as any, SyncedTable);
 }

package/lib/prostgles-full.ts

@@ -1,5 +1,5 @@
 import { prostgles as pgls, InitOptions } from "./prostgles";
-import { SyncedTable } from "./SyncedTable";
+import { SyncedTable } from "./SyncedTable/SyncedTable";
 function prostgles<DBSchema = void>(params: InitOptions<DBSchema>) { 
     return pgls(params as any, SyncedTable);
 }

package/lib/prostgles.ts

@@ -36,11 +36,12 @@ import {
   asName,
   getJoinHandlers,
   getKeys,
-  isObject
+  isObject,
+  omitKeys
 } from "prostgles-types";
 
-import { SyncDataItem, SyncOneOptions, SyncOptions, SyncedTable, type DbTableSync, type Sync, type SyncOne } from "./SyncedTable";
-import { getReact, useAsyncEffectQueue, useFetch, useIsMounted, useSubscribe, useSync } from "./react-hooks";
+import { SyncDataItem, SyncOneOptions, SyncOptions, SyncedTable, type DbTableSync, type Sync, type SyncOne } from "./SyncedTable/SyncedTable";
+import { getReact, isEqual, useAsyncEffectQueue, useFetch, useIsMounted, useSubscribe, useSync } from "./react-hooks";
 
 const DEBUG_KEY = "DEBUG_SYNCEDTABLE";
 const hasWnd = typeof window !== "undefined";
@@ -245,7 +246,7 @@ type SyncConfig = CoreParams & {
 type Syncs = {
   [channelName: string]: SyncConfig;
 };
-export function prostgles<DBSchema>(initOpts: InitOptions<DBSchema>, syncedTable: any) {
+export function prostgles<DBSchema>(initOpts: InitOptions<DBSchema>, syncedTable: typeof SyncedTable) {
   const { socket, onReady, onDisconnect, onReconnect, onSchemaChange = true, onReload, onDebug } = initOpts;
   let schemaAge: { origin: "onReady" | "onReconnect"; date: Date; } | undefined;
   debug("prostgles", { initOpts })
@@ -472,8 +473,10 @@ export function prostgles<DBSchema>(initOpts: InitOptions<DBSchema>, syncedTable
         s &&
         s.tableName === tableName &&
         s.command === command &&
-        JSON.stringify(s.param1 || {}) === JSON.stringify(param1 || {}) &&
-        JSON.stringify(s.param2 || {}) === JSON.stringify(param2 || {})
+        isEqual(s.param1, param1) &&
+        isEqual(s.param2, param2) 
+        // JSON.stringify(s.param1 || {}) === JSON.stringify(param1 || {}) &&
+        // JSON.stringify(s.param2 || {}) === JSON.stringify(param2 || {})
         // s.triggers.find(tr => (
         //     tr.onPullRequest === triggers.onPullRequest &&
         //     tr.onSyncRequest === triggers.onSyncRequest &&
@@ -487,7 +490,7 @@ export function prostgles<DBSchema>(initOpts: InitOptions<DBSchema>, syncedTable
       return makeHandler(existingChannel);
     } else {
       const sync_info = await addServerSync({ tableName, command, param1, param2 }, onSyncRequest);
-      const { channelName, synced_field, id_fields } = sync_info;
+      const { channelName } = sync_info;
       function onCall(data: any | undefined, cb: Function) {
         /*               
             Client will:
@@ -897,25 +900,38 @@ export function prostgles<DBSchema>(initOpts: InitOptions<DBSchema>, syncedTable
               if (syncedTable) {
                 dboTable.getSync = async (filter, params = {}) => {
                   await onDebug?.({ type: "table", command: "getSync", tableName, data: { filter, params } });
-                  return syncedTable.create({ name: tableName, onDebug, filter, db: dbo, ...params });
+                  return syncedTable.create({ 
+                    name: tableName, 
+                    onDebug: onDebug as any, 
+                    filter, 
+                    db: dbo, 
+                    ...params 
+                  });
                 }
-                const upsertSTable = async (basicFilter = {}, options = {}, onError) => {
-                  const syncName = `${tableName}.${JSON.stringify(basicFilter)}.${JSON.stringify(options)}`
+                const upsertSyncTable = async (basicFilter = {}, options: SyncOptions = {}, onError) => {
+                  const syncName = `${tableName}.${JSON.stringify(basicFilter)}.${JSON.stringify(omitKeys(options, ["handlesOnData"]))}`
                   if (!syncedTables[syncName]) {
-                    syncedTables[syncName] = await syncedTable.create({ ...options, onDebug, name: tableName, filter: basicFilter, db: dbo, onError });
+                    syncedTables[syncName] = await syncedTable.create({ 
+                      ...options, 
+                      onDebug: onDebug as any, 
+                      name: tableName, 
+                      filter: basicFilter, 
+                      db: dbo, 
+                      onError 
+                    });
                   }
                   return syncedTables[syncName]
                 }
                 const sync: Sync<AnyObject> = async (basicFilter, options = { handlesOnData: true, select: "*" }, onChange, onError) => {
                   await onDebug?.({ type: "table", command: "sync", tableName, data: { basicFilter, options } });
                   checkSubscriptionArgs(basicFilter, options, onChange, onError);
-                  const s = await upsertSTable(basicFilter, options, onError);
+                  const s = await upsertSyncTable(basicFilter, options, onError);
                   return await s.sync(onChange, options.handlesOnData);
                 }
                 const syncOne: SyncOne<AnyObject> = async (basicFilter, options = { handlesOnData: true }, onChange, onError) => {
                   await onDebug?.({ type: "table", command: "syncOne", tableName, data: { basicFilter, options } });
                   checkSubscriptionArgs(basicFilter, options, onChange, onError);
-                  const s = await upsertSTable(basicFilter, options, onError);
+                  const s = await upsertSyncTable(basicFilter, options, onError);
                   return await s.syncOne(basicFilter, onChange, options.handlesOnData);
                 }
                 dboTable.sync = sync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-client",
-  "version": "4.0.94",
+  "version": "4.0.95",
   "description": "Reactive client for Postgres",
   "main": "dist/prostgles-full.js",
   "types": "dist/prostgles-full.d.ts",

package/tests/package-lock.json

@@ -17,7 +17,7 @@
     },
     "..": {
       "name": "prostgles-client",
-      "version": "4.0.93",
+      "version": "4.0.94",
       "license": "MIT",
       "dependencies": {
         "prostgles-types": "^4.0.73"

package/dist/SyncedTable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SyncedTable.d.ts","sourceRoot":"","sources":["../lib/SyncedTable.ts"],"names":[],"mappings":"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"}