tinybase 5.2.0-beta.2 → 5.2.0-beta.3

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

@@ -18,7 +18,6 @@
 
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,6 +56,13 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? async (sql, args) => {
+          onSqlCommand(sql, args);
+          return await rawCmd(sql, args);
+        }
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -202,9 +208,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {
@@ -866,7 +874,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -879,47 +887,54 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(async () => {
-        try {
-          const [{d, s, c}] = await cmd(
-            SELECT +
-              ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (
-            d != (dataVersion ??= d) ||
-            s != (schemaVersion ??= s) ||
-            c != (totalChanges ??= c)
-          ) {
-            listener();
-            dataVersion = d;
-            schemaVersion = s;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds),
-      addUpdateListener((tableName) =>
-        managedTableNamesSet.has(tableName) ? listener() : 0,
-      ),
-    ];
-    const delPersisterListener = ([interval, listeningHandle]) => {
-      stopInterval(interval);
-      dataVersion = schemaVersion = totalChanges = null;
-      delUpdateListener(listeningHandle);
+    const addPersisterListener = (listener) => {
+      let interval;
+      const startPolling = () =>
+        (interval = startInterval(async () => {
+          try {
+            const [{d, s, c}] = await cmd(
+              // eslint-disable-next-line max-len
+              `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+            );
+            if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+              if (dataVersion != null) {
+                listener();
+              }
+              dataVersion = d;
+              schemaVersion = s;
+              totalChanges = c;
+            }
+          } catch {}
+        }, autoLoadIntervalSeconds));
+      const stopPolling = () => {
+        dataVersion = schemaVersion = totalChanges = null;
+        stopInterval(interval);
+      };
+      const listeningHandle = addUpdateListener((tableName) => {
+        if (managedTableNamesSet.has(tableName)) {
+          stopPolling();
+          listener();
+          startPolling();
+        }
+      });
+      startPolling();
+      return () => {
+        stopPolling();
+        delUpdateListener(listeningHandle);
+      };
     };
+    const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+      stopPollingAndDelUpdateListener();
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,

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

@@ -149,9 +149,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {

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

@@ -149,9 +149,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {

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

@@ -18,7 +18,6 @@
 
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,6 +56,13 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? async (sql, args) => {
+          onSqlCommand(sql, args);
+          return await rawCmd(sql, args);
+        }
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -202,9 +208,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {
@@ -866,7 +874,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -879,47 +887,54 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(async () => {
-        try {
-          const [{d, s, c}] = await cmd(
-            SELECT +
-              ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (
-            d != (dataVersion ??= d) ||
-            s != (schemaVersion ??= s) ||
-            c != (totalChanges ??= c)
-          ) {
-            listener();
-            dataVersion = d;
-            schemaVersion = s;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds),
-      addUpdateListener((tableName) =>
-        managedTableNamesSet.has(tableName) ? listener() : 0,
-      ),
-    ];
-    const delPersisterListener = ([interval, listeningHandle]) => {
-      stopInterval(interval);
-      dataVersion = schemaVersion = totalChanges = null;
-      delUpdateListener(listeningHandle);
+    const addPersisterListener = (listener) => {
+      let interval;
+      const startPolling = () =>
+        (interval = startInterval(async () => {
+          try {
+            const [{d, s, c}] = await cmd(
+              // eslint-disable-next-line max-len
+              `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+            );
+            if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+              if (dataVersion != null) {
+                listener();
+              }
+              dataVersion = d;
+              schemaVersion = s;
+              totalChanges = c;
+            }
+          } catch {}
+        }, autoLoadIntervalSeconds));
+      const stopPolling = () => {
+        dataVersion = schemaVersion = totalChanges = null;
+        stopInterval(interval);
+      };
+      const listeningHandle = addUpdateListener((tableName) => {
+        if (managedTableNamesSet.has(tableName)) {
+          stopPolling();
+          listener();
+          startPolling();
+        }
+      });
+      startPolling();
+      return () => {
+        stopPolling();
+        delUpdateListener(listeningHandle);
+      };
     };
+    const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+      stopPollingAndDelUpdateListener();
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,

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

@@ -18,7 +18,6 @@
 
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,6 +56,13 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? async (sql, args) => {
+          onSqlCommand(sql, args);
+          return await rawCmd(sql, args);
+        }
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -202,9 +208,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {
@@ -866,7 +874,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -879,47 +887,54 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(async () => {
-        try {
-          const [{d, s, c}] = await cmd(
-            SELECT +
-              ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (
-            d != (dataVersion ??= d) ||
-            s != (schemaVersion ??= s) ||
-            c != (totalChanges ??= c)
-          ) {
-            listener();
-            dataVersion = d;
-            schemaVersion = s;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds),
-      addUpdateListener((tableName) =>
-        managedTableNamesSet.has(tableName) ? listener() : 0,
-      ),
-    ];
-    const delPersisterListener = ([interval, listeningHandle]) => {
-      stopInterval(interval);
-      dataVersion = schemaVersion = totalChanges = null;
-      delUpdateListener(listeningHandle);
+    const addPersisterListener = (listener) => {
+      let interval;
+      const startPolling = () =>
+        (interval = startInterval(async () => {
+          try {
+            const [{d, s, c}] = await cmd(
+              // eslint-disable-next-line max-len
+              `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+            );
+            if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+              if (dataVersion != null) {
+                listener();
+              }
+              dataVersion = d;
+              schemaVersion = s;
+              totalChanges = c;
+            }
+          } catch {}
+        }, autoLoadIntervalSeconds));
+      const stopPolling = () => {
+        dataVersion = schemaVersion = totalChanges = null;
+        stopInterval(interval);
+      };
+      const listeningHandle = addUpdateListener((tableName) => {
+        if (managedTableNamesSet.has(tableName)) {
+          stopPolling();
+          listener();
+          startPolling();
+        }
+      });
+      startPolling();
+      return () => {
+        stopPolling();
+        delUpdateListener(listeningHandle);
+      };
     };
+    const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+      stopPollingAndDelUpdateListener();
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,

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

@@ -18,7 +18,6 @@
 
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -58,6 +57,13 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? async (sql, args) => {
+          onSqlCommand(sql, args);
+          return await rawCmd(sql, args);
+        }
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -203,9 +209,11 @@
         await schedule(async () => {
           try {
             const content = await getPersisted();
-            isArray(content)
-              ? setContentOrChanges(content)
-              : errorNew(`Content is not an array ${content}`);
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else {
+              errorNew(`Content is not an array ${content}`);
+            }
           } catch (error) {
             onIgnoredError?.(error);
             if (initialContent) {
@@ -867,7 +875,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -880,47 +888,54 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(async () => {
-        try {
-          const [{d, s, c}] = await cmd(
-            SELECT +
-              ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (
-            d != (dataVersion ??= d) ||
-            s != (schemaVersion ??= s) ||
-            c != (totalChanges ??= c)
-          ) {
-            listener();
-            dataVersion = d;
-            schemaVersion = s;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds),
-      addUpdateListener((tableName) =>
-        managedTableNamesSet.has(tableName) ? listener() : 0,
-      ),
-    ];
-    const delPersisterListener = ([interval, listeningHandle]) => {
-      stopInterval(interval);
-      dataVersion = schemaVersion = totalChanges = null;
-      delUpdateListener(listeningHandle);
+    const addPersisterListener = (listener) => {
+      let interval;
+      const startPolling = () =>
+        (interval = startInterval(async () => {
+          try {
+            const [{d, s, c}] = await cmd(
+              // eslint-disable-next-line max-len
+              `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+            );
+            if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+              if (dataVersion != null) {
+                listener();
+              }
+              dataVersion = d;
+              schemaVersion = s;
+              totalChanges = c;
+            }
+          } catch {}
+        }, autoLoadIntervalSeconds));
+      const stopPolling = () => {
+        dataVersion = schemaVersion = totalChanges = null;
+        stopInterval(interval);
+      };
+      const listeningHandle = addUpdateListener((tableName) => {
+        if (managedTableNamesSet.has(tableName)) {
+          stopPolling();
+          listener();
+          startPolling();
+        }
+      });
+      startPolling();
+      return () => {
+        stopPolling();
+        delUpdateListener(listeningHandle);
+      };
     };
+    const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+      stopPollingAndDelUpdateListener();
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,