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

package/cjs/es6/persisters/persister-postgres/with-schemas/index.cjs

@@ -6,8 +6,9 @@ const EMPTY_STRING = '';
 const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
 const UNDEFINED = '\uFFFC';
+const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
-var __async$6 = (__this, __arguments, generator) => {
+var __async$7 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -39,7 +40,7 @@ const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = (promises) =>
-  __async$6(void 0, null, function* () {
+  __async$7(void 0, null, function* () {
     return promise.all(promises);
   });
 const errorNew = (message) => {
@@ -56,6 +57,29 @@ const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
+var __async$6 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) =>
+      x.done
+        ? resolve(x.value)
+        : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 const SINGLE_ROW_ID = '_';
 const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
@@ -64,6 +88,14 @@ const TABLE = 'TABLE';
 const ALTER_TABLE = 'ALTER ' + TABLE;
 const DELETE_FROM = 'DELETE FROM';
 const SELECT_STAR_FROM = SELECT + '*FROM';
+const getWrappedCommand = (rawCmd, onSqlCommand) =>
+  onSqlCommand
+    ? (sql, args) =>
+        __async$6(void 0, null, function* () {
+          onSqlCommand(sql, args);
+          return yield rawCmd(sql, args);
+        })
+    : rawCmd;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -110,14 +142,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 == null ? void 0 : map.get(key));
@@ -141,25 +177,25 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) =>
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) =>
   key in obj
-    ? __defProp$1(obj, key, {
+    ? __defProp(obj, key, {
         enumerable: true,
         configurable: true,
         writable: true,
         value,
       })
     : (obj[key] = value);
-var __spreadValues$1 = (a, b) => {
+var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
+    if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
     }
   return a;
 };
@@ -274,9 +310,11 @@ const createCustomPersister = (
           __async$5(void 0, null, function* () {
             try {
               const content = yield 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 == null ? void 0 : onIgnoredError(error);
               if (initialContent) {
@@ -371,7 +409,7 @@ const createCustomPersister = (
     return stopAutoLoad().stopAutoSave();
   };
   const getStats = () => ({loads, saves});
-  const persister = __spreadValues$1(
+  const persister = __spreadValues(
     {
       load,
       startAutoLoad,
@@ -399,28 +437,6 @@ const setNew = (entryOrEntries) =>
   );
 const setAdd = (set, value) => (set == null ? void 0 : set.add(value));
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) =>
-  key in obj
-    ? __defProp(obj, key, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value,
-      })
-    : (obj[key] = value);
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __async$4 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -449,7 +465,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -470,7 +489,9 @@ const getCommandFunctions = (
                 yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
                 (row) => [
                   row[rowIdColumnName],
-                  objDel(__spreadValues({}, row), rowIdColumnName),
+                  decode
+                    ? objMap(objDel(row, rowIdColumnName), decode)
+                    : objDel(row, rowIdColumnName),
                 ],
               ),
               ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -513,10 +534,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,
                 ),
               )});`,
           );
@@ -537,7 +558,7 @@ const getCommandFunctions = (
                         escapeId(tableName) +
                         'ADD' +
                         escapeId(columnName) +
-                        (index == 0 ? 'text' : 'json'),
+                        columnType,
                     );
                     if (index == 0) {
                       yield cmd(
@@ -592,8 +613,13 @@ const getCommandFunctions = (
                     tableName,
                     rowIdColumnName,
                     objIds(row),
-                    [rowId, ...objValues(row)],
-                    useOnConflict,
+                    [
+                      rowId,
+                      ...(encode
+                        ? arrayMap(objValues(row), encode)
+                        : objValues(row)),
+                    ],
+                    orReplace,
                   );
                 }
               }),
@@ -613,7 +639,11 @@ const getCommandFunctions = (
               args,
               rowId,
               ...arrayMap(changingColumnNames, (cellId) =>
-                row == null ? void 0 : row[cellId],
+                encode
+                  ? encode(row == null ? void 0 : row[cellId])
+                  : row == null
+                    ? void 0
+                    : row[cellId],
               ),
             );
             arrayPush(deleteRowIds, rowId);
@@ -624,7 +654,7 @@ const getCommandFunctions = (
             rowIdColumnName,
             changingColumnNames,
             args,
-            useOnConflict,
+            orReplace,
           );
           yield cmd(
             DELETE_FROM +
@@ -659,12 +689,12 @@ const upsert = (
   rowIdColumnName,
   changingColumnNames,
   args,
-  useOnConflict = true,
+  orReplace = 0,
 ) =>
   __async$4(void 0, null, function* () {
     return yield cmd(
       'INSERT ' +
-        (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
         escapeId(tableName) +
         '(' +
@@ -677,8 +707,9 @@ const upsert = (
         ) +
         ')VALUES' +
         getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -688,8 +719,7 @@ const upsert = (
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
+            )),
       arrayMap(args, (arg) => (arg != null ? arg : null)),
     );
   });
@@ -747,7 +777,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -755,7 +786,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = () =>
     __async$3(void 0, null, function* () {
@@ -857,7 +889,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -865,7 +900,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = (tables, partial) =>
     __async$2(void 0, null, function* () {
@@ -1119,12 +1157,16 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-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,
@@ -1132,26 +1174,65 @@ const createPostgresqlPersister = (
   thing,
   getThing = 'getDb',
 ) => {
+  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
   const [isJson, , defaultedConfig, managedTableNamesSet] = getConfigStructures(
     configOrStoreTableName,
   );
+  const addDataTrigger = (tableName) =>
+    __async$1(void 0, null, function* () {
+      yield 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 = (listener) =>
     __async$1(void 0, null, function* () {
-      return yield addUpdateListener(
-        (tableName) => (managedTableNamesSet.has(tableName) ? listener() : 0),
-        managedTableNamesSet,
+      yield 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 {
+        yield 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 (e) {}
+      yield 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;`,
+      );
+      yield promiseAll(
+        arrayMap(collValues(managedTableNamesSet), (tableName) =>
+          __async$1(void 0, null, function* () {
+            yield cmd(
+              // eslint-disable-next-line max-len
+              `CREATE TABLE IF NOT EXISTS ${escapeId(tableName)}("_id"text PRIMARY KEY)`,
+            );
+            yield addDataTrigger(tableName);
+          }),
+        ),
+      );
+      return yield addNotifyListener(EVENT_CHANNEL, (prefixAndTableName) =>
+        __async$1(void 0, null, function* () {
+          return yield ifNotUndefined(
+            strMatch(prefixAndTableName, EVENT_REGEX),
+            (_0) =>
+              __async$1(void 0, [_0], function* ([, eventType, tableName]) {
+                if (collHas(managedTableNamesSet, tableName)) {
+                  if (eventType == 'c:') {
+                    yield addDataTrigger(tableName);
+                  }
+                  listener();
+                }
+              }),
+          );
+        }),
       );
     });
