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

package/es6/persisters/persister-libsql/with-schemas/index.js

@@ -5,7 +5,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 {
@@ -30,7 +30,6 @@ var __async$6 = (__this, __arguments, generator) => {
 };
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -42,7 +41,7 @@ const isArray = (thing) => Array.isArray(thing);
 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) => {
@@ -59,6 +58,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';
@@ -72,6 +94,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(
@@ -282,9 +312,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) {
@@ -1130,7 +1162,7 @@ var __async$1 = (__this, __arguments, generator) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -1143,53 +1175,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/es6/persisters/persister-partykit-client/index.js

@@ -212,9 +212,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/es6/persisters/persister-partykit-client/with-schemas/index.js

@@ -212,9 +212,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/es6/persisters/persister-partykit-server/index.js

@@ -222,20 +222,27 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
                                     T,
                                     ...ids,
                                   );
-                                  isUndefined(cell)
-                                    ? !initialSave &&
+                                  if (isUndefined(cell)) {
+                                    if (
+                                      !initialSave &&
                                       (yield that.canDelCell(
                                         ...ids,
                                         requestOrConnection,
-                                      )) &&
-                                      arrayPush(keysToDel, key)
-                                    : (yield that.canSetCell(
-                                        ...ids,
-                                        cell,
-                                        initialSave,
-                                        requestOrConnection,
-                                        yield storage.get(key),
-                                      )) && (keysToSet[key] = cell);
+                                      ))
+                                    ) {
+                                      arrayPush(keysToDel, key);
+                                    }
+                                  } else if (
+                                    yield that.canSetCell(
+                                      ...ids,
+                                      cell,
+                                      initialSave,
+                                      requestOrConnection,
+                                      yield storage.get(key),
+                                    )
+                                  ) {
+                                    keysToSet[key] = cell;
+                                  }
                                 }),
                               ),
                             ));
@@ -249,17 +256,24 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
       objToArray(changes[1], (value, valueId) =>
         __async(void 0, null, function* () {
           const key = storagePrefix + V + valueId;
-          isUndefined(value)
-            ? !initialSave &&
-              (yield that.canDelValue(valueId, requestOrConnection)) &&
-              arrayPush(keysToDel, key)
-            : (yield that.canSetValue(
-                valueId,
-                value,
-                initialSave,
-                requestOrConnection,
-                yield storage.get(key),
-              )) && (keysToSet[key] = value);
+          if (isUndefined(value)) {
+            if (
+              !initialSave &&
+              (yield that.canDelValue(valueId, requestOrConnection))
+            ) {
+              arrayPush(keysToDel, key);
+            }
+          } else if (
+            yield that.canSetValue(
+              valueId,
+              value,
+              initialSave,
+              requestOrConnection,
+              yield storage.get(key),
+            )
+          ) {
+            keysToSet[key] = value;
+          }
         }),
       ),
     );

package/es6/persisters/persister-partykit-server/with-schemas/index.js

@@ -222,20 +222,27 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
                                     T,
                                     ...ids,
                                   );
-                                  isUndefined(cell)
-                                    ? !initialSave &&
+                                  if (isUndefined(cell)) {
+                                    if (
+                                      !initialSave &&
                                       (yield that.canDelCell(
                                         ...ids,
                                         requestOrConnection,
-                                      )) &&
-                                      arrayPush(keysToDel, key)
-                                    : (yield that.canSetCell(
-                                        ...ids,
-                                        cell,
-                                        initialSave,
-                                        requestOrConnection,
-                                        yield storage.get(key),
-                                      )) && (keysToSet[key] = cell);
+                                      ))
+                                    ) {
+                                      arrayPush(keysToDel, key);
+                                    }
+                                  } else if (
+                                    yield that.canSetCell(
+                                      ...ids,
+                                      cell,
+                                      initialSave,
+                                      requestOrConnection,
+                                      yield storage.get(key),
+                                    )
+                                  ) {
+                                    keysToSet[key] = cell;
+                                  }
                                 }),
                               ),
                             ));
