tinybase 6.1.0-beta.1 → 6.1.0-beta.3

package/@types/common/index.d.ts

@@ -33,10 +33,10 @@ export type Ids = Id[];
 export type Id = string;
 
 /**
- * The Id type is a simple alias for the union of a string or `null` value,
- * where the string should be considered to be the key of an objects (such as a
- * Row Id string used in a Table), and typically `null` indicates a wildcard -
- * such as when used in the Store addRowListener method.
+ * The IdOrNull type is a simple alias for the union of a string or `null`
+ * value, where the string should be considered to be the key of an objects
+ * (such as a Row Id string used in a Table), and typically `null` indicates a
+ * wildcard - such as when used in the Store addRowListener method.
  * @category Identity
  * @since v1.0.0
  */

package/@types/common/with-schemas/index.d.ts

@@ -33,10 +33,10 @@ export type Ids = Id[];
 export type Id = string;
 
 /**
- * The Id type is a simple alias for the union of a string or `null` value,
- * where the string should be considered to be the key of an objects (such as a
- * Row Id string used in a Table), and typically `null` indicates a wildcard -
- * such as when used in the Store addRowListener method.
+ * The IdOrNull type is a simple alias for the union of a string or `null`
+ * value, where the string should be considered to be the key of an objects
+ * (such as a Row Id string used in a Table), and typically `null` indicates a
+ * wildcard - such as when used in the Store addRowListener method.
  * @category Identity
  * @since v1.0.0
  */

package/@types/mergeable-store/index.d.ts

@@ -27,6 +27,18 @@ import type {
   ValueOrUndefined,
 } from '../store/index.d.ts';
 
+/**
+ * The GetNow type is used to represent a function that returns the current time
+ * in milliseconds.
+ *
+ * This is used internally within the mergeable-store module, but is used for
+ * the createMergeableStore function's second optional argument to allow
+ * applications to override the clock used to generate timestamps.
+ * @category Stamps
+ * @since v6.1.0
+ */
+export type GetNow = () => number;
+
 /**
  * The Hash type is used within the mergeable-store module to quickly compare
  * the content of two objects.
@@ -328,7 +340,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    *
@@ -380,7 +392,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    * console.log(store.getMergeableContentHashes());
@@ -414,7 +426,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    * console.log(store.getMergeableTableHashes());
@@ -447,7 +459,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -500,7 +512,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}, felix: {color: 'tan'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -536,7 +548,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -594,7 +606,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown', species: 'dog'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -634,7 +646,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -710,7 +722,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setValue('employees', 3);
    * console.log(store.getMergeableValueHashes());
@@ -743,7 +755,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    *
    * const store2 = createMergeableStore('store2');
@@ -788,7 +800,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    * console.log(store1.getMergeableContent());
    * // ->
@@ -836,7 +848,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    *
    * const store2 = createMergeableStore('store2');
@@ -870,7 +882,7 @@ export interface MergeableStore extends Store {
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    * store.setTables({pets: {fido: {species: 'dog', color: 'brown'}}});
    * store.setValues({open: true});
    *
@@ -1034,12 +1046,22 @@ export interface MergeableStore extends Store {
  * The createMergeableStore function creates a MergeableStore, and is the main
  * entry point into the mergeable-store module.
  *
- * There is one optional parameter which is a uniqueId for the MergeableStore.
- * This is used to distinguish conflicting changes made in the same millisecond
- * by two different MergeableStore objects as its hash is added to the end of
- * the HLC timestamps. Generally this can be omitted unless you have a need for
- * deterministic HLCs, such as in a testing scenario. Otherwise, TinyBase will
- * assign a unique Id to the Store at the time of creation.
+ * There are two optional parameters which are only for testing and advanced
+ * usage.
+ *
+ * The first is a uniqueId for the MergeableStore, used to distinguish
+ * conflicting changes made in the same millisecond by two different
+ * MergeableStore objects as its hash is added to the end of the HLC timestamps.
+ * Generally this can be omitted unless you have a need for deterministic HLCs,
+ * such as in a testing scenario. Otherwise, TinyBase will assign a unique Id to
+ * the Store at the time of creation.
+ *
+ * Since v6.1.0, the second is a function that can be used to replace the way
+ * the timestamp is generated for HLCs (by default JavaScript's `Date.now()`
+ * method).
+ * @param uniqueId An optional unique Id for the MergeableStore.
+ * @param getNow An optional function that generates millisecond timestamps,
+ * since v6.1.0.
  * @returns A reference to the new MergeableStore.
  * @example
  * This example creates a MergeableStore.
@@ -1136,4 +1158,7 @@ export interface MergeableStore extends Store {
  * @category Creation
  * @since v5.0.0
  */
