tinybase 5.1.0-beta.0 → 5.1.0-beta.1

package/umd/synchronizers/with-schemas/index.js

@@ -28,6 +28,7 @@
   const arrayForEach = (array, cb) => array.forEach(cb);
   const arrayMap = (array, cb) => array.map(cb);
   const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -74,15 +75,17 @@
     return mapGet(map, key);
   };
 
-  const Persists = {
-    StoreOnly: 1,
-    MergeableStoreOnly: 2,
-    StoreOrMergeableStore: 3,
-  };
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) =>
+    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-    persist != Persists.StoreOnly && store.isMergeable()
+  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+    persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -91,7 +94,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -176,19 +179,24 @@
     };
     const startAutoLoad = async (initialContent) => {
       await stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (loadSave != 2) {
-            loadSave = 1;
-            loads++;
-            setContentOrChanges(changes ?? content);
-            loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener(async (content, changes) => {
+          if (changes || content) {
+            /* istanbul ignore else */
+            if (loadSave != 2) {
+              loadSave = 1;
+              loads++;
+              setContentOrChanges(changes ?? content);
+              loadSave = 0;
+            }
+          } else {
+            await load();
           }
-        } else {
-          await load();
-        }
-      });
+        });
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError?.(error);
+      }
       return persister;
     };
     const stopAutoLoad = () => {
@@ -238,7 +246,10 @@
       return persister;
     };
     const getStore = () => store;
-    const destroy = () => stopAutoLoad().stopAutoSave();
+    const destroy = () => {
+      arrayClear(mapGet(scheduleActions, scheduleId));
+      return stopAutoLoad().stopAutoSave();
+    };
     const getStats = () => ({loads, saves});
     const persister = {
       load,
@@ -258,13 +269,6 @@
     return objFreeze(persister);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) =>
-    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -285,14 +289,14 @@
     );
 
   const Message = {
-    Response: 0,
-    GetContentHashes: 1,
-    ContentHashes: 2,
-    ContentDiff: 3,
-    GetTableDiff: 4,
-    GetRowDiff: 5,
-    GetCellDiff: 6,
-    GetValueDiff: 7,
+    Response: 0 /* Response */,
+    GetContentHashes: 1 /* GetContentHashes */,
+    ContentHashes: 2 /* ContentHashes */,
+    ContentDiff: 3 /* ContentDiff */,
+    GetTableDiff: 4 /* GetTableDiff */,
+    GetRowDiff: 5 /* GetRowDiff */,
+    GetCellDiff: 6 /* GetCellDiff */,
+    GetValueDiff: 7 /* GetValueDiff */,
   };
   const createCustomSynchronizer = (
     store,
@@ -300,6 +304,8 @@
     registerReceive,
     destroyImpl,
     requestTimeoutSeconds,
+    onSend,
+    onReceive,
     onIgnoredError,
     extra = {},
   ) => {
@@ -307,52 +313,20 @@
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
-    registerReceive((fromClientId, requestId, message, body) => {
-      receives++;
-      if (message == Message.Response) {
-        ifNotUndefined(
-          mapGet(pendingRequests, requestId),
-          ([toClientId, handleResponse]) =>
-            isUndefined(toClientId) || toClientId == fromClientId
-              ? handleResponse(body, fromClientId)
-              : /* istanbul ignore next */
-                0,
-        );
-      } else if (
-        message == Message.ContentHashes &&
-        persister.isAutoLoading()
-      ) {
-        getChangesFromOtherStore(fromClientId, body).then((changes) => {
-          persisterListener?.(void 0, changes);
-        });
-      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-        persisterListener?.(void 0, body);
-      } else {
-        ifNotUndefined(
-          message == Message.GetContentHashes && persister.isAutoSaving()
-            ? store.getMergeableContentHashes()
-            : message == Message.GetTableDiff
-              ? store.getMergeableTableDiff(body)
-              : message == Message.GetRowDiff
-                ? store.getMergeableRowDiff(body)
-                : message == Message.GetCellDiff
-                  ? store.getMergeableCellDiff(body)
-                  : message == Message.GetValueDiff
-                    ? store.getMergeableValueDiff(body)
-                    : void 0,
-          (response) => {
-            sends++;
-            send(fromClientId, requestId, Message.Response, response);
-          },
-        );
-      }
-    });
+    const sendImpl = (toClientId, requestId, message, body) => {
+      sends++;
+      onSend?.(toClientId, requestId, message, body);
+      send(toClientId, requestId, message, body);
+    };
     const request = async (toClientId, message, body = EMPTY_STRING) =>
       promiseNew((resolve, reject) => {
         const requestId = getUniqueId();
         const timeout = setTimeout(() => {
           collDel(pendingRequests, requestId);
-          reject(`No response from ${toClientId ?? 'anyone'} to '${message}'`);
+          reject(
+            `No response from ${toClientId ?? 'anyone'} to ${requestId}, ` +
+              message,
+          );
         }, requestTimeoutSeconds * 1e3);
         mapSet(pendingRequests, requestId, [
           toClientId,
@@ -362,8 +336,7 @@
             resolve([response, fromClientId]);
           },
         ]);
-        sends++;
-        send(toClientId, requestId, message, body);
+        sendImpl(toClientId, requestId, message, body);
       });
     const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
       objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -388,7 +361,7 @@
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          Message.GetContentHashes,
+          1 /* GetContentHashes */,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -398,7 +371,7 @@
         const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            Message.GetTableDiff,
