tinybase 5.4.0-beta.2 → 5.4.0-beta.3

package/@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts

@@ -9,7 +9,16 @@
  * @since v5.4.0
  */
 
-import type {Id, IdAddedOrRemoved, Ids} from '../../../with-schemas/index.d.ts';
+import type {
+  Id,
+  IdAddedOrRemoved,
+  Ids,
+  OptionalSchemas,
+} from '../../../with-schemas/index.d.ts';
+import type {
+  Persister,
+  Persists,
+} from '../../../persisters/with-schemas/index.d.ts';
 import {DurableObject} from 'cloudflare:workers';
 
 /**
@@ -19,11 +28,67 @@ import {DurableObject} from 'cloudflare:workers';
  * @category Creation
  * @since v5.4.0
  */
-export class WsServerDurableObject<Env = unknown> extends DurableObject<Env> {
+export class WsServerDurableObject<
+  Schemas extends OptionalSchemas,
+  Env = unknown,
+> extends DurableObject<Env> {
+  /**
+   * The createPersister method is used to return a persister for the
+   * Durable Object to preserve Store state for when clients are not connected.
+   *
+   * This has schema-based typing. The following is a simplified representation:
+   *
+   * ```ts override
+   * createPersister():
+   *   | Persister<Persists.MergeableStoreOnly>
+   *   | Promise<Persister<Persists.MergeableStoreOnly>>
+   *   | undefined;
+   * ```
+   *
+   * This should almost certainly be a DurableObjectStoragePersister, created
+   * with the createDurableObjectStoragePersister function.
+   * @example
+   * This example creates a Persister object against a newly-created
+   * MergeableStore (within the createPersister method of a
+   * WsServerDurableObject instance) and then gets the storage reference back
+   * out again.
+   *
+   * ```js yolo
+   * import {createDurableObjectStoragePersister} from 'tinybase/persisters/persister-durable-object-storage';
+   * import {createMergeableStore} from 'tinybase';
+   *
+   * // Within the createPersister method of a WsServerDurableObject instance.
+   * const store = createMergeableStore().setTables();
+   * const persister = createDurableObjectStoragePersister(
+   *   store,
+   *   this.ctx.storage,
+   * );
+   *
+   * return persister;
+   * ```
+   * @category Creation
+   * @since v5.4.0
+   */
+  createPersister():
+    | Persister<Schemas, Persists.MergeableStoreOnly>
+    | Promise<Persister<Schemas, Persists.MergeableStoreOnly>>
+    | undefined;
+
+  /**
+   * The getPathId method is used to get the Id of the path that is being
+   * served.
+   * @category Getter
+   * @since v5.4.0
+   */
+  getPathId(): Id;
+
   /**
    * The getClientIds method is used to access a list of all the connected
    * clients on a given path.
-   * @category Getters
+   *
+   * Note that if you call this method from the onClientId method as a client is
+   * getting removed, it will still be returned in the list of client Ids.
+   * @category Getter
    * @since v5.4.0
    */
   getClientIds(pathId: Id): Ids;
@@ -31,7 +96,7 @@ export class WsServerDurableObject<Env = unknown> extends DurableObject<Env> {
   /**
    * The onPathId method is called when the first client connects to, or the
    * last client disconnects from, the server with a given path Id.
-   * @category Events
+   * @category Event
    * @since v5.4.0
    */
   onPathId(pathId: Id, addedOrRemoved: IdAddedOrRemoved): void;
@@ -39,10 +104,22 @@ export class WsServerDurableObject<Env = unknown> extends DurableObject<Env> {
   /**
    * The onClientId method is called when a client connects to, or disconnects
    * from, the server.
-   * @category Events
+   * @category Event
    * @since v5.4.0
    */
   onClientId(pathId: Id, clientId: Id, addedOrRemoved: IdAddedOrRemoved): void;
+
+  /**
+   * The onMessage method is called when a message is handled by the server.
+   *
+   * Note that this method is potentially called very frequently, and should be
+   * performant. A pathId is not passed as an argument, since it has a small
+   * cost to provide by default. You can use the getPathId method yourself if
+   * that information is needed.
+   * @category Event
+   * @since v5.4.0
+   */
+  onMessage(_fromClientId: Id, _toClientId: Id, _remainder: string): void;
 }
 
 /**
@@ -52,11 +129,16 @@ export class WsServerDurableObject<Env = unknown> extends DurableObject<Env> {
  * @category Creation
  * @since v5.4.0
  */
-export function getWsServerDurableObjectFetch<Namespace extends string>(
+export function getWsServerDurableObjectFetch<
+  Schemas extends OptionalSchemas,
+  Namespace extends string,
+>(
   namespace: Namespace,
 ): (
   request: Request,
   env: {
-    [namespace in Namespace]: DurableObjectNamespace<WsServerDurableObject>;
+    [namespace in Namespace]: DurableObjectNamespace<
+      WsServerDurableObject<Schemas>
+    >;
   },
 ) => Response;

package/cjs/es6/index.cjs

@@ -1650,6 +1650,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;
   };
@@ -1913,9 +1914,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) =>
@@ -1932,22 +1934,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 &&
@@ -3509,7 +3509,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) ^
@@ -3520,7 +3520,7 @@ const createMergeableStore = (uniqueId) => {
     tablesHash ^= isContent
       ? 0
       : replaceTimeHash(oldTablesTime, incomingTablesTime);
-    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
     const [valuesTime] = mergeCellsOrValues(
       values,
       valuesStampMap,
@@ -3556,6 +3556,7 @@ const createMergeableStore = (uniqueId) => {
         if (!oldThingTime || thingTime > oldThingTime) {
           stampUpdate(
             thingStampMap,
+            thingTime,
             isContent
               ? incomingThingHash
               : getHash(
@@ -3563,7 +3564,6 @@ const createMergeableStore = (uniqueId) => {
                     ':' +
                     thingTime,
                 ),
-            thingTime,
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
@@ -3578,7 +3578,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 = () => {};
@@ -3742,7 +3742,7 @@ const createMergeableStore = (uniqueId) => {
         ),
       ),
     );
-    return newStamp(tablesObj, tablesTime);
+    return stampNew(tablesObj, tablesTime);
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
@@ -3750,11 +3750,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(() =>
@@ -3774,31 +3774,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);
         },
       ),
     );
@@ -3806,12 +3810,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/cjs/es6/indexes/index.cjs

@@ -7,7 +7,7 @@ const id = (key) => EMPTY_STRING + key;
 
 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/cjs/es6/indexes/with-schemas/index.cjs

@@ -7,7 +7,7 @@ const id = (key) => EMPTY_STRING + key;
 
 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/cjs/es6/mergeable-store/index.cjs

@@ -253,9 +253,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) =>
@@ -272,22 +273,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 &&
@@ -2003,7 +2002,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) ^
@@ -2014,7 +2013,7 @@ const createMergeableStore = (uniqueId) => {
     tablesHash ^= isContent
       ? 0
       : replaceTimeHash(oldTablesTime, incomingTablesTime);
-    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
     const [valuesTime] = mergeCellsOrValues(
       values,
       valuesStampMap,
@@ -2050,6 +2049,7 @@ const createMergeableStore = (uniqueId) => {
         if (!oldThingTime || thingTime > oldThingTime) {
           stampUpdate(
             thingStampMap,
+            thingTime,
             isContent
               ? incomingThingHash
               : getHash(
@@ -2057,7 +2057,6 @@ const createMergeableStore = (uniqueId) => {
                     ':' +
                     thingTime,
                 ),
-            thingTime,
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
@@ -2072,7 +2071,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 = () => {};
@@ -2236,7 +2235,7 @@ const createMergeableStore = (uniqueId) => {
         ),
       ),
     );
-    return newStamp(tablesObj, tablesTime);
+    return stampNew(tablesObj, tablesTime);
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
@@ -2244,11 +2243,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(() =>
@@ -2268,31 +2267,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);
         },
       ),
     );
@@ -2300,12 +2303,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/cjs/es6/mergeable-store/with-schemas/index.cjs

@@ -253,9 +253,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) =>
@@ -272,22 +273,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 &&
@@ -2003,7 +2002,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) ^
@@ -2014,7 +2013,7 @@ const createMergeableStore = (uniqueId) => {
     tablesHash ^= isContent
       ? 0
       : replaceTimeHash(oldTablesTime, incomingTablesTime);
-    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    stampUpdate(tablesStampMap, incomingTablesTime, tablesHash);
     const [valuesTime] = mergeCellsOrValues(
       values,
       valuesStampMap,
@@ -2050,6 +2049,7 @@ const createMergeableStore = (uniqueId) => {
         if (!oldThingTime || thingTime > oldThingTime) {
           stampUpdate(
             thingStampMap,
+            thingTime,
             isContent
               ? incomingThingHash
               : getHash(
@@ -2057,7 +2057,6 @@ const createMergeableStore = (uniqueId) => {
                     ':' +
                     thingTime,
                 ),
-            thingTime,
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
@@ -2072,7 +2071,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 = () => {};
@@ -2236,7 +2235,7 @@ const createMergeableStore = (uniqueId) => {
         ),
       ),
     );
-    return newStamp(tablesObj, tablesTime);
+    return stampNew(tablesObj, tablesTime);
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
@@ -2244,11 +2243,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(() =>
@@ -2268,31 +2267,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);
         },
       ),
     );
@@ -2300,12 +2303,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/cjs/es6/metrics/index.cjs

@@ -15,7 +15,7 @@ const mathMin = math.min;
 const isFiniteNumber = isFinite;
 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 isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);

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

@@ -15,7 +15,7 @@ const mathMin = math.min;
 const isFiniteNumber = isFinite;
 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 isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);