@effect/sql-sqlite-do 4.0.0-beta.86 → 4.0.0-beta.88

package/dist/SqliteClient.d.ts

@@ -1,15 +1,26 @@
 /**
  * Connects Effect SQL to SQLite storage inside Cloudflare Durable Objects.
  *
- * This module wraps a Durable Object `SqlStorage` handle and exposes it as both
- * `SqliteClient` and the generic Effect SQL client. It serializes access,
- * supports normal and streaming queries, converts returned `ArrayBuffer` values
- * to `Uint8Array`, and provides layers for wiring the client into an Effect
- * application. `updateValues` is not supported by this driver.
+ * This module adapts a Durable Object `SqlStorage` handle into both the
+ * Durable Object-specific `SqliteClient` service and the generic Effect
+ * `SqlClient` service. Use it from inside a Durable Object to run local
+ * per-object queries, repositories, migrations, transactional read/write
+ * workflows, and tests that exercise Cloudflare's SQLite-backed storage API.
+ *
+ * Durable Object SQLite storage is scoped to one object id, so each object
+ * instance has its own database. Callers can pass the `SqlStorage` handle for
+ * normal queries, or the full `DurableObjectStorage` when `withTransaction` or
+ * migrations need Cloudflare-managed transactions. This adapter serializes
+ * Effect SQL access through one connection; a transaction holds that permit for
+ * the lifetime of its scope, so keep transactions short, avoid suspending them
+ * across unrelated work, and use them when multi-statement writes must commit
+ * atomically. `SqlStorage.exec` returns `ArrayBuffer` values
+ * for SQLite blobs, which this client normalizes to `Uint8Array`, and SQLite
+ * does not support `updateValues`.
  *
  * @since 4.0.0
  */
