@an5/adapters 0.2.5 → 0.2.9

package/typescript/src/sqlite/engine.ts

@@ -1,55 +1,66 @@
-import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
-
-// ─── SQLite Engine ─────────────────────────────────────────────────────────────────
-
-let BetterSqlite3: any = null;
-try { BetterSqlite3 = require('better-sqlite3'); } catch { }
-
-export class SqliteEngine implements QueryEngine {
-  dialect: Dialect = 'sqlite';
-  private db: any = null;
-  private readonly filePath: string;
-
-  constructor(adapterConfig: An5AdapterConfig) {
-    if (!BetterSqlite3) throw new Error('better-sqlite3 package is required for SQLite support. Run: npm install better-sqlite3');
-    this.filePath = adapterConfig.connectionString
-      .replace(/^sqlite:\/\/\//i, '/')
-      .replace(/^sqlite:\/\//i, '');
-  }
-
-  private getDb(): any {
-    if (!this.db) this.db = new BetterSqlite3(this.filePath);
-    return this.db;
-  }
-
-  // better-sqlite3 natively supports @name parameters
-  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
-    return this.getDb().prepare(query).all(params ?? {}) as T[];
-  }
-
-  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
-    const info = this.getDb().prepare(query).run(params ?? {});
-    return info.changes ?? 0;
-  }
-
-  async connect(): Promise<void> { this.getDb(); }
-
-  async disconnect(): Promise<void> {
-    if (this.db) { this.db.close(); this.db = null; }
-  }
-
-  async beginTransaction(): Promise<TransactionHandle> {
-    const db = this.getDb();
-    db.prepare('BEGIN').run();
-    let done = false;
-
-    return {
-      exec: async <T>(q: string, p?: Record<string, any>) =>
-        db.prepare(q).all(p ?? {}) as T[],
-      executeRaw: async (q: string, p?: Record<string, any>) =>
-        (db.prepare(q).run(p ?? {}).changes ?? 0),
-      commit: async () => { if (!done) { db.prepare('COMMIT').run(); done = true; } },
-      rollback: async () => { if (!done) { db.prepare('ROLLBACK').run(); done = true; } },
-    };
-  }
-}
+import type { An5AdapterConfig, Dialect, QueryEngine, TransactionHandle } from '../base/types';
+
+// ─── SQLite Engine ─────────────────────────────────────────────────────────────────
+
+let BetterSqlite3: any = null;
+try { BetterSqlite3 = require('better-sqlite3'); } catch { }
+
+export class SqliteEngine implements QueryEngine {
+  dialect: Dialect = 'sqlite';
+  private db: any = null;
+  private readonly filePath: string;
+
+  constructor(adapterConfig: An5AdapterConfig) {
+    if (!BetterSqlite3) throw new Error('better-sqlite3 package is required for SQLite support. Run: npm install better-sqlite3');
+    this.filePath = (adapterConfig.connectionString ?? '')
+      .replace(/^sqlite:\/\/\//i, '/')
+      .replace(/^sqlite:\/\//i, '');
+  }
+
+  private getDb(): any {
+    if (!this.db) this.db = new BetterSqlite3(this.filePath);
+    return this.db;
+  }
+
+  // better-sqlite3 natively supports @name parameters
+  async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
+    const stmt = this.getDb().prepare(query);
+    if (stmt.reader) {
+      return stmt.all(params ?? {}) as T[];
+    }
+    stmt.run(params ?? {});
+    return [] as T[];
+  }
+
+  async executeRaw(query: string, params?: Record<string, any>): Promise<number> {
+    const info = this.getDb().prepare(query).run(params ?? {});
+    return info.changes ?? 0;
+  }
+
+  async connect(): Promise<void> { this.getDb(); }
+
+  async disconnect(): Promise<void> {
+    if (this.db) { this.db.close(); this.db = null; }
+  }
+
+  async beginTransaction(): Promise<TransactionHandle> {
+    const db = this.getDb();
+    db.prepare('BEGIN').run();
+    let done = false;
+
+    return {
+      exec: async <T>(q: string, p?: Record<string, any>) => {
+        const stmt = db.prepare(q);
+        if (stmt.reader) {
+          return stmt.all(p ?? {}) as T[];
+        }
+        stmt.run(p ?? {});
+        return [] as T[];
+      },
+      executeRaw: async (q: string, p?: Record<string, any>) =>
+        (db.prepare(q).run(p ?? {}).changes ?? 0),
+      commit: async () => { if (!done) { db.prepare('COMMIT').run(); done = true; } },
+      rollback: async () => { if (!done) { db.prepare('ROLLBACK').run(); done = true; } },
+    };
+  }
+}

package/typescript/src/sqlite/index.ts

@@ -1 +1,3 @@
-export * from './engine';
+export * from './engine';
+export * from './browserEngine';
+

package/typescript/src/typed.ts

@@ -0,0 +1,52 @@
+import type { AdapterTableClient, An5Adapter } from './an5Adapter';
+
+// ─── Typed model access ──────────────────────────────────────────────────────
+// The runtime adapter resolves `db.user` / `db.User` dynamically through a
+// Proxy, which TypeScript normally types as `any` (An5Adapter declares
+// `[key: string]: any`). These helpers let app code bind generated model
+// delegate types (e.g. `UserTableClient` emitted by the schema generator) so
+// `db.user` gets full autocomplete and compile-time argument checking — the
+// standard ORM experience — without changing any runtime behavior.
+//
+// Usage:
+//   import { createAn5Adapter } from '@an5/adapters';
+//   import type { UserTableClient } from './generated/typescript/User';
+//   import type { OrderTableClient } from './generated/typescript/Order';
+//   const db = createAn5Adapter<{
+//     user: UserTableClient;
+//     order: OrderTableClient;
+//   }>({ connectionString: process.env.DATABASE_URL! });
+//   await db.user.findMany({ where: { email: { contains: '@example.com' } } });
+
+// Public adapter surface (methods/getters) without the open-ended index
+// signature, so explicit model props in TModels take effect instead of `any`.
+type AdapterMethodKeys =
+  | 'dialect'
+  | 'exec'
+  | '$queryRawUnsafe'
+  | '$executeRaw'
+  | '$executeRawUnsafe'
+  | '$connect'
+  | '$disconnect'
+  | '$transaction'
+  | '$begin'
+  | 'table'
+  | '$on'
+  | '$off'
+  | '$emit'
+  | '$use'
+  | 'view'
+  | '$queryProc'
+  | '$executeProc'
+  | 'readRange'
+  | 'writeRange'
+  | 'appendRange'
+  | 'listSheets'
+  | 'deleteSheet';
+
+export type AdapterAPI = Pick<An5Adapter, AdapterMethodKeys>;
+
+// An5Adapter with dynamically-resolved model delegates typed as TModels.
+// NOTE: keep AdapterMethodKeys in sync when adding public An5Adapter methods.
+export type TypedAn5Adapter<TModels extends object = Record<string, AdapterTableClient<any>>> =
+  AdapterAPI & TModels;