tinybase 5.0.0-beta.25 → 5.0.0-beta.27

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

@@ -1261,10 +1261,15 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+const Persists = {
+  StoreOnly: 1,
+  MergeableStoreOnly: 2,
+  StoreOrMergeableStore: 3,
+};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1273,7 +1278,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1290,7 +1295,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1308,7 +1313,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$1(void 0, null, function* () {
       /* istanbul ignore else */
@@ -1551,14 +1556,16 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const RESPONSE = 0;
-const GET_CONTENT_HASHES = 1;
-const CONTENT_HASHES = 2;
-const CONTENT_DIFF = 3;
-const GET_TABLE_DIFF = 4;
-const GET_ROW_DIFF = 5;
-const GET_CELL_DIFF = 6;
-const GET_VALUE_DIFF = 7;
+const Message = {
+  Response: 0,
+  GetContentHashes: 1,
+  ContentHashes: 2,
+  ContentDiff: 3,
+  GetTableDiff: 4,
+  GetRowDiff: 5,
+  GetCellDiff: 6,
+  GetValueDiff: 7,
+};
 const createCustomSynchronizer = (
   store,
   send,
@@ -1572,41 +1579,39 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  onReceive((fromClientId, requestId, messageType, messageBody) => {
+  onReceive((fromClientId, requestId, message, body) => {
     receives++;
-    if (messageType == RESPONSE) {
+    if (message == Message.Response) {
       ifNotUndefined(
         mapGet(pendingRequests, requestId),
         ([toClientId, handleResponse]) =>
           isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(messageBody, fromClientId)
+            ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
       );
-    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
         persisterListener == null ? void 0 : persisterListener(void 0, changes);
       });
-    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener == null
-        ? void 0
-        : persisterListener(void 0, messageBody);
+    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {
       ifNotUndefined(
-        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+        message == Message.GetContentHashes && persister.isAutoSaving()
           ? store.getMergeableContentHashes()
-          : messageType == GET_TABLE_DIFF
-            ? store.getMergeableTableDiff(messageBody)
-            : messageType == GET_ROW_DIFF
-              ? store.getMergeableRowDiff(messageBody)
-              : messageType == GET_CELL_DIFF
-                ? store.getMergeableCellDiff(messageBody)
-                : messageType == GET_VALUE_DIFF
-                  ? store.getMergeableValueDiff(messageBody)
+          : 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, RESPONSE, response);
+          send(fromClientId, requestId, Message.Response, response);
         },
       );
     }
@@ -1615,13 +1620,13 @@ const createCustomSynchronizer = (
     __async(
       void 0,
       [_0, _1, ..._2],
-      function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+      function* (toClientId, message, body = EMPTY_STRING) {
         return promiseNew((resolve, reject) => {
           const requestId = getUniqueId();
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -1633,7 +1638,7 @@ const createCustomSynchronizer = (
             },
           ]);
           sends++;
-          send(toClientId, requestId, messageType, messageBody);
+          send(toClientId, requestId, message, body);
         });
       },
     );
@@ -1658,7 +1663,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -1667,21 +1672,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          GET_TABLE_DIFF,
+          Message.GetTableDiff,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            GET_ROW_DIFF,
+            Message.GetRowDiff,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              GET_CELL_DIFF,
+              Message.GetCellDiff,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -1694,7 +1699,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              GET_VALUE_DIFF,
+              Message.GetValueDiff,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -1711,9 +1716,14 @@ const createCustomSynchronizer = (
     __async(void 0, null, function* () {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
@@ -1737,7 +1747,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
   return persister;
@@ -4102,20 +4112,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -4136,7 +4146,7 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) => {
       var _a;
       return mapForEach(
@@ -4144,13 +4154,13 @@ const createMergeableStore = (uniqueId) => {
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       );
     });
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -4207,13 +4217,13 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
       ([, , hash], valueId) =>
-        hash == (relativeTo == null ? void 0 : relativeTo[valueId]),
+        hash == (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
     );
     return newStamp(values, valuesTime);
   };
@@ -4340,6 +4350,8 @@ const createMergeableStore = (uniqueId) => {
   return objFreeze(mergeableStore);
 };
 
+exports.Message = Message;
+exports.Persists = Persists;
 exports.createCheckpoints = createCheckpoints;
 exports.createCustomPersister = createCustomPersister;
 exports.createCustomSynchronizer = createCustomSynchronizer;

package/cjs/index.cjs

@@ -1145,10 +1145,15 @@ const createMetrics = getCreateFunction((store) => {
   return objFreeze(metrics);
 });
 
+const Persists = {
+  StoreOnly: 1,
+  MergeableStoreOnly: 2,
+  StoreOrMergeableStore: 3,
+};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1157,7 +1162,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1174,7 +1179,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1192,7 +1197,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1366,14 +1371,16 @@ const stampValidate = (stamp, validateThing) =>
   isFiniteNumber(stamp[2]) &&
   validateThing(stamp[0]);
 
-const RESPONSE = 0;
-const GET_CONTENT_HASHES = 1;
-const CONTENT_HASHES = 2;
-const CONTENT_DIFF = 3;
-const GET_TABLE_DIFF = 4;
-const GET_ROW_DIFF = 5;
-const GET_CELL_DIFF = 6;
-const GET_VALUE_DIFF = 7;
+const Message = {
+  Response: 0,
+  GetContentHashes: 1,
+  ContentHashes: 2,
+  ContentDiff: 3,
+  GetTableDiff: 4,
+  GetRowDiff: 5,
+  GetCellDiff: 6,
+  GetValueDiff: 7,
+};
 const createCustomSynchronizer = (
   store,
   send,
@@ -1387,51 +1394,49 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  onReceive((fromClientId, requestId, messageType, messageBody) => {
+  onReceive((fromClientId, requestId, message, body) => {
     receives++;
-    if (messageType == RESPONSE) {
+    if (message == Message.Response) {
       ifNotUndefined(
         mapGet(pendingRequests, requestId),
         ([toClientId, handleResponse]) =>
           isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(messageBody, fromClientId)
+            ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
       );
-    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
         persisterListener?.(void 0, changes);
       });
-    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener?.(void 0, messageBody);
+    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+      persisterListener?.(void 0, body);
     } else {
       ifNotUndefined(
-        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+        message == Message.GetContentHashes && persister.isAutoSaving()
           ? store.getMergeableContentHashes()
-          : messageType == GET_TABLE_DIFF
-            ? store.getMergeableTableDiff(messageBody)
-            : messageType == GET_ROW_DIFF
-              ? store.getMergeableRowDiff(messageBody)
-              : messageType == GET_CELL_DIFF
-                ? store.getMergeableCellDiff(messageBody)
-                : messageType == GET_VALUE_DIFF
-                  ? store.getMergeableValueDiff(messageBody)
+          : 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, RESPONSE, response);
+          send(fromClientId, requestId, Message.Response, response);
         },
       );
     }
   });
-  const request = async (toClientId, messageType, messageBody = EMPTY_STRING) =>
+  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 '${messageType}'`,
-        );
+        reject(`No response from ${toClientId ?? 'anyone'} to '${message}'`);
       }, requestTimeoutSeconds * 1e3);
       mapSet(pendingRequests, requestId, [
         toClientId,
@@ -1442,7 +1447,7 @@ const createCustomSynchronizer = (
         },
       ]);
       sends++;
-      send(toClientId, requestId, messageType, messageBody);
+      send(toClientId, requestId, message, body);
     });
   const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
     objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -1467,7 +1472,7 @@ const createCustomSynchronizer = (
     if (isUndefined(otherContentHashes)) {
       [otherContentHashes, otherClientId] = await request(
         otherClientId,
-        GET_CONTENT_HASHES,
+        Message.GetContentHashes,
       );
     }
     const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -1477,7 +1482,7 @@ const createCustomSynchronizer = (
       const [newTables, differentTableHashes] = (
         await request(
           otherClientId,
-          GET_TABLE_DIFF,
+          Message.GetTableDiff,
           store.getMergeableTableHashes(),
         )
       )[0];
@@ -1486,7 +1491,7 @@ const createCustomSynchronizer = (
         const [newRows, differentRowHashes] = (
           await request(
             otherClientId,
-            GET_ROW_DIFF,
+            Message.GetRowDiff,
             store.getMergeableRowHashes(differentTableHashes),
           )
         )[0];
@@ -1495,7 +1500,7 @@ const createCustomSynchronizer = (
           const newCells = (
             await request(
               otherClientId,
-              GET_CELL_DIFF,
+              Message.GetCellDiff,
               store.getMergeableCellHashes(differentRowHashes),
             )
           )[0];
@@ -1510,7 +1515,7 @@ const createCustomSynchronizer = (
         : (
             await request(
               otherClientId,
-              GET_VALUE_DIFF,
+              Message.GetValueDiff,
               store.getMergeableValueHashes(),
             )
           )[0],
@@ -1526,9 +1531,14 @@ const createCustomSynchronizer = (
   const setPersisted = async (_getContent, changes) => {
     sends++;
     if (changes) {
-      send(null, null, CONTENT_DIFF, changes);
+      send(null, null, Message.ContentDiff, changes);
     } else {
-      send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+      send(
+        null,
+        null,
+        Message.ContentHashes,
+        store.getMergeableContentHashes(),
+      );
     }
   };
   const addPersisterListener = (listener) => (persisterListener = listener);
@@ -1548,7 +1558,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
@@ -3850,20 +3860,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -3884,20 +3894,20 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) =>
       mapForEach(
         mapGet(contentStampMap[0][0], tableId)?.[0],
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       ),
     );
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -3954,12 +3964,12 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
-      ([, , hash], valueId) => hash == relativeTo?.[valueId],
+      ([, , hash], valueId) => hash == otherValueHashes?.[valueId],
     );
     return newStamp(values, valuesTime);
   };
@@ -4084,6 +4094,8 @@ const createMergeableStore = (uniqueId) => {
   return objFreeze(mergeableStore);
 };
 
+exports.Message = Message;
+exports.Persists = Persists;
 exports.createCheckpoints = createCheckpoints;
 exports.createCustomPersister = createCustomPersister;
 exports.createCustomSynchronizer = createCustomSynchronizer;

package/cjs/mergeable-store/index.cjs

@@ -2019,20 +2019,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -2053,20 +2053,20 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) =>
       mapForEach(
         mapGet(contentStampMap[0][0], tableId)?.[0],
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       ),
     );
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -2123,12 +2123,12 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
-      ([, , hash], valueId) => hash == relativeTo?.[valueId],
+      ([, , hash], valueId) => hash == otherValueHashes?.[valueId],
     );
     return newStamp(values, valuesTime);
   };