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

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

@@ -16,7 +16,7 @@
   const STRING = getTypeOf(EMPTY_STRING);
   const UNDEFINED = '\uFFFC';
 
-  var __async$6 = (__this, __arguments, generator) => {
+  var __async$7 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -41,7 +41,6 @@
   };
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,7 +56,7 @@
   const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
   const size = (arrayOrString) => arrayOrString.length;
   const promiseAll = (promises) =>
-    __async$6(void 0, null, function* () {
+    __async$7(void 0, null, function* () {
       return promise.all(promises);
     });
   const errorNew = (message) => {
@@ -74,6 +73,29 @@
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
+  var __async$6 = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) =>
+        x.done
+          ? resolve(x.value)
+          : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
   const SINGLE_ROW_ID = '_';
   const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
   const SELECT = 'SELECT';
@@ -87,6 +109,14 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? (sql, args) =>
+          __async$6(void 0, null, function* () {
+            onSqlCommand(sql, args);
+            return yield rawCmd(sql, args);
+          })
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -301,9 +331,11 @@
             __async$5(void 0, null, function* () {
               try {
                 const content = yield 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 == null ? void 0 : onIgnoredError(error);
                 if (initialContent) {
@@ -1155,7 +1187,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -1168,55 +1200,62 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(
-        () =>
-          __async$1(void 0, null, function* () {
-            try {
-              const [{d, s, c}] = yield cmd(
-                SELECT +
-                  ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-              );
-              if (
-                d != (dataVersion != null ? dataVersion : (dataVersion = d)) ||
-                s !=
-                  (schemaVersion != null
-                    ? schemaVersion
-                    : (schemaVersion = s)) ||
-                c != (totalChanges != null ? totalChanges : (totalChanges = c))
-              ) {
-                listener();
-                dataVersion = d;
-                schemaVersion = s;
-              }
-            } catch (e) {}
-          }),
-        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$1(void 0, null, function* () {
+              try {
+                const [{d, s, c}] = yield 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 (e) {}
+            }),
+          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
-        ? (sql, args) =>
-            __async$1(void 0, null, function* () {
-              onSqlCommand(sql, args);
-              return yield cmd(sql, args);
-            })
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,

package/umd/es6/persisters/persister-electric-sql/index.js

@@ -16,7 +16,7 @@
   const STRING = getTypeOf(EMPTY_STRING);
   const UNDEFINED = '\uFFFC';
 
-  var __async$6 = (__this, __arguments, generator) => {
+  var __async$7 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -41,7 +41,6 @@
   };
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,7 +56,7 @@
   const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
   const size = (arrayOrString) => arrayOrString.length;
   const promiseAll = (promises) =>
-    __async$6(void 0, null, function* () {
+    __async$7(void 0, null, function* () {
       return promise.all(promises);
     });
   const errorNew = (message) => {
@@ -75,6 +74,29 @@
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
+  var __async$6 = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) =>
+        x.done
+          ? resolve(x.value)
+          : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
   const SINGLE_ROW_ID = '_';
   const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
   const SELECT = 'SELECT';
@@ -88,6 +110,14 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? (sql, args) =>
+          __async$6(void 0, null, function* () {
+            onSqlCommand(sql, args);
+            return yield rawCmd(sql, args);
+          })
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -302,9 +332,11 @@
             __async$5(void 0, null, function* () {
               try {
                 const content = yield 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 == null ? void 0 : onIgnoredError(error);
                 if (initialContent) {
@@ -1156,7 +1188,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -1169,55 +1201,62 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(
-        () =>
-          __async$1(void 0, null, function* () {
-            try {
-              const [{d, s, c}] = yield cmd(
-                SELECT +
-                  ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-              );
-              if (
-                d != (dataVersion != null ? dataVersion : (dataVersion = d)) ||
-                s !=
-                  (schemaVersion != null
-                    ? schemaVersion
-                    : (schemaVersion = s)) ||
-                c != (totalChanges != null ? totalChanges : (totalChanges = c))
-              ) {
-                listener();
-                dataVersion = d;
-                schemaVersion = s;
-              }
-            } catch (e) {}
-          }),
-        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$1(void 0, null, function* () {
+              try {
+                const [{d, s, c}] = yield 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 (e) {}
+            }),
+          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
-        ? (sql, args) =>
-            __async$1(void 0, null, function* () {
-              onSqlCommand(sql, args);
-              return yield cmd(sql, args);
-            })
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,

package/umd/es6/persisters/persister-electric-sql/with-schemas/index.js

@@ -16,7 +16,7 @@
   const STRING = getTypeOf(EMPTY_STRING);
   const UNDEFINED = '\uFFFC';
 
-  var __async$6 = (__this, __arguments, generator) => {
+  var __async$7 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -41,7 +41,6 @@
   };
   const promise = Promise;
   const startInterval = (callback, sec, immediate) => {
-    callback();
     return setInterval(callback, sec * 1e3);
   };
   const stopInterval = clearInterval;
@@ -57,7 +56,7 @@
   const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
   const size = (arrayOrString) => arrayOrString.length;
   const promiseAll = (promises) =>
-    __async$6(void 0, null, function* () {
+    __async$7(void 0, null, function* () {
       return promise.all(promises);
     });
   const errorNew = (message) => {
@@ -75,6 +74,29 @@
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
+  var __async$6 = (__this, __arguments, generator) => {
+    return new Promise((resolve, reject) => {
+      var fulfilled = (value) => {
+        try {
+          step(generator.next(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var rejected = (value) => {
+        try {
+          step(generator.throw(value));
+        } catch (e) {
+          reject(e);
+        }
+      };
+      var step = (x) =>
+        x.done
+          ? resolve(x.value)
+          : Promise.resolve(x.value).then(fulfilled, rejected);
+      step((generator = generator.apply(__this, __arguments)).next());
+    });
+  };
   const SINGLE_ROW_ID = '_';
   const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
   const SELECT = 'SELECT';
@@ -88,6 +110,14 @@
   const SCHEMA_VERSION = 'schema_version';
   const FROM = 'FROM ';
   const PRAGMA_TABLE = 'pragma_table_';
+  const getWrappedCommand = (rawCmd, onSqlCommand) =>
+    onSqlCommand
+      ? (sql, args) =>
+          __async$6(void 0, null, function* () {
+            onSqlCommand(sql, args);
+            return yield rawCmd(sql, args);
+          })
+      : rawCmd;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
   const getPlaceholders = (array) =>
     arrayJoin(
@@ -302,9 +332,11 @@
             __async$5(void 0, null, function* () {
               try {
                 const content = yield 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 == null ? void 0 : onIgnoredError(error);
                 if (initialContent) {
@@ -1156,7 +1188,7 @@
   const createSqlitePersister = (
     store,
     configOrStoreTableName,
-    cmd,
+    rawCmd,
     addUpdateListener,
     delUpdateListener,
     onSqlCommand,
@@ -1169,55 +1201,62 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
       defaultedConfig,
       managedTableNamesSet,
     ] = getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = (listener) => [
-      startInterval(
-        () =>
-          __async$1(void 0, null, function* () {
-            try {
-              const [{d, s, c}] = yield cmd(
-                SELECT +
-                  ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-              );
-              if (
-                d != (dataVersion != null ? dataVersion : (dataVersion = d)) ||
-                s !=
-                  (schemaVersion != null
-                    ? schemaVersion
-                    : (schemaVersion = s)) ||
-                c != (totalChanges != null ? totalChanges : (totalChanges = c))
-              ) {
-                listener();
-                dataVersion = d;
-                schemaVersion = s;
-              }
-            } catch (e) {}
-          }),
-        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$1(void 0, null, function* () {
+              try {
+                const [{d, s, c}] = yield 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 (e) {}
+            }),
+          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
-        ? (sql, args) =>
-            __async$1(void 0, null, function* () {
-              onSqlCommand(sql, args);
-              return yield cmd(sql, args);
-            })
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,