tinybase 6.0.0-beta.2 → 6.0.0

package/persisters/persister-postgres/index.js

@@ -29,30 +29,6 @@ const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const SELECT = 'SELECT';
-const WHERE = 'WHERE';
-const TABLE = 'TABLE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const DELETE_FROM = 'DELETE FROM';
-const SELECT_STAR_FROM = SELECT + '*FROM';
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
-    COMMA,
-  );
-
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
@@ -99,6 +75,30 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const DELETE_FROM = 'DELETE FROM';
+const SELECT_STAR_FROM = SELECT + '*FROM';
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const getPlaceholders = (array, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => '$' + offset[0]++),
+    COMMA,
+  );
+
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
 const mapMap = (coll, cb) =>
@@ -143,6 +143,110 @@ const setNew = (entryOrEntries) =>
   );
 const setAdd = (set, value) => set?.add(value);
 
+const COLUMN_NAME = 'ColumnName';
+const STORE = 'store';
+const JSON$1 = 'json';
+const STORE_TABLE_NAME = STORE + 'TableName';
+const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
+const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
+const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
+const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
+const TABLE_ID = 'tableId';
+const TABLE_NAME = 'tableName';
+const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
+const DELETE_EMPTY_TABLE = 'deleteEmptyTable';
+const DEFAULT_CONFIG = {
+  mode: JSON$1,
+  [AUTO_LOAD_INTERVAL_SECONDS]: 1,
+};
+const DEFAULT_TABULAR_VALUES_CONFIG = {
+  load: 0,
+  save: 0,
+  [TABLE_NAME]: TINYBASE + '_values',
+};
+const getDefaultedConfig = (configOrStoreTableName) =>
+  objMerge(
+    DEFAULT_CONFIG,
+    isString(configOrStoreTableName)
+      ? {[STORE_TABLE_NAME]: configOrStoreTableName}
+      : (configOrStoreTableName ?? {}),
+  );
+const getDefaultedTabularConfigMap = (
+  configsObj,
+  defaultObj,
+  tableField,
+  exclude,
+  then,
+) => {
+  const configMap = mapNew();
+  objMap(configsObj, (configObj, id) => {
+    const defaultedConfig = slice(
+      objValues(
+        objMerge(
+          defaultObj,
+          isString(configObj) ? {[tableField]: configObj} : configObj,
+        ),
+      ),
+      0,
+      objSize(defaultObj),
+    );
+    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
+      then(id, defaultedConfig[0]);
+      mapSet(configMap, id, defaultedConfig);
+    }
+  });
+  return configMap;
+};
+const getConfigStructures = (configOrStoreTableName) => {
+  const config = getDefaultedConfig(configOrStoreTableName);
+  const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
+  if (config.mode == JSON$1) {
+    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
+    return [
+      1,
+      autoLoadIntervalSeconds,
+      [
+        storeTableName,
+        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
+        config[STORE_COLUMN_NAME] ?? STORE,
+      ],
+      setNew(storeTableName),
+    ];
+  }
+  const {tables: {load = {}, save = {}} = {}, values = {}} = config;
+  const valuesConfig = slice(
+    objValues(objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values)),
+    0,
+    objSize(DEFAULT_TABULAR_VALUES_CONFIG),
+  );
+  const valuesTable = valuesConfig[2];
+  const managedTableNames = setNew(valuesTable);
+  const excludedTableNames = setNew(valuesTable);
+  const tabularConfig = [
+    getDefaultedTabularConfigMap(
+      load,
+      {[TABLE_ID]: null, [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME},
+      TABLE_ID,
+      (tableName) => collHas(excludedTableNames, tableName),
+      (tableName) => setAdd(managedTableNames, tableName),
+    ),
+    getDefaultedTabularConfigMap(
+      save,
+      {
+        [TABLE_NAME]: null,
+        [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
+        [DELETE_EMPTY_COLUMNS]: 0,
+        [DELETE_EMPTY_TABLE]: 0,
+      },
+      TABLE_NAME,
+      (_, tableName) => collHas(excludedTableNames, tableName),
+      (_, tableName) => setAdd(managedTableNames, tableName),
+    ),
+    valuesConfig,
+  ];
+  return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
+};
+
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
   const pool = [];
@@ -899,110 +1003,6 @@ const createTabularPersister = (
   return persister;
 };
 
-const COLUMN_NAME = 'ColumnName';
-const STORE = 'store';
-const JSON$1 = 'json';
-const STORE_TABLE_NAME = STORE + 'TableName';
-const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
-const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
-const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
-const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
-const TABLE_ID = 'tableId';
-const TABLE_NAME = 'tableName';
-const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
-const DELETE_EMPTY_TABLE = 'deleteEmptyTable';
-const DEFAULT_CONFIG = {
-  mode: JSON$1,
-  [AUTO_LOAD_INTERVAL_SECONDS]: 1,
-};
-const DEFAULT_TABULAR_VALUES_CONFIG = {
-  load: 0,
-  save: 0,
-  [TABLE_NAME]: TINYBASE + '_values',
-};
-const getDefaultedConfig = (configOrStoreTableName) =>
-  objMerge(
-    DEFAULT_CONFIG,
-    isString(configOrStoreTableName)
-      ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : (configOrStoreTableName ?? {}),
-  );
-const getDefaultedTabularConfigMap = (
-  configsObj,
-  defaultObj,
-  tableField,
-  exclude,
-  then,
-) => {
-  const configMap = mapNew();
-  objMap(configsObj, (configObj, id) => {
-    const defaultedConfig = slice(
-      objValues(
-        objMerge(
-          defaultObj,
-          isString(configObj) ? {[tableField]: configObj} : configObj,
-        ),
-      ),
-      0,
-      objSize(defaultObj),
-    );
-    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
-      then(id, defaultedConfig[0]);
-      mapSet(configMap, id, defaultedConfig);
-    }
-  });
-  return configMap;
-};
-const getConfigStructures = (configOrStoreTableName) => {
-  const config = getDefaultedConfig(configOrStoreTableName);
-  const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
-  if (config.mode == JSON$1) {
-    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
-    return [
-      1,
-      autoLoadIntervalSeconds,
-      [
-        storeTableName,
-        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
-        config[STORE_COLUMN_NAME] ?? STORE,
-      ],
-      setNew(storeTableName),
-    ];
-  }
-  const {tables: {load = {}, save = {}} = {}, values = {}} = config;
-  const valuesConfig = slice(
-    objValues(objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values)),
-    0,
-    objSize(DEFAULT_TABULAR_VALUES_CONFIG),
-  );
-  const valuesTable = valuesConfig[2];
-  const managedTableNames = setNew(valuesTable);
-  const excludedTableNames = setNew(valuesTable);
-  const tabularConfig = [
-    getDefaultedTabularConfigMap(
-      load,
-      {[TABLE_ID]: null, [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME},
-      TABLE_ID,
-      (tableName) => collHas(excludedTableNames, tableName),
-      (tableName) => setAdd(managedTableNames, tableName),
-    ),
-    getDefaultedTabularConfigMap(
-      save,
-      {
-        [TABLE_NAME]: null,
-        [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
-        [DELETE_EMPTY_COLUMNS]: 0,
-        [DELETE_EMPTY_TABLE]: 0,
-      },
-      TABLE_NAME,
-      (_, tableName) => collHas(excludedTableNames, tableName),
-      (_, tableName) => setAdd(managedTableNames, tableName),
-    ),
-    valuesConfig,
-  ];
-  return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
-};
-
 const EVENT_CHANNEL = TINYBASE;
 const EVENT_REGEX = /^([cd]:)(.+)/;
 const CHANGE_DATA_TRIGGER = TINYBASE + '_data';

package/persisters/persister-postgres/with-schemas/index.js

@@ -29,30 +29,6 @@ const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const SELECT = 'SELECT';
-const WHERE = 'WHERE';
-const TABLE = 'TABLE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const DELETE_FROM = 'DELETE FROM';
-const SELECT_STAR_FROM = SELECT + '*FROM';
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
-    COMMA,
-  );
-
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
@@ -99,6 +75,30 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const DELETE_FROM = 'DELETE FROM';
+const SELECT_STAR_FROM = SELECT + '*FROM';
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const getPlaceholders = (array, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => '$' + offset[0]++),
+    COMMA,
+  );
+
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
 const mapMap = (coll, cb) =>
