tinybase 5.0.4 → 5.1.0-beta.1

package/cjs/persisters/persister-powersync/index.cjs

@@ -30,6 +30,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();
 
@@ -389,15 +390,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,
@@ -406,7 +402,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -489,19 +485,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 = () => {
@@ -551,7 +552,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,
@@ -757,7 +761,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -935,7 +939,8 @@ const createPowerSyncPersister = (
     (abortController) => abortController.abort(),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     powerSync,
     'getPowerSync',
     useOnConflict,

package/cjs/persisters/persister-powersync/with-schemas/index.cjs

@@ -30,6 +30,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();
 
@@ -389,15 +390,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,
@@ -406,7 +402,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -489,19 +485,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 = () => {
@@ -551,7 +552,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,
@@ -757,7 +761,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -935,7 +939,8 @@ const createPowerSyncPersister = (
     (abortController) => abortController.abort(),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     powerSync,
     'getPowerSync',
     useOnConflict,

package/cjs/persisters/persister-remote/index.cjs

@@ -14,6 +14,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();
 
@@ -35,6 +36,12 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonStringWithMap = (obj) =>
+  JSON.stringify(obj, (_key, value) =>
+    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
+  );
+const jsonParse = JSON.parse;
+
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -49,15 +56,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,
@@ -66,7 +68,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -149,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 = () => {
@@ -211,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,
@@ -231,12 +241,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
-  );
-const jsonParse = JSON.parse;
-
 const getETag = (response) => response.headers.get('ETag');
 const createRemotePersister = (
   store,
@@ -278,7 +282,8 @@ const createRemotePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getUrls: () => [loadUrl, saveUrl]},
   );
 };

package/cjs/persisters/persister-remote/with-schemas/index.cjs

@@ -14,6 +14,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();
 
@@ -35,6 +36,12 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonStringWithMap = (obj) =>
+  JSON.stringify(obj, (_key, value) =>
+    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
+  );
+const jsonParse = JSON.parse;
+
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -49,15 +56,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,
@@ -66,7 +68,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -149,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 = () => {
@@ -211,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,
@@ -231,12 +241,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
-  );
-const jsonParse = JSON.parse;
-
 const getETag = (response) => response.headers.get('ETag');
 const createRemotePersister = (
   store,
@@ -278,7 +282,8 @@ const createRemotePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getUrls: () => [loadUrl, saveUrl]},
   );
 };

package/cjs/persisters/persister-sqlite-wasm/index.cjs

@@ -30,6 +30,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();
 
@@ -389,15 +390,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,
@@ -406,7 +402,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -489,19 +485,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 = () => {
@@ -551,7 +552,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,
@@ -757,7 +761,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -930,7 +934,8 @@ const createSqliteWasmPersister = (
     () => sqlite3.capi.sqlite3_update_hook(db, () => 0, 0),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     db,
   );
 

package/cjs/persisters/persister-sqlite-wasm/with-schemas/index.cjs

@@ -30,6 +30,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();
 
@@ -389,15 +390,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,
@@ -406,7 +402,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -489,19 +485,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 = () => {
@@ -551,7 +552,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,
@@ -757,7 +761,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -930,7 +934,8 @@ const createSqliteWasmPersister = (
     () => sqlite3.capi.sqlite3_update_hook(db, () => 0, 0),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     db,
   );