tinybase 5.3.2 → 5.3.3

package/umd/es6/persisters/persister-postgres/index.js

@@ -61,8 +61,6 @@
     throw new Error(message);
   };
 
-  const arrayNew = (size2, cb) =>
-    arrayMap(new Array(size2).fill(0), (_, index) => cb(index));
   const arrayForEach = (array, cb) => array.forEach(cb);
   const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
   const arrayMap = (array, cb) => array.map(cb);
@@ -112,9 +110,11 @@
           })
       : executeCommand;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-  const getPlaceholders = (array) =>
+  const escapeColumnNames = (...columnNames) =>
+    arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+  const getPlaceholders = (array, offset = [1]) =>
     arrayJoin(
-      arrayMap(array, (_, index) => '$' + (index + 1)),
+      arrayMap(array, () => '$' + offset[0]++),
       COMMA,
     );
 
@@ -644,7 +644,7 @@
     querySchema,
     onIgnoredError,
     columnType,
-    orReplace,
+    upsert = defaultUpsert,
     encode,
     decode,
   ) => {
@@ -689,27 +689,27 @@
       partial = false,
     ) =>
       __async$4(void 0, null, function* () {
-        const tableCellOrValueIds = setNew();
+        const settingColumnNameSet = setNew();
         objToArray(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
-            (cellOrValueId) => setAdd(tableCellOrValueIds, cellOrValueId),
+            (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
           ),
         );
-        const tableColumnNames = collValues(tableCellOrValueIds);
+        const settingColumnNames = collValues(settingColumnNameSet);
         if (
           !partial &&
           deleteEmptyTable &&
-          arrayIsEmpty(tableColumnNames) &&
+          arrayIsEmpty(settingColumnNames) &&
           collHas(schemaMap, tableName)
         ) {
           yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
           mapSet(schemaMap, tableName);
           return;
         }
-        const tableSchemaColumns = mapGet(schemaMap, tableName);
-        const currentColumnNames = setNew(collValues(tableSchemaColumns));
-        if (!arrayIsEmpty(tableColumnNames)) {
+        const currentColumnNames = mapGet(schemaMap, tableName);
+        const unaccountedColumnNames = setNew(collValues(currentColumnNames));
+        if (!arrayIsEmpty(settingColumnNames)) {
           if (!collHas(schemaMap, tableName)) {
             yield databaseExecuteCommand(
               'CREATE ' +
@@ -717,28 +717,29 @@
                 escapeId(tableName) +
                 `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
                   arrayMap(
-                    tableColumnNames,
-                    (columnName) => COMMA + escapeId(columnName) + columnType,
+                    settingColumnNames,
+                    (settingColumnName) =>
+                      COMMA + escapeId(settingColumnName) + columnType,
                   ),
                 )});`,
             );
             mapSet(
               schemaMap,
               tableName,
-              setNew([rowIdColumnName, ...tableColumnNames]),
+              setNew([rowIdColumnName, ...settingColumnNames]),
             );
           } else {
             yield promiseAll(
               arrayMap(
-                [rowIdColumnName, ...tableColumnNames],
-                (columnName, index) =>
+                [rowIdColumnName, ...settingColumnNames],
+                (settingColumnName, index) =>
                   __async$4(void 0, null, function* () {
-                    if (!collDel(currentColumnNames, columnName)) {
+                    if (!collDel(unaccountedColumnNames, settingColumnName)) {
                       yield databaseExecuteCommand(
                         ALTER_TABLE +
                           escapeId(tableName) +
                           'ADD' +
-                          escapeId(columnName) +
+                          escapeId(settingColumnName) +
                           columnType,
                       );
                       if (index == 0) {
@@ -748,7 +749,7 @@
                             `(${escapeId(rowIdColumnName)})`,
                         );
                       }
-                      setAdd(tableSchemaColumns, columnName);
+                      setAdd(currentColumnNames, settingColumnName);
                     }
                   }),
               ),
@@ -757,18 +758,20 @@
         }
         yield promiseAll([
           ...(!partial && deleteEmptyColumns
-            ? arrayMap(collValues(currentColumnNames), (columnName) =>
-                __async$4(void 0, null, function* () {
-                  if (columnName != rowIdColumnName) {
-                    yield databaseExecuteCommand(
-                      ALTER_TABLE +
-                        escapeId(tableName) +
-                        'DROP' +
-                        escapeId(columnName),
-                    );
-                    collDel(tableSchemaColumns, columnName);
-                  }
-                }),
+            ? arrayMap(
+                collValues(unaccountedColumnNames),
+                (unaccountedColumnName) =>
+                  __async$4(void 0, null, function* () {
+                    if (unaccountedColumnName != rowIdColumnName) {
+                      yield databaseExecuteCommand(
+                        ALTER_TABLE +
+                          escapeId(tableName) +
+                          'DROP' +
+                          escapeId(unaccountedColumnName),
+                      );
+                      collDel(currentColumnNames, unaccountedColumnName);
+                    }
+                  }),
               )
             : []),
         ]);
@@ -790,19 +793,18 @@
                         '=$1',
                       [rowId],
                     );
-                  } else if (!arrayIsEmpty(tableColumnNames)) {
+                  } else if (!arrayIsEmpty(settingColumnNames)) {
                     yield upsert(
                       databaseExecuteCommand,
                       tableName,
                       rowIdColumnName,
                       objIds(row),
-                      [
-                        rowId,
-                        ...(encode
+                      {
+                        [rowId]: encode
                           ? arrayMap(objValues(row), encode)
-                          : objValues(row)),
-                      ],
-                      orReplace,
+                          : objValues(row),
+                      },
+                      currentColumnNames,
                     );
                   }
                 }),
@@ -810,24 +812,20 @@
             );
           }
         } else {
-          if (!arrayIsEmpty(tableColumnNames)) {
+          if (!arrayIsEmpty(settingColumnNames)) {
             const changingColumnNames = arrayFilter(
               collValues(mapGet(schemaMap, tableName)),
-              (columnName) => columnName != rowIdColumnName,
+              (changingColumnName) => changingColumnName != rowIdColumnName,
             );
-            const params = [];
+            const rows = {};
             const deleteRowIds = [];
             objToArray(content != null ? content : {}, (row, rowId) => {
-              arrayPush(
-                params,
-                rowId,
-                ...arrayMap(changingColumnNames, (cellId) =>
-                  encode
-                    ? encode(row == null ? void 0 : row[cellId])
-                    : row == null
-                      ? void 0
-                      : row[cellId],
-                ),
+              rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+                encode
+                  ? encode(row == null ? void 0 : row[cellId])
+                  : row == null
+                    ? void 0
+                    : row[cellId],
               );
               arrayPush(deleteRowIds, rowId);
             });
@@ -836,8 +834,7 @@
               tableName,
               rowIdColumnName,
               changingColumnNames,
-              params,
-              orReplace,
+              rows,
             );
             yield databaseExecuteCommand(
               DELETE_FROM +
@@ -868,63 +865,46 @@
       });
     return [refreshSchema, loadTable, saveTable, transaction];
   };
