tinybase 5.2.0-beta.4 → 5.2.0

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

@@ -86,14 +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) =>
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
   onSqlCommand
-    ? (sql, args) =>
+    ? (sql, params) =>
         __async$6(void 0, null, function* () {
-          onSqlCommand(sql, args);
-          return yield rawCmd(sql, args);
+          onSqlCommand(sql, params);
+          return yield executeCommand(sql, params);
         })
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -459,7 +459,7 @@ var __async$4 = (__this, __arguments, generator) => {
   });
 };
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
@@ -474,8 +474,9 @@ const getCommandFunctions = (
   const refreshSchema = () =>
     __async$4(void 0, null, function* () {
       collClear(schemaMap);
-      arrayMap(yield querySchema(cmd, managedTableNames), ({tn, cn}) =>
-        setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+      arrayMap(
+        yield querySchema(databaseExecuteCommand, managedTableNames),
+        ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
       );
     });
   const loadTable = (tableName, rowIdColumnName) =>
@@ -484,7 +485,9 @@ const getCommandFunctions = (
         ? objNew(
             arrayFilter(
               arrayMap(
-                yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                yield databaseExecuteCommand(
+                  SELECT_STAR_FROM + escapeId(tableName),
+                ),
                 (row) => [
                   row[rowIdColumnName],
                   decode
@@ -520,7 +523,7 @@ const getCommandFunctions = (
         arrayIsEmpty(tableColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
-        yield cmd('DROP ' + TABLE + escapeId(tableName));
+        yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
         mapSet(schemaMap, tableName);
         return;
       }
@@ -528,7 +531,7 @@ const getCommandFunctions = (
       const currentColumnNames = setNew(collValues(tableSchemaColumns));
       if (!arrayIsEmpty(tableColumnNames)) {
         if (!collHas(schemaMap, tableName)) {
-          yield cmd(
+          yield databaseExecuteCommand(
             'CREATE ' +
               TABLE +
               escapeId(tableName) +
@@ -551,7 +554,7 @@ const getCommandFunctions = (
               (columnName, index) =>
                 __async$4(void 0, null, function* () {
                   if (!collDel(currentColumnNames, columnName)) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'ADD' +
@@ -559,7 +562,7 @@ const getCommandFunctions = (
                         columnType,
                     );
                     if (index == 0) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         'CREATE UNIQUE INDEX pk ON ' +
                           escapeId(tableName) +
                           `(${escapeId(rowIdColumnName)})`,
@@ -577,7 +580,7 @@ const getCommandFunctions = (
           ? arrayMap(collValues(currentColumnNames), (columnName) =>
               __async$4(void 0, null, function* () {
                 if (columnName != rowIdColumnName) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'DROP' +
@@ -591,13 +594,15 @@ const getCommandFunctions = (
       ]);
       if (partial) {
         if (isUndefined(content)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         } else {
           yield promiseAll(
             objToArray(content, (row, rowId) =>
               __async$4(void 0, null, function* () {
                 if (isUndefined(row)) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     DELETE_FROM +
                       escapeId(tableName) +
                       WHERE +
@@ -607,7 +612,7 @@ const getCommandFunctions = (
                   );
                 } else if (!arrayIsEmpty(tableColumnNames)) {
                   yield upsert(
-                    cmd,
+                    databaseExecuteCommand,
                     tableName,
                     rowIdColumnName,
                     objIds(row),
@@ -630,11 +635,11 @@ const getCommandFunctions = (
             collValues(mapGet(schemaMap, tableName)),
             (columnName) => columnName != rowIdColumnName,
           );
-          const args = [];
+          const params = [];
           const deleteRowIds = [];
           objToArray(content != null ? content : {}, (row, rowId) => {
             arrayPush(
-              args,
+              params,
               rowId,
               ...arrayMap(changingColumnNames, (cellId) =>
                 encode
@@ -647,14 +652,14 @@ const getCommandFunctions = (
             arrayPush(deleteRowIds, rowId);
           });
           yield upsert(
-            cmd,
+            databaseExecuteCommand,
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            args,
+            params,
             orReplace,
           );
-          yield cmd(
+          yield databaseExecuteCommand(
             DELETE_FROM +
               escapeId(tableName) +
               WHERE +
@@ -663,34 +668,36 @@ const getCommandFunctions = (
             deleteRowIds,
           );
         } else if (collHas(schemaMap, tableName)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         }
       }
     });
   const transaction = (actions) =>
     __async$4(void 0, null, function* () {
       let result;
-      yield cmd('BEGIN');
+      yield databaseExecuteCommand('BEGIN');
       try {
         result = yield actions();
       } catch (error) {
         onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      yield cmd('END');
+      yield databaseExecuteCommand('END');
       return result;
     });
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
+  params,
   orReplace = 0,
 ) =>
   __async$4(void 0, null, function* () {
-    return yield cmd(
+    return yield executeCommand(
       'INSERT ' +
         (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
@@ -704,7 +711,7 @@ const upsert = (
           ),
         ) +
         ')VALUES' +
-        getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+        getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
         (orReplace
           ? EMPTY_STRING
           : 'ON CONFLICT(' +
@@ -718,7 +725,7 @@ const upsert = (
               ),
               COMMA,
             )),
-      arrayMap(args, (arg) => (arg != null ? arg : null)),
+      arrayMap(params, (param) => (param != null ? param : null)),
     );
   });
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -764,7 +771,7 @@ var __async$3 = (__this, __arguments, generator) => {
 };
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -780,7 +787,7 @@ const createJsonPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -872,7 +879,7 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -894,7 +901,7 @@ const createTabularPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -1159,12 +1166,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,
@@ -1172,37 +1179,37 @@ const createPostgreSqlPersister = (
   thing,
   getThing = 'getDb',
 ) => {
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [isJson, , defaultedConfig, managedTableNamesSet] = getConfigStructures(
     configOrStoreTableName,
   );
   const addDataTrigger = (tableName) =>
     __async$1(void 0, null, function* () {
-      yield cmd(
+      yield 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 = (listener) =>
     __async$1(void 0, null, function* () {
-      yield cmd(
+      yield 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 {
-        yield cmd(
+        yield 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 (e) {}
-      yield cmd(
+      yield 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;`,
       );
       yield promiseAll(
         arrayMap(collValues(managedTableNamesSet), (tableName) =>
           __async$1(void 0, null, function* () {
-            yield cmd(
+            yield executeCommand(
               // eslint-disable-next-line max-len
               `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
             );
@@ -1210,7 +1217,7 @@ const createPostgreSqlPersister = (
           }),
         ),
       );
-      return yield addNotifyListener(EVENT_CHANNEL, (prefixAndTableName) =>
+      return yield addChangeListener(EVENT_CHANNEL, (prefixAndTableName) =>
         __async$1(void 0, null, function* () {
           return yield ifNotUndefined(
             strMatch(prefixAndTableName, EVENT_REGEX),
@@ -1227,10 +1234,10 @@ const createPostgreSqlPersister = (
         }),
       );
     });
-  const delPersisterListener = delNotifyListener;
+  const delPersisterListener = delChangeListener;
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -1238,9 +1245,9 @@ const createPostgreSqlPersister = (
     persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
-    (cmd2, managedTableNames) =>
+    (executeCommand2, managedTableNames) =>
       __async$1(void 0, null, function* () {
-        return yield cmd2(
+        return yield 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,
@@ -1286,16 +1293,16 @@ const createPglitePersister = (
   onIgnoredError,
 ) =>
   __async(void 0, null, function* () {
-    return createPostgreSqlPersister(
+    return createCustomPostgreSqlPersister(
       store,
       configOrStoreTableName,
       (_0, ..._1) =>
-        __async(void 0, [_0, ..._1], function* (sql, args = []) {
-          return (yield pglite.query(sql, args)).rows;
+        __async(void 0, [_0, ..._1], function* (sql, params = []) {
+          return (yield pglite.query(sql, params)).rows;
         }),
-      (channel, notifyListener) =>
+      (channel, listener) =>
         __async(void 0, null, function* () {
-          return pglite.listen(channel, notifyListener);
+          return pglite.listen(channel, listener);
         }),
       (unlisten) =>
         __async(void 0, null, function* () {