+            4 /* GetTableDiff */,
             store.getMergeableTableHashes(),
           )
         )[0];
@@ -407,7 +380,7 @@
           const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              Message.GetRowDiff,
+              5 /* GetRowDiff */,
               store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
@@ -416,7 +389,7 @@
             const newCells = (
               await request(
                 otherClientId,
-                Message.GetCellDiff,
+                6 /* GetCellDiff */,
                 store.getMergeableCellHashes(differentRowHashes),
               )
             )[0];
@@ -431,7 +404,7 @@
           : (
               await request(
                 otherClientId,
-                Message.GetValueDiff,
+                7 /* GetValueDiff */,
                 store.getMergeableValueHashes(),
               )
             )[0],
@@ -444,19 +417,15 @@
         ? changes
         : void 0;
     };
-    const setPersisted = async (_getContent, changes) => {
-      sends++;
-      if (changes) {
-        send(null, null, Message.ContentDiff, changes);
-      } else {
-        send(
-          null,
-          null,
-          Message.ContentHashes,
-          store.getMergeableContentHashes(),
-        );
-      }
-    };
+    const setPersisted = async (_getContent, changes) =>
+      changes
+        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        : sendImpl(
+            null,
+            null,
+            2 /* ContentHashes */,
+            store.getMergeableContentHashes(),
+          );
     const addPersisterListener = (listener) => (persisterListener = listener);
     const delPersisterListener = () => (persisterListener = void 0);
     const startSync = async (initialContent) =>
@@ -474,9 +443,50 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.MergeableStoreOnly,
+      2,
+      // MergeableStoreOnly
       {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
     );
+    registerReceive((fromClientId, requestId, message, body) => {
+      receives++;
+      onReceive?.(fromClientId, requestId, message, body);
+      if (message == 0 /* Response */) {
+        ifNotUndefined(
+          mapGet(pendingRequests, requestId),
+          ([toClientId, handleResponse]) =>
+            isUndefined(toClientId) || toClientId == fromClientId
+              ? handleResponse(body, fromClientId)
+              : /* istanbul ignore next */
+                0,
+        );
+      } else if (
+        message == 2 /* ContentHashes */ &&
+        persister.isAutoLoading()
+      ) {
+        getChangesFromOtherStore(fromClientId, body).then((changes) => {
+          persisterListener?.(void 0, changes);
+        });
+      } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+        persisterListener?.(void 0, body);
+      } else {
+        ifNotUndefined(
+          message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+            ? store.getMergeableContentHashes()
+            : message == 4 /* GetTableDiff */
+              ? store.getMergeableTableDiff(body)
+              : message == 5 /* GetRowDiff */
+                ? store.getMergeableRowDiff(body)
+                : message == 6 /* GetCellDiff */
+                  ? store.getMergeableCellDiff(body)
+                  : message == 7 /* GetValueDiff */
+                    ? store.getMergeableValueDiff(body)
+                    : void 0,
+          (response) => {
+            sendImpl(fromClientId, requestId, 0 /* Response */, response);
+          },
+        );
+      }
+    });
     return persister;
   };
 

