tinybase 4.0.0-beta.4 → 4.0.0-beta.5

package/lib/debug/{persister-file.js → persisters/persister-file.js}

@@ -1,9 +1,11 @@
-import {readFile, writeFile} from 'fs/promises';
 import {watch} from 'fs';
+import {readFile, writeFile} from 'fs/promises';
 
 const UTF8 = 'utf8';
 
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayPush = (array, ...values) => array.push(...values);
+const arrayShift = (array) => array.shift();
 
 const jsonString = (obj) =>
   JSON.stringify(obj, (_key, value) =>
@@ -18,6 +20,7 @@ const jsonString = (obj) =>
         )
       : value,
   );
+const jsonParse = JSON.parse;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
@@ -37,8 +40,23 @@ const createCustomPersister = (
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = false;
+  let running = 0;
+  let listening = 0;
+  let action;
   let listeningHandle;
+  const scheduledActions = [];
+  const run = async () => {
+    /* istanbul ignore else */
+    if (!running) {
+      running = 1;
+      while (!isUndefined((action = arrayShift(scheduledActions)))) {
+        try {
+          await action();
+        } catch {}
+      }
+      running = 0;
+    }
+  };
   const loadLock = async (actions) => {
     /* istanbul ignore else */
     if (loadSave != 2) {
@@ -53,18 +71,18 @@ const createCustomPersister = (
   const persister = {
     load: async (initialTables = {}, initialValues = {}) => {
       await loadLock(async () => {
-        let content;
         try {
-          content = await getPersisted();
-        } catch {}
-        store.setContent(content ?? [initialTables, initialValues]);
+          store.setContent(await getPersisted());
+        } catch {
+          store.setContent([initialTables, initialValues]);
+        }
       });
       return persister;
     },
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
       persister.stopAutoLoad();
       await persister.load(initialTables, initialValues);
-      listening = true;
+      listening = 1;
       listeningHandle = addPersisterListener(
         async (getContent, getTransactionChanges) => {
           await loadLock(async () => {
@@ -84,27 +102,33 @@ const createCustomPersister = (
       if (listening) {
         delPersisterListener(listeningHandle);
         listeningHandle = void 0;
-        listening = false;
+        listening = 0;
       }
       return persister;
     },
     save: async (getTransactionChanges) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
+      await persister.schedule(async () => {
+        /* istanbul ignore else */
+        if (loadSave != 1) {
+          loadSave = 2;
+          {
+            saves++;
+          }
+          try {
+            await setPersisted(store.getContent, getTransactionChanges);
+          } catch {}
+          loadSave = 0;
         }
-        await setPersisted(store.getContent, getTransactionChanges);
-        loadSave = 0;
-      }
+      });
       return persister;
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) =>
-          persister.save(getTransactionChanges),
+        (_store, getTransactionChanges) => {
+          const transactionChanges = getTransactionChanges();
+          persister.save(() => transactionChanges);
+        },
       );
       return persister;
     },
@@ -112,6 +136,11 @@ const createCustomPersister = (
       ifNotUndefined(listenerId, store.delListener);
       return persister;
     },
+    schedule: async (...actions) => {
+      arrayPush(scheduledActions, ...actions);
+      await run();
+      return persister;
+    },
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
@@ -120,12 +149,9 @@ const createCustomPersister = (
 };
 
 const createFilePersister = (store, filePath) => {
-  const getPersisted = async () => JSON.parse(await readFile(filePath, UTF8));
-  const setPersisted = async (getContent) => {
-    try {
-      await writeFile(filePath, jsonString(getContent()), UTF8);
-    } catch {}
-  };
+  const getPersisted = async () => jsonParse(await readFile(filePath, UTF8));
+  const setPersisted = async (getContent) =>
+    await writeFile(filePath, jsonString(getContent()), UTF8);
   const addPersisterListener = (listener) => watch(filePath, () => listener());
   const delPersisterListener = (watcher) => watcher?.close();
   return createCustomPersister(

package/lib/debug/{persister-remote.js → persisters/persister-remote.js}

@@ -1,4 +1,6 @@
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayPush = (array, ...values) => array.push(...values);
+const arrayShift = (array) => array.shift();
 
 const jsonString = (obj) =>
   JSON.stringify(obj, (_key, value) =>
@@ -13,6 +15,7 @@ const jsonString = (obj) =>
         )
       : value,
   );
+const jsonParse = JSON.parse;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
@@ -32,8 +35,23 @@ const createCustomPersister = (
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = false;
+  let running = 0;
+  let listening = 0;
+  let action;
   let listeningHandle;
+  const scheduledActions = [];
+  const run = async () => {
+    /* istanbul ignore else */
+    if (!running) {
+      running = 1;
+      while (!isUndefined((action = arrayShift(scheduledActions)))) {
+        try {
+          await action();
+        } catch {}
+      }
+      running = 0;
+    }
+  };
   const loadLock = async (actions) => {
     /* istanbul ignore else */
     if (loadSave != 2) {
@@ -48,18 +66,18 @@ const createCustomPersister = (
   const persister = {
     load: async (initialTables = {}, initialValues = {}) => {
       await loadLock(async () => {
-        let content;
         try {
-          content = await getPersisted();
-        } catch {}
-        store.setContent(content ?? [initialTables, initialValues]);
+          store.setContent(await getPersisted());
+        } catch {
+          store.setContent([initialTables, initialValues]);
+        }
       });
       return persister;
     },
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
       persister.stopAutoLoad();
       await persister.load(initialTables, initialValues);
-      listening = true;
+      listening = 1;
       listeningHandle = addPersisterListener(
         async (getContent, getTransactionChanges) => {
           await loadLock(async () => {
@@ -79,27 +97,33 @@ const createCustomPersister = (
       if (listening) {
         delPersisterListener(listeningHandle);
         listeningHandle = void 0;
-        listening = false;
+        listening = 0;
       }
       return persister;
     },
     save: async (getTransactionChanges) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
+      await persister.schedule(async () => {
+        /* istanbul ignore else */
+        if (loadSave != 1) {
+          loadSave = 2;
+          {
+            saves++;
+          }
+          try {
+            await setPersisted(store.getContent, getTransactionChanges);
+          } catch {}
+          loadSave = 0;
         }
-        await setPersisted(store.getContent, getTransactionChanges);
-        loadSave = 0;
-      }
+      });
       return persister;
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) =>
-          persister.save(getTransactionChanges),
+        (_store, getTransactionChanges) => {
+          const transactionChanges = getTransactionChanges();
+          persister.save(() => transactionChanges);
+        },
       );
       return persister;
     },
@@ -107,6 +131,11 @@ const createCustomPersister = (
       ifNotUndefined(listenerId, store.delListener);
       return persister;
     },
+    schedule: async (...actions) => {
+      arrayPush(scheduledActions, ...actions);
+      await run();
+      return persister;
+    },
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
@@ -125,7 +154,7 @@ const createRemotePersister = (
   const getPersisted = async () => {
     const response = await fetch(loadUrl);
     lastEtag = getETag(response);
-    return JSON.parse(await response.text());
+    return jsonParse(await response.text());
   };
   const setPersisted = async (getContent) =>
     await fetch(saveUrl, {