tinybase 5.0.0-beta.10 → 5.0.0-beta.11

package/lib/debug/persisters/persister-powersync.js

@@ -388,24 +388,27 @@ const jsonParse = JSON.parse;
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportsMergeableStore, store) =>
-  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+const getStoreFunctions = (supportedStoreType = 1, store) =>
+  supportedStoreType > 1 && 'getMergeableContent' in store
     ? [
-        0,
-        store.getContent,
-        store.getTransactionChanges,
-        ([changedTables, changedValues]) =>
-          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
-        store.setContent,
-      ]
-    : [
         1,
         store.getMergeableContent,
         store.getTransactionMergeableChanges,
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
-      ];
+      ]
+    : supportedStoreType != 2
+      ? [
+          0,
+          store.getContent,
+          store.getTransactionChanges,
+          ([changedTables, changedValues]) =>
+            !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+          store.setContent,
+        ]
+      : /* istanbul ignore next */
+        0;
 const createCustomPersister = (
   store,
   getPersisted,
@@ -413,7 +416,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportsMergeableStore,
+  supportedStoreType,
   extra = {},
   scheduleId = [],
 ) => {
@@ -431,7 +434,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportsMergeableStore, store);
+  ] = getStoreFunctions(supportedStoreType, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -449,20 +452,6 @@ const createCustomPersister = (
       mapSet(scheduleRunning, scheduleId, 0);
     }
   };
-  const loadLock = async (actions) => {
-    /* istanbul ignore else */
-    if (loadSave != 2) {
-      loadSave = 1;
-      {
-        loads++;
-      }
-      await persister.schedule(async () => {
-        await actions();
-        loadSave = 0;
-      });
-    }
-    return persister;
-  };
   const setContentOrChanges = (contentOrChanges) => {
     (isMergeableStore && isArray(contentOrChanges?.[0])
       ? contentOrChanges?.[2] === 1
@@ -472,9 +461,14 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
-  const persister = {
-    load: async (initialContent) =>
-      await loadLock(async () => {
+  const load = async (initialContent) => {
+    /* istanbul ignore else */
+    if (loadSave != 2) {
+      loadSave = 1;
+      {
+        loads++;
+      }
+      await schedule(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
@@ -483,76 +477,94 @@ const createCustomPersister = (
             setDefaultContent(initialContent);
           }
         }
-      }),
-    startAutoLoad: async (initialContent) => {
-      await persister.stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(
-        async (getContent2, getChanges2) => {
-          const changes = getChanges2?.();
-          await loadLock(async () => {
-            try {
-              setContentOrChanges(
-                changes ?? getContent2?.() ?? (await getPersisted()),
-              );
-            } catch (error) {
-              onIgnoredError?.(error);
-            }
-          });
-        },
-      );
-      return persister;
-    },
-    stopAutoLoad: () => {
-      if (autoLoadHandle) {
-        delPersisterListener(autoLoadHandle);
-        autoLoadHandle = void 0;
-      }
-      return persister;
-    },
-    isAutoLoading: () => !isUndefined(autoLoadHandle),
-    save: async (getChanges2) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
-        }
-        await persister.schedule(async () => {
-          try {
-            await setPersisted(getContent, getChanges2);
-          } catch (error) {
-            /* istanbul ignore next */
-            onIgnoredError?.(error);
+        loadSave = 0;
+      });
+    }
+    return persister;
+  };
+  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;
-        });
+        }
+      } else {
+        await load();
       }
