tinybase 5.1.0-beta.0 → 5.1.0

package/persisters/index.js

@@ -7,6 +7,7 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -43,14 +44,14 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
 };
 
 const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
+  StoreOnly: 1 /* StoreOnly */,
+  MergeableStoreOnly: 2 /* MergeableStoreOnly */,
+  StoreOrMergeableStore: 3 /* StoreOrMergeableStore */,
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -59,7 +60,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -128,7 +129,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -142,19 +146,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -204,7 +213,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,

package/persisters/persister-automerge/index.js

@@ -10,6 +10,7 @@ const errorNew = (message) => {
 };
 
 const arrayMap = (array, cb) => array.map(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -60,15 +61,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -77,7 +73,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -146,7 +142,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -160,19 +159,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -222,7 +226,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -367,7 +374,8 @@ const createAutomergePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getDocHandle: () => docHandle},
   );
 };

package/persisters/persister-automerge/with-schemas/index.js

@@ -10,6 +10,7 @@ const errorNew = (message) => {
 };
 
 const arrayMap = (array, cb) => array.map(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -60,15 +61,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -77,7 +73,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -146,7 +142,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -160,19 +159,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -222,7 +226,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -367,7 +374,8 @@ const createAutomergePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getDocHandle: () => docHandle},
   );
 };

package/persisters/persister-browser/index.js

@@ -11,6 +11,7 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -32,6 +33,12 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -46,15 +53,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -63,7 +65,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -132,7 +134,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -146,19 +151,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -208,7 +218,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -228,12 +241,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const STORAGE = 'storage';
 const createStoragePersister = (
   store,
@@ -267,7 +274,8 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/persisters/persister-browser/with-schemas/index.js

@@ -11,6 +11,7 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -32,6 +33,12 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -46,15 +53,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -63,7 +65,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -132,7 +134,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -146,19 +151,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -208,7 +218,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -228,12 +241,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const STORAGE = 'storage';
 const createStoragePersister = (
   store,
@@ -267,7 +274,8 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/persisters/persister-cr-sqlite-wasm/index.js

@@ -28,6 +28,7 @@ const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayFilter = (array, cb) => array.filter(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -387,15 +388,10 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -404,7 +400,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -473,7 +469,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -487,19 +486,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -549,7 +553,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -755,7 +762,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -919,7 +926,8 @@ const createCrSqliteWasmPersister = (
     (removeListener) => removeListener(),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     db,
   );