tinybase 5.3.2 → 5.3.3

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

@@ -31,8 +31,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);
@@ -58,9 +56,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,
     );
 
@@ -462,7 +462,7 @@
     querySchema,
     onIgnoredError,
     columnType,
-    orReplace,
+    upsert = defaultUpsert,
     encode,
     decode,
   ) => {
@@ -503,26 +503,26 @@
       deleteEmptyTable,
       partial = false,
     ) => {
-      const tableCellOrValueIds = setNew();
+      const settingColumnNameSet = setNew();
       objToArray(content ?? {}, (contentRow) =>
         arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
-          setAdd(tableCellOrValueIds, cellOrValueId),
+          setAdd(settingColumnNameSet, cellOrValueId),
         ),
       );
-      const tableColumnNames = collValues(tableCellOrValueIds);
+      const settingColumnNames = collValues(settingColumnNameSet);
       if (
         !partial &&
         deleteEmptyTable &&
-        arrayIsEmpty(tableColumnNames) &&
+        arrayIsEmpty(settingColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
         await 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)) {
           await databaseExecuteCommand(
             'CREATE ' +
@@ -530,27 +530,28 @@
               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 {
           await promiseAll(
             arrayMap(
-              [rowIdColumnName, ...tableColumnNames],
-              async (columnName, index) => {
-                if (!collDel(currentColumnNames, columnName)) {
+              [rowIdColumnName, ...settingColumnNames],
+              async (settingColumnName, index) => {
+                if (!collDel(unaccountedColumnNames, settingColumnName)) {
                   await databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'ADD' +
-                      escapeId(columnName) +
+                      escapeId(settingColumnName) +
                       columnType,
                   );
                   if (index == 0) {
@@ -560,7 +561,7 @@
                         `(${escapeId(rowIdColumnName)})`,
                     );
                   }
-                  setAdd(tableSchemaColumns, columnName);
+                  setAdd(currentColumnNames, settingColumnName);
                 }
               },
             ),
@@ -569,17 +570,20 @@
       }
       await promiseAll([
         ...(!partial && deleteEmptyColumns
-          ? arrayMap(collValues(currentColumnNames), async (columnName) => {
-              if (columnName != rowIdColumnName) {
-                await databaseExecuteCommand(
-                  ALTER_TABLE +
-                    escapeId(tableName) +
-                    'DROP' +
-                    escapeId(columnName),
-                );
-                collDel(tableSchemaColumns, columnName);
-              }
-            })
+          ? arrayMap(
+              collValues(unaccountedColumnNames),
+              async (unaccountedColumnName) => {
+                if (unaccountedColumnName != rowIdColumnName) {
+                  await databaseExecuteCommand(
+                    ALTER_TABLE +
+                      escapeId(tableName) +
+                      'DROP' +
+                      escapeId(unaccountedColumnName),
+                  );
+                  collDel(currentColumnNames, unaccountedColumnName);
+                }
+              },
+            )
           : []),
       ]);
       if (partial) {
@@ -599,39 +603,34 @@
                     '=$1',
                   [rowId],
                 );
-              } else if (!arrayIsEmpty(tableColumnNames)) {
+              } else if (!arrayIsEmpty(settingColumnNames)) {
                 await upsert(
                   databaseExecuteCommand,
                   tableName,
                   rowIdColumnName,
                   objIds(row),
-                  [
-                    rowId,
-                    ...(encode
+                  {
+                    [rowId]: encode
                       ? arrayMap(objValues(row), encode)
-                      : objValues(row)),
-                  ],
-                  orReplace,
+                      : objValues(row),
+                  },
+                  currentColumnNames,
                 );
               }
             }),
           );
         }
       } 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 ?? {}, (row, rowId) => {
-            arrayPush(
-              params,
-              rowId,
-              ...arrayMap(changingColumnNames, (cellId) =>
-                encode ? encode(row?.[cellId]) : row?.[cellId],
-              ),
+            rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
             );
             arrayPush(deleteRowIds, rowId);
           });
