tinybase 6.2.0-beta.1 → 6.2.0-beta.2

package/common/index.js

@@ -4,23 +4,32 @@ const strSplit = (str, separator = EMPTY_STRING, limit) =>
 
 const GLOBAL = globalThis;
 const math = Math;
+const mathMax = math.max;
 const mathFloor = math.floor;
+const isUndefined = (thing) => thing == void 0;
+const ifNotUndefined = (value, then, otherwise) =>
+  isUndefined(value) ? otherwise?.() : then(value);
 
+const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
+const mapNew = (entries) => new Map(entries);
+const mapGet = (map, key) => map?.get(key);
+
 const MASK6 = 63;
 const ENCODE = /* @__PURE__ */ strSplit(
   '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz',
 );
+const DECODE = /* @__PURE__ */ mapNew(
+  /* @__PURE__ */ arrayMap(ENCODE, (char, index) => [char, index]),
+);
 const encode = (num) => ENCODE[num & MASK6];
-
+const decode = (str, pos) => mapGet(DECODE, str[pos]) ?? 0;
 const getRandomValues = GLOBAL.crypto
   ? (array) => GLOBAL.crypto.getRandomValues(array)
   : /* istanbul ignore next */
     (array) => arrayMap(array, () => mathFloor(math.random() * 256));
-const defaultSorter = (sortKey1, sortKey2) =>
-  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
     getRandomValues(new Uint8Array(length)),
@@ -28,4 +37,99 @@ const getUniqueId = (length = 16) =>
     '',
   );
 
-export {defaultSorter, getUniqueId};
+const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
+const getHash = (value) => {
+  let hash = 2166136261;
+  arrayForEach(textEncoder.encode(value), (char) => {
+    hash ^= char;
+    hash +=
+      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+  });
+  return hash >>> 0;
+};
+
+const SHIFT36 = 2 ** 36;
+const SHIFT30 = 2 ** 30;
+const SHIFT24 = 2 ** 24;
+const SHIFT18 = 2 ** 18;
+const SHIFT12 = 2 ** 12;
+const SHIFT6 = 2 ** 6;
+const getClientIdFromUniqueId = (uniqueId) => {
+  const clientHash30 = getHash(uniqueId);
+  return (
+    encode(clientHash30 / SHIFT24) +
+    encode(clientHash30 / SHIFT18) +
+    encode(clientHash30 / SHIFT12) +
+    encode(clientHash30 / SHIFT6) +
+    encode(clientHash30)
+  );
+};
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
+  let lastLogicalTime = 0;
+  let lastCounter = -1;
+  const thisClientId = ifNotUndefined(uniqueId, getClientIdFromUniqueId, () =>
+    getUniqueId(5),
+  );
+  const getNextHlc = () => {
+    seenHlc();
+    return encodeHlc(lastLogicalTime, ++lastCounter);
+  };
+  const seenHlc = (hlc) => {
+    const previousLogicalTime = lastLogicalTime;
+    const [remoteLogicalTime, remoteCounter] =
+      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
+    lastLogicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
+    lastCounter =
+      lastLogicalTime == previousLogicalTime
+        ? lastLogicalTime == remoteLogicalTime
+          ? mathMax(lastCounter, remoteCounter)
+          : lastCounter
+        : lastLogicalTime == remoteLogicalTime
+          ? remoteCounter
+          : -1;
+  };
+  const encodeHlc = (logicalTime42, counter24, clientId) =>
+    encode(logicalTime42 / SHIFT36) +
+    encode(logicalTime42 / SHIFT30) +
+    encode(logicalTime42 / SHIFT24) +
+    encode(logicalTime42 / SHIFT18) +
+    encode(logicalTime42 / SHIFT12) +
+    encode(logicalTime42 / SHIFT6) +
+    encode(logicalTime42) +
+    encode(counter24 / SHIFT18) +
+    encode(counter24 / SHIFT12) +
+    encode(counter24 / SHIFT6) +
+    encode(counter24) +
+    (isUndefined(clientId) ? thisClientId : getClientIdFromUniqueId(clientId));
+  const decodeHlc = (hlc16) => [
+    decode(hlc16, 0) * SHIFT36 +
+      decode(hlc16, 1) * SHIFT30 +
+      decode(hlc16, 2) * SHIFT24 +
+      decode(hlc16, 3) * SHIFT18 +
+      decode(hlc16, 4) * SHIFT12 +
+      decode(hlc16, 5) * SHIFT6 +
+      decode(hlc16, 6),
+    decode(hlc16, 7) * SHIFT18 +
+      decode(hlc16, 8) * SHIFT12 +
+      decode(hlc16, 9) * SHIFT6 +
+      decode(hlc16, 10),
+    hlc16.slice(11),
+  ];
+  const getLastLogicalTime = () => lastLogicalTime;
+  const getLastCounter = () => lastCounter;
+  const getClientId = () => thisClientId;
+  return [
+    getNextHlc,
+    seenHlc,
+    encodeHlc,
+    decodeHlc,
+    getLastLogicalTime,
+    getLastCounter,
+    getClientId,
+  ];
+};
+
+const defaultSorter = (sortKey1, sortKey2) =>
+  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
+
+export {defaultSorter, getHlcFunctions, getRandomValues, getUniqueId};

