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

package/cjs/es6/persisters/persister-sqlite3/with-schemas/index.cjs

@@ -7,7 +7,7 @@ const COMMA = ',';
 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 {
@@ -32,7 +32,6 @@ var __async$6 = (__this, __arguments, generator) => {
 };
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -45,7 +44,7 @@ const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseNew = (resolver) => new promise(resolver);
 const promiseAll = (promises) =>
-  __async$6(void 0, null, function* () {
+  __async$7(void 0, null, function* () {
     return promise.all(promises);
   });
 const errorNew = (message) => {
@@ -62,6 +61,29 @@ const arrayClear = (array, to) => array.splice(0, to);
 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';
@@ -75,6 +97,14 @@ const DATA_VERSION = 'data_version';
 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(
@@ -285,9 +315,11 @@ const createCustomPersister = (
           __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) {
@@ -1133,7 +1165,7 @@ var __async$1 = (__this, __arguments, generator) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -1146,53 +1178,58 @@ 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$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/cjs/es6/persisters/persister-yjs/index.cjs

@@ -211,9 +211,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/persisters/persister-yjs/with-schemas/index.cjs

@@ -211,9 +211,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/persisters/with-schemas/index.cjs

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

package/cjs/es6/relationships/index.cjs

@@ -362,19 +362,21 @@ const getListenerFunctions = (getThing) => {
         const callWithIds = (...ids) => {
           var _a, _b;
           const index = size(ids);
-          index == size(path)
-            ? listener(thing, ...ids, ...extraArgsGetter(ids))
-            : isUndefined(path[index])
-              ? arrayForEach(
-                  (_b =
-                    (_a = pathGetters[index]) == null
-                      ? void 0
-                      : _a.call(pathGetters, ...ids)) != null
-                    ? _b
-                    : [],
-                  (id2) => callWithIds(...ids, id2),
-                )
-              : callWithIds(...ids, path[index]);
+          if (index == size(path)) {
+            listener(thing, ...ids, ...extraArgsGetter(ids));
+          } else if (isUndefined(path[index])) {
+            arrayForEach(
+              (_b =
+                (_a = pathGetters[index]) == null
+                  ? void 0
+                  : _a.call(pathGetters, ...ids)) != null
+                ? _b
+                : [],
+              (id2) => callWithIds(...ids, id2),
+            );
+          } else {
+            callWithIds(...ids, path[index]);
+          }
         };
         callWithIds();
       },

package/cjs/es6/relationships/with-schemas/index.cjs

@@ -362,19 +362,21 @@ const getListenerFunctions = (getThing) => {
         const callWithIds = (...ids) => {
           var _a, _b;
           const index = size(ids);
-          index == size(path)
-            ? listener(thing, ...ids, ...extraArgsGetter(ids))
-            : isUndefined(path[index])
-              ? arrayForEach(
-                  (_b =
-                    (_a = pathGetters[index]) == null
-                      ? void 0
-                      : _a.call(pathGetters, ...ids)) != null
-                    ? _b
-                    : [],
-                  (id2) => callWithIds(...ids, id2),
-                )
-              : callWithIds(...ids, path[index]);
+          if (index == size(path)) {
+            listener(thing, ...ids, ...extraArgsGetter(ids));
+          } else if (isUndefined(path[index])) {
+            arrayForEach(
+              (_b =
+                (_a = pathGetters[index]) == null
+                  ? void 0
+                  : _a.call(pathGetters, ...ids)) != null
+                ? _b
+                : [],
+              (id2) => callWithIds(...ids, id2),
+            );
+          } else {
+            callWithIds(...ids, path[index]);
+          }
         };
         callWithIds();
       },

package/cjs/es6/store/index.cjs

@@ -157,9 +157,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   collForEach(map, (mapValue, id) => {
     if (!(excludeMapValue == null ? void 0 : excludeMapValue(mapValue, id))) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      (excludeObjValue == null ? void 0 : excludeObjValue(objValue))
-        ? 0
-        : (obj[id] = objValue);
+      if (!(excludeObjValue == null ? void 0 : excludeObjValue(objValue))) {
+        obj[id] = objValue;
+      }
     }
   });
   return obj;
@@ -309,19 +309,21 @@ const getListenerFunctions = (getThing) => {
         const callWithIds = (...ids) => {
           var _a, _b;
           const index = size(ids);
-          index == size(path)
-            ? listener(thing, ...ids, ...extraArgsGetter(ids))
-            : isUndefined(path[index])
-              ? arrayForEach(
-                  (_b =
-                    (_a = pathGetters[index]) == null
-                      ? void 0
-                      : _a.call(pathGetters, ...ids)) != null
-                    ? _b
-                    : [],
-                  (id2) => callWithIds(...ids, id2),
-                )
-              : callWithIds(...ids, path[index]);
+          if (index == size(path)) {
+            listener(thing, ...ids, ...extraArgsGetter(ids));
+          } else if (isUndefined(path[index])) {
+            arrayForEach(
+              (_b =
+                (_a = pathGetters[index]) == null
+                  ? void 0
+                  : _a.call(pathGetters, ...ids)) != null
+                ? _b
+                : [],
+              (id2) => callWithIds(...ids, id2),
+            );
+          } else {
+            callWithIds(...ids, path[index]);
+          }
         };
         callWithIds();
       },
@@ -699,7 +701,11 @@ const createStore = () => {
       cellIdsChanged(tableId, rowId, cellId2, -1);
       mapSet(row, cellId2);
     };
-    isUndefined(defaultCell) ? delCell2(cellId) : mapForEach(row, delCell2);
+    if (isUndefined(defaultCell)) {
+      delCell2(cellId);
+    } else {
+      mapForEach(row, delCell2);
+    }
     if (collIsEmpty(row)) {
       rowIdsChanged(tableId, rowId, -1);
       if (collIsEmpty(mapSet(table, rowId))) {

package/cjs/es6/store/with-schemas/index.cjs

@@ -157,9 +157,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   collForEach(map, (mapValue, id) => {
     if (!(excludeMapValue == null ? void 0 : excludeMapValue(mapValue, id))) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      (excludeObjValue == null ? void 0 : excludeObjValue(objValue))
-        ? 0
-        : (obj[id] = objValue);
+      if (!(excludeObjValue == null ? void 0 : excludeObjValue(objValue))) {
+        obj[id] = objValue;
+      }
     }
   });
   return obj;
@@ -309,19 +309,21 @@ const getListenerFunctions = (getThing) => {
         const callWithIds = (...ids) => {
           var _a, _b;
           const index = size(ids);
-          index == size(path)
-            ? listener(thing, ...ids, ...extraArgsGetter(ids))
-            : isUndefined(path[index])
-              ? arrayForEach(
-                  (_b =
-                    (_a = pathGetters[index]) == null
-                      ? void 0
-                      : _a.call(pathGetters, ...ids)) != null
-                    ? _b
-                    : [],
-                  (id2) => callWithIds(...ids, id2),
-                )
-              : callWithIds(...ids, path[index]);
+          if (index == size(path)) {
+            listener(thing, ...ids, ...extraArgsGetter(ids));
+          } else if (isUndefined(path[index])) {
+            arrayForEach(
+              (_b =
+                (_a = pathGetters[index]) == null
+                  ? void 0
+                  : _a.call(pathGetters, ...ids)) != null
+                ? _b
+                : [],
+              (id2) => callWithIds(...ids, id2),
+            );
+          } else {
+            callWithIds(...ids, path[index]);
+          }
         };
         callWithIds();
       },
@@ -699,7 +701,11 @@ const createStore = () => {
       cellIdsChanged(tableId, rowId, cellId2, -1);
       mapSet(row, cellId2);
     };
-    isUndefined(defaultCell) ? delCell2(cellId) : mapForEach(row, delCell2);
+    if (isUndefined(defaultCell)) {
+      delCell2(cellId);
+    } else {
+      mapForEach(row, delCell2);
+    }
     if (collIsEmpty(row)) {
       rowIdsChanged(tableId, rowId, -1);
       if (collIsEmpty(mapSet(table, rowId))) {

package/cjs/es6/synchronizers/index.cjs

@@ -223,9 +223,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/synchronizers/synchronizer-broadcast-channel/index.cjs

@@ -223,9 +223,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/synchronizers/synchronizer-broadcast-channel/with-schemas/index.cjs

@@ -223,9 +223,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/synchronizers/synchronizer-local/index.cjs

@@ -226,9 +226,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/synchronizers/synchronizer-local/with-schemas/index.cjs

@@ -226,9 +226,11 @@ const createCustomPersister = (
           __async$1(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) {

package/cjs/es6/synchronizers/synchronizer-ws-client/index.cjs

@@ -63,9 +63,9 @@ const jsonParseWithUndefined = (str) =>
 const MESSAGE_SEPARATOR = '\n';
 const ifPayloadValid = (payload, then) => {
   const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-  splitAt !== -1
-    ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-    : 0;
+  if (splitAt !== -1) {
+    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+  }
 };
 const receivePayload = (payload, receive) =>
   ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -250,9 +250,11 @@ const createCustomPersister = (
           __async$2(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) {

package/cjs/es6/synchronizers/synchronizer-ws-client/with-schemas/index.cjs

@@ -63,9 +63,9 @@ const jsonParseWithUndefined = (str) =>
 const MESSAGE_SEPARATOR = '\n';
 const ifPayloadValid = (payload, then) => {
   const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-  splitAt !== -1
-    ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-    : 0;
+  if (splitAt !== -1) {
+    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+  }
 };
 const receivePayload = (payload, receive) =>
   ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -250,9 +250,11 @@ const createCustomPersister = (
           __async$2(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) {