tinybase 5.4.0-beta.1 → 5.4.0-beta.3

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

@@ -5,21 +5,21 @@ import {
   useSetValueCallback,
   useSetCellCallback,
   useValueIds,
-  ValueView,
   useStoreOrStoreById,
+  ValueView,
   useRowCount,
   useSortedRowIds,
+  CellView,
   useTableCellIds,
   useIndexesOrIndexesById,
   useSliceRowIds,
   useRelationshipsOrRelationshipsById,
+  useRemoteRowId,
   useRowIds,
   useResultRowCount,
   useResultSortedRowIds,
-  useResultTableCellIds,
-  useRemoteRowId,
-  CellView,
   ResultCellView,
+  useResultTableCellIds,
   useIndexes,
   useIndexIds,
   useSliceIds,
@@ -1709,12 +1709,16 @@ const getListenerFunctions = (getThing) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+const getStoreFunctions = (
+  persist = 1 /* StoreOnly */,
+  store,
+  isSynchronizer,
+) =>
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
-        store.getTransactionMergeableChanges,
+        () => store.getTransactionMergeableChanges(!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -1738,6 +1742,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -1755,7 +1760,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -1801,7 +1806,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           if (initialContent) {
@@ -1814,7 +1819,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoLoad = async (initialContent) => {
-    await stopAutoLoad().load(initialContent);
+    stopAutoLoad();
+    await load(initialContent);
     try {
       autoLoadHandle = await addPersisterListener(async (content, changes) => {
         if (changes || content) {
@@ -1855,7 +1861,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoSave = async () => {
-    await stopAutoSave().save();
+    stopAutoSave();
+    await save();
     autoSaveListenerId = store.addDidFinishTransactionListener(() => {
       const changes = getChanges();
       if (hasChanges(changes)) {
@@ -1865,8 +1872,10 @@ const createCustomPersister = (
     return persister;
   };
   const stopAutoSave = () => {
-    ifNotUndefined(autoSaveListenerId, store.delListener);
-    autoSaveListenerId = void 0;
+    if (autoSaveListenerId) {
+      store.delListener(autoSaveListenerId);
+      autoSaveListenerId = void 0;
+    }
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -2260,11 +2269,11 @@ const createStore = () => {
   };
   const getNewRowId = (tableId, reuse) => {
     const [getId] = mapGet(tablePoolFunctions, tableId);
-    const rowId = getId(reuse);
-    if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-      return rowId;
-    }
-    return getNewRowId(tableId, reuse);
+    let rowId;
+    do {
+      rowId = getId(reuse);
+    } while (collHas(mapGet(tablesMap, tableId), rowId));
+    return rowId;
   };
   const getOrCreateTable = (tableId) =>
     mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});

package/umd/es6/index.js

@@ -1690,6 +1690,7 @@
     };
     const getListenerStats = () => {
       const _a = resultStore.getListenerStats(),
+        {tables: _1, tableIds: _2, transaction: _3} = _a,
         stats = __objRest(_a, ['tables', 'tableIds', 'transaction']);
       return stats;
     };
@@ -1957,9 +1958,10 @@
     return hash >>> 0;
   };
 
+  const stampClone = ([value, time]) => stampNew(value, time);
   const stampCloneWithHash = ([value, time, hash]) => [value, time, hash];
-  const stampCloneWithoutHash = ([value, time]) => newStamp(value, time);
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const stampNew = (value, time) => (time ? [value, time] : [value]);
+  const stampNewWithHash = (value, time, hash) => [value, time, hash];
   const getStampHash = (stamp) => stamp[2];
   const hashIdAndHash = (id, hash) => getHash(id + ':' + hash);
   const replaceTimeHash = (oldTime, newTime) =>
@@ -1976,22 +1978,20 @@
         : ''
     );
   };
-  const stampUpdate = (stamp, hash, time) => {
-    stamp[2] = hash >>> 0;
+  const stampUpdate = (stamp, time, hash) => {
     if (time > stamp[1]) {
       stamp[1] = time;
     }
+    stamp[2] = hash >>> 0;
   };
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+  const stampNewObj = (time = EMPTY_STRING) => stampNew(objNew(), time);
   const stampNewMap = (time = EMPTY_STRING) => [mapNew(), time, 0];
   const stampMapToObjWithHash = (
     [map, time, hash],
     mapper = stampCloneWithHash,
   ) => [mapToObj(map, mapper), time, hash];
-  const stampMapToObjWithoutHash = (
-    [map, time],
-    mapper = stampCloneWithoutHash,
-  ) => newStamp(mapToObj(map, mapper), time);
+  const stampMapToObjWithoutHash = ([map, time], mapper = stampClone) =>
+    stampNew(mapToObj(map, mapper), time);
   const stampValidate = (stamp, validateThing) =>
     isArray(stamp) &&
     size(stamp) == 3 &&
@@ -2326,11 +2326,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) => {
       var _a;
@@ -3587,7 +3587,7 @@
           tableHash ^= isContent
             ? 0
             : replaceTimeHash(oldTableTime, incomingTableTime);
-          stampUpdate(tableStampMap, tableHash, incomingTableTime);
+          stampUpdate(tableStampMap, incomingTableTime, tableHash);
           tablesHash ^= isContent
             ? 0
             : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
@@ -3598,7 +3598,7 @@
       tablesHash ^= isContent
         ? 0
         : replaceTimeHash(oldTablesTime, incomingTablesTime);
-      stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+      stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
       const [valuesTime] = mergeCellsOrValues(
         values,
         valuesStampMap,
@@ -3634,6 +3634,7 @@
           if (!oldThingTime || thingTime > oldThingTime) {
             stampUpdate(
               thingStampMap,
+              thingTime,
               isContent
                 ? incomingThingHash
                 : getHash(
@@ -3641,7 +3642,6 @@
                       ':' +
                       thingTime,
                   ),
-              thingTime,
             );
             thingStampMap[0] = thing;
             thingsChanges[thingId] = thing;
@@ -3656,7 +3656,7 @@
       thingsHash ^= isContent
         ? 0
         : replaceTimeHash(oldThingsTime, incomingThingsTime);
-      stampUpdate(thingsStampMap, thingsHash, incomingThingsTime);
+      stampUpdate(thingsStampMap, incomingThingsTime, thingsHash);
       return [thingsTime, oldThingsHash, thingsStampMap[2]];
     };
     const preStartTransaction = () => {};
@@ -3831,7 +3831,7 @@
           ),
         ),
       );
-      return newStamp(tablesObj, tablesTime);
+      return stampNew(tablesObj, tablesTime);
     };
     const getMergeableValueHashes = () =>
       mapToObj(contentStampMap[1][0], getStampHash);
@@ -3839,12 +3839,12 @@
       const [, [valueStampMaps, valuesTime]] = contentStampMap;
       const values = mapToObj(
         valueStampMaps,
-        stampCloneWithoutHash,
+        stampClone,
         ([, , hash], valueId) =>
           hash ==
           (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
       );
-      return newStamp(values, valuesTime);
+      return stampNew(values, valuesTime);
     };
     const setMergeableContent = (mergeableContent) =>
       disableListeningToRawStoreChanges(() =>
@@ -3864,31 +3864,35 @@
       });
       return mergeableStore;
     };
-    const getTransactionMergeableChanges = () => {
-      const [[tableStampMaps, tablesTime], [valueStampMaps, valuesTime]] =
-        contentStampMap;
+    const getTransactionMergeableChanges = (withHashes = false) => {
+      const [
+        [tableStampMaps, tablesTime, tablesHash],
+        [valueStampMaps, valuesTime, valuesHash],
+      ] = contentStampMap;
+      const newStamp = withHashes ? stampNewWithHash : stampNew;
       const tablesObj = {};
       collForEach(touchedCells, (touchedTable, tableId) =>
         ifNotUndefined(
           mapGet(tableStampMaps, tableId),
-          ([rowStampMaps, tableTime]) => {
+          ([rowStampMaps, tableTime, tableHash]) => {
             const tableObj = {};
             collForEach(touchedTable, (touchedRow, rowId) =>
               ifNotUndefined(
                 mapGet(rowStampMaps, rowId),
-                ([cellStampMaps, rowTime]) => {
+                ([cellStampMaps, rowTime, rowHash]) => {
                   const rowObj = {};
                   collForEach(touchedRow, (cellId) => {
                     ifNotUndefined(
                       mapGet(cellStampMaps, cellId),
-                      ([cell, time]) => (rowObj[cellId] = newStamp(cell, time)),
+                      ([cell, time, hash]) =>
+                        (rowObj[cellId] = newStamp(cell, time, hash)),
                     );
                   });
-                  tableObj[rowId] = newStamp(rowObj, rowTime);
+                  tableObj[rowId] = newStamp(rowObj, rowTime, rowHash);
                 },
               ),
             );
-            tablesObj[tableId] = newStamp(tableObj, tableTime);
+            tablesObj[tableId] = newStamp(tableObj, tableTime, tableHash);
           },
         ),
       );
@@ -3896,12 +3900,13 @@
       collForEach(touchedValues, (valueId) =>
         ifNotUndefined(
           mapGet(valueStampMaps, valueId),
-          ([value, time]) => (valuesObj[valueId] = newStamp(value, time)),
+          ([value, time, hash]) =>
+            (valuesObj[valueId] = newStamp(value, time, hash)),
         ),
       );
       return [
-        newStamp(tablesObj, tablesTime),
-        newStamp(valuesObj, valuesTime),
+        newStamp(tablesObj, tablesTime, tablesHash),
+        newStamp(valuesObj, valuesTime, valuesHash),
         1,
       ];
     };

package/umd/es6/indexes/index.js

@@ -16,7 +16,11 @@
 
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isString = (thing) => getTypeOf(thing) == STRING;
   const isArray = (thing) => Array.isArray(thing);
   const size = (arrayOrString) => arrayOrString.length;

package/umd/es6/indexes/with-schemas/index.js

@@ -16,7 +16,11 @@
 
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isString = (thing) => getTypeOf(thing) == STRING;
   const isArray = (thing) => Array.isArray(thing);
   const size = (arrayOrString) => arrayOrString.length;

package/umd/es6/mergeable-store/index.js

@@ -272,9 +272,10 @@
     return hash >>> 0;
   };
 
+  const stampClone = ([value, time]) => stampNew(value, time);
   const stampCloneWithHash = ([value, time, hash]) => [value, time, hash];
-  const stampCloneWithoutHash = ([value, time]) => newStamp(value, time);
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const stampNew = (value, time) => (time ? [value, time] : [value]);
+  const stampNewWithHash = (value, time, hash) => [value, time, hash];
   const getStampHash = (stamp) => stamp[2];
   const hashIdAndHash = (id, hash) => getHash(id + ':' + hash);
   const replaceTimeHash = (oldTime, newTime) =>
@@ -291,22 +292,20 @@
         : ''
     );
   };
-  const stampUpdate = (stamp, hash, time) => {
-    stamp[2] = hash >>> 0;
+  const stampUpdate = (stamp, time, hash) => {
     if (time > stamp[1]) {
       stamp[1] = time;
     }
+    stamp[2] = hash >>> 0;
   };
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+  const stampNewObj = (time = EMPTY_STRING) => stampNew(objNew(), time);
   const stampNewMap = (time = EMPTY_STRING) => [mapNew(), time, 0];
   const stampMapToObjWithHash = (
     [map, time, hash],
     mapper = stampCloneWithHash,
   ) => [mapToObj(map, mapper), time, hash];
-  const stampMapToObjWithoutHash = (
-    [map, time],
-    mapper = stampCloneWithoutHash,
-  ) => newStamp(mapToObj(map, mapper), time);
+  const stampMapToObjWithoutHash = ([map, time], mapper = stampClone) =>
+    stampNew(mapToObj(map, mapper), time);
   const stampValidate = (stamp, validateThing) =>
     isArray(stamp) &&
     size(stamp) == 3 &&
@@ -799,11 +798,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) => {
       var _a;
@@ -2060,7 +2059,7 @@
           tableHash ^= isContent
             ? 0
             : replaceTimeHash(oldTableTime, incomingTableTime);
-          stampUpdate(tableStampMap, tableHash, incomingTableTime);
+          stampUpdate(tableStampMap, incomingTableTime, tableHash);
           tablesHash ^= isContent
             ? 0
             : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
@@ -2071,7 +2070,7 @@
       tablesHash ^= isContent
         ? 0
         : replaceTimeHash(oldTablesTime, incomingTablesTime);
-      stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+      stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
       const [valuesTime] = mergeCellsOrValues(
         values,
         valuesStampMap,
@@ -2107,6 +2106,7 @@
           if (!oldThingTime || thingTime > oldThingTime) {
             stampUpdate(
               thingStampMap,
+              thingTime,
               isContent
                 ? incomingThingHash
                 : getHash(
@@ -2114,7 +2114,6 @@
                       ':' +
                       thingTime,
                   ),
-              thingTime,
             );
             thingStampMap[0] = thing;
             thingsChanges[thingId] = thing;
@@ -2129,7 +2128,7 @@
       thingsHash ^= isContent
         ? 0
         : replaceTimeHash(oldThingsTime, incomingThingsTime);
-      stampUpdate(thingsStampMap, thingsHash, incomingThingsTime);
+      stampUpdate(thingsStampMap, incomingThingsTime, thingsHash);
       return [thingsTime, oldThingsHash, thingsStampMap[2]];
     };
     const preStartTransaction = () => {};
@@ -2304,7 +2303,7 @@
           ),
         ),
       );
-      return newStamp(tablesObj, tablesTime);
+      return stampNew(tablesObj, tablesTime);
     };
     const getMergeableValueHashes = () =>
       mapToObj(contentStampMap[1][0], getStampHash);
