tinybase 5.0.0-beta.24 → 5.0.0-beta.26

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

@@ -3,6 +3,9 @@
 const EMPTY_STRING = '';
 
 const promise = Promise;
+const GLOBAL = globalThis;
+const math = Math;
+const mathFloor = math.floor;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -62,17 +65,15 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-new globalThis.TextEncoder();
-
-const newStamp = (value, time) => (time ? [value, time] : [value]);
-const getLatestTime = (time1, time2) =>
-  ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -81,7 +82,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -98,7 +99,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -116,7 +117,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -246,6 +247,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+new GLOBAL.TextEncoder();
+
+const newStamp = (value, time) => (time ? [value, time] : [value]);
+const getLatestTime = (time1, time2) =>
+  ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
 const MASK6 = 63;
 const ENCODE =
   '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -254,9 +262,13 @@ const ENCODE =
 mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
 const encode = (num) => ENCODE[num & MASK6];
 
+const getRandomValues = GLOBAL.crypto
+  ? (array) => GLOBAL.crypto.getRandomValues(array)
+  : /* istanbul ignore next */
+    (array) => arrayMap(array, () => mathFloor(math.random() * 256));
 const getUniqueId = (length = 16) =>
   arrayReduce(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );
@@ -443,7 +455,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;

package/cjs/ui-react-dom/index.cjs

@@ -13,6 +13,8 @@ const VALUE = 'Value';
 const CURRENT_TARGET = 'currentTarget';
 const _VALUE = 'value';
 
+const math = Math;
+const mathMin = math.min;
 const isFiniteNumber = isFinite;
 const isUndefined = (thing) => thing == void 0;
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
@@ -758,7 +760,7 @@ const SortedTablePaginator = ({
         ),
         offset + 1,
         ' to ',
-        Math.min(total, offset + limit),
+        mathMin(total, offset + limit),
         ' of ',
       ),
     total,

package/cjs/ui-react-dom/with-schemas/index.cjs

@@ -13,6 +13,8 @@ const VALUE = 'Value';
 const CURRENT_TARGET = 'currentTarget';
 const _VALUE = 'value';
 
+const math = Math;
+const mathMin = math.min;
 const isFiniteNumber = isFinite;
 const isUndefined = (thing) => thing == void 0;
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
@@ -758,7 +760,7 @@ const SortedTablePaginator = ({
         ),
         offset + 1,
         ' to ',
-        Math.min(total, offset + limit),
+        mathMin(total, offset + limit),
         ' of ',
       ),
     total,

package/cjs/ui-react-inspector/index.cjs

@@ -31,7 +31,11 @@ const _VALUE = 'value';
 const UNDEFINED = '\uFFFC';
 const id = (key) => EMPTY_STRING + key;
 
-const mathFloor = Math.floor;
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
+const math = Math;
+const mathMin = math.min;
+const mathFloor = math.floor;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
@@ -1006,7 +1010,7 @@ const SortedTablePaginator = ({
         ),
         offset + 1,
         ' to ',
-        Math.min(total, offset + limit),
+        mathMin(total, offset + limit),
         ' of ',
       ),
     total,
@@ -1580,10 +1584,15 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1592,7 +1601,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1609,7 +1618,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1627,7 +1636,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1751,7 +1760,6 @@ const createCustomPersister = (
 };
 
 const STORAGE = 'storage';
