Add DoSqliteDriver, typegres/core + do-sqlite entries, codegen fixes

Author: ryanrasti

package.json

@@ -28,6 +28,26 @@
     "./exoeval": {
       "import": "./dist/exoeval/index.mjs",
       "types": "./dist/exoeval/index.d.mts"
+    },
+    "./capnweb": {
+      "import": "./dist/capnweb/shim.mjs",
+      "types": "./dist/capnweb/shim.d.mts"
+    },
+    "./drivers/do": {
+      "import": "./dist/drivers/do.mjs",
+      "types": "./dist/drivers/do.d.mts"
+    },
+    "./drivers/pg": {
+      "import": "./dist/drivers/pg.mjs",
+      "types": "./dist/drivers/pg.d.mts"
+    },
+    "./drivers/pglite": {
+      "import": "./dist/drivers/pglite.mjs",
+      "types": "./dist/drivers/pglite.d.mts"
+    },
+    "./drivers/sqlite": {
+      "import": "./dist/drivers/sqlite.mjs",
+      "types": "./dist/drivers/sqlite.d.mts"
     }
   },
   "bin": {
@@ -38,14 +58,18 @@
   ],
   "peerDependencies": {
     "@electric-sql/pglite": "^0.4.4",
-    "pg": "^8.20.0"
+    "pg": "^8.20.0",
+    "better-sqlite3": "^12.11.1"
   },
   "peerDependenciesMeta": {
     "@electric-sql/pglite": {
       "optional": true
     },
     "pg": {
       "optional": true
+    },
+    "better-sqlite3": {
+      "optional": true
     }
   },
   "engines": {
@@ -54,7 +78,7 @@
   "scripts": {
     "build": "tsdown",
     "codegen": "node --experimental-strip-types src/types/postgres/emit.ts && node --experimental-strip-types src/types/sqlite/emit.ts",
-    "codegen:check": "tmp=$(mktemp -d) && node --experimental-strip-types src/types/postgres/emit.ts --out-dir \"$tmp/pg\" && { diff -r \"$tmp/pg\" src/types/postgres/generated || { echo 'src/types/postgres/generated is stale \u2014 run `npm run codegen` and commit.' >&2; rm -rf \"$tmp\"; exit 1; }; } && node --experimental-strip-types src/types/sqlite/emit.ts --out-dir \"$tmp/sqlite\" && { diff -r \"$tmp/sqlite/generated\" src/types/sqlite/generated || { echo 'src/types/sqlite/generated is stale \u2014 run `npm run codegen` and commit.' >&2; rm -rf \"$tmp\"; exit 1; }; } && rm -rf \"$tmp\"",
+    "codegen:check": "tmp=$(mktemp -d) && node --experimental-strip-types src/types/postgres/emit.ts --out-dir \"$tmp/pg\" && { diff -r \"$tmp/pg\" src/types/postgres/generated || { echo 'src/types/postgres/generated is stale — run `npm run codegen` and commit.' >&2; rm -rf \"$tmp\"; exit 1; }; } && node --experimental-strip-types src/types/sqlite/emit.ts --out-dir \"$tmp/sqlite\" && { diff -r \"$tmp/sqlite/generated\" src/types/sqlite/generated || { echo 'src/types/sqlite/generated is stale — run `npm run codegen` and commit.' >&2; rm -rf \"$tmp\"; exit 1; }; } && rm -rf \"$tmp\"",
     "lint": "eslint src",
     "typecheck": "tsgo --noEmit",
     "format": "prettier --write src",

site/.gitignore

@@ -10,3 +10,8 @@ public/demo.ts.static
 public/events-*.js
 public/chunk-*.js
 public/lib-*.js
+public/rolldown-runtime-*.js
+# playground driver code-split chunks from dynamic import() in typegres()
+public/pg-*.js
+public/pglite-*.js
+public/sqlite-*.js

src/database.test.ts

@@ -2,8 +2,8 @@ import { test, expect, beforeAll, afterAll } from "vitest";
 import { Int8, Text } from "./types/postgres";
 import { sql } from "./builder/sql";
 import { setupDb, db, conn } from "./test-helpers";
-import { PgDriver } from "./driver";
-import type { Driver } from "./driver";
+import { PgDriver } from "./drivers/pg";
+import type { Driver } from "./drivers/types";
 import { requireDatabaseUrl } from "./pg";
 import type { Connection } from "./database";
 import { Database } from "./database";

src/database.ts

@@ -1,4 +1,4 @@
-import type { ExecuteFn, Driver, QueryResult } from "./driver";
+import type { ExecuteFn, Driver, QueryResult } from "./drivers/types";
 import type { Fromable, RowType, RowTypeToTsType } from "./builder/query";
 import { QueryBuilder, hydrateRows } from "./builder/query";
 import { deserializeRows } from "./util";

src/driver.ts

@@ -0,0 +1,34 @@
+import type { CompiledSql } from "../builder/sql";
+import type { Driver, ExecuteFn, QueryResult } from "./types";
+import { normalizeRow, stripMatchedOuterParens } from "./shared-sqlite";
+
+// Duck-typed Cloudflare SqlStorage — no @cloudflare/workers-types dependency.
+export interface SqlStorageLike {
+  exec(query: string, ...bindings: unknown[]): { toArray(): { [key: string]: unknown }[] };
+}
+
+// typegres Driver over a Durable Object's SQLite (Cloudflare SqlStorage).
+// No node-only peer imports — safe to bundle into workerd.
+//
+// Contract notes:
+//   - numbers bind as REAL (integer affinity from the dialect CAST);
+//   - SqlStorage REJECTS BigInt (unlike better-sqlite3) — we do not coerce;
+//     callers / the dialect must not emit bigint bindings for this backend;
+//   - results are native JS values, normalized to strings for deserialize;
+//   - blobs come back as ArrayBuffer (better-sqlite3 gives Uint8Array/Buffer).
+export class DoSqliteDriver implements Driver {
+  readonly dialect = "sqlite" as const;
+
+  constructor(private readonly sql: SqlStorageLike) {}
+
+  execute: ExecuteFn = ({ text, values }: CompiledSql): Promise<QueryResult> => {
+    const query = stripMatchedOuterParens(text);
+    const rows = this.sql.exec(query, ...values).toArray().map(normalizeRow);
+    return Promise.resolve({ rows });
+  };
+
+  runInSingleConnection = <T>(cb: (execute: ExecuteFn) => Promise<T>): Promise<T> =>
+    cb(this.execute);
+
+  close = (): Promise<void> => Promise.resolve();
+}

src/drivers/do.ts

@@ -0,0 +1,45 @@
+import type { CompiledSql } from "../builder/sql";
+import type { DialectName } from "../builder/sql";
+import type pg from "pg";
+import type { Driver, ExecuteFn, QueryResult } from "./types";
+
+// pg adapter — returns raw text strings (no driver-side deserialization).
+// `pg` is an *optional* peer dep (see package.json#peerDependenciesMeta).
+// Dynamic import keeps bundlers from pulling pg into browser builds and
+// lets a missing peer fail late with a real module-not-found error.
+export class PgDriver implements Driver {
+  readonly dialect: DialectName = "postgres";
+
+  static async create(
+    connectionString: string,
+    poolOptions: pg.PoolConfig = {},
+  ): Promise<PgDriver> {
+    // eslint-disable-next-line no-restricted-syntax -- optional peer, see class comment
+    const pgMod = (await import(/* webpackIgnore: true */ "pg")).default;
+    const pool = new pgMod.Pool({
+      connectionString,
+      ...poolOptions,
+      types: { getTypeParser: () => (v: string) => v },
+    });
+    return new PgDriver(pool);
+  }
+
+  private constructor(private pool: pg.Pool) {}
+
+  async execute({ text, values }: CompiledSql): Promise<QueryResult> {
+    return this.pool.query(text, values as unknown[]);
+  }
+
+  async runInSingleConnection<T>(cb: (execute: ExecuteFn) => Promise<T>): Promise<T> {
+    const client = await this.pool.connect();
+    try {
+      return await cb(({ text, values }) => client.query(text, values as unknown[]));
+    } finally {
+      client.release();
+    }
+  }
+
+  async close(): Promise<void> {
+    await this.pool.end();
+  }
+}