-import type { SqlStorage } from "@cloudflare/workers-types";
+import type { DurableObjectStorage, SqlStorage } from "@cloudflare/workers-types";
 import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -56,19 +67,20 @@ export interface SqliteClient extends Client.SqlClient {
  */
 export declare const SqliteClient: Context.Service<SqliteClient, SqliteClient>;
 /**
- * Configuration for a Cloudflare Durable Object SQLite client, including the `SqlStorage` handle, span attributes, and query/result name transforms.
+ * Configuration for a Cloudflare Durable Object SQLite client, including either a `SqlStorage` handle or the full `DurableObjectStorage` for transaction support, span attributes, and query/result name transforms.
  *
  * @category models
  * @since 4.0.0
  */
 export interface SqliteClientConfig {
-    readonly db: SqlStorage;
+    readonly db?: SqlStorage | undefined;
+    readonly storage?: DurableObjectStorage | undefined;
     readonly spanAttributes?: Record<string, unknown> | undefined;
     readonly transformResultNames?: ((str: string) => string) | undefined;
     readonly transformQueryNames?: ((str: string) => string) | undefined;
 }
 /**
- * Creates a scoped Cloudflare Durable Object SQLite client around `SqlStorage`, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
+ * Creates a scoped Cloudflare Durable Object SQLite client around Durable Object SQLite storage, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
  *
  * @category constructors
  * @since 4.0.0

package/dist/SqliteClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteClient.d.ts","sourceRoot":"","sources":["../src/SqliteClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,UAAU,MAAM,uCAAuC,CAAA;AACnE,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAUvD;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,MAA8C,CAAA;AAEnE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,qCAAqC,CAAA;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,SAAS;IACpD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IAEnC,8BAA8B;IAC9B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,6CAAsE,CAAA;AAE/F;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,GACf,SAAS,kBAAkB,KAC1B,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAsHrE,CAAA;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GACtB,QAAQ,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KACtC,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAUzB,CAAA;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,QAAQ,kBAAkB,KACzB,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,SAAS,CAML,CAAA"}
+{"version":3,"file":"SqliteClient.d.ts","sourceRoot":"","sources":["../src/SqliteClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACjF,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAIvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,UAAU,MAAM,uCAAuC,CAAA;AACnE,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAUvD;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,MAA8C,CAAA;AAEnE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,qCAAqC,CAAA;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,SAAS;IACpD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IAEnC,8BAA8B;IAC9B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,6CAAsE,CAAA;AAM/F;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAA;IACnD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAiED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,GACf,SAAS,kBAAkB,KAC1B,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CA+HrE,CAAA;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GACtB,QAAQ,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KACtC,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAUzB,CAAA;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,QAAQ,kBAAkB,KACzB,KAAK,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,SAAS,CAML,CAAA"}

package/dist/SqliteClient.js

@@ -1,6 +1,7 @@
 import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
 import * as Fiber from "effect/Fiber";
 import { identity } from "effect/Function";
 import * as Layer from "effect/Layer";
@@ -9,7 +10,7 @@ import * as Semaphore from "effect/Semaphore";
 import * as Stream from "effect/Stream";
 import * as Reactivity from "effect/unstable/reactivity/Reactivity";
 import * as Client from "effect/unstable/sql/SqlClient";
-import { classifySqliteError, SqlError } from "effect/unstable/sql/SqlError";
+import { classifySqliteError, SqlError, UnknownError } from "effect/unstable/sql/SqlError";
 import * as Statement from "effect/unstable/sql/Statement";
 const ATTR_DB_SYSTEM_NAME = "db.system.name";
 const classifyError = (cause, message, operation) => classifySqliteError(cause, {
@@ -35,8 +36,45 @@ export const TypeId = "~@effect/sql-sqlite-do/SqliteClient";
  * @since 4.0.0
  */
 export const SqliteClient = /*#__PURE__*/Context.Service("@effect/sql-sqlite-do/SqliteClient");
+const SqliteTransaction = /*#__PURE__*/Context.Service("@effect/sql-sqlite-do/SqliteClient/SqliteTransaction");
+const unsupportedTransaction = (message, operation) => new SqlError({
+  reason: new UnknownError({
+    cause: new Error(message),
+    message,
+    operation
+  })
+});
+const makeUnsupportedWithTransaction = message => _effect => Effect.fail(unsupportedTransaction(message, "transaction"));
+const makeStorageBackedWithTransaction = (storage, connection, semaphore) => effect => Effect.withFiber(fiber => {
+  const services = fiber.context;
+  const connOption = Context.getOption(services, SqliteTransaction);
+  if (connOption._tag === "Some") {
+    return Effect.fail(unsupportedTransaction("Nested transactions are not supported by Cloudflare Durable Object SQLite storage", "transaction"));
+  }
+  const effectWithTxn = Effect.provideContext(effect, Context.add(services, SqliteTransaction, [connection, 0]));
+  return semaphore.withPermits(1)(Effect.callback(resume => {
+    let interrupted = false;
+    const promise = storage.transaction(txn => new Promise(resolve => {
+      if (interrupted) return resolve();
+      resume(Effect.onExit(effectWithTxn, exit => {
+        if (Exit.isFailure(exit)) {
+          txn.rollback();
+        }
+        resolve();
+        // wait for the transaction to complete
+        return Effect.promise(() => promise);
+      }));
+    })).catch(cause => resume(Effect.fail(new SqlError({
+      reason: classifyError(cause, "Failed transaction", "transaction")
+    }))));
+    return Effect.suspend(() => {
+      interrupted = true;
+      return Effect.promise(() => promise);
+    });
+  }));
+});
 /**
- * Creates a scoped Cloudflare Durable Object SQLite client around `SqlStorage`, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
+ * Creates a scoped Cloudflare Durable Object SQLite client around Durable Object SQLite storage, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
  *
  * @category constructors
  * @since 4.0.0
@@ -44,10 +82,14 @@ export const SqliteClient = /*#__PURE__*/Context.Service("@effect/sql-sqlite-do/
 export const make = options => Effect.gen(function* () {
   const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
   const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
+  const db = options.storage?.sql ?? options.db;
+  if (db === undefined) {
+    return yield* Effect.die("SqliteClient.make requires either a Durable Object storage or sql storage");
+  }
+  const sqlStorage = db;
   const makeConnection = Effect.gen(function* () {
-    const db = options.db;
     function* runIterator(sql, params = []) {
-      const cursor = db.exec(sql, ...params);
+      const cursor = sqlStorage.exec(sql, ...params);
       const columns = cursor.columnNames;
       for (const result of cursor.raw()) {
         const obj = {};
@@ -65,7 +107,7 @@ export const make = options => Effect.gen(function* () {
       })
     });
     const runValues = (sql, params = []) => Effect.try({
-      try: () => Array.from(db.exec(sql, ...params).raw(), row => {
+      try: () => Array.from(sqlStorage.exec(sql, ...params).raw(), row => {
         for (let i = 0; i < row.length; i++) {
           const value = row[i];
           if (value instanceof ArrayBuffer) {
@@ -110,15 +152,18 @@ export const make = options => Effect.gen(function* () {
     const scope = Context.getUnsafe(fiber.context, Scope.Scope);
     return Effect.as(Effect.tap(restore(semaphore.take(1)), () => Scope.addFinalizer(scope, semaphore.release(1))), connection);
   });
-  return Object.assign(yield* Client.make({
+  const client = yield* Client.make({
     acquirer,
     compiler,
     transactionAcquirer,
+    transactionService: SqliteTransaction,
     spanAttributes: [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [ATTR_DB_SYSTEM_NAME, "sqlite"]],
     transformRows
-  }), {
+  });
+  return Object.assign(client, {
     [TypeId]: TypeId,
-    config: options
+    config: options,
+    withTransaction: options.storage ? makeStorageBackedWithTransaction(options.storage, connection, semaphore) : makeUnsupportedWithTransaction("Transactions require Durable Object storage; pass ctx.storage as the storage option")
   });
 });
 /**

package/dist/SqliteClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteClient.js","names":["Config","Context","Effect","Fiber","identity","Layer","Scope","Semaphore","Stream","Reactivity","Client","classifySqliteError","SqlError","Statement","ATTR_DB_SYSTEM_NAME","classifyError","cause","message","operation","TypeId","SqliteClient","Service","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","makeConnection","db","runIterator","sql","params","cursor","exec","columns","columnNames","result","raw","obj","i","length","value","ArrayBuffer","Uint8Array","runStatement","try","Array","from","catch","reason","runValues","row","execute","map","executeRaw","executeValues","executeValuesUnprepared","executeUnprepared","executeStream","suspend","iterator","fromIteratorSucceed","pipe","mapArray","chunk","semaphore","connection","acquirer","withPermits","succeed","transactionAcquirer","uninterruptibleMask","restore","fiber","getCurrent","scope","getUnsafe","context","as","tap","take","addFinalizer","release","Object","assign","spanAttributes","entries","config","layerConfig","effectContext","unwrap","flatMap","client","add","SqlClient","provide","layer"],"sources":["../src/SqliteClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SqliteClient.js","names":["Config","Context","Effect","Exit","Fiber","identity","Layer","Scope","Semaphore","Stream","Reactivity","Client","classifySqliteError","SqlError","UnknownError","Statement","ATTR_DB_SYSTEM_NAME","classifyError","cause","message","operation","TypeId","SqliteClient","Service","SqliteTransaction","unsupportedTransaction","reason","Error","makeUnsupportedWithTransaction","_effect","fail","makeStorageBackedWithTransaction","storage","connection","semaphore","effect","withFiber","fiber","services","context","connOption","getOption","_tag","effectWithTxn","provideContext","add","withPermits","callback","resume","interrupted","promise","transaction","txn","Promise","resolve","onExit","exit","isFailure","rollback","catch","suspend","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","db","sql","die","sqlStorage","makeConnection","runIterator","params","cursor","exec","columns","columnNames","result","raw","obj","i","length","value","ArrayBuffer","Uint8Array","runStatement","try","Array","from","runValues","row","execute","map","executeRaw","executeValues","executeValuesUnprepared","executeUnprepared","executeStream","iterator","fromIteratorSucceed","pipe","mapArray","chunk","acquirer","succeed","transactionAcquirer","uninterruptibleMask","restore","getCurrent","scope","getUnsafe","as","tap","take","addFinalizer","release","client","transactionService","spanAttributes","Object","entries","assign","config","withTransaction","layerConfig","effectContext","unwrap","flatMap","SqlClient","provide","layer"],"sources":["../src/SqliteClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/SqliteMigrator.d.ts

@@ -2,10 +2,25 @@
  * Runs database migrations for Durable Object SQLite storage that uses Effect
  * SQL.
  *
- * This module re-exports the shared migration loaders and errors, then provides
- * `run` and `layer` helpers that apply pending migration files with the current
- * `SqlClient`. The SQL client supplies the Durable Object storage connection;
- * this module only handles migration execution.
+ * This module re-exports the shared `Migrator` loaders and error types, then
+ * provides `run` and `layer` helpers that execute ordered migrations through the
+ * current Durable Object SQLite `SqlClient`. Use it when a Durable
+ * Object needs to create or upgrade its local schema during construction, before
+ * repositories or request handlers use the object storage, or in tests that
+ * exercise Durable Object persistence.
+ *
+ * Migrations are recorded in `effect_sql_migrations` by default and are loaded
+ * using the shared `<id>_<name>` file or record-key convention. The underlying
+ * storage is scoped to a Durable Object id, so running migrations for one object
+ * does not update any other object instance; run the migrator against the same
+ * `DurableObjectStorage`-backed client that the object uses for normal queries
+ * so migrations can run in Cloudflare-managed transactions. These SQL
+ * migrations are separate from Cloudflare's Durable Object class migrations, and
+ * the Durable Object must already be configured with SQLite storage before this
+ * module can apply schema changes. Repeated startup runs are expected and are
+ * guarded by the migrations table, but request handling should wait until the
+ * migration layer has finished. This adapter does not currently write SQLite
+ * schema dumps for `schemaDirectory`.
  *
  * @since 4.0.0
  */

package/dist/SqliteMigrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteMigrator.d.ts","sourceRoot":"","sources":["../src/SqliteMigrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D;;GAEG;AACH,cAAc,8BAA8B,CAAA;AAE5C;;;;;GAKG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAC7D,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,MAAM,CAAC,SAAS,GAAG,EAAE,CACF,CAAA;AAErB;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,EACrB,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACnC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAAE,MAAM,CAAC,SAAS,GAAG,CAAC,CAAsC,CAAA"}
+{"version":3,"file":"SqliteMigrator.d.ts","sourceRoot":"","sources":["../src/SqliteMigrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D;;GAEG;AACH,cAAc,8BAA8B,CAAA;AAE5C;;;;;GAKG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAC7D,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,MAAM,CAAC,SAAS,GAAG,EAAE,CACF,CAAA;AAErB;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,EACrB,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACnC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAAE,MAAM,CAAC,SAAS,GAAG,CAAC,CAAsC,CAAA"}

package/dist/SqliteMigrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteMigrator.js","names":["Layer","Migrator","run","make","layer","options","effectDiscard"],"sources":["../src/SqliteMigrator.ts"],"sourcesContent":[null],"mappings":"AAYA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,QAAQ,MAAM,8BAA8B;AAIxD;;;AAGA,cAAc,8BAA8B;AAE5C;;;;;;AAMA,OAAO,MAAMC,GAAG,gBAMZD,QAAQ,CAACE,IAAI,CAAC,EAAE,CAAC;AAErB;;;;;;AAMA,OAAO,MAAMC,KAAK,GAChBC,OAAoC,IAC6CL,KAAK,CAACM,aAAa,CAACJ,GAAG,CAACG,OAAO,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"SqliteMigrator.js","names":["Layer","Migrator","run","make","layer","options","effectDiscard"],"sources":["../src/SqliteMigrator.ts"],"sourcesContent":[null],"mappings":"AA2BA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,QAAQ,MAAM,8BAA8B;AAIxD;;;AAGA,cAAc,8BAA8B;AAE5C;;;;;;AAMA,OAAO,MAAMC,GAAG,gBAMZD,QAAQ,CAACE,IAAI,CAAC,EAAE,CAAC;AAErB;;;;;;AAMA,OAAO,MAAMC,KAAK,GAChBC,OAAoC,IAC6CL,KAAK,CAACM,aAAa,CAACJ,GAAG,CAACG,OAAO,CAAC,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-do",
-  "version": "4.0.0-beta.86",
+  "version": "4.0.0-beta.88",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
@@ -44,10 +44,10 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260511.1",
-    "effect": "^4.0.0-beta.86"
+    "effect": "^4.0.0-beta.88"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.86"
+    "effect": "^4.0.0-beta.88"
   },
   "scripts": {
     "codegen": "effect-utils codegen",

package/src/SqliteClient.ts

@@ -1,18 +1,30 @@
 /**
  * Connects Effect SQL to SQLite storage inside Cloudflare Durable Objects.
  *
- * This module wraps a Durable Object `SqlStorage` handle and exposes it as both
- * `SqliteClient` and the generic Effect SQL client. It serializes access,
- * supports normal and streaming queries, converts returned `ArrayBuffer` values
- * to `Uint8Array`, and provides layers for wiring the client into an Effect
- * application. `updateValues` is not supported by this driver.
+ * This module adapts a Durable Object `SqlStorage` handle into both the
+ * Durable Object-specific `SqliteClient` service and the generic Effect
+ * `SqlClient` service. Use it from inside a Durable Object to run local
+ * per-object queries, repositories, migrations, transactional read/write
+ * workflows, and tests that exercise Cloudflare's SQLite-backed storage API.
+ *
+ * Durable Object SQLite storage is scoped to one object id, so each object
+ * instance has its own database. Callers can pass the `SqlStorage` handle for
+ * normal queries, or the full `DurableObjectStorage` when `withTransaction` or
+ * migrations need Cloudflare-managed transactions. This adapter serializes
+ * Effect SQL access through one connection; a transaction holds that permit for
+ * the lifetime of its scope, so keep transactions short, avoid suspending them
+ * across unrelated work, and use them when multi-statement writes must commit
+ * atomically. `SqlStorage.exec` returns `ArrayBuffer` values
+ * for SQLite blobs, which this client normalizes to `Uint8Array`, and SQLite
+ * does not support `updateValues`.
  *
  * @since 4.0.0
  */
-import type { SqlStorage } from "@cloudflare/workers-types"
+import type { DurableObjectStorage, SqlStorage } from "@cloudflare/workers-types"
 import * as Config from "effect/Config"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
 import { identity } from "effect/Function"
 import * as Layer from "effect/Layer"
@@ -22,7 +34,7 @@ import * as Stream from "effect/Stream"
 import * as Reactivity from "effect/unstable/reactivity/Reactivity"
 import * as Client from "effect/unstable/sql/SqlClient"
 import type { Connection } from "effect/unstable/sql/SqlConnection"
-import { classifySqliteError, SqlError } from "effect/unstable/sql/SqlError"
+import { classifySqliteError, SqlError, UnknownError } from "effect/unstable/sql/SqlError"
 import * as Statement from "effect/unstable/sql/Statement"
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name"
@@ -73,22 +85,90 @@ export interface SqliteClient extends Client.SqlClient {
  */
 export const SqliteClient = Context.Service<SqliteClient>("@effect/sql-sqlite-do/SqliteClient")
 
+const SqliteTransaction = Context.Service<Client.TransactionConnection, Client.TransactionConnection.Service>(
+  "@effect/sql-sqlite-do/SqliteClient/SqliteTransaction"
+)
+
 /**
- * Configuration for a Cloudflare Durable Object SQLite client, including the `SqlStorage` handle, span attributes, and query/result name transforms.
+ * Configuration for a Cloudflare Durable Object SQLite client, including either a `SqlStorage` handle or the full `DurableObjectStorage` for transaction support, span attributes, and query/result name transforms.
  *
  * @category models
  * @since 4.0.0
  */
 export interface SqliteClientConfig {
-  readonly db: SqlStorage
+  readonly db?: SqlStorage | undefined
+  readonly storage?: DurableObjectStorage | undefined
   readonly spanAttributes?: Record<string, unknown> | undefined
 
   readonly transformResultNames?: ((str: string) => string) | undefined
   readonly transformQueryNames?: ((str: string) => string) | undefined
 }
 
+const unsupportedTransaction = (message: string, operation: string) =>
+  new SqlError({
+    reason: new UnknownError({
+      cause: new Error(message),
+      message,
+      operation
+    })
+  })
+
+const makeUnsupportedWithTransaction =
+  (message: string): Client.SqlClient["withTransaction"] =>
+  <R, E, A>(_effect: Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R> =>
+    Effect.fail(unsupportedTransaction(message, "transaction"))
+
+const makeStorageBackedWithTransaction = (
+  storage: DurableObjectStorage,
+  connection: Connection,
+  semaphore: Semaphore.Semaphore
+): Client.SqlClient["withTransaction"] =>
+<R, E, A>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R> =>
+  Effect.withFiber((fiber) => {
+    const services = fiber.context
+    const connOption = Context.getOption(services, SqliteTransaction)
+    if (connOption._tag === "Some") {
+      return Effect.fail(
+        unsupportedTransaction(
+          "Nested transactions are not supported by Cloudflare Durable Object SQLite storage",
+          "transaction"
+        )
+      )
+    }
+
+    const effectWithTxn = Effect.provideContext(
+      effect,
+      Context.add(services, SqliteTransaction, [connection, 0] as const)
+    )
+
+    return semaphore.withPermits(1)(
+      Effect.callback((resume) => {
+        let interrupted = false
+        const promise = storage.transaction((txn) =>
+          new Promise<void>((resolve) => {
+            if (interrupted) return resolve()
+            resume(Effect.onExit(effectWithTxn, (exit) => {
+              if (Exit.isFailure(exit)) {
+                txn.rollback()
+              }
+              resolve()
+              // wait for the transaction to complete
+              return Effect.promise(() => promise)
+            }))
+          })
+        ).catch((cause) =>
+          resume(Effect.fail(new SqlError({ reason: classifyError(cause, "Failed transaction", "transaction") })))
+        )
+        return Effect.suspend(() => {
+          interrupted = true
+          return Effect.promise(() => promise)
+        })
+      })
+    )
+  })
+
 /**
- * Creates a scoped Cloudflare Durable Object SQLite client around `SqlStorage`, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
+ * Creates a scoped Cloudflare Durable Object SQLite client around Durable Object SQLite storage, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
  *
  * @category constructors
  * @since 4.0.0
@@ -101,15 +181,19 @@ export const make = (
     const transformRows = options.transformResultNames
       ? Statement.defaultTransforms(options.transformResultNames).array
       : undefined
+    const db = options.storage?.sql ?? options.db
 
-    const makeConnection = Effect.gen(function*() {
-      const db = options.db
+    if (db === undefined) {
+      return yield* Effect.die("SqliteClient.make requires either a Durable Object storage or sql storage")
+    }
+    const sqlStorage = db
 
+    const makeConnection = Effect.gen(function*() {
       function* runIterator(
         sql: string,
         params: ReadonlyArray<unknown> = []
       ) {
-        const cursor = db.exec(sql, ...params)
+        const cursor = sqlStorage.exec(sql, ...params)
         const columns = cursor.columnNames
         for (const result of cursor.raw()) {
           const obj: any = {}
@@ -136,7 +220,7 @@ export const make = (
       ): Effect.Effect<ReadonlyArray<any>, SqlError, never> =>
         Effect.try({
           try: () =>
-            Array.from(db.exec(sql, ...params).raw(), (row) => {
+            Array.from(sqlStorage.exec(sql, ...params).raw(), (row) => {
               for (let i = 0; i < row.length; i++) {
                 const value = row[i]
                 if (value instanceof ArrayBuffer) {
@@ -197,22 +281,27 @@ export const make = (
       )
     })
 
-    return Object.assign(
-      (yield* Client.make({
-        acquirer,
-        compiler,
-        transactionAcquirer,
-        spanAttributes: [
-          ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
-          [ATTR_DB_SYSTEM_NAME, "sqlite"]
-        ],
-        transformRows
-      })) as SqliteClient,
-      {
-        [TypeId]: TypeId as TypeId,
-        config: options
-      }
-    )
+    const client = (yield* Client.make({
+      acquirer,
+      compiler,
+      transactionAcquirer,
+      transactionService: SqliteTransaction,
+      spanAttributes: [
+        ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
+        [ATTR_DB_SYSTEM_NAME, "sqlite"]
+      ],
+      transformRows
+    })) as SqliteClient
+
+    return Object.assign(client, {
+      [TypeId]: TypeId as TypeId,
+      config: options,
+      withTransaction: options.storage
+        ? makeStorageBackedWithTransaction(options.storage, connection, semaphore)
+        : makeUnsupportedWithTransaction(
+          "Transactions require Durable Object storage; pass ctx.storage as the storage option"
+        )
+    })
   })
 
 /**

package/src/SqliteMigrator.ts

@@ -2,10 +2,25 @@
  * Runs database migrations for Durable Object SQLite storage that uses Effect
  * SQL.
  *
- * This module re-exports the shared migration loaders and errors, then provides
- * `run` and `layer` helpers that apply pending migration files with the current
- * `SqlClient`. The SQL client supplies the Durable Object storage connection;
- * this module only handles migration execution.
+ * This module re-exports the shared `Migrator` loaders and error types, then
+ * provides `run` and `layer` helpers that execute ordered migrations through the
+ * current Durable Object SQLite `SqlClient`. Use it when a Durable
+ * Object needs to create or upgrade its local schema during construction, before
+ * repositories or request handlers use the object storage, or in tests that
+ * exercise Durable Object persistence.
+ *
+ * Migrations are recorded in `effect_sql_migrations` by default and are loaded
+ * using the shared `<id>_<name>` file or record-key convention. The underlying
+ * storage is scoped to a Durable Object id, so running migrations for one object
+ * does not update any other object instance; run the migrator against the same
+ * `DurableObjectStorage`-backed client that the object uses for normal queries
+ * so migrations can run in Cloudflare-managed transactions. These SQL
+ * migrations are separate from Cloudflare's Durable Object class migrations, and
+ * the Durable Object must already be configured with SQLite storage before this
+ * module can apply schema changes. Repeated startup runs are expected and are
+ * guarded by the migrations table, but request handling should wait until the
+ * migration layer has finished. This adapter does not currently write SQLite
+ * schema dumps for `schemaDirectory`.
  *
  * @since 4.0.0
  */