-const WINDOW = globalThis.window;
 const createStoragePersister = (
   store,
   storageName,
@@ -1784,7 +1792,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/cjs/ui-react-inspector/with-schemas/index.cjs

@@ -31,7 +31,11 @@ const _VALUE = 'value';
 const UNDEFINED = '\uFFFC';
 const id = (key) => EMPTY_STRING + key;
 
-const mathFloor = Math.floor;
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
+const math = Math;
+const mathMin = math.min;
+const mathFloor = math.floor;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
@@ -1006,7 +1010,7 @@ const SortedTablePaginator = ({
         ),
         offset + 1,
         ' to ',
-        Math.min(total, offset + limit),
+        mathMin(total, offset + limit),
         ' of ',
       ),
     total,
@@ -1580,10 +1584,15 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1592,7 +1601,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1609,7 +1618,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1627,7 +1636,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1751,7 +1760,6 @@ const createCustomPersister = (
 };
 
 const STORAGE = 'storage';
-const WINDOW = globalThis.window;
 const createStoragePersister = (
   store,
   storageName,
@@ -1784,7 +1792,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/cjs/with-schemas/index.cjs

@@ -35,8 +35,11 @@ const strStartsWith = (str, prefix) => str.startsWith(prefix);
 const strEndsWith = (str, suffix) => str.endsWith(suffix);
 
 const promise = Promise;
-const mathMax = Math.max;
-const mathMin = Math.min;
+const GLOBAL = globalThis;
+const math = Math;
+const mathMax = math.max;
+const mathMin = math.min;
+const mathFloor = math.floor;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
@@ -758,11 +761,15 @@ const DECODE = mapNew(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(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );
@@ -1138,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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1150,7 +1162,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1167,7 +1179,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1185,7 +1197,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1315,7 +1327,7 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const textEncoder = new globalThis.TextEncoder();
+const textEncoder = new GLOBAL.TextEncoder();
 const getHash = (value) => {
   let hash = 2166136261;
   arrayForEach(textEncoder.encode(value), (char) => {
@@ -1541,7 +1553,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
@@ -3591,7 +3603,7 @@ const getHlcFunctions = (uniqueId) => {
     logicalTime = mathMax(
       previousLogicalTime,
       remoteLogicalTime,
-      globalThis.HLC_TIME ?? Date.now(),
+      GLOBAL.HLC_TIME ?? Date.now(),
     );
     lastCounter =
       logicalTime == previousLogicalTime
@@ -3843,20 +3855,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 = {};
@@ -3877,20 +3889,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 = {};
@@ -3947,12 +3959,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);
   };
@@ -4077,6 +4089,7 @@ const createMergeableStore = (uniqueId) => {
   return objFreeze(mergeableStore);
 };
 
+exports.Persists = Persists;
 exports.createCheckpoints = createCheckpoints;
 exports.createCustomPersister = createCustomPersister;
 exports.createCustomSynchronizer = createCustomSynchronizer;

package/common/index.js

@@ -1,5 +1,9 @@
 const EMPTY_STRING = '';
 
+const GLOBAL = globalThis;
+const math = Math;
+const mathFloor = math.floor;
+
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
@@ -13,11 +17,15 @@ const ENCODE =
 mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
 const encode = (num) => ENCODE[num & MASK6];
 
+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(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );

package/common/with-schemas/index.js

@@ -1,5 +1,9 @@
 const EMPTY_STRING = '';
 
+const GLOBAL = globalThis;
+const math = Math;
+const mathFloor = math.floor;
+
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
@@ -13,11 +17,15 @@ const ENCODE =
 mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
 const encode = (num) => ENCODE[num & MASK6];
 
+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(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );

package/es6/common/index.js

@@ -1,5 +1,9 @@
 const EMPTY_STRING = '';
 
+const GLOBAL = globalThis;
+const math = Math;
+const mathFloor = math.floor;
+
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
@@ -13,13 +17,17 @@ const ENCODE =
 mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
 const encode = (num) => ENCODE[num & MASK6];
 
+const getRandomValues = GLOBAL.crypto
+  ? (array) => GLOBAL.crypto.getRandomValues(array)
+  : /* istanbul ignore next */
+    (array) => arrayMap(array, () => mathFloor(math.random() * 256));
 const defaultSorter = (sortKey1, sortKey2) =>
   (sortKey1 != null ? sortKey1 : 0) < (sortKey2 != null ? sortKey2 : 0)
     ? -1
     : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );

package/es6/common/with-schemas/index.js

@@ -1,5 +1,9 @@
 const EMPTY_STRING = '';
 
+const GLOBAL = globalThis;
+const math = Math;
+const mathFloor = math.floor;
+
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 
@@ -13,13 +17,17 @@ const ENCODE =
 mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
 const encode = (num) => ENCODE[num & MASK6];
 
+const getRandomValues = GLOBAL.crypto
+  ? (array) => GLOBAL.crypto.getRandomValues(array)
+  : /* istanbul ignore next */
+    (array) => arrayMap(array, () => mathFloor(math.random() * 256));
 const defaultSorter = (sortKey1, sortKey2) =>
   (sortKey1 != null ? sortKey1 : 0) < (sortKey2 != null ? sortKey2 : 0)
     ? -1
     : 1;
 const getUniqueId = (length = 16) =>
   arrayReduce(
-    crypto.getRandomValues(new Uint8Array(length)),
+    getRandomValues(new Uint8Array(length)),
     (uniqueId, number) => uniqueId + encode(number),
     '',
   );