@@ -640,8 +639,7 @@
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            params,
-            orReplace,
+            rows,
           );
           await databaseExecuteCommand(
             DELETE_FROM +
@@ -671,61 +669,45 @@
     };
     return [refreshSchema, loadTable, saveTable, transaction];
   };
-  const upsert = async (
+  const defaultUpsert = async (
     executeCommand,
     tableName,
     rowIdColumnName,
     changingColumnNames,
-    params,
-    orReplace = 0,
-  ) =>
+    rows,
+  ) => {
+    const offset = [1];
     await executeCommand(
-      'INSERT ' +
-        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-        'INTO' +
+      '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),
-    );
-  const getUpsertPlaceholders = (array, columnCount) =>
-    arrayJoin(
-      arrayNew(
-        size(array) / columnCount,
-        (row) =>
-          '(' +
-          arrayJoin(
-            arrayNew(
-              columnCount,
-              (column) => '$' + (row * columnCount + column + 1),
-            ),
-            COMMA,
-          ) +
-          ')',
-      ),
-      COMMA,
+          COMMA,
+        ),
+      objToArray(rows, (row, id) => [
+        id,
+        ...arrayMap(row, (value) => value ?? null),
+      ]).flat(),
     );
+  };
 
   const createJsonPersister = (
     store,
@@ -741,7 +723,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -750,7 +732,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
       );
     const getPersisted = async () =>
       await transaction(async () => {
@@ -813,7 +795,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
     encode,
     decode,
   ) => {
@@ -824,7 +806,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
         encode,
         decode,
       );
@@ -1114,7 +1096,7 @@
       thing,
       getThing,
       'text',
-      0,
+      void 0,
       (cellOrValue) => jsonString(cellOrValue),
       (field) => jsonParse(field),
     );

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

@@ -31,8 +31,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);
@@ -58,9 +56,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,
     );
 
@@ -462,7 +462,7 @@
     querySchema,
     onIgnoredError,
     columnType,
-    orReplace,
+    upsert = defaultUpsert,
     encode,
     decode,
   ) => {
@@ -503,26 +503,26 @@
       deleteEmptyTable,
       partial = false,
     ) => {
-      const tableCellOrValueIds = setNew();
+      const settingColumnNameSet = setNew();
       objToArray(content ?? {}, (contentRow) =>
         arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
-          setAdd(tableCellOrValueIds, cellOrValueId),
+          setAdd(settingColumnNameSet, cellOrValueId),
         ),
       );
