alchemy 2.0.0-beta.43 → 2.0.0-beta.45

package/lib/Cloudflare/Workers/WorkerAsyncBindings.js

@@ -1,122 +1,42 @@
+import * as Config from "effect/Config";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Output from "../../Output.js";
 import { isYieldableEffectLike } from "../../Util/effect.js";
+import { asEffect } from "../../Util/types.js";
+import { isAiGateway } from "../AiGateway/AiGateway.js";
 import { isAnalyticsEngineDataset } from "../AnalyticsEngine/AnalyticsEngineDataset.js";
 import { isArtifacts } from "../Artifacts/Artifacts.js";
+import { isBrowserRendering } from "../BrowserRendering/BrowserRendering.js";
+import { isD1Database } from "../D1/D1Database.js";
 import { isSendEmail } from "../Email/SendEmail.js";
+import { isHyperdrive } from "../Hyperdrive/Hyperdrive.js";
+import { getHyperdriveDevOrigin } from "../Hyperdrive/HyperdriveBinding.js";
 import { isImages } from "../Images/Images.js";
+import { isKVNamespace } from "../KV/KVNamespace.js";
+import { isQueue } from "../Queue/Queue.js";
+import { isR2Bucket } from "../R2/R2Bucket.js";
 import { isAssets } from "./Assets.js";
 import { isDurableObjectNamespaceLike } from "./DurableObjectNamespace.js";
 import { isWorker } from "./Worker.js";
 export const bindWorkerAsyncBindings = Effect.fnUntraced(function* (resource, props) {
-    if (props.bindings) {
-        for (const bindingName in props.bindings) {
+    if (props.env) {
+        for (const bindingName in props.env) {
             // @ts-expect-error
-            const bindingEff = props.bindings?.[bindingName];
+            const bindingEff = props.env?.[bindingName];
             // Bindings can be passed as a plain resource value, an Effect that
             // yields a resource, or an effect-class (e.g. a `Cloudflare.Worker`
             // class). Resolve the yieldable forms before deriving binding metadata.
             const binding = isYieldableEffectLike(bindingEff)
                 ? (yield* bindingEff)
                 : bindingEff;
-            const bindingMeta = typeof binding === "string"
-                ? {
-                    type: "plain_text",
-                    name: bindingName,
-                    value: binding,
-                }
-                : Redacted.isRedacted(binding)
-                    ? {
-                        type: "secret_text",
-                        name: bindingName,
-                        value: Redacted.value(binding),
-                    }
-                    : isAssets(binding)
-                        ? {
-                            type: "assets",
-                            name: bindingName,
-                        }
-                        : isArtifacts(binding)
-                            ? {
-                                type: "artifacts",
-                                name: bindingName,
-                                namespace: binding.namespace,
-                            }
-                            : isImages(binding)
-                                ? {
-                                    type: "images",
-                                    name: bindingName,
-                                }
-                                : isAnalyticsEngineDataset(binding)
-                                    ? {
-                                        type: "analytics_engine",
-                                        name: bindingName,
-                                        dataset: binding.dataset,
-                                    }
-                                    : isSendEmail(binding)
-                                        ? {
-                                            type: "send_email",
-                                            name: bindingName,
-                                            destinationAddress: binding.destinationAddress,
-                                            allowedDestinationAddresses: binding.allowedDestinationAddresses,
-                                            allowedSenderAddresses: binding.allowedSenderAddresses,
-                                        }
-                                        : isDurableObjectNamespaceLike(binding)
-                                            ? {
-                                                type: "durable_object_namespace",
-                                                name: bindingName,
-                                                className: binding.className ?? binding.name,
-                                            }
-                                            : binding.Type === "Cloudflare.D1Database"
-                                                ? {
-                                                    type: "d1",
-                                                    id: binding.databaseId,
-                                                    name: bindingName,
-                                                }
-                                                : binding.Type === "Cloudflare.R2Bucket"
-                                                    ? {
-                                                        type: "r2_bucket",
-                                                        name: bindingName,
-                                                        bucketName: binding.bucketName,
-                                                        jurisdiction: binding.jurisdiction.pipe(Output.map((jurisdiction) => jurisdiction === "default"
-                                                            ? undefined
-                                                            : jurisdiction)),
-                                                    }
-                                                    : binding.Type === "Cloudflare.KVNamespace"
-                                                        ? {
-                                                            type: "kv_namespace",
-                                                            name: bindingName,
-                                                            namespaceId: binding.namespaceId,
-                                                        }
-                                                        : binding.Type === "Cloudflare.Queue"
-                                                            ? {
-                                                                type: "queue",
-                                                                name: bindingName,
-                                                                queueName: binding.queueName,
-                                                            }
-                                                            : binding.Type === "Cloudflare.AiGateway"
-                                                                ? {
-                                                                    type: "ai",
-                                                                    name: bindingName,
-                                                                }
-                                                                : binding.Type === "Cloudflare.Hyperdrive"
-                                                                    ? {
-                                                                        type: "hyperdrive",
-                                                                        name: bindingName,
-                                                                        id: binding.hyperdriveId,
-                                                                    }
-                                                                    : isWorker(binding)
-                                                                        ? {
-                                                                            type: "service",
-                                                                            name: bindingName,
-                                                                            service: binding.workerName,
-                                                                        }
-                                                                        : // TODO(sam): handle others
-                                                                            undefined;
+            const bindingMeta = yield* asEffect(toBinding(bindingName, binding));
             if (bindingMeta) {
                 yield* resource.bind `${bindingName}`({
                     bindings: [bindingMeta],
+                    hyperdrives: isHyperdrive(binding)
+                        ? getHyperdriveDevOrigin(binding)
+                        : undefined,
                 });
             }
             else {
@@ -125,5 +45,146 @@ export const bindWorkerAsyncBindings = Effect.fnUntraced(function* (resource, pr
         }
     }
 });
+const toBinding = (bindingName, binding) => {
+    // narrowing to Config<unknown> doesn't work for us, we need any
+    const isConfig = Config.isConfig;
+    // narrowing to Redacted<unknown> doesn't work for us, we need any
+    const isRedacted = Redacted.isRedacted;
+    if (typeof binding === "string") {
+        return {
+            type: "plain_text",
+            name: bindingName,
+            text: binding,
+        };
+    }
+    else if (isRedacted(binding)) {
+        const val = Redacted.value(binding);
+        if (typeof val === "string") {
+            return {
+                type: "secret_text",
+                name: bindingName,
+                text: val,
+            };
+        }
+        else {
+            return {
+                type: "secret_text",
+                name: bindingName,
+                text: JSON.stringify(val),
+            };
+        }
+    }
+    else if (isConfig(binding)) {
+        return binding.pipe(Effect.flatMap((json) => {
+            const b = toBinding(bindingName, json);
+            return Effect.isEffect(b) ? b : Effect.succeed(b);
+        }), Effect.orDie);
+    }
+    else if (isAssets(binding)) {
+        return {
+            type: "assets",
+            name: bindingName,
+        };
+    }
+    else if (isArtifacts(binding)) {
+        return {
+            type: "artifacts",
+            name: bindingName,
+            namespace: binding.namespace,
+        };
+    }
+    else if (isImages(binding)) {
+        return {
+            type: "images",
+            name: bindingName,
+        };
+    }
+    else if (isBrowserRendering(binding)) {
+        return {
+            type: "browser",
+            name: bindingName,
+        };
+    }
+    else if (isAnalyticsEngineDataset(binding)) {
+        return {
+            type: "analytics_engine",
+            name: bindingName,
+            dataset: binding.dataset,
+        };
+    }
+    else if (isSendEmail(binding)) {
+        return {
+            type: "send_email",
+            name: bindingName,
+            destinationAddress: binding.destinationAddress,
+            allowedDestinationAddresses: binding.allowedDestinationAddresses,
+            allowedSenderAddresses: binding.allowedSenderAddresses,
+        };
+    }
+    else if (isDurableObjectNamespaceLike(binding)) {
+        return {
+            type: "durable_object_namespace",
+            name: bindingName,
+            className: binding.className ?? binding.name,
+            scriptName: binding.scriptName,
+        };
+    }
+    else if (isD1Database(binding)) {
+        return {
+            type: "d1",
+            databaseId: binding.databaseId,
+            name: bindingName,
+        };
+    }
+    else if (isR2Bucket(binding)) {
+        return {
+            type: "r2_bucket",
+            name: bindingName,
+            bucketName: binding.bucketName,
+            jurisdiction: binding.jurisdiction.pipe(Output.map((jurisdiction) => jurisdiction === "default" ? undefined : jurisdiction)),
+        };
+    }
+    else if (isKVNamespace(binding)) {
+        return {
+            type: "kv_namespace",
+            name: bindingName,
+            namespaceId: binding.namespaceId,
+        };
+    }
+    else if (isQueue(binding)) {
+        return {
+            type: "queue",
+            name: bindingName,
+            queueName: binding.queueName,
+        };
+    }
+    else if (isAiGateway(binding)) {
+        return {
+            type: "ai",
+            name: bindingName,
+        };
+    }
+    else if (isHyperdrive(binding)) {
+        return {
+            type: "hyperdrive",
+            name: bindingName,
+            id: binding.hyperdriveId,
+        };
+    }
+    else if (isWorker(binding)) {
+        return {
+            type: "service",
+            name: bindingName,
+            service: binding.workerName,
+        };
+    }
+    else {
+        return {
+            type: "json",
+            name: bindingName,
+            json: binding,
+        };
+    }
+};
 export const getCronBindings = (bindings) => Array.from(new Set(bindings.flatMap((b) => b.data.crons ?? [])));
 //# sourceMappingURL=WorkerAsyncBindings.js.map

package/lib/Cloudflare/Workers/WorkerAsyncBindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerAsyncBindings.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerAsyncBindings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerAsyncBindings.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerAsyncBindings.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/Workers/WorkerBinding.d.ts

@@ -1,10 +1,14 @@
 import type * as workers from "@distilled.cloud/cloudflare/workers";
+import * as Config from "effect/Config";
 import * as Effect from "effect/Effect";
+import * as Redacted from "effect/Redacted";
+import type { Json } from "effect/Schema";
 import * as Binding from "../../Binding.ts";
 import type { Rpc } from "../../Rpc.ts";
 import type { AiGateway } from "../AiGateway/AiGateway.ts";
 import { AnalyticsEngineDataset } from "../AnalyticsEngine/AnalyticsEngineDataset.ts";
 import { Artifacts } from "../Artifacts/Artifacts.ts";
+import { BrowserRendering } from "../BrowserRendering/BrowserRendering.ts";
 import type { D1Database } from "../D1/D1Database.ts";
 import { SendEmail } from "../Email/SendEmail.ts";
 import { Hyperdrive } from "../Hyperdrive/Hyperdrive.ts";
@@ -17,11 +21,11 @@ import type { DurableObjectNamespaceLike } from "./DurableObjectNamespace.ts";
 import { Worker } from "./Worker.ts";
 export type WorkerBinding = Exclude<workers.PutScriptRequest["metadata"]["bindings"], undefined>[number];
 export type WorkerSettingsBinding = Exclude<workers.GetScriptScriptAndVersionSettingResponse["bindings"], null | undefined>[number];
-export type WorkerBindingResource = Assets | R2Bucket | D1Database | KVNamespace | Queue | AiGateway | AnalyticsEngineDataset | SendEmail | Artifacts | Images | Hyperdrive | Worker | DurableObjectNamespaceLike<any>;
+export type WorkerBindingResource = Json | Redacted.Redacted<Json> | Config.Config<Json> | Assets | R2Bucket | D1Database | KVNamespace | Queue | AiGateway | AnalyticsEngineDataset | SendEmail | Artifacts | BrowserRendering | Images | Hyperdrive | Worker | DurableObjectNamespaceLike<any>;
 export type WorkerBindings = {
     [bindingName in string]: WorkerBindingResource;
 };
-export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect/Pipeable").Pipeable & import("../../Resource.ts").ResourceLike<"Cloudflare.Worker", import("./Worker.ts").WorkerProps<any, import("./Worker.ts").WorkerEnv, import("./Worker.ts").WorkerAssetsConfig | undefined>, {
+export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect/Pipeable").Pipeable & import("../../Resource.ts").ResourceLike<"Cloudflare.Worker", import("./Worker.ts").WorkerProps<any, import("./Worker.ts").WorkerAssetsConfig | undefined>, {
     workerId: string;
     workerName: string;
     logpush: boolean | undefined;
@@ -29,11 +33,7 @@ export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect
     tags: string[] | undefined;
     durableObjectNamespaces: Record<string, string>;
     accountId: string;
-    domains: {
-        hostname: string;
-        id: string;
-        zoneId: string;
-    }[];
+    domains: string[];
     crons: string[];
     hash?: {
         assets: string | undefined;
@@ -72,18 +72,14 @@ export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect
     tags: import("../../Output.ts").Output<string[] | undefined, never>;
     durableObjectNamespaces: import("../../Output.ts").Output<Record<string, string>, never>;
     accountId: import("../../Output.ts").Output<string, never>;
-    domains: import("../../Output.ts").Output<{
-        hostname: string;
-        id: string;
-        zoneId: string;
-    }[], never>;
+    domains: import("../../Output.ts").Output<string[], never>;
     crons: import("../../Output.ts").Output<string[], never>;
     hash: import("../../Output.ts").Output<{
         assets: string | undefined;
         bundle: string | undefined;
         input: string | undefined;
     } | undefined, never>;
-} & Rpc<Shape>) | Effect.Effect<import("effect/Pipeable").Pipeable & import("../../Resource.ts").ResourceLike<"Cloudflare.Worker", import("./Worker.ts").WorkerProps<any, import("./Worker.ts").WorkerEnv, import("./Worker.ts").WorkerAssetsConfig | undefined>, {
+} & Rpc<Shape>) | Effect.Effect<import("effect/Pipeable").Pipeable & import("../../Resource.ts").ResourceLike<"Cloudflare.Worker", import("./Worker.ts").WorkerProps<any, import("./Worker.ts").WorkerAssetsConfig | undefined>, {
     workerId: string;
     workerName: string;
     logpush: boolean | undefined;
@@ -91,11 +87,7 @@ export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect
     tags: string[] | undefined;
     durableObjectNamespaces: Record<string, string>;
     accountId: string;
-    domains: {
-        hostname: string;
-        id: string;
-        zoneId: string;
-    }[];
+    domains: string[];
     crons: string[];
     hash?: {
         assets: string | undefined;
@@ -134,11 +126,7 @@ export declare const bindWorker: <Shape, Req = never>(workerEff: (import("effect
     tags: import("../../Output.ts").Output<string[] | undefined, never>;
     durableObjectNamespaces: import("../../Output.ts").Output<Record<string, string>, never>;
     accountId: import("../../Output.ts").Output<string, never>;
-    domains: import("../../Output.ts").Output<{
-        hostname: string;
-        id: string;
-        zoneId: string;
-    }[], never>;
+    domains: import("../../Output.ts").Output<string[], never>;
     crons: import("../../Output.ts").Output<string[], never>;
     hash: import("../../Output.ts").Output<{
         assets: string | undefined;

package/lib/Cloudflare/Workers/WorkerBinding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBinding.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBinding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,qCAAqC,CAAC;AACpE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAY,MAAM,EAAqB,MAAM,aAAa,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,OAAO,CACjC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,EAChD,SAAS,CACV,CAAC,MAAM,CAAC,CAAC;AAEV,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,OAAO,CAAC,wCAAwC,CAAC,UAAU,CAAC,EAC5D,IAAI,GAAG,SAAS,CACjB,CAAC,MAAM,CAAC,CAAC;AAEV,MAAM,MAAM,qBAAqB,GAC7B,MAAM,GACN,QAAQ,GACR,UAAU,GACV,WAAW,GACX,KAAK,GACL,SAAS,GACT,sBAAsB,GACtB,SAAS,GACT,SAAS,GACT,MAAM,GACN,UAAU,GACV,MAAM,GACN,0BAA0B,CAAC,GAAG,CAAC,CAAC;AAEpC,MAAM,MAAM,cAAc,GAAG;KAC1B,WAAW,IAAI,MAAM,GAAG,qBAAqB;CAC/C,CAAC;AAEF,eAAO,MAAM,UAAU,GAAgC,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sJA4B/D,CAAC;iHAIQ,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;AAFzC,qBAAa,gBAAiB,SAAQ,qBAGT;CAAG;AAEhC,eAAO,MAAM,oBAAoB,8DAkBhC,CAAC"}
+{"version":3,"file":"WorkerBinding.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBinding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,qCAAqC,CAAC;AACpE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAY,MAAM,EAAqB,MAAM,aAAa,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,OAAO,CACjC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,EAChD,SAAS,CACV,CAAC,MAAM,CAAC,CAAC;AAEV,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,OAAO,CAAC,wCAAwC,CAAC,UAAU,CAAC,EAC5D,IAAI,GAAG,SAAS,CACjB,CAAC,MAAM,CAAC,CAAC;AAEV,MAAM,MAAM,qBAAqB,GAE7B,IAAI,GACJ,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GACvB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAEnB,MAAM,GACN,QAAQ,GACR,UAAU,GACV,WAAW,GACX,KAAK,GACL,SAAS,GACT,sBAAsB,GACtB,SAAS,GACT,SAAS,GACT,gBAAgB,GAChB,MAAM,GACN,UAAU,GACV,MAAM,GACN,0BAA0B,CAAC,GAAG,CAAC,CAAC;AAEpC,MAAM,MAAM,cAAc,GAAG;KAC1B,WAAW,IAAI,MAAM,GAAG,qBAAqB;CAC/C,CAAC;AAEF,eAAO,MAAM,UAAU,GAAgC,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sJA4B/D,CAAC;iHAIQ,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;AAFzC,qBAAa,gBAAiB,SAAQ,qBAGT;CAAG;AAEhC,eAAO,MAAM,oBAAoB,8DAkBhC,CAAC"}

package/lib/Cloudflare/Workers/WorkerBinding.js

@@ -1,8 +1,11 @@
+import * as Config from "effect/Config";
 import * as Effect from "effect/Effect";
+import * as Redacted from "effect/Redacted";
 import * as Binding from "../../Binding.js";
 import { isYieldableEffectLike } from "../../Util/effect.js";
 import { AnalyticsEngineDataset } from "../AnalyticsEngine/AnalyticsEngineDataset.js";
 import { Artifacts } from "../Artifacts/Artifacts.js";
+import { BrowserRendering } from "../BrowserRendering/BrowserRendering.js";
 import { SendEmail } from "../Email/SendEmail.js";
 import { Hyperdrive } from "../Hyperdrive/Hyperdrive.js";
 import { Images } from "../Images/Images.js";

package/lib/Cloudflare/Workers/WorkerBinding.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBinding.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBinding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA+BlE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACnD,SAEkD;IAElD,8DAA8D;IAC9D,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,KAAK,CAAC,CAAC,SAA2D;QACpE,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,MAAM,EAAE,CAAC;QAC1B,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE,MAAM,CAAC,UAAU;aAC3B;SACF;KACF,CAAC,CAAC;IAEH,qEAAqE;IACrE,oEAAoE;IACpE,mEAAmE;IACnE,mDAAmD;IACnD,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CACpC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA+B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CACxE,CAAC;IACF,OAAO,WAAW,CAAQ,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,MAAM,EAGjD,CAAC,wBAAwB,CAAC;CAAG;AAEhC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAChE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAc;IACvC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,MAAM,EAAE,CAAC;YAC1B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,MAAM,CAAC,SAAS;oBACtB,OAAO,EAAE,MAAM,CAAC,UAAU;iBAC3B;aACF;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,KAAK,CAAC,8CAA8C,IAAI,CAAC,IAAI,GAAG,CAAC,CACtE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"WorkerBinding.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBinding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAE3E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAqClE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACnD,SAEkD;IAElD,8DAA8D;IAC9D,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC;QAC7C,CAAC,CAAC,KAAK,CAAC,CAAC,SAA2D;QACpE,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,MAAM,EAAE,CAAC;QAC1B,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE,MAAM,CAAC,UAAU;aAC3B;SACF;KACF,CAAC,CAAC;IAEH,qEAAqE;IACrE,oEAAoE;IACpE,mEAAmE;IACnE,mDAAmD;IACnD,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CACpC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA+B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CACxE,CAAC;IACF,OAAO,WAAW,CAAQ,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,MAAM,EAGjD,CAAC,wBAAwB,CAAC;CAAG;AAEhC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAChE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAc;IACvC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,MAAM,EAAE,CAAC;YAC1B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,MAAM,CAAC,SAAS;oBACtB,OAAO,EAAE,MAAM,CAAC,UAAU;iBAC3B;aACF;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,KAAK,CAAC,8CAA8C,IAAI,CAAC,IAAI,GAAG,CAAC,CACtE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC,CACH,CAAC"}

package/lib/Cloudflare/Workers/WorkerBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBridge.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBridge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI1E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAyBtC;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,OAAO,gBAAgB,GAAG,OAAO,aAAa,EACpD,wBAGG;IACD,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,GAAG,CAAC;CACjB;cAgDwB,GAAG,OACH,GAAG;sBADH,GAAG;sBACH,GAAG;;CAwE7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,GAAG,GAAG,EAAE,oCAI3C;IACD,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,UAAU,EAAE,MAAM,CAAC;CACpB;;;;CAoEA,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,MAAM,GAAG,EACT,WAAW,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAC7B,cAAc,CACZ,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAC7D,OAAO,CAAC,GAAG,CAAC,QA0Bf,CAAC;AAEL,eAAO,MAAM,aAAa,GAAU,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,iBAoB5D,CAAC"}
+{"version":3,"file":"WorkerBridge.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBridge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG1E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AA2BtC;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,OAAO,gBAAgB,GAAG,OAAO,aAAa,EACpD,wBAGG;IACD,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,GAAG,CAAC;CACjB;cAkDwB,GAAG,OACH,GAAG;sBADH,GAAG;sBACH,GAAG;;CAuE7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,GAAG,GAAG,EAAE,oCAI3C;IACD,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,UAAU,EAAE,MAAM,CAAC;CACpB;;;;CAoEA,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,MAAM,GAAG,EACT,WAAW,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAC7B,cAAc,CACZ,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAC7D,OAAO,CAAC,GAAG,CAAC,QAyBf,CAAC;AAEL,eAAO,MAAM,aAAa,GAAU,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,iBAoB5D,CAAC"}

package/lib/Cloudflare/Workers/WorkerBridge.js

@@ -1,5 +1,4 @@
-import { NodeServices } from "@effect/platform-node";
-import { Stream } from "effect";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as Cause from "effect/Cause";
 import * as ConfigProvider from "effect/ConfigProvider";
 import * as Context from "effect/Context";
@@ -10,14 +9,16 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import { MinimumLogLevel } from "effect/References";
 import * as Scope from "effect/Scope";
-import { FetchHttpClient } from "effect/unstable/http";
+import * as Stream from "effect/Stream";
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 import { ExecutionContext } from "../../ExecutionContext.js";
 import { makeEntrypointLayer } from "../../Runtime.js";
 import { Self } from "../../Self.js";
 import { Stack } from "../../Stack.js";
+import cloudflare_workers from "./cloudflare_workers.js";
+import { isScopeEjected } from "./HttpServer.js";
 import { ErrorTag, encodeRpcError, toRpcStream, } from "./Rpc.js";
 import { ExportedHandlerMethods, Worker, WorkerEnvironment, WorkerExecutionContext, } from "./Worker.js";
-import cloudflare_workers from "./cloudflare_workers.js";
 /**
  * Makes the WorkerEntrypoint class and bridges to Effect fetch and RPC calls.
  */
@@ -34,7 +35,9 @@ export const makeWorkerBridge = (Base, { stack, entrypoint, }) => {
             scope,
             cache: {},
         }))))), Effect.provide(Layer.provideMerge(globalContext, Layer.succeed(Scope.Scope, scope))), Effect.runPromiseExit)
-            .finally(() => Scope.close(scope, Exit.void).pipe(Effect.runPromise, (promise) => ctx.waitUntil(promise)));
+            .finally(() => isScopeEjected(scope)
+            ? undefined
+            : Scope.close(scope, Exit.void).pipe(Effect.runPromise, (promise) => ctx.waitUntil(promise)));
     };
     class WorkerBridge extends Base {
         ctx;
@@ -62,7 +65,6 @@ export const makeWorkerBridge = (Base, { stack, entrypoint, }) => {
                             return Effect.die(new Error(`Method "${prop}" not found on worker. ` +
                                 `Make sure it's returned from the worker's default export.`));
                         }
-                        console.log("dispatcher", dispatcher.toString());
                         return Effect.succeed([
                             dispatcher(...args),
                             Context.empty(),
@@ -123,7 +125,6 @@ export const makeRpcProxy = (self, userShape, processEvent) => new Proxy(self, {
                 return Effect.die(new Error(`Method "${prop}" not found on worker. ` +
                     `Make sure it's returned from the worker's default export.`));
             }
-            console.log("dispatcher", dispatcher.toString());
             return dispatcher(...args);
         }), processEvent)
             .then(handleRpcExit);

package/lib/Cloudflare/Workers/WorkerBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBridge.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerBridge.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBridge.ts"],"names":[],"mappings":"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"}

package/lib/Cloudflare/Workers/WorkerBundle.d.ts

@@ -4,7 +4,6 @@ import type * as Path from "effect/Path";
 import * as Stream from "effect/Stream";
 import * as Bundle from "../../Bundle/Bundle.ts";
 import { type DurableObjectExport } from "./DurableObjectNamespace.ts";
-import type { WorkerProps } from "./Worker.ts";
 import { type WorkflowExport } from "./Workflow.ts";
 export interface WorkerBundleOptions {
     id: string;
@@ -23,7 +22,7 @@ export interface WorkerBundleOptions {
         name: string;
         stage: string;
     };
-    userOptions: WorkerProps["build"] | undefined;
+    extraOptions: Bundle.BundleExtraOptions | undefined;
 }
 export declare const WorkerBundle: Effect.Effect<{
     build: (options: WorkerBundleOptions) => Effect.Effect<Bundle.BundleOutput, Bundle.BundleError, never>;

package/lib/Cloudflare/Workers/WorkerBundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBundle.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBundle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAEtE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC;IACF,KAAK,EACD;QACE,IAAI,EAAE,UAAU,CAAC;KAClB,GACD;QACE,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,CAAC,CAAC;KAC/D,CAAC;IACN,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CAC/C;AAED,eAAO,MAAM,YAAY;;;4CAoGvB,CAAC;AAEH,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,CAAC,EAC7D,OAAO;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,MAa9B,YAAY,MAAM,WAuC3B,CAAC"}
+{"version":3,"file":"WorkerBundle.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBundle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAEtE,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC;IACF,KAAK,EACD;QACE,IAAI,EAAE,UAAU,CAAC;KAClB,GACD;QACE,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,CAAC,CAAC;KAC/D,CAAC;IACN,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,YAAY,EAAE,MAAM,CAAC,kBAAkB,GAAG,SAAS,CAAC;CACrD;AAED,eAAO,MAAM,YAAY;;;4CAoGvB,CAAC;AAEH,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,CAAC,EAC7D,OAAO;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,MAa9B,YAAY,MAAM,WAuC3B,CAAC"}

package/lib/Cloudflare/Workers/WorkerBundle.js

@@ -4,7 +4,7 @@ import * as FileSystem from "effect/FileSystem";
 import { flow } from "effect/Function";
 import * as Stream from "effect/Stream";
 import { fileURLToPath } from "node:url";
-import Sonda from "sonda/rolldown";
+import path from "pathe";
 import * as Bundle from "../../Bundle/Bundle.js";
 import { findCwdForBundle } from "../../Bundle/TempRoot.js";
 import { isDurableObjectExport, } from "./DurableObjectNamespace.js";
@@ -37,11 +37,12 @@ export const WorkerBundle = Effect.gen(function* () {
                         virtualEntryPlugin(makeEffectVirtualEntry(options.entry.exports, options.stack)),
                     ]
                     : undefined,
-                ...(options.userOptions?.metafile ? [Sonda({ open: false })] : []),
             ],
             checks: {
                 // Suppress unresolved import warnings for unrelated AWS packages
                 unresolvedImport: false,
+                // Suppress warning caused by static import of `@effect/platform-node/NodeServices` in `WorkerBridge.ts`
+                ineffectiveDynamicImport: false,
             },
         };
         const outputOptions = {
@@ -51,10 +52,7 @@ export const WorkerBundle = Effect.gen(function* () {
             keepNames: true,
             dir: `.alchemy/bundles/${options.id}`,
         };
-        const extraOptions = {
-            pure: options.userOptions?.pure,
-        };
-        return { inputOptions, outputOptions, extraOptions };
+        return { inputOptions, outputOptions, extraOptions: options.extraOptions };
     });
     const sanitizeMain = (main) => Effect.sync(() => {
         try {
@@ -63,7 +61,9 @@ export const WorkerBundle = Effect.gen(function* () {
         catch {
             return main;
         }
-    }).pipe(Effect.flatMap((path) => fs.realPath(path)), Effect.mapError((cause) => new Bundle.BundleError({
+    }).pipe(Effect.flatMap((p) => fs.realPath(p)), 
+    //* fix windows paths
+    Effect.map((p) => path.resolve(p)), Effect.mapError((cause) => new Bundle.BundleError({
         message: `Failed to find real path for bundle: ${main}`,
         cause,
     })));

package/lib/Cloudflare/Workers/WorkerBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerBundle.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerBundle.js","sourceRoot":"","sources":["../../../src/Cloudflare/Workers/WorkerBundle.ts"],"names":[],"mappings":"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"}