tinybase 4.0.0-beta.4 → 4.0.0-beta.5.1

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

@@ -1,6 +1,9 @@
+const TINYBASE = 'tinybase';
+
 const arrayMap = (array, cb) => array.map(cb);
 const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
+const arrayPush = (array, ...values) => array.push(...values);
+const arrayShift = (array) => array.shift();
 
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
@@ -14,10 +17,14 @@ const isObject = (obj) =>
   isInstanceOf(obj, object) && obj.constructor == object;
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objHas = (obj, id) => !isUndefined(objGet(obj, id));
-const objDel = (obj, id) => delete obj[id];
+const objDel = (obj, id) => {
+  delete obj[id];
+  return obj;
+};
 const objMap = (obj, cb) =>
   arrayMap(object.entries(obj), ([id, value]) => cb(value, id));
-const objIsEmpty = (obj) => isObject(obj) && arrayIsEmpty(objIds(obj));
+const objSize = (obj) => arrayLength(objIds(obj));
+const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 const objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
     obj[id] = getDefaultValue();
@@ -36,8 +43,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) {
@@ -50,20 +72,20 @@ const createCustomPersister = (
     }
   };
   const persister = {
-    load: async (initialTables = {}, initialValues = {}) => {
+    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 () => {
@@ -83,27 +105,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;
     },
@@ -111,6 +139,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}),
@@ -216,18 +249,13 @@ const docObjMatch = (docObjOrParent, idInParent, obj, set) => {
   }
   return changed;
 };
-const createAutomergePersister = (
-  store,
-  docHandle,
-  docObjName = 'tinybase',
-) => {
+const createAutomergePersister = (store, docHandle, docObjName = TINYBASE) => {
   docHandle.change((doc) => (doc[docObjName] = {}));
-  const getPersisted = async () => {
-    return arrayLength(objIds(docHandle.doc[docObjName])) == 2
+  const getPersisted = async () =>
+    objSize(docHandle.doc[docObjName]) == 2
       ? getDocContent(docHandle.doc, docObjName)
       : void 0;
-  };
-  const setPersisted = async (getContent, getTransactionChanges) => {
+  const setPersisted = async (getContent, getTransactionChanges) =>
     docHandle.change((doc) =>
       setTransactionChangesToDoc(
         doc,
@@ -236,7 +264,6 @@ const createAutomergePersister = (
         getTransactionChanges,
       ),
     );
-  };
   const addPersisterListener = (listener) => {
     const observer = ({doc}) => listener(() => getDocContent(doc, docObjName));
     docHandle.on('change', observer);

package/lib/debug/{persister-browser.js → persisters/persister-browser.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) {
@@ -46,20 +64,20 @@ const createCustomPersister = (
     }
   };
   const persister = {
-    load: async (initialTables = {}, initialValues = {}) => {
+    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}),
@@ -117,13 +146,13 @@ const createCustomPersister = (
 const STORAGE = 'storage';
 const WINDOW = globalThis.window;
 const getStoragePersister = (store, storageName, storage) => {
-  const getPersisted = async () => JSON.parse(storage.getItem(storageName));
+  const getPersisted = async () => jsonParse(storage.getItem(storageName));
   const setPersisted = async (getContent) =>
     storage.setItem(storageName, jsonString(getContent()));
   const addPersisterListener = (listener) => {
     const storeListener = (event) => {
       if (event.storageArea === storage && event.key === storageName) {
-        listener(() => JSON.parse(event.newValue));
+        listener(() => jsonParse(event.newValue));
       }
     };
     WINDOW.addEventListener(STORAGE, storeListener);