tinybase 5.3.2 → 5.3.4

package/cjs/persisters/persister-powersync/with-schemas/index.cjs

@@ -25,8 +25,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);
@@ -36,6 +34,45 @@ const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
+const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
+const objEntries = object.entries;
+const isObject = (obj) =>
+  !isUndefined(obj) &&
+  ifNotUndefined(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isUndefined(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
+const objIds = object.keys;
+const objFreeze = object.freeze;
+const objNew = (entries = []) => object.fromEntries(entries);
+const objMerge = (...objs) => object.assign({}, ...objs);
+const objHas = (obj, id) => id in obj;
+const objDel = (obj, id) => {
+  delete obj[id];
+  return obj;
+};
+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 setNew = (entryOrEntries) =>
+  new Set(
+    isArray(entryOrEntries) || isUndefined(entryOrEntries)
+      ? entryOrEntries
+      : [entryOrEntries],
+  );
+const setAdd = (set, value) => set?.add(value);
+
 const SINGLE_ROW_ID = '_';
 const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
@@ -57,9 +94,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,
   );
 
@@ -71,37 +110,6 @@ const collClear = (coll) => coll.clear();
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
-const object = Object;
-const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
-const objEntries = object.entries;
-const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
-    getPrototypeOf(obj),
-    (objPrototype) =>
-      objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
-
-    /* istanbul ignore next */
-    () => true,
-  );
-const objIds = object.keys;
-const objFreeze = object.freeze;
-const objNew = (entries = []) => object.fromEntries(entries);
-const objMerge = (...objs) => object.assign({}, ...objs);
-const objHas = (obj, id) => id in obj;
-const objDel = (obj, id) => {
-  delete obj[id];
-  return obj;
-};
-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) =>
@@ -145,14 +153,6 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
-const setNew = (entryOrEntries) =>
-  new Set(
-    isArray(entryOrEntries) || isUndefined(entryOrEntries)
-      ? entryOrEntries
-      : [entryOrEntries],
-  );
-const setAdd = (set, value) => set?.add(value);
-
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
   const pool = [];
@@ -333,6 +333,8 @@ const createCustomPersister = (
           const content = await getPersisted();
           if (isArray(content)) {
             setContentOrChanges(content);
+          } else if (initialContent) {
+            setDefaultContent(initialContent);
           } else {
             errorNew(`Content is not an array ${content}`);
           }
@@ -455,7 +457,7 @@ const getCommandFunctions = (
   querySchema,
   onIgnoredError,
   columnType,
-  orReplace,
+  upsert = defaultUpsert,
   encode,
   decode,
 ) => {
@@ -496,26 +498,26 @@ const getCommandFunctions = (
     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 ' +
@@ -523,27 +525,28 @@ 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 {
         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) {
@@ -553,7 +556,7 @@ const getCommandFunctions = (
                       `(${escapeId(rowIdColumnName)})`,
                   );
                 }
-                setAdd(tableSchemaColumns, columnName);
+                setAdd(currentColumnNames, settingColumnName);
               }
             },
           ),
@@ -562,17 +565,20 @@ const getCommandFunctions = (
     }
     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) {
@@ -592,39 +598,34 @@ const getCommandFunctions = (
                   '=$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);
         });