package/umd/ui-react/index.js

@@ -48,6 +48,7 @@
     arrayEvery(array1, (value1, index) => array2[index] === value1);
   const arrayMap = (array, cb) => array.map(cb);
   const arrayIsEmpty = (array) => size(array) == 0;
+  const arrayFilter = (array, cb) => array.filter(cb);
 
   const object = Object;
   const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -215,12 +216,7 @@
       /* eslint-disable-next-line react-hooks/exhaustive-deps */
       [thing, returnType, listenable, ...args],
     );
-    const result = useSyncExternalStore(subscribe, getResult);
-    return returnType == 0 /* Object */
-      ? {...result}
-      : returnType < 3 /* CellOrValue */
-        ? [...result]
-        : result;
+    return useSyncExternalStore(subscribe, getResult);
   };
   const useListener = (
     listenable,
@@ -252,9 +248,7 @@
           ifNotUndefined(get(parameter, store2), (thing) =>
             then(
               store2['set' + settable](
-                ...arrayMap(args, (arg) =>
-                  isFunction(arg) ? arg(parameter, store2) : arg,
-                ),
+                ...argsOrGetArgs(args, store2, parameter),
                 thing,
               ),
               thing,
@@ -262,9 +256,13 @@
           ),
         ),
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [store, settable, ...getDeps, ...thenDeps, ...args],
+      [store, settable, ...getDeps, ...thenDeps, ...nonFunctionDeps(args)],
     );
   };
+  const argsOrGetArgs = (args, store, parameter) =>
+    arrayMap(args, (arg) => (isFunction(arg) ? arg(parameter, store) : arg));
+  const nonFunctionDeps = (args) =>
+    arrayFilter(args, (arg) => !isFunction(arg));
   const useDel = (
     storeOrStoreId,
     deletable,
@@ -274,9 +272,12 @@
   ) => {
     const store = useStoreOrStoreById(storeOrStoreId);
     return useCallback$2(
-      () => then(store?.['del' + deletable](...args)),
+      (parameter) =>
+        then(
+          store?.['del' + deletable](...argsOrGetArgs(args, store, parameter)),
+        ),
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [store, deletable, ...thenDeps, ...args],
+      [store, deletable, ...thenDeps, ...nonFunctionDeps(args)],
     );
   };
   const useCheckpointAction = (checkpointsOrCheckpointsId, action, arg) => {

package/umd/ui-react/with-schemas/index.js

@@ -48,6 +48,7 @@
     arrayEvery(array1, (value1, index) => array2[index] === value1);
   const arrayMap = (array, cb) => array.map(cb);
   const arrayIsEmpty = (array) => size(array) == 0;
+  const arrayFilter = (array, cb) => array.filter(cb);
 
   const object = Object;
   const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -215,12 +216,7 @@
       /* eslint-disable-next-line react-hooks/exhaustive-deps */
       [thing, returnType, listenable, ...args],
     );
-    const result = useSyncExternalStore(subscribe, getResult);
-    return returnType == 0 /* Object */
-      ? {...result}
-      : returnType < 3 /* CellOrValue */
-        ? [...result]
-        : result;
+    return useSyncExternalStore(subscribe, getResult);
   };
   const useListener = (
     listenable,
@@ -252,9 +248,7 @@
           ifNotUndefined(get(parameter, store2), (thing) =>
             then(
               store2['set' + settable](
-                ...arrayMap(args, (arg) =>
-                  isFunction(arg) ? arg(parameter, store2) : arg,
-                ),
+                ...argsOrGetArgs(args, store2, parameter),
                 thing,
               ),
               thing,
@@ -262,9 +256,13 @@
           ),
         ),
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [store, settable, ...getDeps, ...thenDeps, ...args],
+      [store, settable, ...getDeps, ...thenDeps, ...nonFunctionDeps(args)],
     );
   };
