tinybase 5.1.0-beta.0 → 5.1.0

package/persisters/persister-file/index.js

@@ -1,6 +1,7 @@
-import {watch} from 'fs';
+import {existsSync, writeFileSync, watch} from 'fs';
 import {readFile, writeFile} from 'fs/promises';
 
+const EMPTY_STRING = '';
 const UTF8 = 'utf8';
 const UNDEFINED = '\uFFFC';
 
@@ -13,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();
 
@@ -34,6 +36,11 @@ const objFreeze = object.freeze;
 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);
 
@@ -48,15 +55,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,
@@ -65,7 +67,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -134,7 +136,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) {
@@ -148,19 +153,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 = () => {
@@ -210,7 +220,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,
@@ -230,17 +243,17 @@ const createCustomPersister = (
   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 readFile(filePath, UTF8));
   const setPersisted = async (getContent) =>
     await writeFile(filePath, jsonStringWithUndefined(getContent()), UTF8);
-  const addPersisterListener = (listener) => watch(filePath, () => listener());
+  const addPersisterListener = (listener) => {
+    if (!existsSync(filePath)) {
+      writeFileSync(filePath, EMPTY_STRING, UTF8);
+    }
+    return watch(filePath, () => listener());
+  };
   const delPersisterListener = (watcher) => watcher?.close();
   return createCustomPersister(
     store,
@@ -249,7 +262,8 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     {getFilePath: () => filePath},
   );
 };

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

@@ -1,6 +1,7 @@
-import {watch} from 'fs';
+import {existsSync, writeFileSync, watch} from 'fs';
 import {readFile, writeFile} from 'fs/promises';
 
+const EMPTY_STRING = '';
 const UTF8 = 'utf8';
 const UNDEFINED = '\uFFFC';
 
@@ -13,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();
 
@@ -34,6 +36,11 @@ const objFreeze = object.freeze;
 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);
 
@@ -48,15 +55,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,
@@ -65,7 +67,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -134,7 +136,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) {
@@ -148,19 +153,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 = () => {
@@ -210,7 +220,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,
@@ -230,17 +243,17 @@ const createCustomPersister = (
   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 readFile(filePath, UTF8));
   const setPersisted = async (getContent) =>
     await writeFile(filePath, jsonStringWithUndefined(getContent()), UTF8);
-  const addPersisterListener = (listener) => watch(filePath, () => listener());
+  const addPersisterListener = (listener) => {
+    if (!existsSync(filePath)) {
+      writeFileSync(filePath, EMPTY_STRING, UTF8);
+    }
+    return watch(filePath, () => listener());
+  };
   const delPersisterListener = (watcher) => watcher?.close();
   return createCustomPersister(
     store,
@@ -249,7 +262,8 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     {getFilePath: () => filePath},
   );
 };

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

@@ -20,6 +20,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,
@@ -331,7 +338,8 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getDbName: () => dbName},
   );
 };

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

@@ -20,6 +20,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,
@@ -331,7 +338,8 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getDbName: () => dbName},
   );
 };