effect-cf 0.28.1 → 0.29.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # effect-cf
 
+## 0.29.0
+
+### Minor Changes
+
+- [#108](https://github.com/danieljvdm/effect-cf/pull/108) [`735b6d9`](https://github.com/danieljvdm/effect-cf/commit/735b6d95e4b62c7ade598a7f18ba2d8b4ee60f87) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Require the Effect 4.0.0-rc.110 family — dependency ranges move from `^4.0.0-beta.107 <4.0.0-rc.0` to `^4.0.0-rc.110`.
+
+### Patch Changes
+
+- [#66](https://github.com/danieljvdm/effect-cf/pull/66) [`fe34f95`](https://github.com/danieljvdm/effect-cf/commit/fe34f95abc92f4637968186aeebbb8033157c041) Thanks [@danieljvdm](https://github.com/danieljvdm)! - `DurableObjectStorage.transaction` and `transactionSync` now recover the aborting `Exit` by identity instead of re-deriving its type from the untyped `catch` binding. Failures raised inside a transaction keep the same typed error channel, and a failure thrown by the platform itself is still reported as `StorageOperationError`. No public API change.
+
 ## 0.28.1
 
 ### Patch Changes

package/dist/ComputerWorkspace.mjs

@@ -1,4 +1,4 @@
-import { t as DurableObjectState } from "./DurableObjectState-BjkK2kwH.mjs";
+import { t as DurableObjectState } from "./DurableObjectState-DnnLoHV-.mjs";
 import { fromClient } from "./ComputerArtifacts.mjs";
 import { t as lookup } from "./ComputerWorkspaceHostRegistry-CY5Fv4Ng.mjs";
 import { Context, Effect, Layer, Predicate, Schema, Stream } from "effect";

package/dist/{DurableObjectState-BjkK2kwH.mjs → DurableObjectState-DnnLoHV-.mjs}

@@ -99,24 +99,28 @@ const fromDurableObjectStorage = (storage) => ({
 	setAlarm: (scheduledTime, options) => tryStoragePromise("setAlarm", () => storage.setAlarm(scheduledTime, options)),
 	deleteAlarm: (options) => tryStoragePromise("deleteAlarm", () => storage.deleteAlarm(options)),
 	transactionSync: (closure) => Effect.context().pipe(Effect.flatMap((context) => Effect.suspend(() => {
+		let aborted;
 		try {
 			return Effect.succeed(storage.transactionSync(() => {
 				const exit = Effect.runSyncExitWith(context)(closure());
 				if (Exit.isSuccess(exit)) return exit.value;
+				aborted = exit;
 				throw exit;
 			}));
 		} catch (cause) {
-			if (Exit.isExit(cause) && Exit.isFailure(cause)) return Effect.failCause(cause.cause);
+			if (aborted !== void 0 && cause === aborted && Exit.isFailure(aborted)) return Effect.failCause(aborted.cause);
 			return Effect.fail(storageError("transactionSync", cause));
 		}
 	}))),
 	transaction: (closure) => Effect.context().pipe(Effect.flatMap((context) => Effect.callback((resume) => {
+		let aborted;
 		storage.transaction(async (txn) => {
 			const exit = await Effect.runPromiseExitWith(context)(closure(fromDurableObjectTransaction(txn)));
 			if (Exit.isSuccess(exit)) return exit.value;
+			aborted = exit;
 			throw exit;
 		}).then((value) => resume(Effect.succeed(value)), (cause) => {
-			if (Exit.isExit(cause) && Exit.isFailure(cause)) resume(Effect.failCause(cause.cause));
+			if (aborted !== void 0 && cause === aborted && Exit.isFailure(aborted)) resume(Effect.failCause(aborted.cause));
 			else resume(Effect.fail(storageError("transaction", cause)));
 		});
 	}))),

package/dist/Vitest.mjs

@@ -1,5 +1,5 @@
 import { a as WorkerEnvironment, i as WorkerConfig } from "./ErrorMessage-BM0K-Nik.mjs";
-import { r as fromDurableObjectState, t as DurableObjectState } from "./DurableObjectState-BjkK2kwH.mjs";
+import { r as fromDurableObjectState, t as DurableObjectState } from "./DurableObjectState-DnnLoHV-.mjs";
 import { ConfigProvider, Effect, Exit, Layer } from "effect";
 import { env } from "cloudflare:workers";
 import { abortAllDurableObjects as abortAllDurableObjects$1, adminSecretsStore as adminSecretsStore$1, applyD1Migrations as applyD1Migrations$1, createExecutionContext, createMessageBatch, createPagesEventContext, createScheduledController, evictAllDurableObjects as evictAllDurableObjects$1, evictDurableObject as evictDurableObject$1, getQueueResult, introspectWorkflow as introspectWorkflow$1, introspectWorkflowInstance as introspectWorkflowInstance$1, listDurableObjectIds as listDurableObjectIds$1, reset as reset$1, runDurableObjectAlarm as runDurableObjectAlarm$1, runInDurableObject as runInDurableObject$1, waitOnExecutionContext } from "cloudflare:test";

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { a as WorkerEnvironment, i as WorkerConfig, n as violationsMessage, r as Environment_exports, t as causeMessage } from "./ErrorMessage-BM0K-Nik.mjs";
 import { a as layer$19, i as Service$2, n as Artifacts_exports, r as Binding_exports } from "./Artifacts-rq3hUKQE.mjs";
-import { a as DurableObjectWebSocket_exports, i as fromExecutionContext, n as DurableObjectState_exports, o as fromWebSocket, r as fromDurableObjectState, s as DurableObjectStorage_exports, t as DurableObjectState } from "./DurableObjectState-BjkK2kwH.mjs";
+import { a as DurableObjectWebSocket_exports, i as fromExecutionContext, n as DurableObjectState_exports, o as fromWebSocket, r as fromDurableObjectState, s as DurableObjectStorage_exports, t as DurableObjectState } from "./DurableObjectState-DnnLoHV-.mjs";
 import { Cause, Clock, Config, ConfigProvider, Context, Data, DateTime, Duration, Effect, Exit, Function as Function$1, Layer, ManagedRuntime, Option, Predicate, Queue, Result, Schema } from "effect";
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpEffect, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { OtlpExporter, OtlpLogger, OtlpMetrics, OtlpSerialization, OtlpTracer } from "effect/unstable/observability";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.28.1",
+  "version": "0.29.0",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {
@@ -64,7 +64,7 @@
     "@cloudflare/containers": "catalog:",
     "@cloudflare/vitest-pool-workers": "catalog:",
     "@cloudflare/workers-types": "catalog:",
-    "@effect/platform-node": "^4.0.0-beta.107 <4.0.0-rc.0",
+    "@effect/platform-node": "^4.0.0-rc.110",
     "@effect/sql-d1": "catalog:",
     "@effect/sql-pg": "catalog:",
     "@effect/sql-sqlite-do": "catalog:",
@@ -79,10 +79,10 @@
     "@cloudflare/computer": "^0.2.0",
     "@cloudflare/vitest-pool-workers": "^0.21.3",
     "@cloudflare/workers-types": "^4.20260611.1",
-    "@effect/sql-d1": "^4.0.0-beta.107 <4.0.0-rc.0",
-    "@effect/sql-pg": "^4.0.0-beta.107 <4.0.0-rc.0",
-    "@effect/sql-sqlite-do": "^4.0.0-beta.107 <4.0.0-rc.0",
-    "effect": "^4.0.0-beta.107 <4.0.0-rc.0"
+    "@effect/sql-d1": "^4.0.0-rc.110",
+    "@effect/sql-pg": "^4.0.0-rc.110",
+    "@effect/sql-sqlite-do": "^4.0.0-rc.110",
+    "effect": "^4.0.0-rc.110"
   },
   "peerDependenciesMeta": {
     "@cloudflare/computer": {

package/src/DurableObject.ts

@@ -200,6 +200,7 @@ export const make = <
         // SAFETY: event-layer bypass is used only for initialize; otherwise an absent layer means REvent is never.
         return Runtime.runEventPromise(
           this.runtime,
+          // @effect-diagnostics-next-line unsafeEffectTypeAssertion:off
           effect as Effect.Effect<A, E, HandlerContext<ROut>>,
         );
       }

package/src/DurableObjectStorage.ts

@@ -320,7 +320,12 @@ export const fromDurableObjectStorage = (
   transactionSync: <A, E, R>(closure: () => Effect.Effect<A, E, R>) =>
     Effect.context<R>().pipe(
       Effect.flatMap((context) =>
-        Effect.suspend(() => {
+        Effect.suspend((): Effect.Effect<A, E | StorageOperationError> => {
+          // Cloudflare rolls the transaction back when the callback throws, so a
+          // failed Exit is thrown to abort it. Keep a typed reference to that
+          // Exit rather than recovering its type from the untyped catch binding.
+          let aborted: Exit.Exit<A, E> | undefined;
+
           try {
             return Effect.succeed(
               storage.transactionSync(() => {
@@ -329,18 +334,14 @@ export const fromDurableObjectStorage = (
                 if (Exit.isSuccess(exit)) {
                   return exit.value;
                 }
+                aborted = exit;
 
                 throw exit;
               }),
             );
           } catch (cause) {
-            if (Exit.isExit(cause) && Exit.isFailure(cause)) {
-              // SAFETY: Exit.isFailure proves this cause carries the closure's typed E failure.
-              return Effect.failCause(cause.cause) as Effect.Effect<
-                A,
-                E | StorageOperationError,
-                R
-              >;
+            if (aborted !== undefined && cause === aborted && Exit.isFailure(aborted)) {
+              return Effect.failCause(aborted.cause);
             }
 
             return Effect.fail(storageError("transactionSync", cause));
@@ -352,6 +353,10 @@ export const fromDurableObjectStorage = (
     Effect.context<R>().pipe(
       Effect.flatMap((context) =>
         Effect.callback<A, E | StorageOperationError>((resume) => {
+          // See `transactionSync`: the thrown Exit aborts Cloudflare's
+          // transaction, and holding it here keeps its error type.
+          let aborted: Exit.Exit<A, E> | undefined;
+
           void storage
             .transaction(async (txn) => {
               const exit = await Effect.runPromiseExitWith(context)(
@@ -361,17 +366,15 @@ export const fromDurableObjectStorage = (
               if (Exit.isSuccess(exit)) {
                 return exit.value;
               }
+              aborted = exit;
 
               throw exit;
             })
             .then(
               (value) => resume(Effect.succeed(value)),
               (cause) => {
-                if (Exit.isExit(cause) && Exit.isFailure(cause)) {
-                  // SAFETY: Exit.isFailure proves this cause carries the closure's typed E failure.
-                  resume(
-                    Effect.failCause(cause.cause) as Effect.Effect<A, E | StorageOperationError>,
-                  );
+                if (aborted !== undefined && cause === aborted && Exit.isFailure(aborted)) {
+                  resume(Effect.failCause(aborted.cause));
                 } else {
                   resume(Effect.fail(storageError("transaction", cause)));
                 }

package/src/Worker.ts

@@ -392,6 +392,7 @@ export function make<
         // SAFETY: the public make overloads permit an absent event layer only when REvent is never.
         return Runtime.runEventPromise(
           this.runtime,
+          // @effect-diagnostics-next-line unsafeEffectTypeAssertion:off
           effect as Effect.Effect<A, E, RuntimeContext<ROut> | Scope.Scope>,
         );
       }

package/src/Workflow.ts

@@ -157,6 +157,7 @@ const fromWorkflowStep = (
                     Effect.provideService(
                       Effect.provideContext(
                         // SAFETY: WorkflowStepContext is provided immediately below; context supplies every other R service.
+                        // @effect-diagnostics-next-line unsafeEffectTypeAssertion:off
                         effect as Effect.Effect<A, E, Exclude<R, WorkflowStepContext>>,
                         context,
                       ),