-      return persister;
-    },
-    startAutoSave: async () => {
-      await persister.stopAutoSave().save();
-      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
-        const changes = getChanges();
-        if (hasChanges(changes)) {
-          persister.save(() => changes);
+    });
+    return persister;
+  };
+  const stopAutoLoad = () => {
+    if (autoLoadHandle) {
+      delPersisterListener(autoLoadHandle);
+      autoLoadHandle = void 0;
+    }
+    return persister;
+  };
+  const isAutoLoading = () => !isUndefined(autoLoadHandle);
+  const save = async (changes) => {
+    /* istanbul ignore else */
+    if (loadSave != 1) {
+      loadSave = 2;
+      {
+        saves++;
+      }
+      await schedule(async () => {
+        try {
+          await setPersisted(getContent, changes);
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
         }
+        loadSave = 0;
       });
-      return persister;
-    },
-    stopAutoSave: () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
-      return persister;
-    },
-    isAutoSaving: () => !isUndefined(autoSaveListenerId),
-    schedule: async (...actions) => {
-      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
-      await run();
-      return persister;
-    },
-    getStore: () => store,
-    destroy: () => persister.stopAutoLoad().stopAutoSave(),
-    getStats: () => ({loads, saves}),
+    }
+    return persister;
+  };
+  const startAutoSave = async () => {
+    await stopAutoSave().save();
+    autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+      const changes = getChanges();
+      if (hasChanges(changes)) {
+        save(changes);
+      }
+    });
+    return persister;
+  };
+  const stopAutoSave = () => {
+    ifNotUndefined(autoSaveListenerId, store.delListener);
+    autoSaveListenerId = void 0;
+    return persister;
+  };
+  const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const schedule = async (...actions) => {
+    arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
+    await run();
+    return persister;
+  };
+  const getStore = () => store;
+  const destroy = () => stopAutoLoad().stopAutoSave();
+  const getStats = () => ({loads, saves});
+  const persister = {
+    load,
+    startAutoLoad,
+    stopAutoLoad,
+    isAutoLoading,
+    save,
+    startAutoSave,
+    stopAutoSave,
+    isAutoSaving,
+    schedule,
+    getStore,
+    destroy,
+    getStats,
     ...extra,
   };
   return objFreeze(persister);
@@ -604,7 +616,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    false,
+    1,
     {[getThing]: () => db},
     db,
   );
@@ -691,13 +703,12 @@ const createTabularSqlitePersister = (
         ? [tables, values]
         : void 0;
     });
-  const setPersisted = async (getContent, getChanges) =>
+  const setPersisted = async (getContent, changes) =>
     await transaction(async () => {
       await refreshSchema();
-      if (!isUndefined(getChanges)) {
-        const [tableChanges, valueChanges] = getChanges();
-        await saveTables(tableChanges, true);
-        await saveValues(valueChanges, true);
+      if (!isUndefined(changes)) {
+        await saveTables(changes[0], true);
+        await saveValues(changes[1], true);
       } else {
         const [tables, values] = getContent();
         await saveTables(tables);
@@ -711,7 +722,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    false,
+    1,
     {[getThing]: () => db},
     db,
   );

package/lib/debug/persisters/persister-remote.js

@@ -54,24 +54,27 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportsMergeableStore, store) =>
-  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+const getStoreFunctions = (supportedStoreType = 1, store) =>
+  supportedStoreType > 1 && 'getMergeableContent' in store
     ? [
-        0,
-        store.getContent,
-        store.getTransactionChanges,
-        ([changedTables, changedValues]) =>
-          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
-        store.setContent,
-      ]
-    : [
         1,
         store.getMergeableContent,
         store.getTransactionMergeableChanges,
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
-      ];
+      ]
+    : supportedStoreType != 2
+      ? [
+          0,
+          store.getContent,
+          store.getTransactionChanges,
+          ([changedTables, changedValues]) =>
+            !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+          store.setContent,
+        ]
+      : /* istanbul ignore next */
+        0;
 const createCustomPersister = (
   store,
   getPersisted,
@@ -79,7 +82,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportsMergeableStore,
+  supportedStoreType,
   extra = {},
   scheduleId = [],
 ) => {
@@ -97,7 +100,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportsMergeableStore, store);
+  ] = getStoreFunctions(supportedStoreType, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -115,20 +118,6 @@ const createCustomPersister = (
       mapSet(scheduleRunning, scheduleId, 0);
     }
   };
