tinybase 5.0.0-beta.4 → 5.0.0-beta.6

package/lib/debug/persisters/persister-yjs.js

@@ -22,8 +22,6 @@ const arrayShift = (array) => array.shift();
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
-const objIds = object.keys;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -34,6 +32,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objNew = (entries = []) => object.fromEntries(entries);
 const objHas = (obj, id) => id in obj;
 const objToArray = (obj, cb) =>
@@ -57,16 +57,17 @@ const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
 const getStoreFunctions = (supportsMergeableStore, store) =>
   !supportsMergeableStore || isUndefined(store.getMergeableContent)
     ? [
@@ -91,16 +92,15 @@ const createCustomPersister = (
   delPersisterListener,
   onIgnoredError,
   supportsMergeableStore,
-  [getThing, thing] = [],
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
   const [isMergeableStore, getContent, getChanges, hasChanges] =
@@ -136,55 +136,51 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isString(contentOrChanges?.[0])
+      ? contentOrChanges?.[1][2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          const content = await getPersisted();
-          (isMergeableStore && isMergeable(content)
-            ? store.setMergeableContent
-            : store.setContent)(content);
-        } catch {
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
           store.setContent([initialTables, initialValues]);
         }
       }),
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
+      await persister.stopAutoLoad().load(initialTables, initialValues);
+      autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
-          if (getChanges2) {
-            const changes = getChanges2();
-            await loadLock(async () =>
-              (isMergeableStore && isMergeable(changes)
-                ? store.applyMergeableChanges
-                : store.applyChanges)(changes),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                const content = getContent2?.() ?? (await getPersisted());
-                (isMergeableStore && isMergeable(content)
-                  ? store.setMergeableContent
-                  : store.setContent)(content);
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
     save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
@@ -206,7 +202,7 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(() => {
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
           persister.save(() => changes);
@@ -215,10 +211,11 @@ const createCustomPersister = (
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -227,10 +224,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
@@ -238,7 +233,7 @@ const DELETE = 'delete';
 const getYContent = (yContent) => [yContent.get(T), yContent.get(V)];
 const getChangesFromYDoc = (yContent, events) => {
   if (size(events) == 1 && arrayIsEmpty(events[0].path)) {
-    return [yContent.get(T).toJSON(), yContent.get(V).toJSON()];
+    return [yContent.get(T).toJSON(), yContent.get(V).toJSON(), 1];
   }
   const [yTables, yValues] = getYContent(yContent);
   const tables = {};
@@ -284,7 +279,7 @@ const getChangesFromYDoc = (yContent, events) => {
             (values[valueId] = action == DELETE ? null : yValues.get(valueId)),
         ),
   );
-  return [tables, values];
+  return [tables, values, 1];
 };
 const applyChangesToYDoc = (yContent, getContent, getChanges) => {
   if (!yContent.size) {
@@ -403,7 +398,7 @@ const createYjsPersister = (
     delPersisterListener,
     onIgnoredError,
     false,
-    ['getYDoc', yDoc],
+    {getYDoc: () => yDoc},
   );
 };
 

package/lib/debug/persisters.js

@@ -13,8 +13,6 @@ const arrayShift = (array) => array.shift();
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
-const objIds = object.keys;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -25,6 +23,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
@@ -35,16 +35,17 @@ const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
 const getStoreFunctions = (supportsMergeableStore, store) =>
   !supportsMergeableStore || isUndefined(store.getMergeableContent)
     ? [
@@ -69,16 +70,15 @@ const createCustomPersister = (
   delPersisterListener,
   onIgnoredError,
   supportsMergeableStore,
-  [getThing, thing] = [],
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
   const [isMergeableStore, getContent, getChanges, hasChanges] =
@@ -114,55 +114,51 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isString(contentOrChanges?.[0])
+      ? contentOrChanges?.[1][2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          const content = await getPersisted();
-          (isMergeableStore && isMergeable(content)
-            ? store.setMergeableContent
-            : store.setContent)(content);
-        } catch {
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
           store.setContent([initialTables, initialValues]);
         }
       }),
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
+      await persister.stopAutoLoad().load(initialTables, initialValues);
+      autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
-          if (getChanges2) {
-            const changes = getChanges2();
-            await loadLock(async () =>
-              (isMergeableStore && isMergeable(changes)
-                ? store.applyMergeableChanges
-                : store.applyChanges)(changes),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                const content = getContent2?.() ?? (await getPersisted());
-                (isMergeableStore && isMergeable(content)
-                  ? store.setMergeableContent
-                  : store.setContent)(content);
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
     save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
@@ -184,7 +180,7 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(() => {
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
           persister.save(() => changes);
@@ -193,10 +189,11 @@ const createCustomPersister = (
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -205,10 +202,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 

package/lib/debug/queries.js

@@ -66,9 +66,11 @@ const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -171,9 +173,10 @@ const getAggregateValue = (
     : aggregateValue;
 };
 
-const getCellOrValueType = (cell) => {
-  const type = getTypeOf(cell);
-  return isTypeStringOrBoolean(type) || (type == NUMBER && isFiniteNumber(cell))
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };

package/lib/debug/relationships.js

@@ -42,9 +42,11 @@ const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };

package/lib/debug/store.js

@@ -50,9 +50,7 @@ const arrayShift = (array) => array.shift();
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
-const objIds = object.keys;
 const objFrozen = object.isFrozen;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -63,6 +61,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
@@ -72,6 +72,23 @@ const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
+const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
+  if (
+    isUndefined(obj) ||
+    !isObject(obj) ||
+    (!emptyIsValid && objIsEmpty(obj)) ||
+    objFrozen(obj)
+  ) {
+    onInvalidObj?.();
+    return false;
+  }
+  objToArray(obj, (child, id) => {
+    if (!validateChild(child, id)) {
+      objDel(obj, id);
+    }
+  });
+  return emptyIsValid ? true : !objIsEmpty(obj);
+};
 
 const collSizeN = (collSizer) => (coll) =>
   arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
@@ -95,9 +112,11 @@ const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -106,24 +125,28 @@ const mapMatch = (map, obj, set, del = mapSet) => {
   mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
   return map;
 };
-const mapToObj = (map, mapValue, excludeValue) => {
+const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
-  collForEach(map, (value, id) => {
-    const mappedValue = mapValue ? mapValue(value, id) : value;
-    excludeValue?.(mappedValue, value) ? 0 : (obj[id] = mappedValue);
+  collForEach(map, (mapValue, id) => {
+    if (!excludeMapValue?.(mapValue, id)) {
+      const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
+      excludeObjValue?.(objValue) ? 0 : (obj[id] = objValue);
+    }
   });
   return obj;
 };
-const mapToObj2 = (map, mapValue, excludeValue) =>
+const mapToObj2 = (map, valueMapper, excludeMapValue) =>
   mapToObj(
     map,
-    (childMap) => mapToObj(childMap, mapValue, excludeValue),
+    (childMap) => mapToObj(childMap, valueMapper, excludeMapValue),
+    collIsEmpty,
     objIsEmpty,
   );
-const mapToObj3 = (map, mapValue, excludeValue) =>
+const mapToObj3 = (map, valueMapper, excludeMapValue) =>
   mapToObj(
     map,
-    (childMap) => mapToObj2(childMap, mapValue, excludeValue),
+    (childMap) => mapToObj2(childMap, valueMapper, excludeMapValue),
+    collIsEmpty,
     objIsEmpty,
   );
 const mapClone = (map, mapValue) => {
@@ -253,9 +276,10 @@ const pairNewMap = () => [mapNew(), mapNew()];
 const pairClone = (array) => [...array];
 const pairIsEqual = ([entry1, entry2]) => entry1 === entry2;
 
-const getCellOrValueType = (cell) => {
-  const type = getTypeOf(cell);
-  return isTypeStringOrBoolean(type) || (type == NUMBER && isFiniteNumber(cell))
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
@@ -275,18 +299,6 @@ const jsonParse = JSON.parse;
 const defaultSorter = (sortKey1, sortKey2) =>
   (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 
-const validate = (obj, validateChild, onInvalidObj) => {
-  if (isUndefined(obj) || !isObject(obj) || objIsEmpty(obj) || objFrozen(obj)) {
-    onInvalidObj?.();
-    return false;
-  }
-  objToArray(obj, (child, id2) => {
-    if (!validateChild(child, id2)) {
-      objDel(obj, id2);
-    }
-  });
-  return !objIsEmpty(obj);
-};
 const idsChanged = (changedIds, id2, addedOrRemoved) =>
   mapSet(
     changedIds,
@@ -346,13 +358,13 @@ const createStore = () => {
   const [addListener, callListeners, delListenerImpl, callListenerImpl] =
     getListenerFunctions(() => store);
   const validateTablesSchema = (tableSchema) =>
-    validate(tableSchema, (tableSchema2) =>
-      validate(tableSchema2, validateCellOrValueSchema),
+    objValidate(tableSchema, (tableSchema2) =>
+      objValidate(tableSchema2, validateCellOrValueSchema),
     );
   const validateValuesSchema = (valuesSchema) =>
-    validate(valuesSchema, validateCellOrValueSchema);
+    objValidate(valuesSchema, validateCellOrValueSchema);
   const validateCellOrValueSchema = (schema) => {
-    if (!validate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
+    if (!objValidate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
       return false;
     }
     const type = schema[TYPE];
@@ -365,18 +377,18 @@ const createStore = () => {
     return true;
   };
   const validateTables = (tables) =>
-    validate(tables, validateTable, cellInvalid);
+    objValidate(tables, validateTable, cellInvalid);
   const validateTable = (table, tableId) =>
     (!hasTablesSchema ||
       collHas(tablesSchemaMap, tableId) ||
       cellInvalid(tableId)) &&
-    validate(
+    objValidate(
       table,
       (row, rowId) => validateRow(tableId, rowId, row),
       () => cellInvalid(tableId),
     );
   const validateRow = (tableId, rowId, row, skipDefaults) =>
-    validate(
+    objValidate(
       skipDefaults ? row : addDefaultsToRow(row, tableId, rowId),
       (cell, cellId) =>
         ifNotUndefined(
@@ -403,7 +415,7 @@ const createStore = () => {
         ? cellInvalid(tableId, rowId, cellId, cell)
         : cell;
   const validateValues = (values, skipDefaults) =>
-    validate(
+    objValidate(
       skipDefaults ? values : addDefaultsToValues(values),
       (value, valueId) =>
         ifNotUndefined(
@@ -1246,17 +1258,20 @@ const createStore = () => {
                   : mapToObj(
                       row,
                       ([, newCell]) => newCell,
-                      (_, changedCell) => pairIsEqual(changedCell),
+                      (changedCell) => pairIsEqual(changedCell),
                     ),
+              collIsEmpty,
               objIsEmpty,
             ),
+      collIsEmpty,
       objIsEmpty,
     ),
     mapToObj(
       changedValues,
       ([, newValue]) => newValue,
-      (_, changedValue) => pairIsEqual(changedValue),
+      (changedValue) => pairIsEqual(changedValue),
     ),
+    1,
   ];
   const getTransactionLog = () => [
     !collIsEmpty(changedCells),