tinybase 10.0.0-beta.0 → 10.0.0-beta.2

package/persisters/persister-powersync/index.js

@@ -185,10 +185,74 @@ const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
     arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
 const replaceTableName = (condition, tableName) =>
   strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+const updateThenInsertUpsert = async (
+  executeCommand,
+  tableName,
+  rowIdColumnName,
+  changingColumnNames,
+  rows,
+  getPlaceholder,
+) => {
+  const updateOffset = [1];
+  const assignments = arrayJoin(
+    arrayMap(
+      changingColumnNames,
+      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
+    ),
+    COMMA,
+  );
+  const rowIdPlaceholder = getPlaceholder(updateOffset);
+  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
+    const rowParams = arrayMap(row, (value) => value ?? null);
+    if (
+      isEmpty(
+        await executeCommand(
+          UPDATE +
+            escapeId(tableName) +
+            ' SET' +
+            assignments +
+            ' ' +
+            WHERE +
+            escapeId(rowIdColumnName) +
+            '=' +
+            rowIdPlaceholder +
+            ' RETURNING' +
+            escapeId(rowIdColumnName),
+          [...rowParams, id],
+        ),
+      )
+    ) {
+      const offset = [1];
+      await executeCommand(
+        INSERT +
+          ' INTO' +
+          escapeId(tableName) +
+          '(' +
+          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+          ')VALUES(' +
+          getPlaceholders([id, ...row], getPlaceholder, offset) +
+          ')',
+        [id, ...rowParams],
+      );
+    }
+  }
+};
 
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
@@ -1045,7 +1109,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1201,9 +1265,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1213,8 +1275,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1273,8 +1338,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1282,9 +1351,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }
@@ -1779,60 +1846,8 @@ const createPowerSyncPersister = (
     // StoreOnly,
     powerSync,
     'getPowerSync',
-    powerSyncUpdateThenInsert,
-  );
-};
-const powerSyncUpdateThenInsert = async (
-  executeCommand,
-  tableName,
-  rowIdColumnName,
-  changingColumnNames,
-  rows,
-  getPlaceholder,
-) => {
-  const updateOffset = [1];
-  const assignments = arrayJoin(
-    arrayMap(
-      changingColumnNames,
-      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
-    ),
-    COMMA,
+    updateThenInsertUpsert,
   );
-  const rowIdPlaceholder = getPlaceholder(updateOffset);
-  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
-    const rowParams = arrayMap(row, (value) => value ?? null);
-    if (
-      isEmpty(
-        await executeCommand(
-          UPDATE +
-            escapeId(tableName) +
-            ' SET' +
-            assignments +
-            ' ' +
-            WHERE +
-            escapeId(rowIdColumnName) +
-            '=' +
-            rowIdPlaceholder +
-            ' RETURNING' +
-            escapeId(rowIdColumnName),
-          [...rowParams, id],
-        ),
-      )
-    ) {
-      const offset = [1];
-      await executeCommand(
-        INSERT +
-          ' INTO' +
-          escapeId(tableName) +
-          '(' +
-          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
-          ')VALUES(' +
-          getPlaceholders([id, ...row], getPlaceholder, offset) +
-          ')',
-        [id, ...rowParams],
-      );
-    }
-  }
 };
 
 export {createPowerSyncPersister};

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

