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

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

@@ -127,20 +127,24 @@ const saveStore = async (that, changes, initialSave, requestOrConnection) => {
                     objToArray(row, async (cell, cellId) => {
                       const ids = [tableId, rowId, cellId];
                       const key = constructStorageKey(storagePrefix, 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;
+                      }
                     }),
                   )),
             ),
@@ -150,17 +154,24 @@ const saveStore = async (that, changes, initialSave, requestOrConnection) => {
   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/persisters/persister-partykit-server/with-schemas/index.js

@@ -127,20 +127,24 @@ const saveStore = async (that, changes, initialSave, requestOrConnection) => {
                     objToArray(row, async (cell, cellId) => {
                       const ids = [tableId, rowId, cellId];
                       const key = constructStorageKey(storagePrefix, 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;
+                      }
                     }),
                   )),
             ),
@@ -150,17 +154,24 @@ const saveStore = async (that, changes, initialSave, requestOrConnection) => {
   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/persisters/persister-postgres/index.js

@@ -4,6 +4,7 @@ const EMPTY_STRING = '';
 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;
@@ -36,6 +37,13 @@ const TABLE = 'TABLE';
 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(
@@ -177,9 +185,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) {
@@ -833,12 +843,16 @@ const getConfigStructures = (configOrStoreTableName) => {
   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,
@@ -846,23 +860,60 @@ const createPostgresqlPersister = (
   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;`,
+    );
+    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);
+      }),
     );
-  const delPersisterListener = delUpdateListener;
+    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,
@@ -881,7 +932,6 @@ const createPostgresqlPersister = (
   );
 };
 
-const TRIGGER = TINYBASE;
 const createPostgresPersister = async (
   store,
   sql,
@@ -890,22 +940,18 @@ const createPostgresPersister = async (
   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/persisters/persister-postgres/with-schemas/index.js

@@ -4,6 +4,7 @@ const EMPTY_STRING = '';
 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;
@@ -36,6 +37,13 @@ const TABLE = 'TABLE';
 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(
@@ -177,9 +185,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) {
@@ -833,12 +843,16 @@ const getConfigStructures = (configOrStoreTableName) => {
   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,
@@ -846,23 +860,60 @@ const createPostgresqlPersister = (
   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;`,
+    );
+    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);
+      }),
     );
-  const delPersisterListener = delUpdateListener;
+    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,
@@ -881,7 +932,6 @@ const createPostgresqlPersister = (
   );
 };
 
-const TRIGGER = TINYBASE;
 const createPostgresPersister = async (
   store,
   sql,
@@ -890,22 +940,18 @@ const createPostgresPersister = async (
   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/persisters/persister-powersync/index.js

@@ -7,7 +7,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -46,6 +45,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(
@@ -187,9 +193,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) {
@@ -846,7 +854,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -859,47 +867,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,