@@ -2312,12 +2311,12 @@
       const [, [valueStampMaps, valuesTime]] = contentStampMap;
       const values = mapToObj(
         valueStampMaps,
-        stampCloneWithoutHash,
+        stampClone,
         ([, , hash], valueId) =>
           hash ==
           (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
       );
-      return newStamp(values, valuesTime);
+      return stampNew(values, valuesTime);
     };
     const setMergeableContent = (mergeableContent) =>
       disableListeningToRawStoreChanges(() =>
@@ -2337,31 +2336,35 @@
       });
       return mergeableStore;
     };
-    const getTransactionMergeableChanges = () => {
-      const [[tableStampMaps, tablesTime], [valueStampMaps, valuesTime]] =
-        contentStampMap;
+    const getTransactionMergeableChanges = (withHashes = false) => {
+      const [
+        [tableStampMaps, tablesTime, tablesHash],
+        [valueStampMaps, valuesTime, valuesHash],
+      ] = contentStampMap;
+      const newStamp = withHashes ? stampNewWithHash : stampNew;
       const tablesObj = {};
       collForEach(touchedCells, (touchedTable, tableId) =>
         ifNotUndefined(
           mapGet(tableStampMaps, tableId),
-          ([rowStampMaps, tableTime]) => {
+          ([rowStampMaps, tableTime, tableHash]) => {
             const tableObj = {};
             collForEach(touchedTable, (touchedRow, rowId) =>
               ifNotUndefined(
                 mapGet(rowStampMaps, rowId),
-                ([cellStampMaps, rowTime]) => {
+                ([cellStampMaps, rowTime, rowHash]) => {
                   const rowObj = {};
                   collForEach(touchedRow, (cellId) => {
                     ifNotUndefined(
                       mapGet(cellStampMaps, cellId),
-                      ([cell, time]) => (rowObj[cellId] = newStamp(cell, time)),
+                      ([cell, time, hash]) =>
+                        (rowObj[cellId] = newStamp(cell, time, hash)),
                     );
                   });
-                  tableObj[rowId] = newStamp(rowObj, rowTime);
+                  tableObj[rowId] = newStamp(rowObj, rowTime, rowHash);
                 },
               ),
             );
-            tablesObj[tableId] = newStamp(tableObj, tableTime);
+            tablesObj[tableId] = newStamp(tableObj, tableTime, tableHash);
           },
         ),
       );
@@ -2369,12 +2372,13 @@
       collForEach(touchedValues, (valueId) =>
         ifNotUndefined(
           mapGet(valueStampMaps, valueId),
-          ([value, time]) => (valuesObj[valueId] = newStamp(value, time)),
+          ([value, time, hash]) =>
+            (valuesObj[valueId] = newStamp(value, time, hash)),
         ),
       );
       return [
-        newStamp(tablesObj, tablesTime),
-        newStamp(valuesObj, valuesTime),
+        newStamp(tablesObj, tablesTime, tablesHash),
+        newStamp(valuesObj, valuesTime, valuesHash),
         1,
       ];
     };