-  const delPersisterListener = delUpdateListener;
+  const delPersisterListener = delNotifyListener;
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    onSqlCommand
-      ? (sql, args) =>
-          __async$1(void 0, null, function* () {
-            onSqlCommand(sql, args);
-            return yield cmd(sql, args);
-          })
-      : cmd,
+    cmd,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -1169,6 +1250,10 @@ const createPostgresqlPersister = (
       }),
     thing,
     getThing,
+    'text',
+    0,
+    (cellOrValue) => jsonString(cellOrValue),
+    (field) => jsonParse(field),
   );
 };
 
@@ -1195,7 +1280,6 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const TRIGGER = TINYBASE;
 const createPostgresPersister = (
   store,
   sql,
@@ -1206,27 +1290,22 @@ const createPostgresPersister = (
   __async(void 0, null, function* () {
     var _a;
     const cmdSql = yield (_a = sql.reserve) == null ? void 0 : _a.call(sql);
-    return createPostgresqlPersister(
+    return createPostgreSqlPersister(
       store,
       configOrStoreTableName,
       cmdSql == null ? void 0 : cmdSql.unsafe,
-      (listener, managedTableNamesSet) =>
+      (channel, notifyListener) =>
         __async(void 0, null, function* () {
-          const listen = yield sql.listen(TRIGGER, (value) =>
-            listener == null ? void 0 : listener(value),
-          );
-          yield 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;`;
-          yield promiseAll(
-            arrayMap(collValues(managedTableNamesSet), (tableName) =>
-              __async(void 0, null, function* () {
-                yield sql`CREATE TABLE IF NOT EXISTS ${sql(tableName)}("_id"text PRIMARY KEY)`;
-                yield sql`CREATE OR REPLACE TRIGGER ${sql(TRIGGER + tableName)} AFTER INSERT OR UPDATE OR DELETE ON ${sql(tableName)} EXECUTE FUNCTION ${sql(TRIGGER)}()`;
-              }),
-            ),
-          );
-          return listen;
+          return sql.listen(channel, notifyListener);
+        }),
+      (notifyListener) =>
+        __async(void 0, null, function* () {
+          try {
+            yield notifyListener.unlisten();
+          } catch (e) {
+            onIgnoredError == null ? void 0 : onIgnoredError(e);
+          }
         }),
-      (listen) => listen.unlisten().catch(() => 0),
       onSqlCommand,
       onIgnoredError,
       () => {