@statewalker/webrun-files-sqlite 0.10.3 → 0.11.1

package/src/blocks/sqlite-files-api.ts

@@ -1,3 +1,5 @@
+import type { Db } from "@statewalker/db-api";
+import { inTransaction } from "@statewalker/db-sqlite";
 import type {
   FileInfo,
   FileStats,
@@ -7,13 +9,13 @@ import type {
 } from "@statewalker/webrun-files";
 import { normalizePath } from "@statewalker/webrun-files";
 import { toBytes } from "../bytes.js";
-import type { SqlDriver, SqlStatement } from "../sql.types.js";
+import { runStatements, type SqlStatement } from "../run-statements.js";
 import { ByteReader, collectBlock } from "./byte-reader.js";
 import { Sha256 } from "./sha256.js";
 import { type StreamCodec, webDeflateCodec } from "./stream-codec.js";
 
 const MiB = 1024 * 1024;
-/** Rows on Durable Objects and D1 are capped at 2 MB; leave room for deflate's worst case. */
+/** Rows on Durable Objects are capped at 2 MB; leave room for deflate's worst case. */
 const MAX_BLOCK_SIZE_LIMIT = 1.5 * MiB;
 const LIST_PAGE = 256;
 
@@ -49,14 +51,14 @@ interface ListRow extends EntryRow {
  * A FilesApi over three SQLite tables: paths point at immutable contents, and
  * a content is a sequence of bounded, optionally compressed blocks. Reads and
  * writes stream one block at a time, so no file is ever held whole and no row
- * outgrows the 2 MB limit of Durable Objects and D1.
+ * outgrows the 2 MB row limit of Durable Objects.
  *
  * Streaming happens outside transactions; every step that changes what a path
  * shows is one transaction, so an interruption leaves at most an unreferenced
  * content, which {@link sweep} removes.
  */
 export class SqliteFilesApi implements FilesApi {
-  readonly #sql: SqlDriver;
+  readonly #db: Db;
   readonly #codec: StreamCodec | null;
   readonly #blockSize: number;
   readonly #paths: string;
@@ -64,7 +66,7 @@ export class SqliteFilesApi implements FilesApi {
   readonly #blocks: string;
   readonly #prefix: string;
 
-  constructor(sql: SqlDriver, opts: SqliteFilesApiOptions = {}) {
+  constructor(db: Db, opts: SqliteFilesApiOptions = {}) {
     const prefix = opts.tablePrefix ?? "fs_";
     if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(prefix)) {
       throw new Error(`SqliteFilesApi: tablePrefix must be a plain SQL identifier, got ${prefix}`);
@@ -79,7 +81,7 @@ export class SqliteFilesApi implements FilesApi {
         `SqliteFilesApi: blockSize must be an integer from 1 to ${MAX_BLOCK_SIZE_LIMIT}, got ${this.#blockSize}`,
       );
     }
-    this.#sql = sql;
+    this.#db = db;
     this.#codec = opts.compression === undefined ? availableWebCodec() : opts.compression;
     this.#prefix = prefix;
     this.#paths = `${prefix}paths`;
@@ -113,7 +115,7 @@ export class SqliteFilesApi implements FilesApi {
       `CREATE INDEX IF NOT EXISTS ${this.#prefix}paths_fid ON ${this.#paths}(fid)`,
       `CREATE INDEX IF NOT EXISTS ${this.#prefix}files_hash ON ${this.#files}(hash, size)`,
     ];
-    for (const statement of statements) await this.#sql.run(statement);
+    for (const statement of statements) await this.#db.query(statement);
   }
 
   // ---------------------------------------------------------------- read
@@ -179,14 +181,18 @@ export class SqliteFilesApi implements FilesApi {
   ): Promise<void> {
     const name = normalizePath(path);
     const compression = this.#codec?.name ?? "none";
-    const created = await this.#sql.all<{ fid: number }>(
-      `INSERT INTO ${this.#files}(size, compression, block_size, hash, updated)
-       VALUES (NULL, ?, ?, NULL, ?) RETURNING fid`,
-      compression,
-      this.#blockSize,
-      Date.now(),
+    // In a transaction too, so a Db without db-sqlite's hook fails before writing anything.
+    const fid = await inTransaction(
+      this.#db,
+      async (tx) =>
+        (
+          await tx.query<{ fid: number }>(
+            `INSERT INTO ${this.#files}(size, compression, block_size, hash, updated)
+             VALUES (NULL, ?, ?, NULL, ?) RETURNING fid`,
+            [compression, this.#blockSize, Date.now()],
+          )
+        )[0].fid,
     );
-    const fid = created[0].fid;
 
     const limit = this.#blockSize;
     const reader = new ByteReader(content);
@@ -209,7 +215,7 @@ export class SqliteFilesApi implements FilesApi {
           }
         };
         const block = await collectBlock(this.#codec ? this.#codec.compress(pieces()) : pieces());
-        const [alive] = await this.#sql.transaction([
+        const [alive] = await this.#transaction([
           {
             sql: `UPDATE ${this.#files} SET updated = ? WHERE fid = ? AND size IS NULL`,
             params: [Date.now(), fid],
@@ -225,7 +231,7 @@ export class SqliteFilesApi implements FilesApi {
       }
 
       const previous = await this.#entry(name);
-      const [finished] = await this.#sql.transaction(
+      const [finished] = await this.#transaction(
         this.#finishWrite(name, fid, size, hash.digestHex(), compression, previous?.fid ?? null),
       );
       if (finished === 0) throw sweptDuringWrite(name);
@@ -234,9 +240,9 @@ export class SqliteFilesApi implements FilesApi {
         await reader.close();
       } catch {}
       // Best effort, and never allowed to replace the error that brought us here —
-      // including a synchronous throw from a synchronous driver.
+      // including a Db without db-sqlite's transaction hook.
       try {
-        await this.#sql.transaction([
+        await this.#transaction([
           { sql: `DELETE FROM ${this.#files} WHERE fid = ? AND size IS NULL`, params: [fid] },
           ...this.#deleteBlocksOfMissing(fid),
         ]);
@@ -292,10 +298,9 @@ export class SqliteFilesApi implements FilesApi {
   async mkdir(path: string): Promise<void> {
     const now = Date.now();
     for (const dir of ancestorsAndSelf(normalizePath(path))) {
-      await this.#sql.run(
+      await this.#db.query(
         `INSERT INTO ${this.#paths}(path, fid, mtime) VALUES (?, NULL, ?) ON CONFLICT(path) DO NOTHING`,
-        dir,
-        now,
+        [dir, now],
       );
     }
   }
@@ -326,12 +331,12 @@ export class SqliteFilesApi implements FilesApi {
     for (;;) {
       const params: unknown[] = [...range.params, cursor];
       if (!options.recursive) params.push(prefixLength + 1);
-      const rows = await this.#sql.all<ListRow>(
+      const rows = await this.#db.query<ListRow>(
         `SELECT p.path, p.fid, p.mtime, f.size, f.compression, f.block_size
          FROM ${this.#paths} p LEFT JOIN ${this.#files} f ON f.fid = p.fid
          WHERE ${range.where} AND p.path > ? ${directOnly}
          ORDER BY p.path LIMIT ${LIST_PAGE}`,
-        ...params,
+        params,
       );
       for (const row of rows) {
         const stats = toStats(row);
@@ -346,7 +351,7 @@ export class SqliteFilesApi implements FilesApi {
   // ------------------------------------------------------------- mutation
 
   async remove(path: string): Promise<boolean> {
-    const counts = await this.#sql.transaction(this.#removeTree(normalizePath(path)));
+    const counts = await this.#transaction(this.#removeTree(normalizePath(path)));
     return counts[counts.length - 1] > 0;
   }
 
@@ -427,7 +432,7 @@ export class SqliteFilesApi implements FilesApi {
             params: [to, from.length + 1, now, ...range.params],
           },
     ];
-    const counts = await this.#sql.transaction(statements);
+    const counts = await this.#transaction(statements);
     return counts[counts.length - 1] > 0;
   }
 
@@ -453,7 +458,7 @@ export class SqliteFilesApi implements FilesApi {
     const eligible = `f.updated < ? AND NOT EXISTS (
       SELECT 1 FROM ${this.#paths} p WHERE p.fid = f.fid
     )`;
-    const [, contents] = await this.#sql.transaction([
+    const [, contents] = await this.#transaction([
       {
         sql: `DELETE FROM ${this.#blocks} WHERE fid IN (SELECT f.fid FROM ${this.#files} f WHERE ${eligible})`,
         params: [cutoff],
@@ -465,12 +470,17 @@ export class SqliteFilesApi implements FilesApi {
 
   // -------------------------------------------------------------- private
 
+  /** The statements as one transaction; per statement, the rows it changed. */
+  #transaction(statements: SqlStatement[]): Promise<number[]> {
+    return inTransaction(this.#db, (tx) => runStatements(tx, statements));
+  }
+
   async #entry(name: string): Promise<EntryRow | undefined> {
-    const rows = await this.#sql.all<EntryRow>(
+    const rows = await this.#db.query<EntryRow>(
       `SELECT p.fid, p.mtime, f.size, f.compression, f.block_size
        FROM ${this.#paths} p LEFT JOIN ${this.#files} f ON f.fid = p.fid
        WHERE p.path = ?`,
-      name,
+      [name],
     );
     return rows[0];
   }
@@ -488,10 +498,9 @@ export class SqliteFilesApi implements FilesApi {
   }
 
   async #block(fid: number, shift: number) {
-    const rows = await this.#sql.all<{ shift: number; block: unknown }>(
+    const rows = await this.#db.query<{ shift: number; block: unknown }>(
       `SELECT shift, block FROM ${this.#blocks} WHERE fid = ? AND shift = ?`,
-      fid,
-      shift,
+      [fid, shift],
     );
     return rows[0];
   }

package/src/bytes.ts

@@ -1,8 +1,6 @@
-/** Blobs arrive as Uint8Array (node:sqlite), ArrayBuffer (Durable Objects) or number[] (D1). */
+/** BLOBs arrive as Uint8Array from every @statewalker/db-sqlite driver; SQLAR may hold TEXT. */
 export function toBytes(value: unknown): Uint8Array {
   if (value instanceof Uint8Array) return value;
-  if (value instanceof ArrayBuffer) return new Uint8Array(value);
-  if (Array.isArray(value)) return Uint8Array.from(value);
   if (typeof value === "string") return new TextEncoder().encode(value);
   return new Uint8Array(0);
 }

package/src/index.ts

@@ -13,13 +13,4 @@ export {
   rawCodec,
   webCodec,
 } from "./codec.js";
-export {
-  type D1Database,
-  D1SqlDriver,
-  DoSqlDriver,
-  type DoStorage,
-  NodeSqlDriver,
-  type NodeSqliteDatabase,
-} from "./drivers.js";
-export type { SqlDriver, SqlStatement } from "./sql.types.js";
 export { SqlarFilesApi, type SqlarFilesApiOptions } from "./sqlar-files-api.js";

package/src/run-statements.ts

@@ -0,0 +1,24 @@
+import type { Db } from "@statewalker/db-api";
+
+/** One statement of a transaction. */
+export interface SqlStatement {
+  sql: string;
+  params?: unknown[];
+}
+
+/**
+ * Runs the statements in order on a transaction's Db and returns, per
+ * statement, the rows it changed — zero exactly when it changed nothing. The
+ * count is SQLite's `changes()` on the same connection, so index writes are
+ * not counted. Call it only inside `inTransaction`; it does nothing but SQL,
+ * so a retried transaction callback is safe.
+ */
+export async function runStatements(tx: Db, statements: SqlStatement[]): Promise<number[]> {
+  const counts: number[] = [];
+  for (const { sql, params = [] } of statements) {
+    await tx.query(sql, params);
+    const [row] = await tx.query<{ n: number }>("SELECT changes() AS n");
+    counts.push(Number(row.n));
+  }
+  return counts;
+}

package/src/sqlar-files-api.ts

@@ -1,3 +1,4 @@
+import type { Db } from "@statewalker/db-api";
 import type {
   FileInfo,
   FileStats,
@@ -8,7 +9,6 @@ import type {
 import { comparePaths, normalizePath } from "@statewalker/webrun-files";
 import { toBytes } from "./bytes.js";
 import { type Codec, defaultCodec } from "./codec.js";
-import type { SqlDriver } from "./sql.types.js";
 
 /**
  * The table, verbatim from the SQLite Archive specification. Five columns,
@@ -44,17 +44,17 @@ export interface SqlarFilesApiOptions {
  * missing path — and {@link symlink} / {@link readlink} expose the link itself.
  */
 export class SqlarFilesApi implements FilesApi {
-  readonly #sql: SqlDriver;
+  readonly #db: Db;
   readonly #codec: Codec;
 
-  constructor(sql: SqlDriver, opts: SqlarFilesApiOptions = {}) {
-    this.#sql = sql;
+  constructor(db: Db, opts: SqlarFilesApiOptions = {}) {
+    this.#db = db;
     this.#codec = opts.codec ?? defaultCodec();
   }
 
   /** Creates the table if it is missing. Await it before any other call. */
   async init(): Promise<void> {
-    await this.#sql.run(SCHEMA);
+    await this.#db.query(SCHEMA);
   }
 
   /** A missing path or a directory yields nothing; a file yields one chunk. */
@@ -63,10 +63,9 @@ export class SqlarFilesApi implements FilesApi {
     const resolved = await this.#resolve(toName(path));
     if (resolved?.stats.kind !== "file") return;
 
-    const rows = await this.#sql.all<{ data: unknown }>(
-      "SELECT data FROM sqlar WHERE name = ?",
+    const rows = await this.#db.query<{ data: unknown }>("SELECT data FROM sqlar WHERE name = ?", [
       resolved.name,
-    );
+    ]);
     const content = await this.#content(resolved.name, resolved.stats.size, toBytes(rows[0]?.data));
     options.signal?.throwIfAborted();
     const start = options.start ?? 0;
@@ -150,9 +149,9 @@ export class SqlarFilesApi implements FilesApi {
     // Paths are reported under the requested name even when it is a link.
     const base = resolved.name;
     const range = descendants(base);
-    const rows = await this.#sql.all<StoredRow>(
+    const rows = await this.#db.query<StoredRow>(
       `SELECT ${ROW_COLUMNS} FROM sqlar WHERE ${range.where} ORDER BY name`,
-      ...range.params,
+      range.params,
     );
     const prefixLength = base === "" ? 0 : base.length + 1;
     const seen = new Set<string>();
@@ -183,12 +182,12 @@ export class SqlarFilesApi implements FilesApi {
   async remove(path: string): Promise<boolean> {
     const name = toName(path);
     const range = selfAndDescendants(name);
-    const found = await this.#sql.all(
+    const found = await this.#db.query(
       `SELECT 1 FROM sqlar WHERE ${range.where} LIMIT 1`,
-      ...range.params,
+      range.params,
     );
     if (found.length === 0) return false;
-    await this.#sql.run(`DELETE FROM sqlar WHERE ${range.where}`, ...range.params);
+    await this.#db.query(`DELETE FROM sqlar WHERE ${range.where}`, range.params);
     return true;
   }
 
@@ -200,7 +199,7 @@ export class SqlarFilesApi implements FilesApi {
     const from = toName(source);
     const to = toName(target);
     const range = selfAndDescendants(from);
-    const rows = await this.#sql.all<{
+    const rows = await this.#db.query<{
       name: string;
       mode: number;
       sz: number;
@@ -208,7 +207,7 @@ export class SqlarFilesApi implements FilesApi {
       data: unknown;
     }>(
       `SELECT name, mode, sz, typeof(data) AS dtype, data FROM sqlar WHERE ${range.where}`,
-      ...range.params,
+      range.params,
     );
     if (rows.length === 0) return false;
 
@@ -268,32 +267,28 @@ export class SqlarFilesApi implements FilesApi {
   }
 
   async #row(name: string): Promise<StoredRow | undefined> {
-    const rows = await this.#sql.all<StoredRow>(
+    const rows = await this.#db.query<StoredRow>(
       `SELECT ${ROW_COLUMNS} FROM sqlar WHERE name = ?`,
-      name,
+      [name],
     );
     return rows[0];
   }
 
   async #hasDescendants(name: string): Promise<boolean> {
     const range = descendants(name);
-    const rows = await this.#sql.all(
+    const rows = await this.#db.query(
       `SELECT 1 FROM sqlar WHERE ${range.where} LIMIT 1`,
-      ...range.params,
+      range.params,
     );
     return rows.length > 0;
   }
 
   async #put(name: string, mode: number, sz: number, data: Uint8Array | string | null) {
-    await this.#sql.run(
+    await this.#db.query(
       `INSERT INTO sqlar (name, mode, mtime, sz, data) VALUES (?, ?, ?, ?, ?)
        ON CONFLICT(name) DO UPDATE SET
          mode = excluded.mode, mtime = excluded.mtime, sz = excluded.sz, data = excluded.data`,
-      name,
-      mode,
-      Math.floor(Date.now() / 1000), // SQLAR mtime is in seconds
-      sz,
-      data,
+      [name, mode, Math.floor(Date.now() / 1000), sz, data], // SQLAR mtime is in seconds
     );
   }
 }

package/dist/drivers.d.ts

@@ -1,73 +0,0 @@
-import type { SqlDriver, SqlStatement } from "./sql.types.js";
-/** The subset of node:sqlite's `DatabaseSync` this driver uses. */
-export interface NodeSqliteDatabase {
-    exec(sql: string): void;
-    prepare(sql: string): {
-        all(...params: never[]): unknown[];
-        run(...params: never[]): {
-            changes: number | bigint;
-        };
-    };
-}
-/** node:sqlite — local development, tests and any Node deployment. */
-export declare class NodeSqlDriver implements SqlDriver {
-    #private;
-    constructor(db: NodeSqliteDatabase);
-    all<T>(sql: string, ...params: unknown[]): T[];
-    run(sql: string, ...params: unknown[]): void;
-    /** Synchronous from BEGIN to COMMIT, so no other call can interleave on the connection. */
-    transaction(statements: SqlStatement[]): number[];
-}
-/** The subset of a Durable Object's `ctx.storage` this driver uses. */
-export interface DoStorage {
-    sql: {
-        exec(query: string, ...bindings: unknown[]): {
-            toArray(): unknown[];
-        };
-    };
-    transactionSync<T>(fn: () => T): T;
-}
-/**
- * Durable Object SQLite storage: pass `ctx.storage`. Synchronous; BLOBs come
- * back as ArrayBuffer. Transactions use `transactionSync`, since `sql.exec`
- * rejects `BEGIN`.
- */
-export declare class DoSqlDriver implements SqlDriver {
-    #private;
-    constructor(storage: DoStorage);
-    all<T>(sql: string, ...params: unknown[]): T[];
-    run(sql: string, ...params: unknown[]): void;
-    /**
-     * Counts come from SQLite's `changes()` on the same connection, not from the
-     * cursor's `rowsWritten`, which also counts every index row a write touches.
-     */
-    transaction(statements: SqlStatement[]): number[];
-}
-/** The subset of a `D1Database` this driver uses. */
-export interface D1Database {
-    prepare(query: string): D1PreparedStatement;
-    batch(statements: D1BoundStatement[]): Promise<{
-        meta: {
-            changes: number;
-        };
-    }[]>;
-}
-interface D1PreparedStatement {
-    bind(...values: unknown[]): D1BoundStatement;
-}
-interface D1BoundStatement {
-    all(): Promise<{
-        results: unknown[];
-    }>;
-    run(): Promise<unknown>;
-}
-/** Cloudflare D1. Asynchronous; BLOBs come back as number[]; transactions are `batch()`. */
-export declare class D1SqlDriver implements SqlDriver {
-    #private;
-    constructor(db: D1Database);
-    all<T>(sql: string, ...params: unknown[]): Promise<T[]>;
-    run(sql: string, ...params: unknown[]): Promise<void>;
-    transaction(statements: SqlStatement[]): Promise<number[]>;
-}
-export {};
-//# sourceMappingURL=drivers.d.ts.map

package/dist/drivers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"drivers.d.ts","sourceRoot":"","sources":["../src/drivers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9D,mEAAmE;AACnE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QACpB,GAAG,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC;QACnC,GAAG,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG;YAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;KACvD,CAAC;CACH;AAED,sEAAsE;AACtE,qBAAa,aAAc,YAAW,SAAS;;IAG7C,YAAY,EAAE,EAAE,kBAAkB,EAEjC;IAED,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAE7C;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAE3C;IAED,2FAA2F;IAC3F,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAYhD;CACF;AAED,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE;QACH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAG;YAAE,OAAO,IAAI,OAAO,EAAE,CAAA;SAAE,CAAC;KACvE,CAAC;IACF,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;CACpC;AAED;;;;GAIG;AACH,qBAAa,WAAY,YAAW,SAAS;;IAG3C,YAAY,OAAO,EAAE,SAAS,EAE7B;IAED,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAE7C;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAG3C;IAED;;;OAGG;IACH,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAQhD;CACF;AAED,qDAAqD;AACrD,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC5C,KAAK,CAAC,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC,CAAC;CACjF;AAED,UAAU,mBAAmB;IAC3B,IAAI,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;CAC9C;AAED,UAAU,gBAAgB;IACxB,GAAG,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,CAAA;KAAE,CAAC,CAAC;IACvC,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACzB;AAED,4FAA4F;AAC5F,qBAAa,WAAY,YAAW,SAAS;;IAG3C,YAAY,EAAE,EAAE,UAAU,EAEzB;IAEK,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAM5D;IAEK,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAK1D;IAEK,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAM/D;CACF"}

package/dist/sql.types.d.ts

@@ -1,25 +0,0 @@
-/** One statement of a transaction. */
-export interface SqlStatement {
-    sql: string;
-    params?: unknown[];
-}
-/**
- * The SQL port. Each method may be sync or async, so node:sqlite, a Durable
- * Object's storage and D1 all satisfy it through a thin driver.
- */
-export interface SqlDriver {
-    /** Rows as objects keyed by column name. */
-    all<T = Record<string, unknown>>(sql: string, ...params: unknown[]): T[] | Promise<T[]>;
-    /** Execute one statement for its effect. */
-    run(sql: string, ...params: unknown[]): void | Promise<void>;
-    /**
-     * Run the statements in order as one transaction: all apply or none do, and
-     * a failure rethrows after rolling back. Returns, per statement, a count that
-     * is zero exactly when that statement changed nothing.
-     *
-     * No statement may depend on reading another's result — D1's `batch()` cannot
-     * pass results along — so conditions belong in SQL (`WHERE EXISTS …`).
-     */
-    transaction(statements: SqlStatement[]): number[] | Promise<number[]>;
-}
-//# sourceMappingURL=sql.types.d.ts.map

package/dist/sql.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sql.types.d.ts","sourceRoot":"","sources":["../src/sql.types.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,4CAA4C;IAC5C,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACxF,4CAA4C;IAC5C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D;;;;;;;OAOG;IACH,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACvE"}

package/src/drivers.ts

@@ -1,133 +0,0 @@
-import type { SqlDriver, SqlStatement } from "./sql.types.js";
-
-/** The subset of node:sqlite's `DatabaseSync` this driver uses. */
-export interface NodeSqliteDatabase {
-  exec(sql: string): void;
-  prepare(sql: string): {
-    all(...params: never[]): unknown[];
-    run(...params: never[]): { changes: number | bigint };
-  };
-}
-
-/** node:sqlite — local development, tests and any Node deployment. */
-export class NodeSqlDriver implements SqlDriver {
-  readonly #db: NodeSqliteDatabase;
-
-  constructor(db: NodeSqliteDatabase) {
-    this.#db = db;
-  }
-
-  all<T>(sql: string, ...params: unknown[]): T[] {
-    return this.#db.prepare(sql).all(...(params as never[])) as T[];
-  }
-
-  run(sql: string, ...params: unknown[]): void {
-    this.#db.prepare(sql).run(...(params as never[]));
-  }
-
-  /** Synchronous from BEGIN to COMMIT, so no other call can interleave on the connection. */
-  transaction(statements: SqlStatement[]): number[] {
-    this.#db.exec("BEGIN IMMEDIATE");
-    try {
-      const counts = statements.map(({ sql, params = [] }) =>
-        Number(this.#db.prepare(sql).run(...(params as never[])).changes),
-      );
-      this.#db.exec("COMMIT");
-      return counts;
-    } catch (error) {
-      this.#db.exec("ROLLBACK");
-      throw error;
-    }
-  }
-}
-
-/** The subset of a Durable Object's `ctx.storage` this driver uses. */
-export interface DoStorage {
-  sql: {
-    exec(query: string, ...bindings: unknown[]): { toArray(): unknown[] };
-  };
-  transactionSync<T>(fn: () => T): T;
-}
-
-/**
- * Durable Object SQLite storage: pass `ctx.storage`. Synchronous; BLOBs come
- * back as ArrayBuffer. Transactions use `transactionSync`, since `sql.exec`
- * rejects `BEGIN`.
- */
-export class DoSqlDriver implements SqlDriver {
-  readonly #storage: DoStorage;
-
-  constructor(storage: DoStorage) {
-    this.#storage = storage;
-  }
-
-  all<T>(sql: string, ...params: unknown[]): T[] {
-    return this.#storage.sql.exec(sql, ...params).toArray() as T[];
-  }
-
-  run(sql: string, ...params: unknown[]): void {
-    // The cursor is lazy; draining it makes sure the statement has run.
-    this.#storage.sql.exec(sql, ...params).toArray();
-  }
-
-  /**
-   * Counts come from SQLite's `changes()` on the same connection, not from the
-   * cursor's `rowsWritten`, which also counts every index row a write touches.
-   */
-  transaction(statements: SqlStatement[]): number[] {
-    return this.#storage.transactionSync(() =>
-      statements.map(({ sql, params = [] }) => {
-        this.#storage.sql.exec(sql, ...params).toArray();
-        const [row] = this.#storage.sql.exec("SELECT changes() AS n").toArray() as { n: number }[];
-        return row.n;
-      }),
-    );
-  }
-}
-
-/** The subset of a `D1Database` this driver uses. */
-export interface D1Database {
-  prepare(query: string): D1PreparedStatement;
-  batch(statements: D1BoundStatement[]): Promise<{ meta: { changes: number } }[]>;
-}
-
-interface D1PreparedStatement {
-  bind(...values: unknown[]): D1BoundStatement;
-}
-
-interface D1BoundStatement {
-  all(): Promise<{ results: unknown[] }>;
-  run(): Promise<unknown>;
-}
-
-/** Cloudflare D1. Asynchronous; BLOBs come back as number[]; transactions are `batch()`. */
-export class D1SqlDriver implements SqlDriver {
-  readonly #db: D1Database;
-
-  constructor(db: D1Database) {
-    this.#db = db;
-  }
-
-  async all<T>(sql: string, ...params: unknown[]): Promise<T[]> {
-    const { results } = await this.#db
-      .prepare(sql)
-      .bind(...params)
-      .all();
-    return results as T[];
-  }
-
-  async run(sql: string, ...params: unknown[]): Promise<void> {
-    await this.#db
-      .prepare(sql)
-      .bind(...params)
-      .run();
-  }
-
-  async transaction(statements: SqlStatement[]): Promise<number[]> {
-    if (statements.length === 0) return [];
-    const results = await this.#db.batch(
-      statements.map(({ sql, params = [] }) => this.#db.prepare(sql).bind(...params)),
-    );
-    return results.map((result) => result.meta.changes);
-  }
-}

package/src/sql.types.ts

@@ -1,25 +0,0 @@
-/** One statement of a transaction. */
-export interface SqlStatement {
-  sql: string;
-  params?: unknown[];
-}
-
-/**
- * The SQL port. Each method may be sync or async, so node:sqlite, a Durable
- * Object's storage and D1 all satisfy it through a thin driver.
- */
-export interface SqlDriver {
-  /** Rows as objects keyed by column name. */
-  all<T = Record<string, unknown>>(sql: string, ...params: unknown[]): T[] | Promise<T[]>;
-  /** Execute one statement for its effect. */
-  run(sql: string, ...params: unknown[]): void | Promise<void>;
-  /**
-   * Run the statements in order as one transaction: all apply or none do, and
-   * a failure rethrows after rolling back. Returns, per statement, a count that
-   * is zero exactly when that statement changed nothing.
-   *
-   * No statement may depend on reading another's result — D1's `batch()` cannot
-   * pass results along — so conditions belong in SQL (`WHERE EXISTS …`).
-   */
-  transaction(statements: SqlStatement[]): number[] | Promise<number[]>;
-}