-      const tableColumnNames = collValues(tableCellOrValueIds);
+      const settingColumnNames = collValues(settingColumnNameSet);
       if (
         !partial &&
         deleteEmptyTable &&
-        arrayIsEmpty(tableColumnNames) &&
+        arrayIsEmpty(settingColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
         await 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)) {
           await databaseExecuteCommand(
             'CREATE ' +
@@ -530,27 +530,28 @@
               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 {
           await promiseAll(
             arrayMap(
-              [rowIdColumnName, ...tableColumnNames],
-              async (columnName, index) => {
-                if (!collDel(currentColumnNames, columnName)) {
+              [rowIdColumnName, ...settingColumnNames],
+              async (settingColumnName, index) => {
+                if (!collDel(unaccountedColumnNames, settingColumnName)) {
                   await databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'ADD' +
-                      escapeId(columnName) +
+                      escapeId(settingColumnName) +
                       columnType,
                   );
                   if (index == 0) {
@@ -560,7 +561,7 @@
                         `(${escapeId(rowIdColumnName)})`,
                     );
                   }
-                  setAdd(tableSchemaColumns, columnName);
+                  setAdd(currentColumnNames, settingColumnName);
                 }
               },
             ),
@@ -569,17 +570,20 @@
       }
       await promiseAll([
         ...(!partial && deleteEmptyColumns
-          ? arrayMap(collValues(currentColumnNames), async (columnName) => {
-              if (columnName != rowIdColumnName) {
-                await databaseExecuteCommand(
-                  ALTER_TABLE +
-                    escapeId(tableName) +
-                    'DROP' +
-                    escapeId(columnName),
-                );
-                collDel(tableSchemaColumns, columnName);
-              }
-            })
+          ? arrayMap(
+              collValues(unaccountedColumnNames),
+              async (unaccountedColumnName) => {
+                if (unaccountedColumnName != rowIdColumnName) {
+                  await databaseExecuteCommand(
+                    ALTER_TABLE +
+                      escapeId(tableName) +
+                      'DROP' +
+                      escapeId(unaccountedColumnName),
+                  );
+                  collDel(currentColumnNames, unaccountedColumnName);
+                }
+              },
+            )
           : []),
       ]);
       if (partial) {
@@ -599,39 +603,34 @@
                     '=$1',
                   [rowId],
                 );
-              } else if (!arrayIsEmpty(tableColumnNames)) {
+              } else if (!arrayIsEmpty(settingColumnNames)) {
                 await upsert(
                   databaseExecuteCommand,
                   tableName,
                   rowIdColumnName,
                   objIds(row),
-                  [
-                    rowId,
-                    ...(encode
+                  {
+                    [rowId]: encode
                       ? arrayMap(objValues(row), encode)
-                      : objValues(row)),
-                  ],
-                  orReplace,
+                      : objValues(row),
+                  },
+                  currentColumnNames,
                 );
               }
             }),
           );
         }
       } 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 ?? {}, (row, rowId) => {
-            arrayPush(
-              params,
-              rowId,
-              ...arrayMap(changingColumnNames, (cellId) =>
-                encode ? encode(row?.[cellId]) : row?.[cellId],
-              ),
+            rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
             );
             arrayPush(deleteRowIds, rowId);
           });
@@ -640,8 +639,7 @@
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            params,
-            orReplace,
+            rows,
           );
           await databaseExecuteCommand(
             DELETE_FROM +
@@ -671,61 +669,45 @@
     };
     return [refreshSchema, loadTable, saveTable, transaction];
   };
-  const upsert = async (
+  const defaultUpsert = async (
     executeCommand,
     tableName,
     rowIdColumnName,
     changingColumnNames,
-    params,
-    orReplace = 0,
-  ) =>
+    rows,
+  ) => {
+    const offset = [1];
     await executeCommand(
-      'INSERT ' +
-        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
-        'INTO' +
+      '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),
-    );
-  const getUpsertPlaceholders = (array, columnCount) =>
-    arrayJoin(
-      arrayNew(
-        size(array) / columnCount,
-        (row) =>
-          '(' +
-          arrayJoin(
-            arrayNew(
-              columnCount,
-              (column) => '$' + (row * columnCount + column + 1),
-            ),
-            COMMA,
-          ) +
-          ')',
-      ),
-      COMMA,
+          COMMA,
+        ),
+      objToArray(rows, (row, id) => [
+        id,
+        ...arrayMap(row, (value) => value ?? null),
+      ]).flat(),
     );
+  };
 
   const createJsonPersister = (
     store,
@@ -741,7 +723,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -750,7 +732,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
       );
     const getPersisted = async () =>
       await transaction(async () => {
@@ -813,7 +795,7 @@
     thing,
     getThing,
     columnType,
-    orReplace,
+    upsert,
     encode,
     decode,
   ) => {
@@ -824,7 +806,7 @@
         querySchema,
         onIgnoredError,
         columnType,
-        orReplace,
+        upsert,
         encode,
         decode,
       );
@@ -1114,7 +1096,7 @@
       thing,
       getThing,
       'text',
-      0,
+      void 0,
       (cellOrValue) => jsonString(cellOrValue),
       (field) => jsonParse(field),
     );