-  const upsert = (
+  const defaultUpsert = (
     executeCommand,
     tableName,
     rowIdColumnName,
     changingColumnNames,
-    params,
-    orReplace = 0,
+    rows,
   ) =>
     __async$4(void 0, null, function* () {
-      return yield executeCommand(
-        'INSERT ' +
-          (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-          'INTO' +
+      const offset = [1];
+      yield executeCommand(
+        'INSERT INTO' +
           escapeId(tableName) +
           '(' +
+          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+          ')VALUES' +
+          arrayJoin(
+            objToArray(
+              rows,
+              (row) =>
+                '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            ),
+            COMMA,
+          ) +
+          'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
+          ')DO UPDATE SET' +
           arrayJoin(
             arrayMap(
               changingColumnNames,
-              (columnName) => COMMA + escapeId(columnName),
+              (columnName) =>
+                escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
-          ) +
-          ')VALUES' +
-          getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
-          (orReplace
-            ? EMPTY_STRING
-            : 'ON CONFLICT(' +
-              escapeId(rowIdColumnName) +
-              ')DO UPDATE SET' +
-              arrayJoin(
-                arrayMap(
-                  changingColumnNames,
-                  (columnName) =>
-                    escapeId(columnName) + '=excluded.' + escapeId(columnName),
-                ),
-                COMMA,
-              )),
-        arrayMap(params, (param) => (param != null ? param : null)),
+            COMMA,
+          ),
+        objToArray(rows, (row, id) => [
+          id,
+          ...arrayMap(row, (value) => (value != null ? value : null)),
+        ]).flat(),
       );
     });
-  const getUpsertPlaceholders = (array, columnCount) =>
-    arrayJoin(
-      arrayNew(
-        size(array) / columnCount,
-        (row) =>
-          '(' +
-          arrayJoin(
-            arrayNew(
-              columnCount,
-              (column) => '$' + (row * columnCount + column + 1),
-            ),
-            COMMA,
-          ) +
-          ')',
-      ),
-      COMMA,
-    );
 
   var __async$3 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -963,7 +943,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -972,7 +952,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
       );
     const getPersisted = () =>
       __async$3(void 0, null, function* () {
@@ -1075,7 +1055,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
     encode,
     decode,
   ) => {
@@ -1086,7 +1066,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
         encode,
         decode,
       );
@@ -1441,7 +1421,7 @@
       thing,
       getThing,
       'text',
-      0,
+      void 0,
       (cellOrValue) => jsonString(cellOrValue),
       (field) => jsonParse(field),
     );

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

@@ -61,8 +61,6 @@
     throw new Error(message);
   };
 
-  const arrayNew = (size2, cb) =>
-    arrayMap(new Array(size2).fill(0), (_, index) => cb(index));
   const arrayForEach = (array, cb) => array.forEach(cb);
   const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
   const arrayMap = (array, cb) => array.map(cb);
@@ -112,9 +110,11 @@
           })
       : executeCommand;
   const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-  const getPlaceholders = (array) =>
