tinybase 6.0.0-beta.2 → 6.0.0

package/with-schemas/index.js

@@ -78,6 +78,35 @@ const arrayPop = (array) => array.pop();
 const arrayUnshift = (array, ...values) => array.unshift(...values);
 const arrayShift = (array) => array.shift();
 
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
+    ? type
+    : void 0;
+};
+const isCellOrValueOrNullOrUndefined = (cellOrValue) =>
+  isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
+const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
+  isUndefined(cell)
+    ? store.delCell(tableId, rowId, cellId, true)
+    : store.setCell(tableId, rowId, cellId, cell);
+const setOrDelValue = (store, valueId, value) =>
+  isUndefined(value) ? store.delValue(valueId) : store.setValue(valueId, value);
+
+const collSizeN = (collSizer) => (coll) =>
+  arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
+const collSize = (coll) => coll?.size ?? 0;
+const collSize2 = collSizeN(collSize);
+const collSize3 = collSizeN(collSize2);
+const collSize4 = collSizeN(collSize3);
+const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
+const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
+const collValues = (coll) => [...(coll?.values() ?? [])];
+const collClear = (coll) => coll.clear();
+const collForEach = (coll, cb) => coll?.forEach(cb);
+const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
+
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
@@ -133,19 +162,6 @@ const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
   return emptyIsValid ? true : !objIsEmpty(obj);
 };
 
-const collSizeN = (collSizer) => (coll) =>
-  arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
-const collSize = (coll) => coll?.size ?? 0;
-const collSize2 = collSizeN(collSize);
-const collSize3 = collSizeN(collSize2);
-const collSize4 = collSizeN(collSize3);
-const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
-const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
-const collValues = (coll) => [...(coll?.values() ?? [])];
-const collClear = (coll) => coll.clear();
-const collForEach = (coll, cb) => coll?.forEach(cb);
-const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
-
 const mapNew = (entries) => new Map(entries);
 const mapKeys = (map) => [...(map?.keys() ?? [])];
 const mapGet = (map, key) => map?.get(key);
@@ -223,22 +239,6 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
-const getCellOrValueType = (cellOrValue) => {
-  const type = getTypeOf(cellOrValue);
-  return isTypeStringOrBoolean(type) ||
-    (type == NUMBER && isFiniteNumber(cellOrValue))
-    ? type
-    : void 0;
-};
-const isCellOrValueOrNullOrUndefined = (cellOrValue) =>
-  isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
-const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
-  isUndefined(cell)
-    ? store.delCell(tableId, rowId, cellId, true)
-    : store.setCell(tableId, rowId, cellId, cell);
-const setOrDelValue = (store, valueId, value) =>
-  isUndefined(value) ? store.delValue(valueId) : store.setValue(valueId, value);
-
 const setNew = (entryOrEntries) =>
   new Set(
     isArray(entryOrEntries) || isUndefined(entryOrEntries)
@@ -1809,6 +1809,86 @@ const getHash = (value) => {
   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) => {
+  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,
+      GLOBAL.HLC_TIME ?? Date.now(),
+    );
+    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) =>
+  jsonString(obj, (_key, value) =>
+    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
+  );
+
 const stampClone = ([value, time]) => stampNew(value, time);
 const stampCloneWithHash = ([value, time, hash]) => [value, time, hash];
 const stampNew = (value, time) => (time ? [value, time] : [value]);
@@ -1848,13 +1928,6 @@ const pairNewMap = () => [mapNew(), mapNew()];
 const pairClone = (array) => [...array];
 const pairIsEqual = ([entry1, entry2]) => entry1 === entry2;
 
-const jsonString = JSON.stringify;
-const jsonParse = JSON.parse;
-const jsonStringWithMap = (obj) =>
-  jsonString(obj, (_key, value) =>
-    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
-  );
-
 const idsChanged = (changedIds, id2, addedOrRemoved) =>
   mapSet(
     changedIds,
@@ -3191,79 +3264,6 @@ const createStore = () => {
   return objFreeze(store);
 };
 
-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) => {
-  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,
-      GLOBAL.HLC_TIME ?? Date.now(),
-    );
-    lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
-          ? mathMax(lastCounter, remoteCounter)
-          : lastCounter
-        : logicalTime == remoteLogicalTime
-          ? remoteCounter
-          : -1;
-  };
-  return [getHlc, seenHlc];
-};
-
 const LISTENER_ARGS = {
   HasTable: 1,
   Table: 1,
@@ -3411,7 +3411,7 @@ const createMergeableStore = (uniqueId) => {
     let thingsHash = isContent ? incomingThingsHash : oldThingsHash;
     objForEach(
       thingsObj,
-      ([thing, thingTime, incomingThingHash = 0], thingId) => {
+      ([thing, thingTime = EMPTY_STRING, incomingThingHash = 0], thingId) => {
         const thingStampMap = mapEnsure(thingStampMaps, thingId, () => [
           void 0,
           EMPTY_STRING,