tinybase 5.2.0-beta.2 → 5.2.0-beta.4

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(
@@ -73,14 +81,18 @@ const objDel = (obj, id) => {
 };
 const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+const objMap = (obj, cb) =>
+  objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
@@ -177,9 +189,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) {
@@ -296,7 +310,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -315,7 +332,9 @@ const getCommandFunctions = (
               await cmd(SELECT_STAR_FROM + escapeId(tableName)),
               (row) => [
                 row[rowIdColumnName],
-                objDel({...row}, rowIdColumnName),
+                decode
+                  ? objMap(objDel(row, rowIdColumnName), decode)
+                  : objDel(row, rowIdColumnName),
               ],
             ),
             ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -355,10 +374,10 @@ const getCommandFunctions = (
           'CREATE ' +
             TABLE +
             escapeId(tableName) +
-            `(${escapeId(rowIdColumnName)}text PRIMARY KEY${arrayJoin(
+            `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
                 tableColumnNames,
-                (columnName) => COMMA + escapeId(columnName) + 'json',
+                (columnName) => COMMA + escapeId(columnName) + columnType,
               ),
             )});`,
         );
@@ -378,7 +397,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -430,8 +449,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -449,7 +473,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -459,7 +485,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -493,11 +519,11 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
-  useOnConflict = true,
+  orReplace = 0,
 ) =>
   await cmd(
     'INSERT ' +
-      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
       'INTO' +
       escapeId(tableName) +
       '(' +
@@ -510,8 +536,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -521,8 +548,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -556,7 +582,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -564,7 +591,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -626,7 +654,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -634,7 +665,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -833,12 +867,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 +884,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);
+      }),
+    );
+    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 = delUpdateListener;
+  };
+  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,
@@ -878,10 +953,13 @@ const createPostgresqlPersister = (
       ),
     thing,
     getThing,
+    'text',
+    0,
+    (cellOrValue) => jsonString(cellOrValue),
+    (field) => jsonParse(field),
   );
 };
 
-const TRIGGER = TINYBASE;
 const createPostgresPersister = async (
   store,
   sql,
@@ -890,22 +968,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?.(),