@@ -633,8 +634,7 @@ const getCommandFunctions = (
           tableName,
           rowIdColumnName,
           changingColumnNames,
-          params,
-          orReplace,
+          rows,
         );
         await databaseExecuteCommand(
           DELETE_FROM +
@@ -664,61 +664,45 @@ const getCommandFunctions = (
   };
   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,
@@ -734,7 +718,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -743,7 +727,7 @@ const createJsonPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -806,7 +790,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
-  orReplace,
+  upsert,
   encode,
   decode,
 ) => {
@@ -817,7 +801,7 @@ const createTabularPersister = (
       querySchema,
       onIgnoredError,
       columnType,
-      orReplace,
+      upsert,
       encode,
       decode,
     );
@@ -1030,7 +1014,7 @@ const createCustomSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  orReplace,
+  upsert,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -1099,7 +1083,7 @@ const createCustomSqlitePersister = (
     thing,
     getThing,
     EMPTY_STRING,
-    orReplace,
+    upsert,
     (cellOrValue) =>
       cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
     void 0,
@@ -1112,9 +1096,9 @@ const createPowerSyncPersister = (
   configOrStoreTableName,
   onSqlCommand,
   onIgnoredError,
-  orReplace = 1,
-) =>
-  createCustomSqlitePersister(
+) => {
+  let tableListener;
+  return createCustomSqlitePersister(
     store,
     configOrStoreTableName,
     async (sql, params = []) =>
@@ -1129,12 +1113,18 @@ const createPowerSyncPersister = (
       });
       (async () => {
         for await (const update of onChange) {
-          arrayMap(update.changedTables, listener);
+          if (tableListener) {
+            arrayMap(update.changedTables, tableListener);
+          }
         }
       })();
+      tableListener = listener;
       return abortController;
     },
-    (abortController) => abortController.abort(),
+    (abortController) => {
+      tableListener = void 0;
+      abortController.abort();
+    },
     onSqlCommand,
     onIgnoredError,
     () => 0,
@@ -1142,7 +1132,80 @@ const createPowerSyncPersister = (
     // StoreOnly,
     powerSync,
     'getPowerSync',
-    orReplace,
+    viewUpsert,
   );
+};
+const viewUpsert = async (
+  executeCommand,
+  tableName,
+  rowIdColumnName,
+  changingColumnNames,
+  rows,
+  currentColumnNames,
+) => {
+  const offset = [1];
+  const changingColumnNamesSet = setNew(changingColumnNames);
+  const unchangingColumnNames = currentColumnNames
+    ? arrayFilter(
+        [...currentColumnNames],
+        (currentColumnName) =>
+          currentColumnName != rowIdColumnName &&
+          !collHas(changingColumnNamesSet, currentColumnName),
+      )
+    : [];
+  if (!arrayIsEmpty(unchangingColumnNames)) {
+    const ids = objIds(rows);
+    const unchangingData = objNew(
+      arrayMap(
+        await executeCommand(
+          'SELECT' +
+            escapeColumnNames(rowIdColumnName, ...unchangingColumnNames) +
+            'FROM' +
+            escapeId(tableName) +
+            'WHERE' +
+            escapeId(rowIdColumnName) +
+            'IN(' +
+            getPlaceholders(ids) +
+            ')',
+          ids,
+        ),
+        (unchangingRow) => [unchangingRow[rowIdColumnName], unchangingRow],
+      ),
+    );
+    arrayForEach(ids, (id) =>
+      arrayPush(
+        rows[id],
+        ...arrayMap(
+          unchangingColumnNames,
+          (unchangingColumnName) =>
+            unchangingData?.[id]?.[unchangingColumnName] ?? null,
+        ),
+      ),
+    );
+  }
+  await executeCommand(
+    'INSERT OR REPLACE INTO' +
+      escapeId(tableName) +
+      '(' +
+      escapeColumnNames(
+        rowIdColumnName,
+        ...changingColumnNames,
+        ...unchangingColumnNames,
+      ) +
+      ')VALUES' +
+      arrayJoin(
+        objToArray(
+          rows,
+          (row) =>
+            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+        ),
+        COMMA,
+      ),
+    objToArray(rows, (row, id) => [
+      id,
+      ...arrayMap(row, (value) => value ?? null),
+    ]).flat(),
+  );
+};
 
 exports.createPowerSyncPersister = createPowerSyncPersister;

package/cjs/persisters/persister-remote/index.cjs

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

package/cjs/persisters/persister-remote/with-schemas/index.cjs

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