-  const loadLock = async (actions) => {
-    /* istanbul ignore else */
-    if (loadSave != 2) {
-      loadSave = 1;
-      {
-        loads++;
-      }
-      await persister.schedule(async () => {
-        await actions();
-        loadSave = 0;
-      });
-    }
-    return persister;
-  };
   const setContentOrChanges = (contentOrChanges) => {
     (isMergeableStore && isArray(contentOrChanges?.[0])
       ? contentOrChanges?.[2] === 1
@@ -138,9 +127,14 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
-  const persister = {
-    load: async (initialContent) =>
-      await loadLock(async () => {
+  const load = async (initialContent) => {
+    /* istanbul ignore else */
+    if (loadSave != 2) {
+      loadSave = 1;
+      {
+        loads++;
+      }
+      await schedule(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
@@ -149,76 +143,94 @@ const createCustomPersister = (
             setDefaultContent(initialContent);
           }
         }
-      }),
-    startAutoLoad: async (initialContent) => {
-      await persister.stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(
-        async (getContent2, getChanges2) => {
-          const changes = getChanges2?.();
-          await loadLock(async () => {
-            try {
-              setContentOrChanges(
-                changes ?? getContent2?.() ?? (await getPersisted()),
-              );
-            } catch (error) {
-              onIgnoredError?.(error);
-            }
-          });
-        },
-      );
-      return persister;
-    },
-    stopAutoLoad: () => {
-      if (autoLoadHandle) {
-        delPersisterListener(autoLoadHandle);
-        autoLoadHandle = void 0;
-      }
-      return persister;
-    },
-    isAutoLoading: () => !isUndefined(autoLoadHandle),
-    save: async (getChanges2) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
-        }
-        await persister.schedule(async () => {
-          try {
-            await setPersisted(getContent, getChanges2);
-          } catch (error) {
-            /* istanbul ignore next */
-            onIgnoredError?.(error);
+        loadSave = 0;
+      });
+    }
+    return persister;
+  };
+  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;
-        });
+        }
+      } else {
+        await load();
+      }
+    });
+    return persister;
+  };
+  const stopAutoLoad = () => {
+    if (autoLoadHandle) {
+      delPersisterListener(autoLoadHandle);
+      autoLoadHandle = void 0;
+    }
+    return persister;
+  };
+  const isAutoLoading = () => !isUndefined(autoLoadHandle);
+  const save = async (changes) => {
+    /* istanbul ignore else */
+    if (loadSave != 1) {
+      loadSave = 2;
+      {
+        saves++;
       }
-      return persister;
-    },
-    startAutoSave: async () => {
-      await persister.stopAutoSave().save();
-      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
-        const changes = getChanges();
-        if (hasChanges(changes)) {
-          persister.save(() => changes);
+      await schedule(async () => {
+        try {
+          await setPersisted(getContent, changes);
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
         }
+        loadSave = 0;
       });
-      return persister;
-    },
-    stopAutoSave: () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
-      return persister;
-    },
-    isAutoSaving: () => !isUndefined(autoSaveListenerId),
-    schedule: async (...actions) => {
-      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
-      await run();
-      return persister;
-    },
-    getStore: () => store,
-    destroy: () => persister.stopAutoLoad().stopAutoSave(),
-    getStats: () => ({loads, saves}),
+    }
+    return persister;
+  };
+  const startAutoSave = async () => {
+    await stopAutoSave().save();
+    autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+      const changes = getChanges();
+      if (hasChanges(changes)) {
+        save(changes);
+      }
+    });
+    return persister;
+  };
+  const stopAutoSave = () => {
+    ifNotUndefined(autoSaveListenerId, store.delListener);
+    autoSaveListenerId = void 0;
+    return persister;
+  };
+  const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const schedule = async (...actions) => {
+    arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
+    await run();
+    return persister;
+  };
+  const getStore = () => store;
+  const destroy = () => stopAutoLoad().stopAutoSave();
+  const getStats = () => ({loads, saves});
+  const persister = {
+    load,
+    startAutoLoad,
+    stopAutoLoad,
+    isAutoLoading,
+    save,
+    startAutoSave,
+    stopAutoSave,
+    isAutoSaving,
+    schedule,
+    getStore,
+    destroy,
+    getStats,
     ...extra,
   };
   return objFreeze(persister);
@@ -265,7 +277,7 @@ const createRemotePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    false,
+    1,
     {getUrls: () => [loadUrl, saveUrl]},
   );
 };