@anfenn/dync 1.0.19 → 1.0.21

package/src/storage/sqlite/helpers.ts

@@ -4,7 +4,7 @@ export const SQLITE_SCHEMA_VERSION_STATE_KEY = 'sqlite_schema_version';
 export const DEFAULT_STREAM_BATCH_SIZE = 200;
 
 export const createDefaultState = <T>(): SQLiteCollectionState<T> => ({
-    sqlConditions: [],
+    orGroups: [[]],
     jsPredicate: undefined,
     orderBy: undefined,
     reverse: false,
@@ -18,22 +18,34 @@ export interface SQLiteBuiltQuery {
     parameters: unknown[];
 }
 
-export const buildWhereClause = (conditions: SQLiteCondition[]): SQLiteBuiltQuery => {
-    if (conditions.length === 0) {
+export const buildWhereClause = (orGroups: SQLiteCondition[][]): SQLiteBuiltQuery => {
+    // Filter out empty groups
+    const nonEmptyGroups = orGroups.filter((group) => group.length > 0);
+
+    if (nonEmptyGroups.length === 0) {
         return { whereClause: '', parameters: [] };
     }
 
-    const clauses: string[] = [];
+    const groupClauses: string[] = [];
     const parameters: unknown[] = [];
 
-    for (const condition of conditions) {
-        const built = buildCondition(condition);
-        clauses.push(built.clause);
-        parameters.push(...built.parameters);
+    for (const group of nonEmptyGroups) {
+        const conditionClauses: string[] = [];
+        for (const condition of group) {
+            const built = buildCondition(condition);
+            conditionClauses.push(built.clause);
+            parameters.push(...built.parameters);
+        }
+        // AND conditions within a group
+        const groupClause = conditionClauses.length === 1 ? conditionClauses[0]! : `(${conditionClauses.join(' AND ')})`;
+        groupClauses.push(groupClause);
     }
 
+    // OR between groups (wrap in parens if multiple groups)
+    const whereContent = groupClauses.length === 1 ? groupClauses[0]! : `(${groupClauses.join(' OR ')})`;
+
     return {
-        whereClause: `WHERE ${clauses.join(' AND ')}`,
+        whereClause: `WHERE ${whereContent}`,
         parameters,
     };
 };

package/src/storage/sqlite/types.ts

@@ -79,8 +79,11 @@ export type SQLiteCondition =
     | SQLiteConditionOr;
 
 export interface SQLiteCollectionState<T> {
-    /** SQL-expressible WHERE conditions (ANDed together) */
-    sqlConditions: SQLiteCondition[];
+    /**
+     * OR groups of SQL conditions. Each group's conditions are ANDed together,
+     * then groups are ORed: (A AND B) OR (C) OR (D AND E)
+     */
+    orGroups: SQLiteCondition[][];
     /** JavaScript predicate for conditions that can't be expressed in SQL (e.g., arbitrary filter functions) */
     jsPredicate?: (record: T, key: string, index: number) => boolean;
     orderBy?: { index: string | string[]; direction: 'asc' | 'desc' };

package/dist/chunk-SQB6E7V2.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/storage/sqlite/drivers/CapacitorSQLiteDriver.ts","../src/storage/sqlite/drivers/CapacitorFastSqlDriver.ts"],"sourcesContent":["import type { SQLiteConnection, SQLiteDBConnection } from '@capacitor-community/sqlite';\nimport type { SQLiteDatabaseDriver, SQLiteRunResult, SQLiteQueryResult } from '../types';\n\n// Lazily loaded module cache to avoid top-level imports that break web bundlers\nlet sqliteModuleCache: typeof import('@capacitor-community/sqlite') | null = null;\n\nasync function getSqliteModule(): Promise<typeof import('@capacitor-community/sqlite')> {\n    if (!sqliteModuleCache) {\n        sqliteModuleCache = await import('@capacitor-community/sqlite');\n    }\n    return sqliteModuleCache;\n}\n\nexport interface CapacitorSQLiteDriverOptions {\n    encrypted?: boolean;\n    getEncryptionKey?: () => string;\n    readonly?: boolean;\n    mode?: string;\n    version?: number;\n}\n\nexport class CapacitorSQLiteDriver implements SQLiteDatabaseDriver {\n    readonly type = 'CapacitorSQLiteDriver';\n    private connectionFactory?: SQLiteConnection;\n    private readonly config: CapacitorSQLiteDriverOptions;\n    private db?: SQLiteDBConnection;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(databaseName: string, config: CapacitorSQLiteDriverOptions = {}) {\n        this.name = databaseName;\n        this.config = config;\n    }\n\n    private async getConnectionFactory(): Promise<SQLiteConnection> {\n        if (!this.connectionFactory) {\n            const { CapacitorSQLite, SQLiteConnection } = await getSqliteModule();\n            this.connectionFactory = new SQLiteConnection(CapacitorSQLite);\n        }\n        return this.connectionFactory;\n    }\n\n    private async ensureDb(): Promise<SQLiteDBConnection> {\n        if (!this.db) {\n            const connectionFactory = await this.getConnectionFactory();\n            const readonly = this.config.readonly ?? false;\n\n            // Check if a connection already exists (e.g., after page reload)\n            const existsResult = await connectionFactory.isConnection(this.name, readonly);\n            if (existsResult.result) {\n                // Connection exists - retrieve it instead of creating a new one\n                this.db = await connectionFactory.retrieveConnection(this.name, readonly);\n            } else {\n                // Close any stale native connection (e.g., after page reload) before creating\n                await connectionFactory.closeConnection(this.name, readonly).catch(() => {});\n                this.db = await connectionFactory.createConnection(\n                    this.name,\n                    this.config.encrypted ?? false,\n                    this.config.mode ?? 'no-encryption',\n                    this.config.version ?? 1,\n                    readonly,\n                );\n            }\n\n            // New/retrieved connection means we need to (re)open it.\n            this.opened = false;\n        }\n        return this.db;\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            const connectionFactory = await this.getConnectionFactory();\n            // Set encryption secret if provided and not already stored (must be done before opening)\n            if (this.config.getEncryptionKey) {\n                const { result: isStored } = await connectionFactory.isSecretStored();\n                if (!isStored) {\n                    const key = this.config.getEncryptionKey();\n                    if (!key && this.config.encrypted) {\n                        throw new Error('CapacitorSQLiteDriverOptions.encrypted=true but no encryption key was provided (getEncryptionKey).');\n                    }\n                    await connectionFactory.setEncryptionSecret(key);\n                }\n            }\n            const db = await this.ensureDb();\n            await db.open();\n            this.opened = true;\n        })();\n\n        try {\n            await this.openPromise;\n        } finally {\n            this.openPromise = undefined;\n        }\n    }\n\n    async close(): Promise<void> {\n        if (!this.db) return;\n        await this.db.close();\n        const connectionFactory = await this.getConnectionFactory();\n        await connectionFactory.closeConnection(this.name, this.config.readonly ?? false);\n        this.db = undefined;\n        this.opened = false;\n        this.openPromise = undefined;\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.open();\n        const db = await this.ensureDb();\n        await db.execute(statement, false);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const db = await this.ensureDb();\n        const result = await db.run(statement, values, false, 'no');\n        const changes = (result as any)?.changes?.changes ?? (result as any)?.changes ?? 0;\n        const lastId = (result as any)?.changes?.lastId ?? undefined;\n        return { changes, lastId };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const db = await this.ensureDb();\n        const result: any = await db.query(statement, values, true);\n        if (Array.isArray(result?.values) && result.values.length > 0 && !Array.isArray(result.values[0])) {\n            const columns = Object.keys(result.values[0]);\n            const rows = result.values.map((row: Record<string, any>) => columns.map((column) => row[column]));\n            return { columns, values: rows };\n        }\n        return { columns: result?.columns ?? [], values: result?.values ?? [] };\n    }\n}\n","import type { SQLConnection, SQLValue } from '@capgo/capacitor-fast-sql';\n\nimport type { SQLiteDatabaseDriver, SQLiteRunResult, SQLiteQueryResult } from '../types';\n\nexport interface FastSqlDriverOptions {\n    encrypted?: boolean;\n    getEncryptionKey?: () => string;\n    readonly?: boolean;\n}\n\n// Lazily loaded module cache to avoid top-level imports that break web bundlers\nlet fastSqlModuleCache: typeof import('@capgo/capacitor-fast-sql') | null = null;\n\nasync function getFastSqlModule(): Promise<typeof import('@capgo/capacitor-fast-sql')> {\n    if (!fastSqlModuleCache) {\n        fastSqlModuleCache = await import('@capgo/capacitor-fast-sql');\n    }\n    return fastSqlModuleCache;\n}\n\n/**\n * SQLiteDatabaseDriver implementation for @capgo/capacitor-fast-sql plugin.\n *\n * This driver provides a compatible interface with the existing SQLiteAdapter\n * while using the Capgo Fast SQL plugin which offers better performance through\n * a local HTTP server approach that bypasses Capacitor's bridge.\n * \n * Update your AndroidManifest.xml to allow cleartext traffic:\n * <application\n        ...\n        android:usesCleartextTraffic=\"true\">\n\n    Requires Capacitor HTTP plugin to prevent CORS, as FastSql server runs on localhost:9000, not Capacitor's localhost\n */\nexport class CapacitorFastSqlDriver implements SQLiteDatabaseDriver {\n    readonly type = 'CapacitorFastSqlDriver';\n    private readonly options: FastSqlDriverOptions;\n    private db?: SQLConnection;\n    private openPromise?: Promise<void>;\n    private opened = false;\n    readonly name: string;\n\n    constructor(databaseName: string, options: FastSqlDriverOptions = {}) {\n        this.name = databaseName;\n        this.options = options;\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                const { FastSQL } = await getFastSqlModule();\n                const encryptionKey = this.options.getEncryptionKey?.();\n                if (!encryptionKey && this.options.encrypted) {\n                    throw new Error('FastSqlDriverOptions.encrypted=true but no encryption key was provided (getEncryptionKey).');\n                }\n                this.db = await FastSQL.connect({\n                    database: this.name,\n                    encrypted: this.options.encrypted,\n                    encryptionKey,\n                    readOnly: this.options.readonly,\n                });\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        if (this.db) {\n            const { FastSQL } = await getFastSqlModule();\n            await FastSQL.disconnect(this.name);\n            this.db = undefined;\n            this.opened = false;\n            this.openPromise = undefined;\n        }\n    }\n\n    async execute(statement: string): Promise<void> {\n        await this.open();\n        await this.db!.execute(statement);\n    }\n\n    async run(statement: string, values: any[] = []): Promise<SQLiteRunResult> {\n        await this.open();\n        const result = await this.db!.run(statement, values as SQLValue[]);\n        return {\n            changes: result.rowsAffected,\n            lastId: result.insertId,\n        };\n    }\n\n    async query(statement: string, values: any[] = []): Promise<SQLiteQueryResult> {\n        await this.open();\n        const rows = await this.db!.query(statement, values as SQLValue[]);\n\n        // Convert array of objects to columns + values format expected by adapter\n        if (!rows.length) {\n            return { columns: [], values: [] };\n        }\n\n        const columns = Object.keys(rows[0]!);\n        const resultValues = rows.map((row) => columns.map((col) => (row as Record<string, any>)[col]));\n\n        return { columns, values: resultValues };\n    }\n}\n"],"mappings":"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","names":[]}