@syncular/dialect-expo-sqlite 0.0.6-159 → 0.0.6-167

package/dist/index.d.ts

@@ -1,15 +1,10 @@
 /**
  * @syncular/dialect-expo-sqlite - Expo SQLite dialect for sync
  *
- * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite)
+ * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite).
  * SQLite-compatible — use with @syncular/server-dialect-sqlite.
- *
- * Implements a custom Kysely Driver that wraps expo-sqlite's sync API
- * into the promise-based interface Kysely expects. All operations are
- * serialized through a single connection to prevent "database is locked"
- * errors from concurrent access on the native handle.
  */
-import type { DatabaseIntrospector, Dialect, DialectAdapter, Driver, Kysely, QueryCompiler } from 'kysely';
+import type { Dialect } from 'kysely';
 export type ExpoSqliteBindValue = null | string | number | Uint8Array;
 export type ExpoSqliteBindParams = ExpoSqliteBindValue[];
 export interface ExpoSqliteRunResult {
@@ -39,14 +34,6 @@ export type ExpoSqliteOptions = ExpoSqliteNameOptions | ExpoSqliteInstanceOption
 /**
  * Create the Expo SQLite dialect directly.
  */
-export declare function createExpoSqliteDialect(options: ExpoSqliteOptions): ExpoSqliteDialect;
-declare class ExpoSqliteDialect implements Dialect {
-    #private;
-    constructor(options: ExpoSqliteOptions);
-    createAdapter(): DialectAdapter;
-    createDriver(): Driver;
-    createQueryCompiler(): QueryCompiler;
-    createIntrospector(db: Kysely<unknown>): DatabaseIntrospector;
-}
+export declare function createExpoSqliteDialect(options: ExpoSqliteOptions): Dialect;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EACP,cAAc,EACd,MAAM,EACN,MAAM,EACN,aAAa,EAGd,MAAM,QAAQ,CAAC;AAQhB,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,EAAE,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,CAAC,EAAE,CAAC;IAC9D,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,SAAS,mBAAmB,EAAE,GAAG,CAAC,EAAE,CAAC;IAC3E,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,mBAAmB,CAAC;IACxE,OAAO,CACL,GAAG,EAAE,MAAM,EACX,GAAG,MAAM,EAAE,SAAS,mBAAmB,EAAE,GACxC,mBAAmB,CAAC;IACvB,SAAS,IAAI,IAAI,CAAC;CACnB;AAED,0DAA0D;AAC1D,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,sBAAsB,CAAC;AAEjE,UAAU,qBAAqB;IAC7B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,UAAU,yBAAyB;IACjC,gDAAgD;IAChD,QAAQ,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,MAAM,iBAAiB,GACzB,qBAAqB,GACrB,yBAAyB,CAAC;AAE9B;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,iBAAiB,GACzB,iBAAiB,CAEnB;AAkCD,cAAM,iBAAkB,YAAW,OAAO;;IAGxC,YAAY,OAAO,EAAE,iBAAiB,EAErC;IAED,aAAa,IAAI,cAAc,CAE9B;IAED,YAAY,IAAI,MAAM,CAErB;IAED,mBAAmB,IAAI,aAAa,CAEnC;IAED,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAE5D;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAsB,OAAO,EAAe,MAAM,QAAQ,CAAC;AAIvE,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,EAAE,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,CAAC,EAAE,CAAC;IAC9D,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,SAAS,mBAAmB,EAAE,GAAG,CAAC,EAAE,CAAC;IAC3E,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,mBAAmB,CAAC;IACxE,OAAO,CACL,GAAG,EAAE,MAAM,EACX,GAAG,MAAM,EAAE,SAAS,mBAAmB,EAAE,GACxC,mBAAmB,CAAC;IACvB,SAAS,IAAI,IAAI,CAAC;CACnB;AAED,0DAA0D;AAC1D,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,sBAAsB,CAAC;AAEjE,UAAU,qBAAqB;IAC7B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,UAAU,yBAAyB;IACjC,gDAAgD;IAChD,QAAQ,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,MAAM,iBAAiB,GACzB,qBAAqB,GACrB,yBAAyB,CAAC;AAE9B;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAE3E"}

package/dist/index.js

@@ -1,111 +1,42 @@
 /**
  * @syncular/dialect-expo-sqlite - Expo SQLite dialect for sync
  *
- * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite)
+ * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite).
  * SQLite-compatible — use with @syncular/server-dialect-sqlite.
- *
- * Implements a custom Kysely Driver that wraps expo-sqlite's sync API
- * into the promise-based interface Kysely expects. All operations are
- * serialized through a single connection to prevent "database is locked"
- * errors from concurrent access on the native handle.
  */
-import { CompiledQuery, SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, } from 'kysely';
+import { CompiledQuery } from 'kysely';
+import { BaseSqliteDialect, BaseSqliteDriver } from 'kysely-generic-sqlite';
 /**
  * Create the Expo SQLite dialect directly.
  */
 export function createExpoSqliteDialect(options) {
-    return new ExpoSqliteDialect(options);
-}
-// ---------------------------------------------------------------------------
-// Simple async mutex — serializes all DB access on a single native handle.
-// ---------------------------------------------------------------------------
-class Mutex {
-    #queue = [];
-    #locked = false;
-    async acquire() {
-        if (!this.#locked) {
-            this.#locked = true;
-            return;
-        }
-        return new Promise((resolve) => {
-            this.#queue.push(resolve);
-        });
-    }
-    release() {
-        const next = this.#queue.shift();
-        if (next) {
-            next();
-        }
-        else {
-            this.#locked = false;
-        }
-    }
-}
-// ---------------------------------------------------------------------------
-// Kysely Dialect implementation for expo-sqlite
-// ---------------------------------------------------------------------------
-class ExpoSqliteDialect {
-    #options;
-    constructor(options) {
-        this.#options = options;
-    }
-    createAdapter() {
-        return new SqliteAdapter();
-    }
-    createDriver() {
-        return new ExpoSqliteDriver(this.#options);
-    }
-    createQueryCompiler() {
-        return new SqliteQueryCompiler();
-    }
-    createIntrospector(db) {
-        return new SqliteIntrospector(db);
-    }
+    return new BaseSqliteDialect(() => new ExpoSqliteDriver(options));
 }
-class ExpoSqliteDriver {
-    #options;
+class ExpoSqliteDriver extends BaseSqliteDriver {
     #db;
-    #connection;
-    #mutex = new Mutex();
     constructor(options) {
-        this.#options = options;
-    }
-    async init() {
-        this.#db = this.#resolveDatabase();
-        // Enable WAL mode for better concurrency (allows concurrent reads
-        // while writing, prevents "database is locked" errors during sync).
-        this.#db.runSync('PRAGMA journal_mode = WAL', []);
-        // Wait up to 5s for locks to clear instead of failing immediately.
-        this.#db.runSync('PRAGMA busy_timeout = 5000', []);
-        this.#connection = new ExpoSqliteConnection(this.#db);
-    }
-    async acquireConnection() {
-        await this.#mutex.acquire();
-        return this.#connection;
+        super(async () => {
+            this.#db = resolveExpoSqliteDatabase(options);
+            // Better concurrency defaults for sync workloads.
+            this.#db.runSync('PRAGMA journal_mode = WAL', []);
+            this.#db.runSync('PRAGMA busy_timeout = 5000', []);
+            this.conn = new ExpoSqliteConnection(this.#db);
+        });
     }
-    async beginTransaction(connection, _settings) {
+    async beginTransaction(connection) {
         await connection.executeQuery(CompiledQuery.raw('begin immediate'));
     }
-    async commitTransaction(connection) {
-        await connection.executeQuery(CompiledQuery.raw('commit'));
-    }
-    async rollbackTransaction(connection) {
-        await connection.executeQuery(CompiledQuery.raw('rollback'));
-    }
-    async releaseConnection(_connection) {
-        this.#mutex.release();
-    }
     async destroy() {
-        if (this.#db) {
-            this.#db.closeSync();
-        }
+        const db = this.#db;
+        this.#db = undefined;
+        db?.closeSync();
     }
-    #resolveDatabase() {
-        if ('database' in this.#options) {
-            return this.#options.database;
-        }
-        return this.#options.openDatabaseSync(this.#options.name);
+}
+function resolveExpoSqliteDatabase(options) {
+    if ('database' in options) {
+        return options.database;
     }
+    return options.openDatabaseSync(options.name);
 }
 class ExpoSqliteConnection {
     #db;
@@ -127,7 +58,6 @@ class ExpoSqliteConnection {
                     : {}),
             };
         }
-        // For INSERT, UPDATE, DELETE — use runSync to get lastInsertRowId and changes
         const result = this.#db.runSync(sql, params);
         return {
             rows: [],

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/dialect-expo-sqlite",
-  "version": "0.0.6-159",
+  "version": "0.0.6-167",
   "description": "Expo SQLite dialect for the Syncular client",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -42,14 +42,16 @@
     "build": "tsgo",
     "release": "bunx syncular-publish"
   },
-  "dependencies": {},
+  "dependencies": {
+    "kysely-generic-sqlite": "^1.2.1"
+  },
   "peerDependencies": {
     "expo-sqlite": "*",
     "kysely": "^0.28.0"
   },
   "devDependencies": {
     "@syncular/config": "0.0.0",
-    "@syncular/core": "0.0.6-159",
+    "@syncular/core": "0.0.6-167",
     "kysely": "*"
   },
   "files": [

package/src/index.ts

@@ -1,32 +1,13 @@
 /**
  * @syncular/dialect-expo-sqlite - Expo SQLite dialect for sync
  *
- * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite)
+ * Provides a Kysely dialect for Expo's SQLite module (expo-sqlite).
  * SQLite-compatible — use with @syncular/server-dialect-sqlite.
- *
- * Implements a custom Kysely Driver that wraps expo-sqlite's sync API
- * into the promise-based interface Kysely expects. All operations are
- * serialized through a single connection to prevent "database is locked"
- * errors from concurrent access on the native handle.
  */
 
-import type {
-  DatabaseConnection,
-  DatabaseIntrospector,
-  Dialect,
-  DialectAdapter,
-  Driver,
-  Kysely,
-  QueryCompiler,
-  QueryResult,
-  TransactionSettings,
-} from 'kysely';
-import {
-  CompiledQuery,
-  SqliteAdapter,
-  SqliteIntrospector,
-  SqliteQueryCompiler,
-} from 'kysely';
+import type { DatabaseConnection, Dialect, QueryResult } from 'kysely';
+import { CompiledQuery } from 'kysely';
+import { BaseSqliteDialect, BaseSqliteDriver } from 'kysely-generic-sqlite';
 
 export type ExpoSqliteBindValue = null | string | number | Uint8Array;
 
@@ -70,124 +51,41 @@ export type ExpoSqliteOptions =
 /**
  * Create the Expo SQLite dialect directly.
  */
-export function createExpoSqliteDialect(
-  options: ExpoSqliteOptions
-): ExpoSqliteDialect {
-  return new ExpoSqliteDialect(options);
+export function createExpoSqliteDialect(options: ExpoSqliteOptions): Dialect {
+  return new BaseSqliteDialect(() => new ExpoSqliteDriver(options));
 }
 
-// ---------------------------------------------------------------------------
-// Simple async mutex — serializes all DB access on a single native handle.
-// ---------------------------------------------------------------------------
-
-class Mutex {
-  #queue: Array<() => void> = [];
-  #locked = false;
-
-  async acquire(): Promise<void> {
-    if (!this.#locked) {
-      this.#locked = true;
-      return;
-    }
-    return new Promise<void>((resolve) => {
-      this.#queue.push(resolve);
-    });
-  }
-
-  release(): void {
-    const next = this.#queue.shift();
-    if (next) {
-      next();
-    } else {
-      this.#locked = false;
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Kysely Dialect implementation for expo-sqlite
-// ---------------------------------------------------------------------------
-
-class ExpoSqliteDialect implements Dialect {
-  readonly #options: ExpoSqliteOptions;
-
-  constructor(options: ExpoSqliteOptions) {
-    this.#options = options;
-  }
-
-  createAdapter(): DialectAdapter {
-    return new SqliteAdapter();
-  }
-
-  createDriver(): Driver {
-    return new ExpoSqliteDriver(this.#options);
-  }
-
-  createQueryCompiler(): QueryCompiler {
-    return new SqliteQueryCompiler();
-  }
-
-  createIntrospector(db: Kysely<unknown>): DatabaseIntrospector {
-    return new SqliteIntrospector(db);
-  }
-}
-
-class ExpoSqliteDriver implements Driver {
-  readonly #options: ExpoSqliteOptions;
+class ExpoSqliteDriver extends BaseSqliteDriver {
   #db: ExpoSqliteDatabaseLike | undefined;
-  #connection: ExpoSqliteConnection | undefined;
-  readonly #mutex = new Mutex();
 
   constructor(options: ExpoSqliteOptions) {
-    this.#options = options;
-  }
-
-  async init(): Promise<void> {
-    this.#db = this.#resolveDatabase();
-    // Enable WAL mode for better concurrency (allows concurrent reads
-    // while writing, prevents "database is locked" errors during sync).
-    this.#db.runSync('PRAGMA journal_mode = WAL', []);
-    // Wait up to 5s for locks to clear instead of failing immediately.
-    this.#db.runSync('PRAGMA busy_timeout = 5000', []);
-    this.#connection = new ExpoSqliteConnection(this.#db);
-  }
-
-  async acquireConnection(): Promise<DatabaseConnection> {
-    await this.#mutex.acquire();
-    return this.#connection!;
+    super(async () => {
+      this.#db = resolveExpoSqliteDatabase(options);
+      // Better concurrency defaults for sync workloads.
+      this.#db.runSync('PRAGMA journal_mode = WAL', []);
+      this.#db.runSync('PRAGMA busy_timeout = 5000', []);
+      this.conn = new ExpoSqliteConnection(this.#db);
+    });
   }
 
-  async beginTransaction(
-    connection: DatabaseConnection,
-    _settings: TransactionSettings
-  ): Promise<void> {
+  async beginTransaction(connection: DatabaseConnection): Promise<void> {
     await connection.executeQuery(CompiledQuery.raw('begin immediate'));
   }
 
-  async commitTransaction(connection: DatabaseConnection): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw('commit'));
-  }
-
-  async rollbackTransaction(connection: DatabaseConnection): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw('rollback'));
-  }
-
-  async releaseConnection(_connection: DatabaseConnection): Promise<void> {
-    this.#mutex.release();
-  }
-
   async destroy(): Promise<void> {
-    if (this.#db) {
-      this.#db.closeSync();
-    }
+    const db = this.#db;
+    this.#db = undefined;
+    db?.closeSync();
   }
+}
 
-  #resolveDatabase(): ExpoSqliteDatabaseLike {
-    if ('database' in this.#options) {
-      return this.#options.database;
-    }
-    return this.#options.openDatabaseSync(this.#options.name);
+function resolveExpoSqliteDatabase(
+  options: ExpoSqliteOptions
+): ExpoSqliteDatabaseLike {
+  if ('database' in options) {
+    return options.database;
   }
+  return options.openDatabaseSync(options.name);
 }
 
 class ExpoSqliteConnection implements DatabaseConnection {
@@ -215,7 +113,6 @@ class ExpoSqliteConnection implements DatabaseConnection {
       };
     }
 
-    // For INSERT, UPDATE, DELETE — use runSync to get lastInsertRowId and changes
     const result: ExpoSqliteRunResult = this.#db.runSync(sql, params);
     return {
       rows: [],