tinybase 5.3.2 → 5.3.4

package/es6/persisters/persister-sqlite3/with-schemas/index.js

@@ -50,8 +50,6 @@ const errorNew = (message) => {
   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);
@@ -106,9 +104,11 @@ const getWrappedCommand = (executeCommand, onSqlCommand) =>
         })
     : 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,
   );
 
@@ -478,6 +478,8 @@ const createCustomPersister = (
               const content = yield getPersisted();
               if (isArray(content)) {
                 setContentOrChanges(content);
+              } else if (initialContent) {
+                setDefaultContent(initialContent);
               } else {
                 errorNew(`Content is not an array ${content}`);
               }
@@ -634,7 +636,7 @@ const getCommandFunctions = (
   querySchema,
   onIgnoredError,
   columnType,
-  orReplace,
+  upsert = defaultUpsert,
   encode,
   decode,
 ) => {
@@ -679,27 +681,27 @@ const getCommandFunctions = (
     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 ' +
@@ -707,28 +709,29 @@ const getCommandFunctions = (
               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) {
@@ -738,7 +741,7 @@ const getCommandFunctions = (
                           `(${escapeId(rowIdColumnName)})`,
                       );
                     }
-                    setAdd(tableSchemaColumns, columnName);
+                    setAdd(currentColumnNames, settingColumnName);
                   }
                 }),
             ),
@@ -747,18 +750,20 @@ const getCommandFunctions = (
       }
       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);
+                  }
+                }),
             )
           : []),
       ]);
@@ -780,19 +785,18 @@ const getCommandFunctions = (
                       '=$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,
                   );
                 }
               }),
@@ -800,24 +804,20 @@ const getCommandFunctions = (
           );
         }
       } 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);
           });
@@ -826,8 +826,7 @@ const getCommandFunctions = (
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            params,
-            orReplace,
+            rows,
           );
           yield databaseExecuteCommand(
             DELETE_FROM +
@@ -858,63 +857,46 @@ const getCommandFunctions = (
     });
   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) => {
@@ -953,7 +935,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -962,7 +944,7 @@ const createJsonPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
     );
   const getPersisted = () =>
     __async$3(void 0, null, function* () {
@@ -1065,7 +1047,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
   encode,
   decode,
 ) => {
@@ -1076,7 +1058,7 @@ const createTabularPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
       encode,
       decode,
     );
@@ -1344,7 +1326,7 @@ const createCustomSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  orReplace,
+  upsert,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -1419,7 +1401,7 @@ const createCustomSqlitePersister = (
     thing,
     getThing,
     EMPTY_STRING,
-    orReplace,
+    upsert,
     (cellOrValue) =>
       cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
     void 0,

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

@@ -369,6 +369,8 @@ const createCustomPersister = (
               const content = yield getPersisted();
               if (isArray(content)) {
                 setContentOrChanges(content);
+              } else if (initialContent) {
+                setDefaultContent(initialContent);
               } else {
                 errorNew(`Content is not an array ${content}`);
               }

package/es6/persisters/persister-yjs/with-schemas/index.js

@@ -369,6 +369,8 @@ const createCustomPersister = (
               const content = yield getPersisted();
               if (isArray(content)) {
                 setContentOrChanges(content);
+              } else if (initialContent) {
+                setDefaultContent(initialContent);
               } else {
                 errorNew(`Content is not an array ${content}`);
               }