package/common/with-schemas/index.js

@@ -4,23 +4,32 @@ const strSplit = (str, separator = EMPTY_STRING, limit) =>
 
 const GLOBAL = globalThis;
 const math = Math;
+const mathMax = math.max;
 const mathFloor = math.floor;
+const isUndefined = (thing) => thing == void 0;
+const ifNotUndefined = (value, then, otherwise) =>
+  isUndefined(value) ? otherwise?.() : then(value);
 
+const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
+const mapNew = (entries) => new Map(entries);
+const mapGet = (map, key) => map?.get(key);
+
 const MASK6 = 63;
 const ENCODE = /* @__PURE__ */ strSplit(
   '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz',
 );
+const DECODE = /* @__PURE__ */ mapNew(
+  /* @__PURE__ */ arrayMap(ENCODE, (char, index) => [char, index]),
+);
 const encode = (num) => ENCODE[num & MASK6];
-
+const decode = (str, pos) => mapGet(DECODE, str[pos]) ?? 0;
 const getRandomValues = GLOBAL.crypto
   ? (array) => GLOBAL.crypto.getRandomValues(array)
   : /* istanbul ignore next */
     (array) => arrayMap(array, () => mathFloor(math.random() * 256));
-const defaultSorter = (sortKey1, sortKey2) =>
-  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
     getRandomValues(new Uint8Array(length)),
@@ -28,4 +37,99 @@ const getUniqueId = (length = 16) =>
     '',
   );
 