+  const escapeColumnNames = (...columnNames) =>
+    arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+  const getPlaceholders = (array, offset = [1]) =>
     arrayJoin(
-      arrayMap(array, (_, index) => '$' + (index + 1)),
+      arrayMap(array, () => '$' + offset[0]++),
       COMMA,
     );
 
@@ -644,7 +644,7 @@
     querySchema,
     onIgnoredError,
     columnType,
-    orReplace,
+    upsert = defaultUpsert,
     encode,
     decode,
   ) => {
@@ -689,27 +689,27 @@
       partial = false,
     ) =>
       __async$4(void 0, null, function* () {
-        const tableCellOrValueIds = setNew();
+        const settingColumnNameSet = setNew();
         objToArray(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
-            (cellOrValueId) => setAdd(tableCellOrValueIds, cellOrValueId),
+            (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
           ),
         );
-        const tableColumnNames = collValues(tableCellOrValueIds);
+        const settingColumnNames = collValues(settingColumnNameSet);
         if (
           !partial &&
           deleteEmptyTable &&
-          arrayIsEmpty(tableColumnNames) &&
+          arrayIsEmpty(settingColumnNames) &&
           collHas(schemaMap, tableName)
         ) {
           yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
           mapSet(schemaMap, tableName);
           return;
         }
-        const tableSchemaColumns = mapGet(schemaMap, tableName);
-        const currentColumnNames = setNew(collValues(tableSchemaColumns));
-        if (!arrayIsEmpty(tableColumnNames)) {
+        const currentColumnNames = mapGet(schemaMap, tableName);
+        const unaccountedColumnNames = setNew(collValues(currentColumnNames));
+        if (!arrayIsEmpty(settingColumnNames)) {
           if (!collHas(schemaMap, tableName)) {
             yield databaseExecuteCommand(
               'CREATE ' +
@@ -717,28 +717,29 @@
                 escapeId(tableName) +
                 `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
                   arrayMap(
-                    tableColumnNames,
-                    (columnName) => COMMA + escapeId(columnName) + columnType,
+                    settingColumnNames,
+                    (settingColumnName) =>
+                      COMMA + escapeId(settingColumnName) + columnType,
                   ),
                 )});`,
             );
             mapSet(
               schemaMap,
               tableName,
-              setNew([rowIdColumnName, ...tableColumnNames]),
+              setNew([rowIdColumnName, ...settingColumnNames]),
             );
           } else {
             yield promiseAll(
               arrayMap(
-                [rowIdColumnName, ...tableColumnNames],
-                (columnName, index) =>
+                [rowIdColumnName, ...settingColumnNames],
+                (settingColumnName, index) =>
                   __async$4(void 0, null, function* () {
-                    if (!collDel(currentColumnNames, columnName)) {
+                    if (!collDel(unaccountedColumnNames, settingColumnName)) {
                       yield databaseExecuteCommand(
                         ALTER_TABLE +
                           escapeId(tableName) +
                           'ADD' +
-                          escapeId(columnName) +
+                          escapeId(settingColumnName) +
                           columnType,
                       );
                       if (index == 0) {
@@ -748,7 +749,7 @@
                             `(${escapeId(rowIdColumnName)})`,
                         );
                       }
-                      setAdd(tableSchemaColumns, columnName);
+                      setAdd(currentColumnNames, settingColumnName);
                     }
                   }),
               ),
@@ -757,18 +758,20 @@
         }
         yield promiseAll([
           ...(!partial && deleteEmptyColumns
-            ? arrayMap(collValues(currentColumnNames), (columnName) =>
-                __async$4(void 0, null, function* () {
-                  if (columnName != rowIdColumnName) {
-                    yield databaseExecuteCommand(
-                      ALTER_TABLE +
-                        escapeId(tableName) +
-                        'DROP' +
-                        escapeId(columnName),
-                    );
-                    collDel(tableSchemaColumns, columnName);
-                  }
-                }),
+            ? arrayMap(
+                collValues(unaccountedColumnNames),
+                (unaccountedColumnName) =>
+                  __async$4(void 0, null, function* () {
+                    if (unaccountedColumnName != rowIdColumnName) {
+                      yield databaseExecuteCommand(
+                        ALTER_TABLE +
+                          escapeId(tableName) +
+                          'DROP' +
+                          escapeId(unaccountedColumnName),
+                      );
+                      collDel(currentColumnNames, unaccountedColumnName);
+                    }
+                  }),
               )
             : []),
         ]);
@@ -790,19 +793,18 @@
                         '=$1',
                       [rowId],
                     );
-                  } else if (!arrayIsEmpty(tableColumnNames)) {
+                  } else if (!arrayIsEmpty(settingColumnNames)) {
                     yield upsert(
                       databaseExecuteCommand,
                       tableName,
                       rowIdColumnName,
                       objIds(row),
-                      [
-                        rowId,
-                        ...(encode
+                      {
+                        [rowId]: encode
                           ? arrayMap(objValues(row), encode)
-                          : objValues(row)),
-                      ],
-                      orReplace,
+                          : objValues(row),
+                      },
+                      currentColumnNames,
                     );
                   }
                 }),
@@ -810,24 +812,20 @@
             );
           }
         } else {
-          if (!arrayIsEmpty(tableColumnNames)) {
+          if (!arrayIsEmpty(settingColumnNames)) {
             const changingColumnNames = arrayFilter(
               collValues(mapGet(schemaMap, tableName)),
-              (columnName) => columnName != rowIdColumnName,
+              (changingColumnName) => changingColumnName != rowIdColumnName,
             );
-            const params = [];
+            const rows = {};
             const deleteRowIds = [];
             objToArray(content != null ? content : {}, (row, rowId) => {
-              arrayPush(
-                params,
-                rowId,
-                ...arrayMap(changingColumnNames, (cellId) =>
-                  encode
-                    ? encode(row == null ? void 0 : row[cellId])
-                    : row == null
-                      ? void 0
-                      : row[cellId],
-                ),
+              rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+                encode
+                  ? encode(row == null ? void 0 : row[cellId])
+                  : row == null
+                    ? void 0
+                    : row[cellId],
               );
               arrayPush(deleteRowIds, rowId);
             });
@@ -836,8 +834,7 @@
               tableName,
               rowIdColumnName,
               changingColumnNames,
-              params,
-              orReplace,
+              rows,
             );
             yield databaseExecuteCommand(
               DELETE_FROM +
@@ -868,63 +865,46 @@
       });
     return [refreshSchema, loadTable, saveTable, transaction];
   };
