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

package/cjs/persisters/persister-expo-sqlite/index.cjs

@@ -11,7 +11,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -50,6 +49,13 @@ const DATA_VERSION = 'data_version';
 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(
@@ -191,9 +197,11 @@ const createCustomPersister = (
       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) {
@@ -850,7 +858,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -863,47 +871,54 @@ const createSqlitePersister = (
   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/cjs/persisters/persister-expo-sqlite/with-schemas/index.cjs

@@ -11,7 +11,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -50,6 +49,13 @@ const DATA_VERSION = 'data_version';
 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(
@@ -191,9 +197,11 @@ const createCustomPersister = (
       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) {
@@ -850,7 +858,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -863,47 +871,54 @@ const createSqlitePersister = (
   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/cjs/persisters/persister-file/index.cjs

@@ -139,9 +139,11 @@ const createCustomPersister = (
       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/cjs/persisters/persister-file/with-schemas/index.cjs

@@ -139,9 +139,11 @@ const createCustomPersister = (
       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/cjs/persisters/persister-indexed-db/index.cjs

@@ -145,9 +145,11 @@ const createCustomPersister = (
       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/cjs/persisters/persister-indexed-db/with-schemas/index.cjs

@@ -145,9 +145,11 @@ const createCustomPersister = (
       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/cjs/persisters/persister-libsql/index.cjs

@@ -9,7 +9,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -48,6 +47,13 @@ const DATA_VERSION = 'data_version';
 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(
@@ -189,9 +195,11 @@ const createCustomPersister = (
       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) {
@@ -848,7 +856,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -861,47 +869,54 @@ const createSqlitePersister = (
   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/cjs/persisters/persister-libsql/with-schemas/index.cjs

@@ -9,7 +9,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -48,6 +47,13 @@ const DATA_VERSION = 'data_version';
 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(
@@ -189,9 +195,11 @@ const createCustomPersister = (
       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) {
@@ -848,7 +856,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -861,47 +869,54 @@ const createSqlitePersister = (
   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/cjs/persisters/persister-partykit-client/index.cjs

@@ -156,9 +156,11 @@ const createCustomPersister = (
       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/cjs/persisters/persister-partykit-client/with-schemas/index.cjs

@@ -156,9 +156,11 @@ const createCustomPersister = (
       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) {