@@ -143,6 +143,110 @@ const setNew = (entryOrEntries) =>
   );
 const setAdd = (set, value) => set?.add(value);
 
+const COLUMN_NAME = 'ColumnName';
+const STORE = 'store';
+const JSON$1 = 'json';
+const STORE_TABLE_NAME = STORE + 'TableName';
+const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
+const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
+const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
+const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
+const TABLE_ID = 'tableId';
+const TABLE_NAME = 'tableName';
+const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
+const DELETE_EMPTY_TABLE = 'deleteEmptyTable';
+const DEFAULT_CONFIG = {
+  mode: JSON$1,
+  [AUTO_LOAD_INTERVAL_SECONDS]: 1,
+};
+const DEFAULT_TABULAR_VALUES_CONFIG = {
+  load: 0,
+  save: 0,
+  [TABLE_NAME]: TINYBASE + '_values',
+};
+const getDefaultedConfig = (configOrStoreTableName) =>
+  objMerge(
+    DEFAULT_CONFIG,
+    isString(configOrStoreTableName)
+      ? {[STORE_TABLE_NAME]: configOrStoreTableName}
+      : (configOrStoreTableName ?? {}),
+  );
+const getDefaultedTabularConfigMap = (
+  configsObj,
+  defaultObj,
+  tableField,
+  exclude,
+  then,
+) => {
+  const configMap = mapNew();
+  objMap(configsObj, (configObj, id) => {
+    const defaultedConfig = slice(
+      objValues(
+        objMerge(
+          defaultObj,
+          isString(configObj) ? {[tableField]: configObj} : configObj,
+        ),
+      ),
+      0,
+      objSize(defaultObj),
+    );
+    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
+      then(id, defaultedConfig[0]);
+      mapSet(configMap, id, defaultedConfig);
+    }
+  });
+  return configMap;
+};
+const getConfigStructures = (configOrStoreTableName) => {
+  const config = getDefaultedConfig(configOrStoreTableName);
+  const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
+  if (config.mode == JSON$1) {
+    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
+    return [
+      1,
+      autoLoadIntervalSeconds,
+      [
+        storeTableName,
+        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
+        config[STORE_COLUMN_NAME] ?? STORE,
+      ],
+      setNew(storeTableName),
+    ];
+  }
+  const {tables: {load = {}, save = {}} = {}, values = {}} = config;
+  const valuesConfig = slice(
+    objValues(objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values)),
+    0,
+    objSize(DEFAULT_TABULAR_VALUES_CONFIG),
+  );
+  const valuesTable = valuesConfig[2];
+  const managedTableNames = setNew(valuesTable);
+  const excludedTableNames = setNew(valuesTable);
+  const tabularConfig = [
+    getDefaultedTabularConfigMap(
+      load,
+      {[TABLE_ID]: null, [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME},
+      TABLE_ID,
+      (tableName) => collHas(excludedTableNames, tableName),
+      (tableName) => setAdd(managedTableNames, tableName),
+    ),
+    getDefaultedTabularConfigMap(
+      save,
+      {
+        [TABLE_NAME]: null,
+        [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
+        [DELETE_EMPTY_COLUMNS]: 0,
+        [DELETE_EMPTY_TABLE]: 0,
+      },
+      TABLE_NAME,
+      (_, tableName) => collHas(excludedTableNames, tableName),
+      (_, tableName) => setAdd(managedTableNames, tableName),
+    ),
+    valuesConfig,
+  ];
+  return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
+};
+
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
   const pool = [];
@@ -899,110 +1003,6 @@ const createTabularPersister = (
   return persister;
 };
 
-const COLUMN_NAME = 'ColumnName';
-const STORE = 'store';
-const JSON$1 = 'json';
-const STORE_TABLE_NAME = STORE + 'TableName';
-const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
-const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
-const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
-const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
-const TABLE_ID = 'tableId';
-const TABLE_NAME = 'tableName';
-const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
-const DELETE_EMPTY_TABLE = 'deleteEmptyTable';
-const DEFAULT_CONFIG = {
-  mode: JSON$1,
-  [AUTO_LOAD_INTERVAL_SECONDS]: 1,
-};
-const DEFAULT_TABULAR_VALUES_CONFIG = {
-  load: 0,
-  save: 0,
-  [TABLE_NAME]: TINYBASE + '_values',
-};
-const getDefaultedConfig = (configOrStoreTableName) =>
-  objMerge(
-    DEFAULT_CONFIG,
-    isString(configOrStoreTableName)
-      ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : (configOrStoreTableName ?? {}),
-  );
-const getDefaultedTabularConfigMap = (
-  configsObj,
-  defaultObj,
-  tableField,
-  exclude,
-  then,
-) => {
-  const configMap = mapNew();
-  objMap(configsObj, (configObj, id) => {
-    const defaultedConfig = slice(
-      objValues(
-        objMerge(
-          defaultObj,
-          isString(configObj) ? {[tableField]: configObj} : configObj,
-        ),
-      ),
-      0,
-      objSize(defaultObj),
-    );
-    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
-      then(id, defaultedConfig[0]);
-      mapSet(configMap, id, defaultedConfig);
-    }
-  });
-  return configMap;
-};
-const getConfigStructures = (configOrStoreTableName) => {
-  const config = getDefaultedConfig(configOrStoreTableName);
-  const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
-  if (config.mode == JSON$1) {
-    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
-    return [
-      1,
-      autoLoadIntervalSeconds,
-      [
-        storeTableName,
-        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
-        config[STORE_COLUMN_NAME] ?? STORE,
-      ],
-      setNew(storeTableName),
-    ];
-  }
-  const {tables: {load = {}, save = {}} = {}, values = {}} = config;
-  const valuesConfig = slice(
-    objValues(objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values)),
-    0,
-    objSize(DEFAULT_TABULAR_VALUES_CONFIG),
-  );
-  const valuesTable = valuesConfig[2];
-  const managedTableNames = setNew(valuesTable);
-  const excludedTableNames = setNew(valuesTable);
-  const tabularConfig = [
-    getDefaultedTabularConfigMap(
-      load,
-      {[TABLE_ID]: null, [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME},
-      TABLE_ID,
-      (tableName) => collHas(excludedTableNames, tableName),
-      (tableName) => setAdd(managedTableNames, tableName),
-    ),
-    getDefaultedTabularConfigMap(
-      save,
-      {
-        [TABLE_NAME]: null,
-        [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
-        [DELETE_EMPTY_COLUMNS]: 0,
-        [DELETE_EMPTY_TABLE]: 0,
-      },
-      TABLE_NAME,
-      (_, tableName) => collHas(excludedTableNames, tableName),
-      (_, tableName) => setAdd(managedTableNames, tableName),
-    ),
-    valuesConfig,
-  ];
-  return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
-};
-
 const EVENT_CHANNEL = TINYBASE;
 const EVENT_REGEX = /^([cd]:)(.+)/;
 const CHANGE_DATA_TRIGGER = TINYBASE + '_data';