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

package/es6/ui-react-inspector/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,
@@ -1990,12 +1990,16 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 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,
@@ -2019,6 +2023,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -2036,7 +2041,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -2088,7 +2093,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) {
@@ -2103,7 +2108,8 @@ const createCustomPersister = (
     });
   const startAutoLoad = (initialContent) =>
     __async$2(void 0, null, function* () {
-      yield stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      yield load(initialContent);
       try {
         autoLoadHandle = yield addPersisterListener((content, changes) =>
           __async$2(void 0, null, function* () {
@@ -2150,7 +2156,8 @@ const createCustomPersister = (
     });
   const startAutoSave = () =>
     __async$2(void 0, null, function* () {
-      yield stopAutoSave().save();
+      stopAutoSave();
+      yield save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -2160,8 +2167,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);
@@ -2590,11 +2599,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) => {
     var _a;

package/es6/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,
@@ -1990,12 +1990,16 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 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,
@@ -2019,6 +2023,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -2036,7 +2041,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -2088,7 +2093,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) {
@@ -2103,7 +2108,8 @@ const createCustomPersister = (
     });
   const startAutoLoad = (initialContent) =>
     __async$2(void 0, null, function* () {
-      yield stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      yield load(initialContent);
       try {
         autoLoadHandle = yield addPersisterListener((content, changes) =>
           __async$2(void 0, null, function* () {
@@ -2150,7 +2156,8 @@ const createCustomPersister = (
     });
   const startAutoSave = () =>
     __async$2(void 0, null, function* () {
-      yield stopAutoSave().save();
+      stopAutoSave();
+      yield save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -2160,8 +2167,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);
@@ -2590,11 +2599,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) => {
     var _a;

package/es6/with-schemas/index.js

@@ -1648,6 +1648,7 @@ const createQueries = getCreateFunction((store) => {
   };
   const getListenerStats = () => {
     const _a = resultStore.getListenerStats(),
+      {tables: _1, tableIds: _2, transaction: _3} = _a,
       stats = __objRest(_a, ['tables', 'tableIds', 'transaction']);
     return stats;
   };
@@ -1911,9 +1912,10 @@ const getHash = (value) => {
   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) =>
@@ -1930,22 +1932,20 @@ const getLatestTime = (time1, time2) => {
       : ''
   );
 };
-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 &&
@@ -2268,11 +2268,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) => {
     var _a;
@@ -3507,7 +3507,7 @@ const createMergeableStore = (uniqueId) => {
         tableHash ^= isContent
           ? 0
           : replaceTimeHash(oldTableTime, incomingTableTime);
-        stampUpdate(tableStampMap, tableHash, incomingTableTime);
+        stampUpdate(tableStampMap, incomingTableTime, tableHash);
         tablesHash ^= isContent
           ? 0
           : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
@@ -3518,7 +3518,7 @@ const createMergeableStore = (uniqueId) => {
     tablesHash ^= isContent
       ? 0
       : replaceTimeHash(oldTablesTime, incomingTablesTime);
-    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
     const [valuesTime] = mergeCellsOrValues(
       values,
       valuesStampMap,
@@ -3554,6 +3554,7 @@ const createMergeableStore = (uniqueId) => {
         if (!oldThingTime || thingTime > oldThingTime) {
           stampUpdate(
             thingStampMap,
+            thingTime,
             isContent
               ? incomingThingHash
               : getHash(
@@ -3561,7 +3562,6 @@ const createMergeableStore = (uniqueId) => {
                     ':' +
                     thingTime,
                 ),
-            thingTime,
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
@@ -3576,7 +3576,7 @@ const createMergeableStore = (uniqueId) => {
     thingsHash ^= isContent
       ? 0
       : replaceTimeHash(oldThingsTime, incomingThingsTime);
-    stampUpdate(thingsStampMap, thingsHash, incomingThingsTime);
+    stampUpdate(thingsStampMap, incomingThingsTime, thingsHash);
     return [thingsTime, oldThingsHash, thingsStampMap[2]];
   };
   const preStartTransaction = () => {};
@@ -3740,7 +3740,7 @@ const createMergeableStore = (uniqueId) => {
         ),
       ),
     );
-    return newStamp(tablesObj, tablesTime);
+    return stampNew(tablesObj, tablesTime);
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
@@ -3748,11 +3748,11 @@ const createMergeableStore = (uniqueId) => {
     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(() =>
@@ -3772,31 +3772,35 @@ const createMergeableStore = (uniqueId) => {
     });
     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);
         },
       ),
     );
@@ -3804,12 +3808,13 @@ const createMergeableStore = (uniqueId) => {
     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/index.js

@@ -1807,9 +1807,10 @@ const getHash = (value) => {
   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) =>
@@ -1817,22 +1818,20 @@ const replaceTimeHash = (oldTime, newTime) =>
 const getLatestTime = (time1, time2) =>
   /* istanbul ignore next */
   ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-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 &&
@@ -2155,11 +2154,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, {});
@@ -3370,7 +3369,7 @@ const createMergeableStore = (uniqueId) => {
         tableHash ^= isContent
           ? 0
           : replaceTimeHash(oldTableTime, incomingTableTime);
-        stampUpdate(tableStampMap, tableHash, incomingTableTime);
+        stampUpdate(tableStampMap, incomingTableTime, tableHash);
         tablesHash ^= isContent
           ? 0
           : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
@@ -3381,7 +3380,7 @@ const createMergeableStore = (uniqueId) => {
     tablesHash ^= isContent
       ? 0
       : replaceTimeHash(oldTablesTime, incomingTablesTime);
-    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
     const [valuesTime] = mergeCellsOrValues(
       values,
       valuesStampMap,
@@ -3417,10 +3416,10 @@ const createMergeableStore = (uniqueId) => {
         if (!oldThingTime || thingTime > oldThingTime) {
           stampUpdate(
             thingStampMap,
+            thingTime,
             isContent
               ? incomingThingHash
               : getHash(jsonStringWithMap(thing ?? null) + ':' + thingTime),
-            thingTime,
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
@@ -3435,7 +3434,7 @@ const createMergeableStore = (uniqueId) => {
     thingsHash ^= isContent
       ? 0
       : replaceTimeHash(oldThingsTime, incomingThingsTime);
-    stampUpdate(thingsStampMap, thingsHash, incomingThingsTime);
+    stampUpdate(thingsStampMap, incomingThingsTime, thingsHash);
     return [thingsTime, oldThingsHash, thingsStampMap[2]];
   };
   const preStartTransaction = () => {};
@@ -3598,7 +3597,7 @@ const createMergeableStore = (uniqueId) => {
         ),
       ),
     );
-    return newStamp(tablesObj, tablesTime);
+    return stampNew(tablesObj, tablesTime);
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
@@ -3606,10 +3605,10 @@ const createMergeableStore = (uniqueId) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
-      stampCloneWithoutHash,
+      stampClone,
       ([, , hash], valueId) => hash == otherValueHashes?.[valueId],
     );
-    return newStamp(values, valuesTime);
+    return stampNew(values, valuesTime);
   };
   const setMergeableContent = (mergeableContent) =>
     disableListeningToRawStoreChanges(() =>
@@ -3629,31 +3628,35 @@ const createMergeableStore = (uniqueId) => {
     });
     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);
         },
       ),
     );
@@ -3661,12 +3664,13 @@ const createMergeableStore = (uniqueId) => {
     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,
     ];
   };