@@ -185,10 +185,74 @@ const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
     arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
 const replaceTableName = (condition, tableName) =>
   strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+const updateThenInsertUpsert = async (
+  executeCommand,
+  tableName,
+  rowIdColumnName,
+  changingColumnNames,
+  rows,
+  getPlaceholder,
+) => {
+  const updateOffset = [1];
+  const assignments = arrayJoin(
+    arrayMap(
+      changingColumnNames,
+      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
+    ),
+    COMMA,
+  );
+  const rowIdPlaceholder = getPlaceholder(updateOffset);
+  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
+    const rowParams = arrayMap(row, (value) => value ?? null);
+    if (
+      isEmpty(
+        await executeCommand(
+          UPDATE +
+            escapeId(tableName) +
+            ' SET' +
+            assignments +
+            ' ' +
+            WHERE +
+            escapeId(rowIdColumnName) +
+            '=' +
+            rowIdPlaceholder +
+            ' RETURNING' +
+            escapeId(rowIdColumnName),
+          [...rowParams, id],
+        ),
+      )
+    ) {
+      const offset = [1];
+      await executeCommand(
+        INSERT +
+          ' INTO' +
+          escapeId(tableName) +
+          '(' +
+          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+          ')VALUES(' +
+          getPlaceholders([id, ...row], getPlaceholder, offset) +
+          ')',
+        [id, ...rowParams],
+      );
+    }
+  }
+};
 
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
@@ -1045,7 +1109,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1201,9 +1265,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1213,8 +1275,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1273,8 +1338,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1282,9 +1351,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }
@@ -1779,60 +1846,8 @@ const createPowerSyncPersister = (
     // StoreOnly,
     powerSync,
     'getPowerSync',
-    powerSyncUpdateThenInsert,
-  );
-};
-const powerSyncUpdateThenInsert = async (
-  executeCommand,
-  tableName,
-  rowIdColumnName,
-  changingColumnNames,
-  rows,
-  getPlaceholder,
-) => {
-  const updateOffset = [1];
-  const assignments = arrayJoin(
-    arrayMap(
-      changingColumnNames,
-      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
-    ),
-    COMMA,
+    updateThenInsertUpsert,
   );
-  const rowIdPlaceholder = getPlaceholder(updateOffset);
-  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
-    const rowParams = arrayMap(row, (value) => value ?? null);
-    if (
-      isEmpty(
-        await executeCommand(
-          UPDATE +
-            escapeId(tableName) +
-            ' SET' +
-            assignments +
-            ' ' +
-            WHERE +
-            escapeId(rowIdColumnName) +
-            '=' +
-            rowIdPlaceholder +
-            ' RETURNING' +
-            escapeId(rowIdColumnName),
-          [...rowParams, id],
-        ),
-      )
-    ) {
-      const offset = [1];
-      await executeCommand(
-        INSERT +
-          ' INTO' +
-          escapeId(tableName) +
-          '(' +
-          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
-          ')VALUES(' +
-          getPlaceholders([id, ...row], getPlaceholder, offset) +
-          ')',
-        [id, ...rowParams],
-      );
-    }
-  }
 };
 
 export {createPowerSyncPersister};

package/persisters/persister-react-native-sqlite/index.js

@@ -105,50 +105,6 @@ const arrayClear = (array, to = size(array)) => 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 INSERT = 'INSERT';
-const DELETE = 'DELETE';
-const UPDATE = 'UPDATE';
-const ALTER_TABLE = 'ALTER ' + TABLE;
-const FROM = 'FROM';
-const DELETE_FROM = DELETE + ' ' + FROM;
-const SELECT_STAR_FROM = SELECT + '*' + FROM;
-const PRAGMA = 'pragma_';
-const DATA_VERSION = 'data_version';
-const SCHEMA_VERSION = 'schema_version';
-const PRAGMA_TABLE = 'pragma_table_';
-const CREATE = 'CREATE ';
-const CREATE_TABLE = CREATE + TABLE;
-const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
-const getWrappedCommand = (executeCommand, onSqlCommand) =>
-  onSqlCommand
-    ? async (sql, params) => {
-        onSqlCommand(sql, params);
-        return await executeCommand(sql, params);
-      }
-    : executeCommand;
-const escapeId = (str) =>
-  arrayJoin(
-    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
-    DOT,
-  );
-const escapeColumnNames = (...columnNames) =>
-  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const anonymousPlaceholder = () => '?';
-const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
-  arrayJoin(
-    arrayMap(array, () => getPlaceholder(offset)),
-    COMMA,
-  );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
-const replaceTableName = (condition, tableName) =>
-  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
-
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
@@ -198,6 +154,62 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const SELECT = 'SELECT';
+const WHERE = 'WHERE';
+const TABLE = 'TABLE';
+const INSERT = 'INSERT';
+const DELETE = 'DELETE';
+const UPDATE = 'UPDATE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const FROM = 'FROM';
+const DELETE_FROM = DELETE + ' ' + FROM;
+const SELECT_STAR_FROM = SELECT + '*' + FROM;
+const PRAGMA = 'pragma_';
+const DATA_VERSION = 'data_version';
+const SCHEMA_VERSION = 'schema_version';
+const PRAGMA_TABLE = 'pragma_table_';
+const CREATE = 'CREATE ';
+const CREATE_TABLE = CREATE + TABLE;
+const TABLE_NAME_PLACEHOLDER_REGEX = /\$tableName/g;
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
+      }
+    : executeCommand;
+const escapeId = (str) =>
+  arrayJoin(
+    arrayMap(strSplit(str, DOT), (part) => `"${strReplace(part, /"/g, '""')}"`),
+    DOT,
+  );
+const escapeColumnNames = (...columnNames) =>
+  arrayJoin(arrayMap(columnNames, escapeId), COMMA);
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
+  arrayJoin(
+    arrayMap(array, () => getPlaceholder(offset)),
+    COMMA,
+  );
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
+const replaceTableName = (condition, tableName) =>
+  strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+
 const map = Map;
 const mapNew = (entries) => new map(entries);
 const mapGet = (map2, key) => map2?.get(key);
@@ -1045,7 +1057,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1201,9 +1213,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1213,8 +1223,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1273,8 +1286,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1282,9 +1299,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }