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

package/umd/persisters/persister-partykit-server/index.js

@@ -153,20 +153,24 @@
                           T,
                           ...ids,
                         );
-                        isUndefined(cell)
-                          ? !initialSave &&
-                            (await that.canDelCell(
-                              ...ids,
-                              requestOrConnection,
-                            )) &&
-                            arrayPush(keysToDel, key)
-                          : (await that.canSetCell(
-                              ...ids,
-                              cell,
-                              initialSave,
-                              requestOrConnection,
-                              await storage.get(key),
-                            )) && (keysToSet[key] = cell);
+                        if (isUndefined(cell)) {
+                          if (
+                            !initialSave &&
+                            (await that.canDelCell(...ids, requestOrConnection))
+                          ) {
+                            arrayPush(keysToDel, key);
+                          }
+                        } else if (
+                          await that.canSetCell(
+                            ...ids,
+                            cell,
+                            initialSave,
+                            requestOrConnection,
+                            await storage.get(key),
+                          )
+                        ) {
+                          keysToSet[key] = cell;
+                        }
                       }),
                     )),
               ),
@@ -176,17 +180,24 @@
     await promiseAll(
       objToArray(changes[1], async (value, valueId) => {
         const key = storagePrefix + V + valueId;
-        isUndefined(value)
-          ? !initialSave &&
-            (await that.canDelValue(valueId, requestOrConnection)) &&
-            arrayPush(keysToDel, key)
-          : (await that.canSetValue(
-              valueId,
-              value,
-              initialSave,
-              requestOrConnection,
-              await storage.get(key),
-            )) && (keysToSet[key] = value);
+        if (isUndefined(value)) {
+          if (
+            !initialSave &&
+            (await that.canDelValue(valueId, requestOrConnection))
+          ) {
+            arrayPush(keysToDel, key);
+          }
+        } else if (
+          await that.canSetValue(
+            valueId,
+            value,
+            initialSave,
+            requestOrConnection,
+            await storage.get(key),
+          )
+        ) {
+          keysToSet[key] = value;
+        }
       }),
     );
     if (!arrayIsEmpty(keyPrefixesToDel)) {

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

@@ -153,20 +153,24 @@
                           T,
                           ...ids,
                         );
-                        isUndefined(cell)
-                          ? !initialSave &&
-                            (await that.canDelCell(
-                              ...ids,
-                              requestOrConnection,
-                            )) &&
-                            arrayPush(keysToDel, key)
-                          : (await that.canSetCell(
-                              ...ids,
-                              cell,
-                              initialSave,
-                              requestOrConnection,
-                              await storage.get(key),
-                            )) && (keysToSet[key] = cell);
+                        if (isUndefined(cell)) {
+                          if (
+                            !initialSave &&
+                            (await that.canDelCell(...ids, requestOrConnection))
+                          ) {
+                            arrayPush(keysToDel, key);
+                          }
+                        } else if (
+                          await that.canSetCell(
+                            ...ids,
+                            cell,
+                            initialSave,
+                            requestOrConnection,
+                            await storage.get(key),
+                          )
+                        ) {
+                          keysToSet[key] = cell;
+                        }
                       }),
                     )),
               ),