-export {defaultSorter, getUniqueId};
+const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
+const getHash = (value) => {
+  let hash = 2166136261;
+  arrayForEach(textEncoder.encode(value), (char) => {
+    hash ^= char;
+    hash +=
+      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+  });
+  return hash >>> 0;
+};
+
+const SHIFT36 = 2 ** 36;
+const SHIFT30 = 2 ** 30;
+const SHIFT24 = 2 ** 24;
+const SHIFT18 = 2 ** 18;
+const SHIFT12 = 2 ** 12;
+const SHIFT6 = 2 ** 6;
+const getClientIdFromUniqueId = (uniqueId) => {
+  const clientHash30 = getHash(uniqueId);
+  return (
+    encode(clientHash30 / SHIFT24) +
+    encode(clientHash30 / SHIFT18) +
+    encode(clientHash30 / SHIFT12) +
+    encode(clientHash30 / SHIFT6) +
+    encode(clientHash30)
+  );
+};
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
+  let lastLogicalTime = 0;
+  let lastCounter = -1;
+  const thisClientId = ifNotUndefined(uniqueId, getClientIdFromUniqueId, () =>
+    getUniqueId(5),
+  );
+  const getNextHlc = () => {
+    seenHlc();
+    return encodeHlc(lastLogicalTime, ++lastCounter);
+  };
+  const seenHlc = (hlc) => {
+    const previousLogicalTime = lastLogicalTime;
+    const [remoteLogicalTime, remoteCounter] =
+      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
+    lastLogicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
+    lastCounter =
+      lastLogicalTime == previousLogicalTime
+        ? lastLogicalTime == remoteLogicalTime
+          ? mathMax(lastCounter, remoteCounter)
+          : lastCounter
+        : lastLogicalTime == remoteLogicalTime
+          ? remoteCounter
+          : -1;
+  };
+  const encodeHlc = (logicalTime42, counter24, clientId) =>
+    encode(logicalTime42 / SHIFT36) +
+    encode(logicalTime42 / SHIFT30) +
+    encode(logicalTime42 / SHIFT24) +
+    encode(logicalTime42 / SHIFT18) +
+    encode(logicalTime42 / SHIFT12) +
+    encode(logicalTime42 / SHIFT6) +
+    encode(logicalTime42) +
+    encode(counter24 / SHIFT18) +
+    encode(counter24 / SHIFT12) +
+    encode(counter24 / SHIFT6) +
+    encode(counter24) +
+    (isUndefined(clientId) ? thisClientId : getClientIdFromUniqueId(clientId));
+  const decodeHlc = (hlc16) => [
+    decode(hlc16, 0) * SHIFT36 +
+      decode(hlc16, 1) * SHIFT30 +
+      decode(hlc16, 2) * SHIFT24 +
+      decode(hlc16, 3) * SHIFT18 +
+      decode(hlc16, 4) * SHIFT12 +
+      decode(hlc16, 5) * SHIFT6 +
+      decode(hlc16, 6),
+    decode(hlc16, 7) * SHIFT18 +
+      decode(hlc16, 8) * SHIFT12 +
+      decode(hlc16, 9) * SHIFT6 +
+      decode(hlc16, 10),
+    hlc16.slice(11),
+  ];
+  const getLastLogicalTime = () => lastLogicalTime;
+  const getLastCounter = () => lastCounter;
+  const getClientId = () => thisClientId;
+  return [
+    getNextHlc,
+    seenHlc,
+    encodeHlc,
+    decodeHlc,
+    getLastLogicalTime,
+    getLastCounter,
+    getClientId,
+  ];
+};
+
+const defaultSorter = (sortKey1, sortKey2) =>
+  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
+
+export {defaultSorter, getHlcFunctions, getRandomValues, getUniqueId};

package/index.js

@@ -774,13 +774,10 @@ const DECODE = /* @__PURE__ */ mapNew(
 );
 const encode = (num) => ENCODE[num & MASK6];
 const decode = (str, pos) => mapGet(DECODE, str[pos]) ?? 0;
-
 const getRandomValues = GLOBAL.crypto
   ? (array) => GLOBAL.crypto.getRandomValues(array)
   : /* istanbul ignore next */
     (array) => arrayMap(array, () => mathFloor(math.random() * 256));
-const defaultSorter = (sortKey1, sortKey2) =>
-  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
     getRandomValues(new Uint8Array(length)),
@@ -788,6 +785,101 @@ const getUniqueId = (length = 16) =>
     '',
   );
 