@@ -249,17 +256,24 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
       objToArray(changes[1], (value, valueId) =>
         __async(void 0, null, function* () {
           const key = storagePrefix + V + valueId;
-          isUndefined(value)
-            ? !initialSave &&
-              (yield that.canDelValue(valueId, requestOrConnection)) &&
-              arrayPush(keysToDel, key)
-            : (yield that.canSetValue(
-                valueId,
-                value,
-                initialSave,
-                requestOrConnection,
-                yield storage.get(key),
-              )) && (keysToSet[key] = value);
+          if (isUndefined(value)) {
+            if (
+              !initialSave &&
+              (yield that.canDelValue(valueId, requestOrConnection))
+            ) {
+              arrayPush(keysToDel, key);
+            }
+          } else if (
+            yield that.canSetValue(
+              valueId,
+              value,
+              initialSave,
+              requestOrConnection,
+              yield storage.get(key),
+            )
+          ) {
+            keysToSet[key] = value;
+          }
         }),
       ),
     );

package/es6/persisters/persister-postgres/index.js

@@ -4,8 +4,9 @@ const EMPTY_STRING = '';
 const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
 const UNDEFINED = '\uFFFC';
+const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
-var __async$6 = (__this, __arguments, generator) => {
+var __async$7 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -37,7 +38,7 @@ const isArray = (thing) => Array.isArray(thing);
 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) => {
@@ -54,6 +55,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';
@@ -62,6 +86,14 @@ const TABLE = 'TABLE';
 const ALTER_TABLE = 'ALTER ' + TABLE;
 const DELETE_FROM = 'DELETE FROM';
 const SELECT_STAR_FROM = SELECT + '*FROM';
+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(
@@ -272,9 +304,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) {
@@ -1117,12 +1151,16 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const createPostgresqlPersister = (
+const EVENT_CHANNEL = TINYBASE;
+const EVENT_REGEX = /^([cd]:)(.+)/;
+const CHANGE_DATA_TRIGGER = TINYBASE + '_data';
+const CREATE_TABLE_TRIGGER = TINYBASE + '_table';
+const createPostgreSqlPersister = (
   store,
   configOrStoreTableName,
-  cmd,
-  addUpdateListener,
-  delUpdateListener,
+  rawCmd,
+  addNotifyListener,
+  delNotifyListener,
   onSqlCommand,
   onIgnoredError,
   destroy,
@@ -1130,26 +1168,65 @@ const createPostgresqlPersister = (
   thing,
   getThing = 'getDb',
 ) => {
+  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
   const [isJson, , defaultedConfig, managedTableNamesSet] = getConfigStructures(
     configOrStoreTableName,
   );
+  const addDataTrigger = (tableName) =>
+    __async$1(void 0, null, function* () {
+      yield cmd(
+        // eslint-disable-next-line max-len
+        `CREATE OR REPLACE TRIGGER ${escapeId(CHANGE_DATA_TRIGGER + '_' + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${escapeId(tableName)} EXECUTE FUNCTION ${CHANGE_DATA_TRIGGER}()`,
+      );
+    });
   const addPersisterListener = (listener) =>
     __async$1(void 0, null, function* () {
-      return yield addUpdateListener(
-        (tableName) => (managedTableNamesSet.has(tableName) ? listener() : 0),
-        managedTableNamesSet,
+      yield cmd(
+        // eslint-disable-next-line max-len
+        `CREATE OR REPLACE FUNCTION ${CREATE_TABLE_TRIGGER}()RETURNS event_trigger AS $t2$ DECLARE row record; BEGIN FOR row IN SELECT object_identity FROM pg_event_trigger_ddl_commands()WHERE command_tag='CREATE TABLE' LOOP PERFORM pg_notify('${EVENT_CHANNEL}','c:'||SPLIT_PART(row.object_identity,'.',2));END LOOP;END;$t2$ LANGUAGE plpgsql;`,
+      );
+      try {
+        yield cmd(
+          // eslint-disable-next-line max-len
+          `CREATE EVENT TRIGGER ${CREATE_TABLE_TRIGGER} ON ddl_command_end WHEN TAG IN('CREATE TABLE')EXECUTE FUNCTION ${CREATE_TABLE_TRIGGER}();`,
+        );
+      } catch (e) {}
+      yield cmd(
+        // eslint-disable-next-line max-len
+        `CREATE OR REPLACE FUNCTION ${CHANGE_DATA_TRIGGER}()RETURNS trigger AS $t1$ BEGIN PERFORM pg_notify('${EVENT_CHANNEL}','d:'||TG_TABLE_NAME);RETURN NULL;END;$t1$ LANGUAGE plpgsql;`,
+      );
+      yield promiseAll(
+        arrayMap(collValues(managedTableNamesSet), (tableName) =>
+          __async$1(void 0, null, function* () {
+            yield cmd(
+              // eslint-disable-next-line max-len
+              `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
+            );
+            yield addDataTrigger(tableName);
+          }),
+        ),
+      );
+      return yield addNotifyListener(EVENT_CHANNEL, (prefixAndTableName) =>
+        __async$1(void 0, null, function* () {
+          return yield ifNotUndefined(
+            strMatch(prefixAndTableName, EVENT_REGEX),
+            (_0) =>
+              __async$1(void 0, [_0], function* ([, eventType, tableName]) {
+                if (collHas(managedTableNamesSet, tableName)) {
+                  if (eventType == 'c:') {
+                    yield addDataTrigger(tableName);
+                  }
+                  listener();
+                }
+              }),
+          );
+        }),
       );
     });
-  const delPersisterListener = delUpdateListener;
+  const delPersisterListener = delNotifyListener;
   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,
@@ -1193,7 +1270,6 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const TRIGGER = TINYBASE;
 const createPostgresPersister = (
   store,
   sql,
@@ -1204,27 +1280,22 @@ const createPostgresPersister = (
   __async(void 0, null, function* () {
     var _a;
     const cmdSql = yield (_a = sql.reserve) == null ? void 0 : _a.call(sql);
-    return createPostgresqlPersister(
+    return createPostgreSqlPersister(
       store,
       configOrStoreTableName,
       cmdSql == null ? void 0 : cmdSql.unsafe,
-      (listener, managedTableNamesSet) =>
+      (channel, notifyListener) =>
         __async(void 0, null, function* () {
-          const listen = yield sql.listen(TRIGGER, (value) =>
-            listener == null ? void 0 : listener(value),
-          );
-          yield sql`CREATE OR REPLACE FUNCTION ${sql(TRIGGER)}()RETURNS trigger AS $t$ BEGIN PERFORM pg_notify('${sql.unsafe(TRIGGER)}',TG_TABLE_NAME);RETURN NULL;END;$t$ LANGUAGE plpgsql;`;
-          yield promiseAll(
-            arrayMap(collValues(managedTableNamesSet), (tableName) =>
-              __async(void 0, null, function* () {
-                yield sql`CREATE TABLE IF NOT EXISTS ${sql(tableName)}("_id"text PRIMARY KEY)`;
-                yield sql`CREATE OR REPLACE TRIGGER ${sql(TRIGGER + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${sql(tableName)} EXECUTE FUNCTION ${sql(TRIGGER)}()`;
-              }),
-            ),
-          );
-          return listen;
+          return sql.listen(channel, notifyListener);
+        }),
+      (notifyListener) =>
+        __async(void 0, null, function* () {
+          try {
+            yield notifyListener.unlisten();
+          } catch (e) {
+            onIgnoredError == null ? void 0 : onIgnoredError(e);
+          }
         }),
-      (listen) => listen.unlisten().catch(() => 0),
       onSqlCommand,
       onIgnoredError,
       () => {