-export function createMergeableStore(uniqueId?: Id): MergeableStore;
+export function createMergeableStore(
+  uniqueId?: Id,
+  getNow?: GetNow,
+): MergeableStore;

package/@types/mergeable-store/with-schemas/index.d.ts

@@ -40,6 +40,18 @@ import type {
   ValuesSchema,
 } from '../../store/with-schemas/index.d.ts';
 
+/**
+ * The GetNow type is used to represent a function that returns the current time
+ * in milliseconds.
+ *
+ * This is used internally within the mergeable-store module, but is used for
+ * the createMergeableStore function's second optional argument to allow
+ * applications to override the clock used to generate timestamps.
+ * @category Stamps
+ * @since v6.1.0
+ */
+export type GetNow = () => number;
+
 /**
  * The Hash type is used within the mergeable-store module to quickly compare
  * the content of two objects.
@@ -491,7 +503,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    *
@@ -543,7 +555,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    * console.log(store.getMergeableContentHashes());
@@ -583,7 +595,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setCell('pets', 'fido', 'color', 'brown');
    * console.log(store.getMergeableTableHashes());
@@ -624,7 +636,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -686,7 +698,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}, felix: {color: 'tan'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -732,7 +744,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -799,7 +811,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown', species: 'dog'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -847,7 +859,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setTables({pets: {fido: {color: 'brown'}}});
    *
    * const store2 = createMergeableStore('store2');
@@ -931,7 +943,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    *
    * store.setValue('employees', 3);
    * console.log(store.getMergeableValueHashes());
@@ -970,7 +982,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    *
    * const store2 = createMergeableStore('store2');
@@ -1023,7 +1035,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    * console.log(store1.getMergeableContent());
    * // ->
@@ -1079,7 +1091,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store1 = createMergeableStore('store1'); // !resetHlc
+   * const store1 = createMergeableStore('store1'); // !reset
    * store1.setValues({employees: 3});
    *
    * const store2 = createMergeableStore('store2');
@@ -1121,7 +1133,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
    * ```js
    * import {createMergeableStore} from 'tinybase';
    *
-   * const store = createMergeableStore('store1'); // !resetHlc
+   * const store = createMergeableStore('store1'); // !reset
    * store.setTables({pets: {fido: {species: 'dog', color: 'brown'}}});
    * store.setValues({open: true});
    *
@@ -1520,15 +1532,28 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * createMergeableStore(uniqueId?: Id): MergeableStore;
+ * createMergeableStore(
+ *   uniqueId?: Id,
+ *   getNow?: GetNow,
+ * ): MergeableStore;
  * ```
  *
- * There is one optional parameter which is a uniqueId for the MergeableStore.
- * This is used to distinguish conflicting changes made in the same millisecond
- * by two different MergeableStore objects as its hash is added to the end of
- * the HLC timestamps. Generally this can be omitted unless you have a need for
- * deterministic HLCs, such as in a testing scenario. Otherwise, TinyBase will
- * assign a unique Id to the Store at the time of creation.
+ * There are two optional parameters which are only for testing and advanced
+ * usage.
+ *
+ * The first is a uniqueId for the MergeableStore, used to distinguish
+ * conflicting changes made in the same millisecond by two different
+ * MergeableStore objects as its hash is added to the end of the HLC timestamps.
+ * Generally this can be omitted unless you have a need for deterministic HLCs,
+ * such as in a testing scenario. Otherwise, TinyBase will assign a unique Id to
+ * the Store at the time of creation.
+ *
+ * Since v6.1.0, the second is a function that can be used to replace the way
+ * the timestamp is generated for HLCs (by default JavaScript's `Date.now()`
+ * method).
+ * @param uniqueId An optional unique Id for the MergeableStore.
+ * @param getNow An optional function that generates millisecond timestamps,
+ * since v6.1.0.
  * @returns A reference to the new MergeableStore.
  * @example
  * This example creates a MergeableStore.
@@ -1625,4 +1650,7 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
  * @category Creation
  * @since v5.0.0
  */
-export function createMergeableStore(uniqueId?: Id): MergeableStore<NoSchemas>;
+export function createMergeableStore(
+  uniqueId?: Id,
+  getNow?: GetNow,
+): MergeableStore<NoSchemas>;

package/@types/persisters/index.d.ts

@@ -1710,7 +1710,7 @@ export type DatabaseChangeListener = (tableName: string) => void;
  * // -> '[{"pets":{"fido":{"species":"dog"}}},{}]'
  * storePersister.destroy();
  *
- * const mergeableStore = createMergeableStore('mergeableStore1'); // !resetHlc
+ * const mergeableStore = createMergeableStore('mergeableStore1'); // !reset
  * mergeableStore.setTables({pets: {fido: {species: 'dog'}}});
  * const mergeableStorePersister = createJsonPersister(mergeableStore);
  * await mergeableStorePersister.save();

package/@types/persisters/with-schemas/index.d.ts

@@ -1839,7 +1839,7 @@ export type DatabaseChangeListener = (tableName: string) => void;
  * // -> '[{"pets":{"fido":{"species":"dog"}}},{}]'
  * storePersister.destroy();
  *
- * const mergeableStore = createMergeableStore('mergeableStore1'); // !resetHlc
+ * const mergeableStore = createMergeableStore('mergeableStore1'); // !reset
  * mergeableStore.setTables({pets: {fido: {species: 'dog'}}});
  * const mergeableStorePersister = createJsonPersister(mergeableStore);
  * await mergeableStorePersister.save();

package/index.js

@@ -825,7 +825,14 @@ const createIndexes = getCreateFunction((store) => {
     setDefinitionAndListen(
       indexId,
       tableId,
-      (change, changedSliceIds, changedSortKeys, sliceIds, sortKeys, force) => {
+      (
+        change,
+        changedSliceIds,
+        changedSortKeys,
+        sliceIdOrIdsByRowId,
+        sortKeys,
+        force,
+      ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
         const unsortedSlices = setNew();
@@ -869,8 +876,13 @@ const createIndexes = getCreateFunction((store) => {
             mapForEach(index, (sliceId) => setAdd(unsortedSlices, sliceId));
           } else {
             mapForEach(changedSortKeys, (rowId) =>
-              ifNotUndefined(mapGet(sliceIds, rowId), (sliceId) =>
-                setAdd(unsortedSlices, sliceId),
+              ifNotUndefined(
+                mapGet(sliceIdOrIdsByRowId, rowId),
+                (sliceIdOrIds) =>
+                  arrayForEach(
+                    isArray(sliceIdOrIds) ? sliceIdOrIds : [sliceIdOrIds],
+                    (sliceId) => setAdd(unsortedSlices, sliceId),
+                  ),
               ),
             );
           }
@@ -1019,7 +1031,7 @@ const decodeTimeAndCounter = (hlc16) => [
     decode(hlc16, 9) * SHIFT6 +
     decode(hlc16, 10),
 ];
-const getHlcFunctions = (uniqueId) => {
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
   let logicalTime = 0;
   let lastCounter = -1;
   const clientPart = ifNotUndefined(
@@ -1044,11 +1056,7 @@ const getHlcFunctions = (uniqueId) => {
     const previousLogicalTime = logicalTime;
     const [remoteLogicalTime, remoteCounter] =
       isUndefined(hlc) || hlc == '' ? [0, 0] : decodeTimeAndCounter(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      GLOBAL.HLC_TIME ?? Date.now(),
-    );
+    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
     lastCounter =
       logicalTime == previousLogicalTime
         ? logicalTime == remoteLogicalTime
@@ -2501,13 +2509,13 @@ const validateMergeableContent = (mergeableContent) =>
       1,
     ),
   );
-const createMergeableStore = (uniqueId) => {
+const createMergeableStore = (uniqueId, getNow) => {
   let listeningToRawStoreChanges = 1;
   let contentStampMap = newContentStampMap();
   let defaultingContent = 0;
   const touchedCells = mapNew();
   const touchedValues = setNew();
-  const [getHlc, seenHlc] = getHlcFunctions(uniqueId);
+  const [getHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
   const store = createStore();
   const disableListeningToRawStoreChanges = (actions) => {
     const wasListening = listeningToRawStoreChanges;

package/indexes/index.js

@@ -394,7 +394,14 @@ const createIndexes = getCreateFunction((store) => {
     setDefinitionAndListen(
       indexId,
       tableId,
-      (change, changedSliceIds, changedSortKeys, sliceIds, sortKeys, force) => {
+      (
+        change,
+        changedSliceIds,
+        changedSortKeys,
+        sliceIdOrIdsByRowId,
+        sortKeys,
+        force,
+      ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
         const unsortedSlices = setNew();
@@ -438,8 +445,13 @@ const createIndexes = getCreateFunction((store) => {
             mapForEach(index, (sliceId) => setAdd(unsortedSlices, sliceId));
           } else {
             mapForEach(changedSortKeys, (rowId) =>
-              ifNotUndefined(mapGet(sliceIds, rowId), (sliceId) =>
-                setAdd(unsortedSlices, sliceId),
+              ifNotUndefined(
+                mapGet(sliceIdOrIdsByRowId, rowId),
+                (sliceIdOrIds) =>
+                  arrayForEach(
+                    isArray(sliceIdOrIds) ? sliceIdOrIds : [sliceIdOrIds],
+                    (sliceId) => setAdd(unsortedSlices, sliceId),
+                  ),
               ),
             );
           }

package/indexes/with-schemas/index.js

@@ -394,7 +394,14 @@ const createIndexes = getCreateFunction((store) => {
     setDefinitionAndListen(
       indexId,
       tableId,
-      (change, changedSliceIds, changedSortKeys, sliceIds, sortKeys, force) => {
+      (
+        change,
+        changedSliceIds,
+        changedSortKeys,
+        sliceIdOrIdsByRowId,
+        sortKeys,
+        force,
+      ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
         const unsortedSlices = setNew();
@@ -438,8 +445,13 @@ const createIndexes = getCreateFunction((store) => {
             mapForEach(index, (sliceId) => setAdd(unsortedSlices, sliceId));
           } else {
             mapForEach(changedSortKeys, (rowId) =>
-              ifNotUndefined(mapGet(sliceIds, rowId), (sliceId) =>
-                setAdd(unsortedSlices, sliceId),
+              ifNotUndefined(
+                mapGet(sliceIdOrIdsByRowId, rowId),
+                (sliceIdOrIds) =>
+                  arrayForEach(
+                    isArray(sliceIdOrIds) ? sliceIdOrIds : [sliceIdOrIds],
+                    (sliceId) => setAdd(unsortedSlices, sliceId),
+                  ),
               ),
             );
           }

package/mergeable-store/index.js

@@ -285,7 +285,7 @@ const decodeTimeAndCounter = (hlc16) => [
     decode(hlc16, 9) * SHIFT6 +
     decode(hlc16, 10),
 ];
-const getHlcFunctions = (uniqueId) => {
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
   let logicalTime = 0;
   let lastCounter = -1;
   const clientPart = ifNotUndefined(
@@ -310,11 +310,7 @@ const getHlcFunctions = (uniqueId) => {
     const previousLogicalTime = logicalTime;
     const [remoteLogicalTime, remoteCounter] =
       isUndefined(hlc) || hlc == '' ? [0, 0] : decodeTimeAndCounter(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      GLOBAL.HLC_TIME ?? Date.now(),
-    );
+    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
     lastCounter =
       logicalTime == previousLogicalTime
         ? logicalTime == remoteLogicalTime
@@ -1861,13 +1857,13 @@ const validateMergeableContent = (mergeableContent) =>
       1,
     ),
   );
-const createMergeableStore = (uniqueId) => {
+const createMergeableStore = (uniqueId, getNow) => {
   let listeningToRawStoreChanges = 1;
   let contentStampMap = newContentStampMap();
   let defaultingContent = 0;
   const touchedCells = mapNew();
   const touchedValues = setNew();
-  const [getHlc, seenHlc] = getHlcFunctions(uniqueId);
+  const [getHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
   const store = createStore();
   const disableListeningToRawStoreChanges = (actions) => {
     const wasListening = listeningToRawStoreChanges;

package/mergeable-store/with-schemas/index.js

@@ -285,7 +285,7 @@ const decodeTimeAndCounter = (hlc16) => [
     decode(hlc16, 9) * SHIFT6 +
     decode(hlc16, 10),
 ];
-const getHlcFunctions = (uniqueId) => {
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
   let logicalTime = 0;
   let lastCounter = -1;
   const clientPart = ifNotUndefined(
@@ -310,11 +310,7 @@ const getHlcFunctions = (uniqueId) => {
     const previousLogicalTime = logicalTime;
     const [remoteLogicalTime, remoteCounter] =
       isUndefined(hlc) || hlc == '' ? [0, 0] : decodeTimeAndCounter(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      GLOBAL.HLC_TIME ?? Date.now(),
-    );
+    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
     lastCounter =
       logicalTime == previousLogicalTime
         ? logicalTime == remoteLogicalTime
@@ -1861,13 +1857,13 @@ const validateMergeableContent = (mergeableContent) =>
       1,
     ),
   );
-const createMergeableStore = (uniqueId) => {
+const createMergeableStore = (uniqueId, getNow) => {
   let listeningToRawStoreChanges = 1;
   let contentStampMap = newContentStampMap();
   let defaultingContent = 0;
   const touchedCells = mapNew();
   const touchedValues = setNew();
-  const [getHlc, seenHlc] = getHlcFunctions(uniqueId);
+  const [getHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
   const store = createStore();
   const disableListeningToRawStoreChanges = (actions) => {
     const wasListening = listeningToRawStoreChanges;