@anfenn/dync 1.0.19 → 1.0.20

package/dist/{chunk-WZ7V4U6Z.js → chunk-I2KQD4DD.js}

@@ -2307,7 +2307,7 @@ var MemoryAdapter = class {
 var SQLITE_SCHEMA_VERSION_STATE_KEY = "sqlite_schema_version";
 var DEFAULT_STREAM_BATCH_SIZE = 200;
 var createDefaultState2 = () => ({
-  sqlConditions: [],
+  orGroups: [[]],
   jsPredicate: void 0,
   orderBy: void 0,
   reverse: false,
@@ -2315,19 +2315,26 @@ var createDefaultState2 = () => ({
   limit: void 0,
   distinct: false
 });
-var buildWhereClause = (conditions) => {
-  if (conditions.length === 0) {
+var buildWhereClause = (orGroups) => {
+  const nonEmptyGroups = orGroups.filter((group) => group.length > 0);
+  if (nonEmptyGroups.length === 0) {
     return { whereClause: "", parameters: [] };
   }
-  const clauses = [];
+  const groupClauses = [];
   const parameters = [];
-  for (const condition of conditions) {
-    const built = buildCondition(condition);
-    clauses.push(built.clause);
-    parameters.push(...built.parameters);
+  for (const group of nonEmptyGroups) {
+    const conditionClauses = [];
+    for (const condition of group) {
+      const built = buildCondition(condition);
+      conditionClauses.push(built.clause);
+      parameters.push(...built.parameters);
+    }
+    const groupClause = conditionClauses.length === 1 ? conditionClauses[0] : `(${conditionClauses.join(" AND ")})`;
+    groupClauses.push(groupClause);
   }
+  const whereContent = groupClauses.length === 1 ? groupClauses[0] : `(${groupClauses.join(" OR ")})`;
   return {
-    whereClause: `WHERE ${clauses.join(" AND ")}`,
+    whereClause: `WHERE ${whereContent}`,
     parameters
   };
 };
@@ -3578,25 +3585,26 @@ var SQLiteCollection2 = class _SQLiteCollection {
     this.state = {
       ...base,
       ...state,
-      sqlConditions: state?.sqlConditions ?? base.sqlConditions,
+      orGroups: state?.orGroups ?? base.orGroups,
       jsPredicate: state?.jsPredicate
     };
   }
   getState() {
-    return { ...this.state, sqlConditions: [...this.state.sqlConditions] };
+    return { ...this.state, orGroups: this.state.orGroups.map((g) => [...g]) };
   }
-  // Add a SQL-expressible condition to this collection
+  // Add a SQL-expressible condition to the current OR group
   addSqlCondition(condition) {
+    const newGroups = this.state.orGroups.map((g, i) => i === this.state.orGroups.length - 1 ? [...g, condition] : g);
     return new _SQLiteCollection(this.table, {
       ...this.state,
-      sqlConditions: [...this.state.sqlConditions, condition]
+      orGroups: newGroups
     });
   }
   replicate(overrides) {
     return new _SQLiteCollection(this.table, {
       ...this.state,
       ...overrides,
-      sqlConditions: overrides?.sqlConditions ?? this.state.sqlConditions,
+      orGroups: overrides?.orGroups ?? this.state.orGroups,
       jsPredicate: overrides?.jsPredicate !== void 0 ? overrides.jsPredicate : this.state.jsPredicate
     });
   }
@@ -3622,7 +3630,7 @@ var SQLiteCollection2 = class _SQLiteCollection {
    * and apply them after JS filtering.
    */
   async executeQuery(options = {}) {
-    const { whereClause, parameters } = buildWhereClause(this.state.sqlConditions);
+    const { whereClause, parameters } = buildWhereClause(this.state.orGroups);
     const ordering = options.orderByOverride ?? this.resolveOrdering();
     const cloneValues = options.clone !== false;
     const hasJsFilter = this.hasJsPredicate();
@@ -3689,7 +3697,7 @@ var SQLiteCollection2 = class _SQLiteCollection {
   }
   async keys() {
     if (!this.hasJsPredicate()) {
-      const { whereClause, parameters } = buildWhereClause(this.state.sqlConditions);
+      const { whereClause, parameters } = buildWhereClause(this.state.orGroups);
       const ordering = this.resolveOrdering();
       return this.table.queryKeysWithConditions({
         whereClause,
@@ -3708,7 +3716,7 @@ var SQLiteCollection2 = class _SQLiteCollection {
   }
   async uniqueKeys() {
     if (!this.hasJsPredicate()) {
-      const { whereClause, parameters } = buildWhereClause(this.state.sqlConditions);
+      const { whereClause, parameters } = buildWhereClause(this.state.orGroups);
       const ordering = this.resolveOrdering();
       return this.table.queryKeysWithConditions({
         whereClause,
@@ -3725,8 +3733,8 @@ var SQLiteCollection2 = class _SQLiteCollection {
   async count() {
     if (!this.hasJsPredicate()) {
       return this.table.countWithConditions({
-        whereClause: buildWhereClause(this.state.sqlConditions).whereClause,
-        parameters: buildWhereClause(this.state.sqlConditions).parameters,
+        whereClause: buildWhereClause(this.state.orGroups).whereClause,
+        parameters: buildWhereClause(this.state.orGroups).parameters,
         distinct: this.state.distinct
       });
     }
@@ -3746,7 +3754,11 @@ var SQLiteCollection2 = class _SQLiteCollection {
     return this.withJsPredicate((record) => predicate(cloneValue(record)));
   }
   or(index) {
-    return this.table.createWhereClause(index, this);
+    const newCollection = new _SQLiteCollection(this.table, {
+      ...this.state,
+      orGroups: [...this.state.orGroups, []]
+    });
+    return this.table.createWhereClause(index, newCollection);
   }
   clone(_props) {
     return this.replicate();
@@ -3765,7 +3777,7 @@ var SQLiteCollection2 = class _SQLiteCollection {
   }
   async delete() {
     if (!this.hasJsPredicate()) {
-      const { whereClause, parameters } = buildWhereClause(this.state.sqlConditions);
+      const { whereClause, parameters } = buildWhereClause(this.state.orGroups);
       return this.table.deleteWithConditions({ whereClause, parameters });
     }
     const entries = await this.executeQuery({ clone: false });
@@ -3776,7 +3788,7 @@ var SQLiteCollection2 = class _SQLiteCollection {
   }
   async modify(changes) {
     if (typeof changes !== "function" && !this.hasJsPredicate()) {
-      const { whereClause, parameters } = buildWhereClause(this.state.sqlConditions);
+      const { whereClause, parameters } = buildWhereClause(this.state.orGroups);
       return this.table.updateWithConditions({ whereClause, parameters, changes });
     }
     const entries = await this.executeQuery();
@@ -3806,4 +3818,4 @@ export {
   SqliteQueryContext,
   SQLiteAdapter2 as SQLiteAdapter
 };
-//# sourceMappingURL=chunk-WZ7V4U6Z.js.map
+//# sourceMappingURL=chunk-I2KQD4DD.js.map