@anfenn/dync 1.0.19 → 1.0.21

package/dist/expoSqlite.cjs

@@ -51,6 +51,7 @@ var ExpoSQLiteDriver = class {
     this.openPromise = (async () => {
       if (!this.db) {
         this.db = await SQLite.openDatabaseAsync(this.name);
+        await this.db.execAsync("PRAGMA case_sensitive_like = ON");
         this.opened = true;
       }
     })();

package/dist/expoSqlite.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/expoSqlite.ts","../src/storage/sqlite/drivers/ExpoSQLiteDriver.native.ts"],"sourcesContent":["export { ExpoSQLiteDriver } from './storage/sqlite/drivers/ExpoSQLiteDriver.native';\nexport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from './storage/sqlite/types';\n","import * as SQLite from 'expo-sqlite';\n\nimport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from '../types';\n\nexport class ExpoSQLiteDriver implements SQLiteDatabaseDriver {\n    readonly type = 'ExpoSQLiteDriver';\n    private db: SQLite.SQLiteDatabase | null = null;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(name: string) {\n        this.name = name;\n    }\n\n    async open(): Promise<void> {\n        if (this.opened) return;\n        if (this.openPromise) return this.openPromise;\n\n        this.openPromise = (async () => {\n            if (!this.db) {\n                this.db = await SQLite.openDatabaseAsync(this.name);\n                this.opened = true;\n            }\n        })();\n\n        try {\n            await this.openPromise;\n        } finally {\n            this.openPromise = undefined;\n        }\n    }\n\n    async close(): Promise<void> {\n        const db = this.db;\n        this.db = null;\n        this.opened = false;\n        this.openPromise = undefined;\n        if (db?.closeAsync) {\n            await db.closeAsync();\n        }\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.run(statement, []);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const db = this.db!;\n        const result = await db.runAsync(statement, values);\n        return {\n            changes: result.changes ?? 0,\n            lastId: (result as any).lastInsertRowId ?? (result as any).lastInsertId ?? undefined,\n        };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const db = this.db!;\n        const rows = await db.getAllAsync(statement, values);\n        const first = rows[0];\n        const columns = first ? Object.keys(first) : [];\n        const valuesMatrix = rows.map((row) => columns.map((col) => (row as any)[col]));\n        return { columns, values: valuesMatrix };\n    }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,aAAwB;AAIjB,IAAM,mBAAN,MAAuD;AAAA,EACjD,OAAO;AAAA,EACR,KAAmC;AAAA,EACnC;AAAA,EACA,SAAS;AAAA,EACR;AAAA,EAET,YAAY,MAAc;AACtB,SAAK,OAAO;AAAA,EAChB;AAAA,EAEA,MAAM,OAAsB;AACxB,QAAI,KAAK,OAAQ;AACjB,QAAI,KAAK,YAAa,QAAO,KAAK;AAElC,SAAK,eAAe,YAAY;AAC5B,UAAI,CAAC,KAAK,IAAI;AACV,aAAK,KAAK,MAAa,yBAAkB,KAAK,IAAI;AAClD,aAAK,SAAS;AAAA,MAClB;AAAA,IACJ,GAAG;AAEH,QAAI;AACA,YAAM,KAAK;AAAA,IACf,UAAE;AACE,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAuB;AACzB,UAAM,KAAK,KAAK;AAChB,SAAK,KAAK;AACV,SAAK,SAAS;AACd,SAAK,cAAc;AACnB,QAAI,IAAI,YAAY;AAChB,YAAM,GAAG,WAAW;AAAA,IACxB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,WAAkC;AAC5C,UAAM,KAAK,IAAI,WAAW,CAAC,CAAC;AAAA,EAChC;AAAA,EAEA,MAAM,IAAI,WAAmB,SAAgB,CAAC,GAA6B;AACvE,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,SAAS,MAAM,GAAG,SAAS,WAAW,MAAM;AAClD,WAAO;AAAA,MACH,SAAS,OAAO,WAAW;AAAA,MAC3B,QAAS,OAAe,mBAAoB,OAAe,gBAAgB;AAAA,IAC/E;AAAA,EACJ;AAAA,EAEA,MAAM,MAAM,WAAmB,SAAgB,CAAC,GAA+B;AAC3E,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,OAAO,MAAM,GAAG,YAAY,WAAW,MAAM;AACnD,UAAM,QAAQ,KAAK,CAAC;AACpB,UAAM,UAAU,QAAQ,OAAO,KAAK,KAAK,IAAI,CAAC;AAC9C,UAAM,eAAe,KAAK,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,QAAS,IAAY,GAAG,CAAC,CAAC;AAC9E,WAAO,EAAE,SAAS,QAAQ,aAAa;AAAA,EAC3C;AACJ;","names":[]}
+{"version":3,"sources":["../src/expoSqlite.ts","../src/storage/sqlite/drivers/ExpoSQLiteDriver.native.ts"],"sourcesContent":["export { ExpoSQLiteDriver } from './storage/sqlite/drivers/ExpoSQLiteDriver.native';\nexport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from './storage/sqlite/types';\n","import * as SQLite from 'expo-sqlite';\n\nimport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from '../types';\n\nexport class ExpoSQLiteDriver implements SQLiteDatabaseDriver {\n    readonly type = 'ExpoSQLiteDriver';\n    private db: SQLite.SQLiteDatabase | null = null;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(name: string) {\n        this.name = name;\n    }\n\n    async open(): Promise<void> {\n        if (this.opened) return;\n        if (this.openPromise) return this.openPromise;\n\n        this.openPromise = (async () => {\n            if (!this.db) {\n                this.db = await SQLite.openDatabaseAsync(this.name);\n                // Case-sensitive LIKE to match Dexie's startsWith() behavior\n                await this.db.execAsync('PRAGMA case_sensitive_like = ON');\n                this.opened = true;\n            }\n        })();\n\n        try {\n            await this.openPromise;\n        } finally {\n            this.openPromise = undefined;\n        }\n    }\n\n    async close(): Promise<void> {\n        const db = this.db;\n        this.db = null;\n        this.opened = false;\n        this.openPromise = undefined;\n        if (db?.closeAsync) {\n            await db.closeAsync();\n        }\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.run(statement, []);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const db = this.db!;\n        const result = await db.runAsync(statement, values);\n        return {\n            changes: result.changes ?? 0,\n            lastId: (result as any).lastInsertRowId ?? (result as any).lastInsertId ?? undefined,\n        };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const db = this.db!;\n        const rows = await db.getAllAsync(statement, values);\n        const first = rows[0];\n        const columns = first ? Object.keys(first) : [];\n        const valuesMatrix = rows.map((row) => columns.map((col) => (row as any)[col]));\n        return { columns, values: valuesMatrix };\n    }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,aAAwB;AAIjB,IAAM,mBAAN,MAAuD;AAAA,EACjD,OAAO;AAAA,EACR,KAAmC;AAAA,EACnC;AAAA,EACA,SAAS;AAAA,EACR;AAAA,EAET,YAAY,MAAc;AACtB,SAAK,OAAO;AAAA,EAChB;AAAA,EAEA,MAAM,OAAsB;AACxB,QAAI,KAAK,OAAQ;AACjB,QAAI,KAAK,YAAa,QAAO,KAAK;AAElC,SAAK,eAAe,YAAY;AAC5B,UAAI,CAAC,KAAK,IAAI;AACV,aAAK,KAAK,MAAa,yBAAkB,KAAK,IAAI;AAElD,cAAM,KAAK,GAAG,UAAU,iCAAiC;AACzD,aAAK,SAAS;AAAA,MAClB;AAAA,IACJ,GAAG;AAEH,QAAI;AACA,YAAM,KAAK;AAAA,IACf,UAAE;AACE,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAuB;AACzB,UAAM,KAAK,KAAK;AAChB,SAAK,KAAK;AACV,SAAK,SAAS;AACd,SAAK,cAAc;AACnB,QAAI,IAAI,YAAY;AAChB,YAAM,GAAG,WAAW;AAAA,IACxB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,WAAkC;AAC5C,UAAM,KAAK,IAAI,WAAW,CAAC,CAAC;AAAA,EAChC;AAAA,EAEA,MAAM,IAAI,WAAmB,SAAgB,CAAC,GAA6B;AACvE,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,SAAS,MAAM,GAAG,SAAS,WAAW,MAAM;AAClD,WAAO;AAAA,MACH,SAAS,OAAO,WAAW;AAAA,MAC3B,QAAS,OAAe,mBAAoB,OAAe,gBAAgB;AAAA,IAC/E;AAAA,EACJ;AAAA,EAEA,MAAM,MAAM,WAAmB,SAAgB,CAAC,GAA+B;AAC3E,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,OAAO,MAAM,GAAG,YAAY,WAAW,MAAM;AACnD,UAAM,QAAQ,KAAK,CAAC;AACpB,UAAM,UAAU,QAAQ,OAAO,KAAK,KAAK,IAAI,CAAC;AAC9C,UAAM,eAAe,KAAK,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,QAAS,IAAY,GAAG,CAAC,CAAC;AAC9E,WAAO,EAAE,SAAS,QAAQ,aAAa;AAAA,EAC3C;AACJ;","names":[]}

package/dist/expoSqlite.js

@@ -15,6 +15,7 @@ var ExpoSQLiteDriver = class {
     this.openPromise = (async () => {
       if (!this.db) {
         this.db = await SQLite.openDatabaseAsync(this.name);
+        await this.db.execAsync("PRAGMA case_sensitive_like = ON");
         this.opened = true;
       }
     })();

package/dist/expoSqlite.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/storage/sqlite/drivers/ExpoSQLiteDriver.native.ts"],"sourcesContent":["import * as SQLite from 'expo-sqlite';\n\nimport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from '../types';\n\nexport class ExpoSQLiteDriver implements SQLiteDatabaseDriver {\n    readonly type = 'ExpoSQLiteDriver';\n    private db: SQLite.SQLiteDatabase | null = null;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(name: string) {\n        this.name = name;\n    }\n\n    async open(): Promise<void> {\n        if (this.opened) return;\n        if (this.openPromise) return this.openPromise;\n\n        this.openPromise = (async () => {\n            if (!this.db) {\n                this.db = await SQLite.openDatabaseAsync(this.name);\n                this.opened = true;\n            }\n        })();\n\n        try {\n            await this.openPromise;\n        } finally {\n            this.openPromise = undefined;\n        }\n    }\n\n    async close(): Promise<void> {\n        const db = this.db;\n        this.db = null;\n        this.opened = false;\n        this.openPromise = undefined;\n        if (db?.closeAsync) {\n            await db.closeAsync();\n        }\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.run(statement, []);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const db = this.db!;\n        const result = await db.runAsync(statement, values);\n        return {\n            changes: result.changes ?? 0,\n            lastId: (result as any).lastInsertRowId ?? (result as any).lastInsertId ?? undefined,\n        };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const db = this.db!;\n        const rows = await db.getAllAsync(statement, values);\n        const first = rows[0];\n        const columns = first ? Object.keys(first) : [];\n        const valuesMatrix = rows.map((row) => columns.map((col) => (row as any)[col]));\n        return { columns, values: valuesMatrix };\n    }\n}\n"],"mappings":";AAAA,YAAY,YAAY;AAIjB,IAAM,mBAAN,MAAuD;AAAA,EACjD,OAAO;AAAA,EACR,KAAmC;AAAA,EACnC;AAAA,EACA,SAAS;AAAA,EACR;AAAA,EAET,YAAY,MAAc;AACtB,SAAK,OAAO;AAAA,EAChB;AAAA,EAEA,MAAM,OAAsB;AACxB,QAAI,KAAK,OAAQ;AACjB,QAAI,KAAK,YAAa,QAAO,KAAK;AAElC,SAAK,eAAe,YAAY;AAC5B,UAAI,CAAC,KAAK,IAAI;AACV,aAAK,KAAK,MAAa,yBAAkB,KAAK,IAAI;AAClD,aAAK,SAAS;AAAA,MAClB;AAAA,IACJ,GAAG;AAEH,QAAI;AACA,YAAM,KAAK;AAAA,IACf,UAAE;AACE,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAuB;AACzB,UAAM,KAAK,KAAK;AAChB,SAAK,KAAK;AACV,SAAK,SAAS;AACd,SAAK,cAAc;AACnB,QAAI,IAAI,YAAY;AAChB,YAAM,GAAG,WAAW;AAAA,IACxB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,WAAkC;AAC5C,UAAM,KAAK,IAAI,WAAW,CAAC,CAAC;AAAA,EAChC;AAAA,EAEA,MAAM,IAAI,WAAmB,SAAgB,CAAC,GAA6B;AACvE,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,SAAS,MAAM,GAAG,SAAS,WAAW,MAAM;AAClD,WAAO;AAAA,MACH,SAAS,OAAO,WAAW;AAAA,MAC3B,QAAS,OAAe,mBAAoB,OAAe,gBAAgB;AAAA,IAC/E;AAAA,EACJ;AAAA,EAEA,MAAM,MAAM,WAAmB,SAAgB,CAAC,GAA+B;AAC3E,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,OAAO,MAAM,GAAG,YAAY,WAAW,MAAM;AACnD,UAAM,QAAQ,KAAK,CAAC;AACpB,UAAM,UAAU,QAAQ,OAAO,KAAK,KAAK,IAAI,CAAC;AAC9C,UAAM,eAAe,KAAK,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,QAAS,IAAY,GAAG,CAAC,CAAC;AAC9E,WAAO,EAAE,SAAS,QAAQ,aAAa;AAAA,EAC3C;AACJ;","names":[]}
+{"version":3,"sources":["../src/storage/sqlite/drivers/ExpoSQLiteDriver.native.ts"],"sourcesContent":["import * as SQLite from 'expo-sqlite';\n\nimport type { SQLiteDatabaseDriver, SQLiteQueryResult, SQLiteRunResult } from '../types';\n\nexport class ExpoSQLiteDriver implements SQLiteDatabaseDriver {\n    readonly type = 'ExpoSQLiteDriver';\n    private db: SQLite.SQLiteDatabase | null = null;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(name: string) {\n        this.name = name;\n    }\n\n    async open(): Promise<void> {\n        if (this.opened) return;\n        if (this.openPromise) return this.openPromise;\n\n        this.openPromise = (async () => {\n            if (!this.db) {\n                this.db = await SQLite.openDatabaseAsync(this.name);\n                // Case-sensitive LIKE to match Dexie's startsWith() behavior\n                await this.db.execAsync('PRAGMA case_sensitive_like = ON');\n                this.opened = true;\n            }\n        })();\n\n        try {\n            await this.openPromise;\n        } finally {\n            this.openPromise = undefined;\n        }\n    }\n\n    async close(): Promise<void> {\n        const db = this.db;\n        this.db = null;\n        this.opened = false;\n        this.openPromise = undefined;\n        if (db?.closeAsync) {\n            await db.closeAsync();\n        }\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.run(statement, []);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const db = this.db!;\n        const result = await db.runAsync(statement, values);\n        return {\n            changes: result.changes ?? 0,\n            lastId: (result as any).lastInsertRowId ?? (result as any).lastInsertId ?? undefined,\n        };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const db = this.db!;\n        const rows = await db.getAllAsync(statement, values);\n        const first = rows[0];\n        const columns = first ? Object.keys(first) : [];\n        const valuesMatrix = rows.map((row) => columns.map((col) => (row as any)[col]));\n        return { columns, values: valuesMatrix };\n    }\n}\n"],"mappings":";AAAA,YAAY,YAAY;AAIjB,IAAM,mBAAN,MAAuD;AAAA,EACjD,OAAO;AAAA,EACR,KAAmC;AAAA,EACnC;AAAA,EACA,SAAS;AAAA,EACR;AAAA,EAET,YAAY,MAAc;AACtB,SAAK,OAAO;AAAA,EAChB;AAAA,EAEA,MAAM,OAAsB;AACxB,QAAI,KAAK,OAAQ;AACjB,QAAI,KAAK,YAAa,QAAO,KAAK;AAElC,SAAK,eAAe,YAAY;AAC5B,UAAI,CAAC,KAAK,IAAI;AACV,aAAK,KAAK,MAAa,yBAAkB,KAAK,IAAI;AAElD,cAAM,KAAK,GAAG,UAAU,iCAAiC;AACzD,aAAK,SAAS;AAAA,MAClB;AAAA,IACJ,GAAG;AAEH,QAAI;AACA,YAAM,KAAK;AAAA,IACf,UAAE;AACE,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAuB;AACzB,UAAM,KAAK,KAAK;AAChB,SAAK,KAAK;AACV,SAAK,SAAS;AACd,SAAK,cAAc;AACnB,QAAI,IAAI,YAAY;AAChB,YAAM,GAAG,WAAW;AAAA,IACxB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,WAAkC;AAC5C,UAAM,KAAK,IAAI,WAAW,CAAC,CAAC;AAAA,EAChC;AAAA,EAEA,MAAM,IAAI,WAAmB,SAAgB,CAAC,GAA6B;AACvE,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,SAAS,MAAM,GAAG,SAAS,WAAW,MAAM;AAClD,WAAO;AAAA,MACH,SAAS,OAAO,WAAW;AAAA,MAC3B,QAAS,OAAe,mBAAoB,OAAe,gBAAgB;AAAA,IAC/E;AAAA,EACJ;AAAA,EAEA,MAAM,MAAM,WAAmB,SAAgB,CAAC,GAA+B;AAC3E,UAAM,KAAK,KAAK;AAChB,UAAM,KAAK,KAAK;AAChB,UAAM,OAAO,MAAM,GAAG,YAAY,WAAW,MAAM;AACnD,UAAM,QAAQ,KAAK,CAAC;AACpB,UAAM,UAAU,QAAQ,OAAO,KAAK,KAAK,IAAI,CAAC;AAC9C,UAAM,eAAe,KAAK,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,QAAS,IAAY,GAAG,CAAC,CAAC;AAC9E,WAAO,EAAE,SAAS,QAAQ,aAAa;AAAA,EAC3C;AACJ;","names":[]}

package/dist/index.cjs

@@ -2339,7 +2339,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,
@@ -2347,19 +2347,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
   };
 };
@@ -3610,25 +3617,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
     });
   }
@@ -3654,7 +3662,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();
@@ -3721,7 +3729,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,
@@ -3740,7 +3748,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,
@@ -3757,8 +3765,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
       });
     }
@@ -3778,7 +3786,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();
@@ -3797,7 +3809,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 });
@@ -3808,7 +3820,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();