tinybase 5.1.0-beta.0 → 5.1.0-beta.1

package/umd/persisters/persister-expo-sqlite/index.js

@@ -42,6 +42,7 @@
   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();
 
@@ -406,15 +407,10 @@
   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,
@@ -423,7 +419,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -508,19 +504,24 @@
     };
     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 = () => {
@@ -570,7 +571,10 @@
       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,
@@ -786,7 +790,7 @@
       DEFAULT_CONFIG,
       isString(configOrStoreTableName)
         ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-        : configOrStoreTableName ?? {},
+        : (configOrStoreTableName ?? {}),
     );
   const getDefaultedTabularConfigMap = (
     configsObj,
@@ -956,7 +960,8 @@
       (subscription) => subscription.remove(),
       onSqlCommand,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       db,
     );
 

package/umd/persisters/persister-expo-sqlite/with-schemas/index.js

@@ -42,6 +42,7 @@
   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();
 
@@ -406,15 +407,10 @@
   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,
@@ -423,7 +419,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -508,19 +504,24 @@
     };
     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 = () => {
@@ -570,7 +571,10 @@
       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,
@@ -786,7 +790,7 @@
       DEFAULT_CONFIG,
       isString(configOrStoreTableName)
         ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-        : configOrStoreTableName ?? {},
+        : (configOrStoreTableName ?? {}),
     );
   const getDefaultedTabularConfigMap = (
     configsObj,
@@ -956,7 +960,8 @@
       (subscription) => subscription.remove(),
       onSqlCommand,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       db,
     );
 

package/umd/persisters/persister-file/index.js

@@ -13,6 +13,7 @@
 })(this, function (exports, fs, promises) {
   'use strict';
 
+  const EMPTY_STRING = '';
   const UTF8 = 'utf8';
   const UNDEFINED = '\uFFFC';
 
@@ -25,6 +26,7 @@
     throw new Error(message);
   };
 
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -46,6 +48,13 @@
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+  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);
 
@@ -60,15 +69,10 @@
     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 +81,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -162,19 +166,24 @@
     };
     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 = () => {
@@ -224,7 +233,10 @@
       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,
@@ -244,13 +256,6 @@
     return objFreeze(persister);
   };
 
-  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 createFilePersister = (store, filePath, onIgnoredError) => {
     const getPersisted = async () =>
       jsonParseWithUndefined(await promises.readFile(filePath, UTF8));
@@ -260,8 +265,12 @@
         jsonStringWithUndefined(getContent()),
         UTF8,
       );
-    const addPersisterListener = (listener) =>
-      fs.watch(filePath, () => listener());
+    const addPersisterListener = (listener) => {
+      if (!fs.existsSync(filePath)) {
+        fs.writeFileSync(filePath, EMPTY_STRING, UTF8);
+      }
+      return fs.watch(filePath, () => listener());
+    };
     const delPersisterListener = (watcher) => watcher?.close();
     return createCustomPersister(
       store,
@@ -270,7 +279,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       {getFilePath: () => filePath},
     );
   };

package/umd/persisters/persister-file/with-schemas/index.js

@@ -13,6 +13,7 @@
 })(this, function (exports, fs, promises) {
   'use strict';
 
+  const EMPTY_STRING = '';
   const UTF8 = 'utf8';
   const UNDEFINED = '\uFFFC';
 
@@ -25,6 +26,7 @@
     throw new Error(message);
   };
 
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -46,6 +48,13 @@
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+  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);
 
@@ -60,15 +69,10 @@
     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 +81,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -162,19 +166,24 @@
     };
     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 = () => {
@@ -224,7 +233,10 @@
       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,
@@ -244,13 +256,6 @@
     return objFreeze(persister);
   };
 
-  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 createFilePersister = (store, filePath, onIgnoredError) => {
     const getPersisted = async () =>
       jsonParseWithUndefined(await promises.readFile(filePath, UTF8));
@@ -260,8 +265,12 @@
         jsonStringWithUndefined(getContent()),
         UTF8,
       );
-    const addPersisterListener = (listener) =>
-      fs.watch(filePath, () => listener());
+    const addPersisterListener = (listener) => {
+      if (!fs.existsSync(filePath)) {
+        fs.writeFileSync(filePath, EMPTY_STRING, UTF8);
+      }
+      return fs.watch(filePath, () => listener());
+    };
     const delPersisterListener = (watcher) => watcher?.close();
     return createCustomPersister(
       store,
@@ -270,7 +279,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOrMergeableStore,
+      3,
+      // StoreOrMergeableStore,
       {getFilePath: () => filePath},
     );
   };

package/umd/persisters/persister-indexed-db/index.js

@@ -31,6 +31,7 @@
   };
 
   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();
 
@@ -71,15 +72,10 @@
     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,
@@ -88,7 +84,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -173,19 +169,24 @@
     };
     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 = () => {
@@ -235,7 +236,10 @@
       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,
@@ -344,7 +348,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOnly,
+      1,
+      // StoreOnly,
       {getDbName: () => dbName},
     );
   };

package/umd/persisters/persister-indexed-db/with-schemas/index.js

@@ -31,6 +31,7 @@
   };
 
   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();
 
@@ -71,15 +72,10 @@
     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,
@@ -88,7 +84,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -173,19 +169,24 @@
     };
     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 = () => {
@@ -235,7 +236,10 @@
       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,
@@ -344,7 +348,8 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.StoreOnly,
+      1,
+      // StoreOnly,
       {getDbName: () => dbName},
     );
   };