+  const argsOrGetArgs = (args, store, parameter) =>
+    arrayMap(args, (arg) => (isFunction(arg) ? arg(parameter, store) : arg));
+  const nonFunctionDeps = (args) =>
+    arrayFilter(args, (arg) => !isFunction(arg));
   const useDel = (
     storeOrStoreId,
     deletable,
@@ -274,9 +272,12 @@
   ) => {
     const store = useStoreOrStoreById(storeOrStoreId);
     return useCallback$2(
-      () => then(store?.['del' + deletable](...args)),
+      (parameter) =>
+        then(
+          store?.['del' + deletable](...argsOrGetArgs(args, store, parameter)),
+        ),
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [store, deletable, ...thenDeps, ...args],
+      [store, deletable, ...thenDeps, ...nonFunctionDeps(args)],
     );
   };
   const useCheckpointAction = (checkpointsOrCheckpointsId, action, arg) => {

package/umd/ui-react-inspector/index.js

@@ -96,6 +96,7 @@
   const arrayMap = (array, cb) => array.map(cb);
   const arrayIsEmpty = (array) => size(array) == 0;
   const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -1626,15 +1627,10 @@
       },
     );
 
-  const Persists = {
-    StoreOnly: 1,
-    MergeableStoreOnly: 2,
-    StoreOrMergeableStore: 3,
-  };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-    persist != Persists.StoreOnly && store.isMergeable()
+  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+    persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -1643,7 +1639,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -1724,19 +1720,21 @@
     };
     const startAutoLoad = async (initialContent) => {
       await stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (loadSave != 2) {
-            loadSave = 1;
-            loads++;
-            setContentOrChanges(changes ?? content);
-            loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener(async (content, changes) => {
+          if (changes || content) {
+            /* istanbul ignore else */
+            if (loadSave != 2) {
+              loadSave = 1;
+              loads++;
+              setContentOrChanges(changes ?? content);
+              loadSave = 0;
+            }
+          } else {
+            await load();
           }
-        } else {
-          await load();
-        }
-      });
+        });
+      } catch (error) {}
       return persister;
     };
     const stopAutoLoad = () => {
@@ -1783,7 +1781,10 @@
       return persister;
     };
     const getStore = () => store;
-    const destroy = () => stopAutoLoad().stopAutoSave();
+    const destroy = () => {
+      arrayClear(mapGet(scheduleActions, scheduleId));
+      return stopAutoLoad().stopAutoSave();
+    };
     const getStats = () => ({loads, saves});
     const persister = {
       load,
@@ -1836,7 +1837,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       {getStorageName: () => storageName},
     );
   };

package/umd/ui-react-inspector/with-schemas/index.js

@@ -96,6 +96,7 @@
   const arrayMap = (array, cb) => array.map(cb);
   const arrayIsEmpty = (array) => size(array) == 0;
   const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -1626,15 +1627,10 @@
       },
     );
 
-  const Persists = {
-    StoreOnly: 1,
-    MergeableStoreOnly: 2,
-    StoreOrMergeableStore: 3,
-  };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-    persist != Persists.StoreOnly && store.isMergeable()
+  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+    persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -1643,7 +1639,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -1724,19 +1720,21 @@
     };
     const startAutoLoad = async (initialContent) => {
       await stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (loadSave != 2) {
-            loadSave = 1;
-            loads++;
-            setContentOrChanges(changes ?? content);
-            loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener(async (content, changes) => {
+          if (changes || content) {
+            /* istanbul ignore else */
+            if (loadSave != 2) {
+              loadSave = 1;
+              loads++;
+              setContentOrChanges(changes ?? content);
+              loadSave = 0;
+            }
+          } else {
+            await load();
           }
-        } else {
-          await load();
-        }
-      });
+        });
+      } catch (error) {}
       return persister;
     };
     const stopAutoLoad = () => {
@@ -1783,7 +1781,10 @@
       return persister;
     };
     const getStore = () => store;
-    const destroy = () => stopAutoLoad().stopAutoSave();
+    const destroy = () => {
+      arrayClear(mapGet(scheduleActions, scheduleId));
+      return stopAutoLoad().stopAutoSave();
+    };
     const getStats = () => ({loads, saves});
     const persister = {
       load,
@@ -1836,7 +1837,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       {getStorageName: () => storageName},
     );
   };