+const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
+const getHash = (value) => {
+  let hash = 2166136261;
+  arrayForEach(textEncoder.encode(value), (char) => {
+    hash ^= char;
+    hash +=
+      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+  });
+  return hash >>> 0;
+};
+
+const SHIFT36 = 2 ** 36;
+const SHIFT30 = 2 ** 30;
+const SHIFT24 = 2 ** 24;
+const SHIFT18 = 2 ** 18;
+const SHIFT12 = 2 ** 12;
+const SHIFT6 = 2 ** 6;
+const getClientIdFromUniqueId = (uniqueId) => {
+  const clientHash30 = getHash(uniqueId);
+  return (
+    encode(clientHash30 / SHIFT24) +
+    encode(clientHash30 / SHIFT18) +
+    encode(clientHash30 / SHIFT12) +
+    encode(clientHash30 / SHIFT6) +
+    encode(clientHash30)
+  );
+};
+const getHlcFunctions = (uniqueId, getNow = Date.now) => {
+  let lastLogicalTime = 0;
+  let lastCounter = -1;
+  const thisClientId = ifNotUndefined(uniqueId, getClientIdFromUniqueId, () =>
+    getUniqueId(5),
+  );
+  const getNextHlc = () => {
+    seenHlc();
+    return encodeHlc(lastLogicalTime, ++lastCounter);
+  };
+  const seenHlc = (hlc) => {
+    const previousLogicalTime = lastLogicalTime;
+    const [remoteLogicalTime, remoteCounter] =
+      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
+    lastLogicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
+    lastCounter =
+      lastLogicalTime == previousLogicalTime
+        ? lastLogicalTime == remoteLogicalTime
+          ? mathMax(lastCounter, remoteCounter)
+          : lastCounter
+        : lastLogicalTime == remoteLogicalTime
+          ? remoteCounter
+          : -1;
+  };
+  const encodeHlc = (logicalTime42, counter24, clientId) =>
+    encode(logicalTime42 / SHIFT36) +
+    encode(logicalTime42 / SHIFT30) +
+    encode(logicalTime42 / SHIFT24) +
+    encode(logicalTime42 / SHIFT18) +
+    encode(logicalTime42 / SHIFT12) +
+    encode(logicalTime42 / SHIFT6) +
+    encode(logicalTime42) +
+    encode(counter24 / SHIFT18) +
+    encode(counter24 / SHIFT12) +
+    encode(counter24 / SHIFT6) +
+    encode(counter24) +
+    (isUndefined(clientId) ? thisClientId : getClientIdFromUniqueId(clientId));
+  const decodeHlc = (hlc16) => [
+    decode(hlc16, 0) * SHIFT36 +
+      decode(hlc16, 1) * SHIFT30 +
+      decode(hlc16, 2) * SHIFT24 +
+      decode(hlc16, 3) * SHIFT18 +
+      decode(hlc16, 4) * SHIFT12 +
+      decode(hlc16, 5) * SHIFT6 +
+      decode(hlc16, 6),
+    decode(hlc16, 7) * SHIFT18 +
+      decode(hlc16, 8) * SHIFT12 +
+      decode(hlc16, 9) * SHIFT6 +
+      decode(hlc16, 10),
+    hlc16.slice(11),
+  ];
+  const getLastLogicalTime = () => lastLogicalTime;
+  const getLastCounter = () => lastCounter;
+  const getClientId = () => thisClientId;
+  return [
+    getNextHlc,
+    seenHlc,
+    encodeHlc,
+    decodeHlc,
+    getLastLogicalTime,
+    getLastCounter,
+    getClientId,
+  ];
+};
+
+const defaultSorter = (sortKey1, sortKey2) =>
+  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
+
 const createIndexes = getCreateFunction((store) => {
   const sliceIdsListeners = mapNew();
   const sliceRowIdsListeners = mapNew();
@@ -998,86 +1090,6 @@ const createIndexes = getCreateFunction((store) => {
   return objFreeze(indexes);
 });
 
-const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
-const getHash = (value) => {
-  let hash = 2166136261;
-  arrayForEach(textEncoder.encode(value), (char) => {
-    hash ^= char;
-    hash +=
-      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
-  });
-  return hash >>> 0;
-};
-
-const SHIFT36 = 2 ** 36;
-const SHIFT30 = 2 ** 30;
-const SHIFT24 = 2 ** 24;
-const SHIFT18 = 2 ** 18;
-const SHIFT12 = 2 ** 12;
-const SHIFT6 = 2 ** 6;
-const encodeTimeAndCounter = (logicalTime42, counter24) =>
-  encode(logicalTime42 / SHIFT36) +
-  encode(logicalTime42 / SHIFT30) +
-  encode(logicalTime42 / SHIFT24) +
-  encode(logicalTime42 / SHIFT18) +
-  encode(logicalTime42 / SHIFT12) +
-  encode(logicalTime42 / SHIFT6) +
-  encode(logicalTime42) +
-  encode(counter24 / SHIFT18) +
-  encode(counter24 / SHIFT12) +
-  encode(counter24 / SHIFT6) +
-  encode(counter24);
-const decodeTimeAndCounter = (hlc16) => [
-  decode(hlc16, 0) * SHIFT36 +
-    decode(hlc16, 1) * SHIFT30 +
-    decode(hlc16, 2) * SHIFT24 +
-    decode(hlc16, 3) * SHIFT18 +
-    decode(hlc16, 4) * SHIFT12 +
-    decode(hlc16, 5) * SHIFT6 +
-    decode(hlc16, 6),
-  decode(hlc16, 7) * SHIFT18 +
-    decode(hlc16, 8) * SHIFT12 +
-    decode(hlc16, 9) * SHIFT6 +
-    decode(hlc16, 10),
-];
-const getHlcFunctions = (uniqueId, getNow = Date.now) => {
-  let logicalTime = 0;
-  let lastCounter = -1;
-  const clientPart = ifNotUndefined(
-    uniqueId,
-    (uniqueId2) => {
-      const clientHash30 = getHash(uniqueId2);
-      return (
-        encode(clientHash30 / SHIFT24) +
-        encode(clientHash30 / SHIFT18) +
-        encode(clientHash30 / SHIFT12) +
-        encode(clientHash30 / SHIFT6) +
-        encode(clientHash30)
-      );
-    },
-    () => getUniqueId(5),
-  );
-  const getHlc = () => {
-    seenHlc();
-    return encodeTimeAndCounter(logicalTime, ++lastCounter) + clientPart;
-  };
-  const seenHlc = (hlc) => {
-    const previousLogicalTime = logicalTime;
-    const [remoteLogicalTime, remoteCounter] =
-      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeTimeAndCounter(hlc);
-    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
-    lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
-          ? mathMax(lastCounter, remoteCounter)
-          : lastCounter
-        : logicalTime == remoteLogicalTime
-          ? remoteCounter
-          : -1;
-  };
-  return [getHlc, seenHlc];
-};
-
 const jsonString = JSON.stringify;
 const jsonParse = JSON.parse;
 const jsonStringWithMap = (obj) =>
@@ -2541,7 +2553,7 @@ const createMergeableStore = (uniqueId, getNow) => {
   let defaultingContent = 0;
   const touchedCells = mapNew();
   const touchedValues = setNew();
-  const [getHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
+  const [getNextHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
   const store = createStore();
   const disableListeningToRawStoreChanges = (actions) => {
     const wasListening = listeningToRawStoreChanges;
@@ -2676,7 +2688,7 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getHlc(),
+                      defaultingContent ? EMPTY_STRING : getNextHlc(),
                     ],
                   },
                 ],
@@ -2694,7 +2706,14 @@ const createMergeableStore = (uniqueId, getNow) => {
     if (listeningToRawStoreChanges) {
       mergeContentOrChanges([
         [{}],
-        [{[valueId]: [newValue, defaultingContent ? EMPTY_STRING : getHlc()]}],
+        [
+          {
+            [valueId]: [
+              newValue,
+              defaultingContent ? EMPTY_STRING : getNextHlc(),
+            ],
+          },
+        ],
         1,
       ]);
     }
@@ -3784,5 +3803,7 @@ export {
   createRelationships,
   createStore,
   defaultSorter,
+  getHlcFunctions,
+  getRandomValues,
   getUniqueId,
 };

package/mergeable-store/index.js

@@ -249,13 +249,10 @@ const DECODE = /* @__PURE__ */ mapNew(
 );
 const encode = (num) => ENCODE[num & MASK6];
 const decode = (str, pos) => mapGet(DECODE, str[pos]) ?? 0;
-
 const getRandomValues = GLOBAL.crypto
   ? (array) => GLOBAL.crypto.getRandomValues(array)
   : /* istanbul ignore next */
     (array) => arrayMap(array, () => mathFloor(math.random() * 256));
-const defaultSorter = (sortKey1, sortKey2) =>
-  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
     getRandomValues(new Uint8Array(length)),
@@ -269,67 +266,79 @@ const SHIFT24 = 2 ** 24;
 const SHIFT18 = 2 ** 18;
 const SHIFT12 = 2 ** 12;
 const SHIFT6 = 2 ** 6;
-const encodeTimeAndCounter = (logicalTime42, counter24) =>
-  encode(logicalTime42 / SHIFT36) +
-  encode(logicalTime42 / SHIFT30) +
-  encode(logicalTime42 / SHIFT24) +
-  encode(logicalTime42 / SHIFT18) +
-  encode(logicalTime42 / SHIFT12) +
-  encode(logicalTime42 / SHIFT6) +
-  encode(logicalTime42) +
-  encode(counter24 / SHIFT18) +
-  encode(counter24 / SHIFT12) +
-  encode(counter24 / SHIFT6) +
-  encode(counter24);
-const decodeTimeAndCounter = (hlc16) => [
-  decode(hlc16, 0) * SHIFT36 +
-    decode(hlc16, 1) * SHIFT30 +
-    decode(hlc16, 2) * SHIFT24 +
-    decode(hlc16, 3) * SHIFT18 +
-    decode(hlc16, 4) * SHIFT12 +
-    decode(hlc16, 5) * SHIFT6 +
-    decode(hlc16, 6),
-  decode(hlc16, 7) * SHIFT18 +
-    decode(hlc16, 8) * SHIFT12 +
-    decode(hlc16, 9) * SHIFT6 +
-    decode(hlc16, 10),
-];
+const getClientIdFromUniqueId = (uniqueId) => {
+  const clientHash30 = getHash(uniqueId);
+  return (
+    encode(clientHash30 / SHIFT24) +
+    encode(clientHash30 / SHIFT18) +
+    encode(clientHash30 / SHIFT12) +
+    encode(clientHash30 / SHIFT6) +
+    encode(clientHash30)
+  );
+};
 const getHlcFunctions = (uniqueId, getNow = Date.now) => {
-  let logicalTime = 0;
+  let lastLogicalTime = 0;
   let lastCounter = -1;
-  const clientPart = ifNotUndefined(
-    uniqueId,
-    (uniqueId2) => {
-      const clientHash30 = getHash(uniqueId2);
-      return (
-        encode(clientHash30 / SHIFT24) +
-        encode(clientHash30 / SHIFT18) +
-        encode(clientHash30 / SHIFT12) +
-        encode(clientHash30 / SHIFT6) +
-        encode(clientHash30)
-      );
-    },
-    () => getUniqueId(5),
+  const thisClientId = ifNotUndefined(uniqueId, getClientIdFromUniqueId, () =>
+    getUniqueId(5),
   );
-  const getHlc = () => {
+  const getNextHlc = () => {
     seenHlc();
-    return encodeTimeAndCounter(logicalTime, ++lastCounter) + clientPart;
+    return encodeHlc(lastLogicalTime, ++lastCounter);
   };
   const seenHlc = (hlc) => {
-    const previousLogicalTime = logicalTime;
+    const previousLogicalTime = lastLogicalTime;
     const [remoteLogicalTime, remoteCounter] =
-      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeTimeAndCounter(hlc);
-    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
+      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
+    lastLogicalTime = mathMax(previousLogicalTime, remoteLogicalTime, getNow());
     lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
+      lastLogicalTime == previousLogicalTime
+        ? lastLogicalTime == remoteLogicalTime
           ? mathMax(lastCounter, remoteCounter)
           : lastCounter
-        : logicalTime == remoteLogicalTime
+        : lastLogicalTime == remoteLogicalTime
           ? remoteCounter
           : -1;
   };
-  return [getHlc, seenHlc];
+  const encodeHlc = (logicalTime42, counter24, clientId) =>
+    encode(logicalTime42 / SHIFT36) +
+    encode(logicalTime42 / SHIFT30) +
+    encode(logicalTime42 / SHIFT24) +
+    encode(logicalTime42 / SHIFT18) +
+    encode(logicalTime42 / SHIFT12) +
+    encode(logicalTime42 / SHIFT6) +
+    encode(logicalTime42) +
+    encode(counter24 / SHIFT18) +
+    encode(counter24 / SHIFT12) +
+    encode(counter24 / SHIFT6) +
+    encode(counter24) +
+    (isUndefined(clientId) ? thisClientId : getClientIdFromUniqueId(clientId));
+  const decodeHlc = (hlc16) => [
+    decode(hlc16, 0) * SHIFT36 +
+      decode(hlc16, 1) * SHIFT30 +
+      decode(hlc16, 2) * SHIFT24 +
+      decode(hlc16, 3) * SHIFT18 +
+      decode(hlc16, 4) * SHIFT12 +
+      decode(hlc16, 5) * SHIFT6 +
+      decode(hlc16, 6),
+    decode(hlc16, 7) * SHIFT18 +
+      decode(hlc16, 8) * SHIFT12 +
+      decode(hlc16, 9) * SHIFT6 +
+      decode(hlc16, 10),
+    hlc16.slice(11),
+  ];
+  const getLastLogicalTime = () => lastLogicalTime;
+  const getLastCounter = () => lastCounter;
+  const getClientId = () => thisClientId;
+  return [
+    getNextHlc,
+    seenHlc,
+    encodeHlc,
+    decodeHlc,
+    getLastLogicalTime,
+    getLastCounter,
+    getClientId,
+  ];
 };
 
 const jsonString = JSON.stringify;
@@ -380,6 +389,9 @@ const stampValidate = (stamp, validateThing) =>
   isFiniteNumber(stamp[2]) &&
   validateThing(stamp[0]);
 
+const defaultSorter = (sortKey1, sortKey2) =>
+  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
+
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
   const pool = [];
@@ -1889,7 +1901,7 @@ const createMergeableStore = (uniqueId, getNow) => {
   let defaultingContent = 0;
   const touchedCells = mapNew();
   const touchedValues = setNew();
-  const [getHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
+  const [getNextHlc, seenHlc] = getHlcFunctions(uniqueId, getNow);
   const store = createStore();
   const disableListeningToRawStoreChanges = (actions) => {
     const wasListening = listeningToRawStoreChanges;
@@ -2024,7 +2036,7 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getHlc(),
+                      defaultingContent ? EMPTY_STRING : getNextHlc(),
                     ],
                   },
                 ],
@@ -2042,7 +2054,14 @@ const createMergeableStore = (uniqueId, getNow) => {
     if (listeningToRawStoreChanges) {
       mergeContentOrChanges([
         [{}],
-        [{[valueId]: [newValue, defaultingContent ? EMPTY_STRING : getHlc()]}],
+        [
+          {
+            [valueId]: [
+              newValue,
+              defaultingContent ? EMPTY_STRING : getNextHlc(),
+            ],
+          },
+        ],
         1,
       ]);
     }