-  const upsert = (
+  const defaultUpsert = (
     executeCommand,
     tableName,
     rowIdColumnName,
     changingColumnNames,
-    params,
-    orReplace = 0,
+    rows,
   ) =>
     __async$4(void 0, null, function* () {
-      return yield executeCommand(
-        'INSERT ' +
-          (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-          'INTO' +
+      const offset = [1];
+      yield executeCommand(
+        'INSERT INTO' +
           escapeId(tableName) +
           '(' +
+          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+          ')VALUES' +
+          arrayJoin(
+            objToArray(
+              rows,
+              (row) =>
+                '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            ),
+            COMMA,
+          ) +
+          'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
+          ')DO UPDATE SET' +
           arrayJoin(
             arrayMap(
               changingColumnNames,
-              (columnName) => COMMA + escapeId(columnName),
+              (columnName) =>
+                escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
-          ) +
-          ')VALUES' +
-          getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
-          (orReplace
-            ? EMPTY_STRING
-            : 'ON CONFLICT(' +
-              escapeId(rowIdColumnName) +
-              ')DO UPDATE SET' +
-              arrayJoin(
-                arrayMap(
-                  changingColumnNames,
-                  (columnName) =>
-                    escapeId(columnName) + '=excluded.' + escapeId(columnName),
-                ),
-                COMMA,
-              )),
-        arrayMap(params, (param) => (param != null ? param : null)),
+            COMMA,
+          ),
+        objToArray(rows, (row, id) => [
+          id,
+          ...arrayMap(row, (value) => (value != null ? value : null)),
+        ]).flat(),
       );
     });
-  const getUpsertPlaceholders = (array, columnCount) =>
-    arrayJoin(
-      arrayNew(
-        size(array) / columnCount,
-        (row) =>
-          '(' +
-          arrayJoin(
-            arrayNew(
-              columnCount,
-              (column) => '$' + (row * columnCount + column + 1),
-            ),
-            COMMA,
-          ) +
-          ')',
-      ),
-      COMMA,
-    );
 
   var __async$3 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -963,7 +943,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -972,7 +952,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
       );
     const getPersisted = () =>
       __async$3(void 0, null, function* () {
@@ -1075,7 +1055,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
     encode,
     decode,
   ) => {
@@ -1086,7 +1066,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
         encode,
         decode,
       );
@@ -1441,7 +1421,7 @@
       thing,
       getThing,
       'text',
-      0,
+      void 0,
       (cellOrValue) => jsonString(cellOrValue),
       (field) => jsonParse(field),
     );