@@ -176,17 +180,24 @@
     await promiseAll(
       objToArray(changes[1], async (value, valueId) => {
         const key = storagePrefix + V + valueId;
-        isUndefined(value)
-          ? !initialSave &&
-            (await that.canDelValue(valueId, requestOrConnection)) &&
-            arrayPush(keysToDel, key)
-          : (await that.canSetValue(
-              valueId,
-              value,
-              initialSave,
-              requestOrConnection,
-              await storage.get(key),
-            )) && (keysToSet[key] = value);
+        if (isUndefined(value)) {
+          if (
+            !initialSave &&
+            (await that.canDelValue(valueId, requestOrConnection))
+          ) {
+            arrayPush(keysToDel, key);
+          }
+        } else if (
+          await that.canSetValue(
+            valueId,
+            value,
+            initialSave,
+            requestOrConnection,
+            await storage.get(key),
+          )
+        ) {
+          keysToSet[key] = value;
+        }
       }),
     );
     if (!arrayIsEmpty(keyPrefixesToDel)) {

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

@@ -15,6 +15,7 @@
   const COMMA = ',';
   const STRING = getTypeOf(EMPTY_STRING);
   const UNDEFINED = '\uFFFC';
+  const strMatch = (str, regex) => str?.match(regex);
 
   const promise = Promise;
   const isUndefined = (thing) => thing == void 0;
@@ -47,6 +48,13 @@
   const ALTER_TABLE = 'ALTER ' + TABLE;
   const DELETE_FROM = 'DELETE FROM';
   const SELECT_STAR_FROM = SELECT + '*FROM';
+  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(
@@ -192,9 +200,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) {
@@ -853,12 +863,16 @@
     return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
   };
 
-  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,
@@ -866,22 +880,59 @@
     thing,
     getThing = 'getDb',
   ) => {
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [isJson, , defaultedConfig, managedTableNamesSet] =
       getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = async (listener) =>
-      await addUpdateListener(
-        (tableName) => (managedTableNamesSet.has(tableName) ? listener() : 0),
-        managedTableNamesSet,
+    const addDataTrigger = async (tableName) => {
+      await 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 = async (listener) => {
+      await 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;`,
       );
-    const delPersisterListener = delUpdateListener;
+      try {
+        await 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 {}
+      await 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;`,
+      );
+      await promiseAll(
+        arrayMap(collValues(managedTableNamesSet), async (tableName) => {
+          await cmd(
+            // eslint-disable-next-line max-len
+            `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
+          );
+          await addDataTrigger(tableName);
+        }),
+      );
+      return await addNotifyListener(
+        EVENT_CHANNEL,
+        async (prefixAndTableName) =>
+          await ifNotUndefined(
+            strMatch(prefixAndTableName, EVENT_REGEX),
+            async ([, eventType, tableName]) => {
+              if (collHas(managedTableNamesSet, tableName)) {
+                if (eventType == 'c:') {
+                  await addDataTrigger(tableName);
+                }
+                listener();
+              }
+            },
+          ),
+      );
+    };
+    const delPersisterListener = delNotifyListener;
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
@@ -900,7 +951,6 @@
     );
   };
 
-  const TRIGGER = TINYBASE;
   const createPostgresPersister = async (
     store,
     sql,
@@ -909,22 +959,18 @@
     onIgnoredError,
   ) => {
     const cmdSql = await sql.reserve?.();
-    return createPostgresqlPersister(
+    return createPostgreSqlPersister(
       store,
       configOrStoreTableName,
       cmdSql?.unsafe,
-      async (listener, managedTableNamesSet) => {
-        const listen = await sql.listen(TRIGGER, (value) => listener?.(value));
-        await 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;`;
-        await promiseAll(
-          arrayMap(collValues(managedTableNamesSet), async (tableName) => {
-            await sql`CREATE TABLE IF NOT EXISTS ${sql(tableName)}("_id"text PRIMARY KEY)`;
-            await sql`CREATE OR REPLACE TRIGGER ${sql(TRIGGER + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${sql(tableName)} EXECUTE FUNCTION ${sql(TRIGGER)}()`;
-          }),
-        );
-        return listen;
+      async (channel, notifyListener) => sql.listen(channel, notifyListener),
+      async (notifyListener) => {
+        try {
+          await notifyListener.unlisten();
+        } catch (e) {
+          onIgnoredError?.(e);
+        }
       },
-      (listen) => listen.unlisten().catch(() => 0),
       onSqlCommand,
       onIgnoredError,
       () => cmdSql?.release?.(),

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

@@ -15,6 +15,7 @@
   const COMMA = ',';
   const STRING = getTypeOf(EMPTY_STRING);
   const UNDEFINED = '\uFFFC';
+  const strMatch = (str, regex) => str?.match(regex);
 
   const promise = Promise;
   const isUndefined = (thing) => thing == void 0;
@@ -47,6 +48,13 @@
   const ALTER_TABLE = 'ALTER ' + TABLE;
   const DELETE_FROM = 'DELETE FROM';
   const SELECT_STAR_FROM = SELECT + '*FROM';
+  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(
@@ -192,9 +200,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) {
@@ -853,12 +863,16 @@
     return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
   };
 
-  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,
@@ -866,22 +880,59 @@
     thing,
     getThing = 'getDb',
   ) => {
+    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
     const [isJson, , defaultedConfig, managedTableNamesSet] =
       getConfigStructures(configOrStoreTableName);
-    const addPersisterListener = async (listener) =>
-      await addUpdateListener(
-        (tableName) => (managedTableNamesSet.has(tableName) ? listener() : 0),
-        managedTableNamesSet,
+    const addDataTrigger = async (tableName) => {
+      await 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 = async (listener) => {
+      await 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;`,
       );
-    const delPersisterListener = delUpdateListener;
+      try {
+        await 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 {}
+      await 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;`,
+      );
+      await promiseAll(
+        arrayMap(collValues(managedTableNamesSet), async (tableName) => {
+          await cmd(
+            // eslint-disable-next-line max-len
+            `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
+          );
+          await addDataTrigger(tableName);
+        }),
+      );
+      return await addNotifyListener(
+        EVENT_CHANNEL,
+        async (prefixAndTableName) =>
+          await ifNotUndefined(
+            strMatch(prefixAndTableName, EVENT_REGEX),
+            async ([, eventType, tableName]) => {
+              if (collHas(managedTableNamesSet, tableName)) {
+                if (eventType == 'c:') {
+                  await addDataTrigger(tableName);
+                }
+                listener();
+              }
+            },
+          ),
+      );
+    };
+    const delPersisterListener = delNotifyListener;
     return (isJson ? createJsonPersister : createTabularPersister)(
       store,
-      onSqlCommand
-        ? async (sql, args) => {
-            onSqlCommand(sql, args);
-            return await cmd(sql, args);
-          }
-        : cmd,
+      cmd,
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
@@ -900,7 +951,6 @@
     );
   };
 
-  const TRIGGER = TINYBASE;
   const createPostgresPersister = async (
     store,
     sql,
@@ -909,22 +959,18 @@
     onIgnoredError,
   ) => {
     const cmdSql = await sql.reserve?.();
-    return createPostgresqlPersister(
+    return createPostgreSqlPersister(
       store,
       configOrStoreTableName,
       cmdSql?.unsafe,
-      async (listener, managedTableNamesSet) => {
-        const listen = await sql.listen(TRIGGER, (value) => listener?.(value));
-        await 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;`;
-        await promiseAll(
-          arrayMap(collValues(managedTableNamesSet), async (tableName) => {
-            await sql`CREATE TABLE IF NOT EXISTS ${sql(tableName)}("_id"text PRIMARY KEY)`;
-            await sql`CREATE OR REPLACE TRIGGER ${sql(TRIGGER + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${sql(tableName)} EXECUTE FUNCTION ${sql(TRIGGER)}()`;
-          }),
-        );
-        return listen;
+      async (channel, notifyListener) => sql.listen(channel, notifyListener),
+      async (notifyListener) => {
+        try {
+          await notifyListener.unlisten();
+        } catch (e) {
+          onIgnoredError?.(e);
+        }
       },
-      (listen) => listen.unlisten().catch(() => 0),
       onSqlCommand,
       onIgnoredError,
       () => cmdSql?.release?.(),

package/umd/persisters/persister-powersync/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,