tinybase 5.1.0-beta.0 → 5.1.0

package/cjs/queries/with-schemas/index.cjs

@@ -478,9 +478,9 @@ const createQueries = getCreateFunction((store) => {
           selectedCellId,
           isFunction(aggregate)
             ? [aggregate, aggregateAdd, aggregateRemove, aggregateReplace]
-            : mapGet(numericAggregators, aggregate) ?? [
+            : (mapGet(numericAggregators, aggregate) ?? [
                 (_cells, length) => length,
-              ],
+              ]),
         ],
       ];
       arrayPush(groupEntries, groupEntry);

package/cjs/relationships/index.cjs

@@ -241,7 +241,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {

package/cjs/relationships/with-schemas/index.cjs

@@ -241,7 +241,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {

package/cjs/store/index.cjs

@@ -385,6 +385,7 @@ const createStore = () => {
     }
     return true;
   };
+  const validateContent = isArray;
   const validateTables = (tables) =>
     objValidate(tables, validateTable, cellInvalid);
   const validateTable = (table, tableId) =>
@@ -530,6 +531,10 @@ const createStore = () => {
     );
   const setOrDelTables = (tables) =>
     objIsEmpty(tables) ? delTables() : setTables(tables);
+  const setValidContent = ([tables, values]) => {
+    (objIsEmpty(tables) ? delTables : setTables)(tables);
+    (objIsEmpty(values) ? delValues : setValues)(values);
+  };
   const setValidTables = (tables) =>
     mapMatch(
       tablesMap,
@@ -1017,11 +1022,10 @@ const createStore = () => {
   const getValuesSchemaJson = () => jsonStringWithMap(valuesSchemaMap);
   const getSchemaJson = () =>
     jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
-  const setContent = ([tables, values]) =>
-    fluentTransaction(() => {
-      (objIsEmpty(tables) ? delTables : setTables)(tables);
-      (objIsEmpty(values) ? delValues : setValues)(values);
-    });
+  const setContent = (content) =>
+    fluentTransaction(() =>
+      validateContent(content) ? setValidContent(content) : 0,
+    );
   const setTables = (tables) =>
     fluentTransaction(() =>
       validateTables(tables) ? setValidTables(tables) : 0,

package/cjs/store/with-schemas/index.cjs

@@ -385,6 +385,7 @@ const createStore = () => {
     }
     return true;
   };
+  const validateContent = isArray;
   const validateTables = (tables) =>
     objValidate(tables, validateTable, cellInvalid);
   const validateTable = (table, tableId) =>
@@ -530,6 +531,10 @@ const createStore = () => {
     );
   const setOrDelTables = (tables) =>
     objIsEmpty(tables) ? delTables() : setTables(tables);
+  const setValidContent = ([tables, values]) => {
+    (objIsEmpty(tables) ? delTables : setTables)(tables);
+    (objIsEmpty(values) ? delValues : setValues)(values);
+  };
   const setValidTables = (tables) =>
     mapMatch(
       tablesMap,
@@ -1017,11 +1022,10 @@ const createStore = () => {
   const getValuesSchemaJson = () => jsonStringWithMap(valuesSchemaMap);
   const getSchemaJson = () =>
     jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
-  const setContent = ([tables, values]) =>
-    fluentTransaction(() => {
-      (objIsEmpty(tables) ? delTables : setTables)(tables);
-      (objIsEmpty(values) ? delValues : setValues)(values);
-    });
+  const setContent = (content) =>
+    fluentTransaction(() =>
+      validateContent(content) ? setValidContent(content) : 0,
+    );
   const setTables = (tables) =>
     fluentTransaction(() =>
       validateTables(tables) ? setValidTables(tables) : 0,

package/cjs/synchronizers/index.cjs

@@ -19,6 +19,7 @@ const errorNew = (message) => {
 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();
 
@@ -65,15 +66,17 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   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,
@@ -82,7 +85,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -151,7 +154,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -165,19 +171,24 @@ const createCustomPersister = (
   };
   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 = () => {
@@ -227,7 +238,10 @@ const createCustomPersister = (
     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,
@@ -247,13 +261,6 @@ const createCustomPersister = (
   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(
@@ -274,14 +281,14 @@ const getUniqueId = (length = 16) =>
   );
 
 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,
@@ -289,6 +296,8 @@ const createCustomSynchronizer = (
   registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
+  onSend,
+  onReceive,
   onIgnoredError,
   extra = {},
 ) => {
@@ -296,49 +305,20 @@ const createCustomSynchronizer = (
   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,
@@ -348,8 +328,7 @@ const createCustomSynchronizer = (
           resolve([response, fromClientId]);
         },
       ]);
-      sends++;
-      send(toClientId, requestId, message, body);
+      sendImpl(toClientId, requestId, message, body);
     });
   const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
     objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -374,7 +353,7 @@ const createCustomSynchronizer = (
     if (isUndefined(otherContentHashes)) {
       [otherContentHashes, otherClientId] = await request(
         otherClientId,
-        Message.GetContentHashes,
+        1 /* GetContentHashes */,
       );
     }
     const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -384,7 +363,7 @@ const createCustomSynchronizer = (
       const [newTables, differentTableHashes] = (
         await request(
           otherClientId,
-          Message.GetTableDiff,
+          4 /* GetTableDiff */,
           store.getMergeableTableHashes(),
         )
       )[0];
@@ -393,7 +372,7 @@ const createCustomSynchronizer = (
         const [newRows, differentRowHashes] = (
           await request(
             otherClientId,
-            Message.GetRowDiff,
+            5 /* GetRowDiff */,
             store.getMergeableRowHashes(differentTableHashes),
           )
         )[0];
@@ -402,7 +381,7 @@ const createCustomSynchronizer = (
           const newCells = (
             await request(
               otherClientId,
-              Message.GetCellDiff,
+              6 /* GetCellDiff */,
               store.getMergeableCellHashes(differentRowHashes),
             )
           )[0];
@@ -417,7 +396,7 @@ const createCustomSynchronizer = (
         : (
             await request(
               otherClientId,
-              Message.GetValueDiff,
+              7 /* GetValueDiff */,
               store.getMergeableValueHashes(),
             )
           )[0],
@@ -430,19 +409,15 @@ const createCustomSynchronizer = (
       ? 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) =>
@@ -460,9 +435,47 @@ const createCustomSynchronizer = (
     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;
 };