alchemy 2.0.0-beta.38 → 2.0.0-beta.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "2.0.0-beta.38",
+  "version": "2.0.0-beta.39",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",

package/src/Cloudflare/Workers/HttpServer.ts

@@ -1,9 +1,12 @@
 import type * as cf from "@cloudflare/workers-types";
 import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import type { Scope } from "effect/Scope";
 import type { HttpBodyError } from "effect/unstable/http/HttpBody";
+import * as EffectHttp from "effect/unstable/http/HttpEffect";
+import { ClientAbort } from "effect/unstable/http/HttpServerError";
 import * as HttpServerError from "effect/unstable/http/HttpServerError";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
@@ -48,6 +51,10 @@ export const serveWebRequest = <Req = never>(
   Exclude<Req, HttpServerRequest.HttpServerRequest | Scope>
 > =>
   Effect.gen(function* () {
+    const context =
+      yield* Effect.context<
+        Exclude<Req, HttpServerRequest.HttpServerRequest | Scope>
+      >();
     const request = HttpServerRequest.fromWeb(
       webRequest as any as globalThis.Request,
     ).modify({
@@ -61,9 +68,7 @@ export const serveWebRequest = <Req = never>(
         }),
     });
 
-    const response = yield* handler.pipe(
-      Effect.provideService(HttpServerRequest.HttpServerRequest, request),
-      Effect.provideService(Request, webRequest as any),
+    const safeHandler = handler.pipe(
       Effect.catchCause((cause) => {
         const message = Option.match(Cause.findErrorOption(cause), {
           onNone: () => "Internal Server Error",
@@ -81,7 +86,34 @@ export const serveWebRequest = <Req = never>(
       }),
     );
 
-    return HttpServerResponse.toWeb(response, {
-      context: yield* Effect.context(),
+    const resolveSymbol = Symbol.for("@effect/platform/HttpApp/resolve");
+    const httpApp = EffectHttp.toHandled(safeHandler, (request, response) => {
+      response = EffectHttp.scopeTransferToStream(response);
+      (request as any)[resolveSymbol](
+        HttpServerResponse.toWeb(response, {
+          withoutBody: request.method === "HEAD",
+          context,
+        }),
+      );
+      return Effect.void;
+    });
+
+    return yield* Effect.promise(() => {
+      return new Promise<Response>((resolve) => {
+        const contextMap = new Map<string, any>(context.mapUnsafe);
+        contextMap.set(HttpServerRequest.HttpServerRequest.key, request);
+        contextMap.set(Request.key, webRequest);
+        (request as any)[resolveSymbol] = resolve;
+        const fiber = Effect.runForkWith(Context.makeUnsafe(contextMap))(
+          httpApp as any,
+        );
+        webRequest.signal?.addEventListener(
+          "abort",
+          () => {
+            fiber.interruptUnsafe(undefined, ClientAbort.annotation);
+          },
+          { once: true },
+        );
+      });
     });
   }) as any;

package/src/Cloudflare/Workers/InferEnv.ts

@@ -97,14 +97,18 @@ export type GetBindingType<T> = T extends Cloudflare.Assets
             ? Queue<unknown>
             : T extends Cloudflare.AiGateway
               ? Ai
-              : T extends Cloudflare.AnalyticsEngineDataset
-                ? AnalyticsEngineDataset
-                : T extends Cloudflare.Artifacts
-                  ? Artifacts
-                  : T extends Cloudflare.Images
-                    ? ImagesBinding
-                    : T extends Cloudflare.Hyperdrive
-                      ? Hyperdrive
-                      : T extends Cloudflare.DurableObjectNamespaceLike
-                        ? DurableObjectNamespace<Exclude<T["Shape"], undefined>>
-                        : never;
+              : T extends Cloudflare.SendEmail
+                ? SendEmail
+                : T extends Cloudflare.AnalyticsEngineDataset
+                  ? AnalyticsEngineDataset
+                  : T extends Cloudflare.Artifacts
+                    ? Artifacts
+                    : T extends Cloudflare.Images
+                      ? ImagesBinding
+                      : T extends Cloudflare.Hyperdrive
+                        ? Hyperdrive
+                        : T extends Cloudflare.DurableObjectNamespaceLike
+                          ? DurableObjectNamespace<
+                              Exclude<T["Shape"], undefined>
+                            >
+                          : never;

package/src/Cloudflare/Workers/Worker.ts

@@ -51,6 +51,7 @@ import {
 } from "../Artifacts/Artifacts.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import { D1Database } from "../D1/D1Database.ts";
+import { isSendEmail, type SendEmail } from "../Email/SendEmail.ts";
 import type {
   Hyperdrive,
   HyperdriveDevOrigin,
@@ -201,6 +202,7 @@ export type WorkerBindingResource =
   | CloudflareQueue
   | AiGateway
   | AnalyticsEngineDataset
+  | SendEmail
   | ArtifactsBinding
   | ImagesBinding
   | Hyperdrive
@@ -779,62 +781,71 @@ export const Worker: Platform<
                     name: bindingName,
                     dataset: binding.dataset,
                   }
-                : isDurableObjectNamespaceLike(binding)
+                : isSendEmail(binding)
                   ? {
-                      type: "durable_object_namespace",
+                      type: "send_email",
                       name: bindingName,
-                      className: binding.className ?? binding.name,
+                      destinationAddress: binding.destinationAddress,
+                      allowedDestinationAddresses:
+                        binding.allowedDestinationAddresses,
+                      allowedSenderAddresses: binding.allowedSenderAddresses,
                     }
-                  : binding.Type === "Cloudflare.D1Database"
+                  : isDurableObjectNamespaceLike(binding)
                     ? {
-                        type: "d1",
-                        id: binding.databaseId,
+                        type: "durable_object_namespace",
                         name: bindingName,
+                        className: binding.className ?? binding.name,
                       }
-                    : binding.Type === "Cloudflare.R2Bucket"
+                    : binding.Type === "Cloudflare.D1Database"
                       ? {
-                          type: "r2_bucket",
+                          type: "d1",
+                          id: binding.databaseId,
                           name: bindingName,
-                          bucketName: binding.bucketName,
-                          jurisdiction: binding.jurisdiction.pipe(
-                            Output.map((jurisdiction) =>
-                              jurisdiction === "default"
-                                ? undefined
-                                : jurisdiction,
-                            ),
-                          ),
                         }
-                      : binding.Type === "Cloudflare.KVNamespace"
+                      : binding.Type === "Cloudflare.R2Bucket"
                         ? {
-                            type: "kv_namespace",
+                            type: "r2_bucket",
                             name: bindingName,
-                            namespaceId: binding.namespaceId,
+                            bucketName: binding.bucketName,
+                            jurisdiction: binding.jurisdiction.pipe(
+                              Output.map((jurisdiction) =>
+                                jurisdiction === "default"
+                                  ? undefined
+                                  : jurisdiction,
+                              ),
+                            ),
                           }
-                        : binding.Type === "Cloudflare.Queue"
+                        : binding.Type === "Cloudflare.KVNamespace"
                           ? {
-                              type: "queue",
+                              type: "kv_namespace",
                               name: bindingName,
-                              queueName: binding.queueName,
+                              namespaceId: binding.namespaceId,
                             }
-                          : binding.Type === "Cloudflare.AiGateway"
+                          : binding.Type === "Cloudflare.Queue"
                             ? {
-                                type: "ai",
+                                type: "queue",
                                 name: bindingName,
+                                queueName: binding.queueName,
                               }
-                            : binding.Type === "Cloudflare.Hyperdrive"
+                            : binding.Type === "Cloudflare.AiGateway"
                               ? {
-                                  type: "hyperdrive",
+                                  type: "ai",
                                   name: bindingName,
-                                  id: binding.hyperdriveId,
                                 }
-                              : isWorker(binding)
+                              : binding.Type === "Cloudflare.Hyperdrive"
                                 ? {
-                                    type: "service",
+                                    type: "hyperdrive",
                                     name: bindingName,
-                                    service: binding.workerName,
+                                    id: binding.hyperdriveId,
                                   }
-                                : // TODO(sam): handle others
-                                  undefined;
+                                : isWorker(binding)
+                                  ? {
+                                      type: "service",
+                                      name: bindingName,
+                                      service: binding.workerName,
+                                    }
+                                  : // TODO(sam): handle others
+                                    undefined;
 
         if (bindingMeta) {
           yield* resource.bind`${bindingName}`({
@@ -1607,6 +1618,22 @@ export const LiveWorkerProvider = () =>
           const builder = await vite.createBuilder(
             {
               root: props.vite?.rootDir,
+              // Emulate `vite build` env semantics for `props.env`: only
+              // keys with Vite's default `VITE_` prefix are inlined into
+              // the bundle as `import.meta.env.*`. `Redacted` values are
+              // unwrapped — by prefixing with `VITE_` the user is opting
+              // them into the public bundle.
+              define: Object.fromEntries(
+                Object.entries(props.env ?? {}).flatMap(([key, raw]) => {
+                  if (!key.startsWith("VITE_")) return [];
+                  const value = Redacted.isRedacted(raw)
+                    ? Redacted.value(raw)
+                    : raw;
+                  return [
+                    [`import.meta.env.${key}`, JSON.stringify(value)] as const,
+                  ];
+                }),
+              ),
               // Declare the ssr environment so Vite 8+ creates it.
               // The cloudflare-vite-plugin config hook merges its
               // SSR-specific settings on top of this stub.