tinybase 5.2.0-beta.4 → 5.2.0

package/cjs/persisters/persister-postgres/index.cjs

@@ -39,13 +39,13 @@ const TABLE = 'TABLE';
 const ALTER_TABLE = 'ALTER ' + TABLE;
 const DELETE_FROM = 'DELETE FROM';
 const SELECT_STAR_FROM = SELECT + '*FROM';
-const getWrappedCommand = (rawCmd, onSqlCommand) =>
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
   onSqlCommand
-    ? async (sql, args) => {
-        onSqlCommand(sql, args);
-        return await rawCmd(sql, args);
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
       }
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -308,7 +308,7 @@ const setNew = (entryOrEntries) =>
 const setAdd = (set, value) => set?.add(value);
 
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
@@ -322,8 +322,9 @@ const getCommandFunctions = (
     collHas(mapGet(schemaMap, tableName), rowIdColumnName);
   const refreshSchema = async () => {
     collClear(schemaMap);
-    arrayMap(await querySchema(cmd, managedTableNames), ({tn, cn}) =>
-      setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+    arrayMap(
+      await querySchema(databaseExecuteCommand, managedTableNames),
+      ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
     );
   };
   const loadTable = async (tableName, rowIdColumnName) =>
@@ -331,7 +332,9 @@ const getCommandFunctions = (
       ? objNew(
           arrayFilter(
             arrayMap(
-              await cmd(SELECT_STAR_FROM + escapeId(tableName)),
+              await databaseExecuteCommand(
+                SELECT_STAR_FROM + escapeId(tableName),
+              ),
               (row) => [
                 row[rowIdColumnName],
                 decode
@@ -364,7 +367,7 @@ const getCommandFunctions = (
       arrayIsEmpty(tableColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
-      await cmd('DROP ' + TABLE + escapeId(tableName));
+      await databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
       mapSet(schemaMap, tableName);
       return;
     }
@@ -372,7 +375,7 @@ const getCommandFunctions = (
     const currentColumnNames = setNew(collValues(tableSchemaColumns));
     if (!arrayIsEmpty(tableColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
-        await cmd(
+        await databaseExecuteCommand(
           'CREATE ' +
             TABLE +
             escapeId(tableName) +
@@ -394,7 +397,7 @@ const getCommandFunctions = (
             [rowIdColumnName, ...tableColumnNames],
             async (columnName, index) => {
               if (!collDel(currentColumnNames, columnName)) {
-                await cmd(
+                await databaseExecuteCommand(
                   ALTER_TABLE +
                     escapeId(tableName) +
                     'ADD' +
@@ -402,7 +405,7 @@ const getCommandFunctions = (
                     columnType,
                 );
                 if (index == 0) {
-                  await cmd(
+                  await databaseExecuteCommand(
                     'CREATE UNIQUE INDEX pk ON ' +
                       escapeId(tableName) +
                       `(${escapeId(rowIdColumnName)})`,
@@ -419,7 +422,7 @@ const getCommandFunctions = (
       ...(!partial && deleteEmptyColumns
         ? arrayMap(collValues(currentColumnNames), async (columnName) => {
             if (columnName != rowIdColumnName) {
-              await cmd(
+              await databaseExecuteCommand(
                 ALTER_TABLE +
                   escapeId(tableName) +
                   'DROP' +
@@ -432,12 +435,14 @@ const getCommandFunctions = (
     ]);
     if (partial) {
       if (isUndefined(content)) {
-        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+        await databaseExecuteCommand(
+          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+        );
       } else {
         await promiseAll(
           objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
-              await cmd(
+              await databaseExecuteCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
                   WHERE +
@@ -447,7 +452,7 @@ const getCommandFunctions = (
               );
             } else if (!arrayIsEmpty(tableColumnNames)) {
               await upsert(
-                cmd,
+                databaseExecuteCommand,
                 tableName,
                 rowIdColumnName,
                 objIds(row),
@@ -469,11 +474,11 @@ const getCommandFunctions = (
           collValues(mapGet(schemaMap, tableName)),
           (columnName) => columnName != rowIdColumnName,
         );
-        const args = [];
+        const params = [];
         const deleteRowIds = [];
         objToArray(content ?? {}, (row, rowId) => {
           arrayPush(
-            args,
+            params,
             rowId,
             ...arrayMap(changingColumnNames, (cellId) =>
               encode ? encode(row?.[cellId]) : row?.[cellId],
@@ -482,14 +487,14 @@ const getCommandFunctions = (
           arrayPush(deleteRowIds, rowId);
         });
         await upsert(
-          cmd,
+          databaseExecuteCommand,
           tableName,
           rowIdColumnName,
           changingColumnNames,
-          args,
+          params,
           orReplace,
         );
-        await cmd(
+        await databaseExecuteCommand(
           DELETE_FROM +
             escapeId(tableName) +
             WHERE +
@@ -498,32 +503,34 @@ const getCommandFunctions = (
           deleteRowIds,
         );
       } else if (collHas(schemaMap, tableName)) {
-        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+        await databaseExecuteCommand(
+          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+        );
       }
     }
   };
   const transaction = async (actions) => {
     let result;
-    await cmd('BEGIN');
+    await databaseExecuteCommand('BEGIN');
     try {
       result = await actions();
     } catch (error) {
       onIgnoredError?.(error);
     }
-    await cmd('END');
+    await databaseExecuteCommand('END');
     return result;
   };
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = async (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
+  params,
   orReplace = 0,
 ) =>
-  await cmd(
+  await executeCommand(
     'INSERT ' +
       (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
       'INTO' +
@@ -537,7 +544,7 @@ const upsert = async (
         ),
       ) +
       ')VALUES' +
-      getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+      getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
       (orReplace
         ? EMPTY_STRING
         : 'ON CONFLICT(' +
@@ -551,7 +558,7 @@ const upsert = async (
             ),
             COMMA,
           )),
-    arrayMap(args, (arg) => arg ?? null),
+    arrayMap(params, (param) => param ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
   arrayJoin(
@@ -573,7 +580,7 @@ const getUpsertPlaceholders = (array, columnCount) =>
 
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -589,7 +596,7 @@ const createJsonPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -641,7 +648,7 @@ const createJsonPersister = (
 
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -663,7 +670,7 @@ const createTabularPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -873,12 +880,12 @@ const EVENT_CHANNEL = TINYBASE;
 const EVENT_REGEX = /^([cd]:)(.+)/;
 const CHANGE_DATA_TRIGGER = TINYBASE + '_data';
 const CREATE_TABLE_TRIGGER = TINYBASE + '_table';
-const createPostgreSqlPersister = (
+const createCustomPostgreSqlPersister = (
   store,
   configOrStoreTableName,
-  rawCmd,
-  addNotifyListener,
-  delNotifyListener,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
   onSqlCommand,
   onIgnoredError,
   destroy,
@@ -886,41 +893,41 @@ const createPostgreSqlPersister = (
   thing,
   getThing = 'getDb',
 ) => {
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [isJson, , defaultedConfig, managedTableNamesSet] = getConfigStructures(
     configOrStoreTableName,
   );
   const addDataTrigger = async (tableName) => {
-    await cmd(
+    await executeCommand(
       // 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(
+    await executeCommand(
       // 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(
+      await executeCommand(
         // 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(
+    await executeCommand(
       // 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(
+        await executeCommand(
           // eslint-disable-next-line max-len
           `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
         );
         await addDataTrigger(tableName);
       }),
     );
-    return await addNotifyListener(
+    return await addChangeListener(
       EVENT_CHANNEL,
       async (prefixAndTableName) =>
         await ifNotUndefined(
@@ -936,10 +943,10 @@ const createPostgreSqlPersister = (
         ),
     );
   };
-  const delPersisterListener = delNotifyListener;
+  const delPersisterListener = delChangeListener;
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -947,8 +954,8 @@ const createPostgreSqlPersister = (
     persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
-    async (cmd2, managedTableNames) =>
-      await cmd2(
+    async (executeCommand2, managedTableNames) =>
+      await executeCommand2(
         // eslint-disable-next-line max-len
         `${SELECT} table_name tn,column_name cn FROM information_schema.columns ${WHERE} table_schema='public'AND table_name IN(${getPlaceholders(managedTableNames)})`,
         managedTableNames,
@@ -969,12 +976,12 @@ const createPostgresPersister = async (
   onSqlCommand,
   onIgnoredError,
 ) => {
-  const cmdSql = await sql.reserve?.();
-  return createPostgreSqlPersister(
+  const commandSql = await sql.reserve?.();
+  return createCustomPostgreSqlPersister(
     store,
     configOrStoreTableName,
-    cmdSql?.unsafe,
-    async (channel, notifyListener) => sql.listen(channel, notifyListener),
+    commandSql?.unsafe,
+    async (channel, listener) => sql.listen(channel, listener),
     async (notifyListener) => {
       try {
         await notifyListener.unlisten();
@@ -984,7 +991,7 @@ const createPostgresPersister = async (
     },
     onSqlCommand,
     onIgnoredError,
-    () => cmdSql?.release?.(),
+    () => commandSql?.release?.(),
     3,
     // StoreOrMergeableStore,
     sql,