alchemy 2.0.0-beta.51 → 2.0.0-beta.53

package/lib/Cloudflare/VpcService/VpcService.js

@@ -32,122 +32,128 @@ import { CloudflareEnvironment } from "../CloudflareEnvironment.js";
  * ```
  */
 export const VpcService = Resource("Cloudflare.VpcService");
-export const VpcServiceProvider = () => Provider.effect(VpcService, Effect.gen(function* () {
-    const { accountId } = yield* CloudflareEnvironment;
-    const createService = yield* connectivity.createDirectoryService;
-    const getService = yield* connectivity.getDirectoryService;
-    const updateService = yield* connectivity.updateDirectoryService;
-    const deleteService = yield* connectivity.deleteDirectoryService;
-    const listServices = connectivity.listDirectoryServices;
-    const createServiceName = (id, name) => Effect.gen(function* () {
-        if (name)
-            return name;
-        return yield* createPhysicalName({
-            id,
-            lowercase: true,
-            maxLength: 63,
-        });
+const createServiceName = (id, name) => Effect.gen(function* () {
+    if (name)
+        return name;
+    return yield* createPhysicalName({
+        id,
+        lowercase: true,
+        maxLength: 63,
     });
-    const findServiceByName = (name) => listServices.items({ accountId }).pipe(Stream.filter((s) => s.name === name), Stream.runHead, Effect.map(Option.getOrUndefined));
-    return {
-        stables: ["serviceId", "accountId"],
-        diff: Effect.fn(function* ({ id, olds, news, output }) {
-            if (!isResolved(news))
-                return undefined;
-            if ((output?.accountId ?? accountId) !== accountId) {
-                return { action: "replace" };
-            }
-            const name = yield* createServiceName(id, news.name);
-            const oldName = output?.serviceName
-                ? output.serviceName
-                : yield* createServiceName(id, olds?.name);
-            if (name !== oldName) {
-                return { action: "update" };
-            }
-        }),
-        reconcile: Effect.fn(function* ({ id, news, output }) {
-            const name = yield* createServiceName(id, news.name);
-            const acct = output?.accountId ?? accountId;
-            // Observe — re-fetch the cached service; fall back to a name
-            // scan so we recover from out-of-band deletes or partial state
-            // persistence failures.
-            let observed;
-            if (output?.serviceId) {
-                observed = yield* getService({
-                    accountId: acct,
-                    serviceId: output.serviceId,
-                }).pipe(Effect.catch(() => Effect.succeed(undefined)));
-            }
-            if (!observed) {
-                const match = yield* findServiceByName(name);
-                observed = match;
-            }
-            // Ensure — create if missing. Cloudflare rejects a duplicate
-            // name with a generic error; tolerate by adopting the existing
-            // service (when the caller opted in) and re-applying the
-            // desired configuration.
-            if (!observed || !observed.serviceId) {
-                const result = yield* createService({
+});
+const findServiceByName = Effect.fnUntraced(function* (name) {
+    const { accountId } = yield* yield* CloudflareEnvironment;
+    return yield* connectivity.listDirectoryServices.items({ accountId }).pipe(Stream.filter((s) => s.name === name), Stream.runHead, Effect.map(Option.getOrUndefined));
+});
+export const VpcServiceProvider = () => Provider.succeed(VpcService, {
+    stables: ["serviceId", "accountId"],
+    diff: Effect.fn(function* ({ id, olds, news, output }) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        if (!isResolved(news))
+            return undefined;
+        if ((output?.accountId ?? accountId) !== accountId) {
+            return { action: "replace" };
+        }
+        const name = yield* createServiceName(id, news.name);
+        const oldName = output?.serviceName
+            ? output.serviceName
+            : yield* createServiceName(id, olds?.name);
+        if (name !== oldName) {
+            return { action: "update" };
+        }
+    }),
+    reconcile: Effect.fn(function* ({ id, news, output }) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        const name = yield* createServiceName(id, news.name);
+        const acct = output?.accountId ?? accountId;
+        // Observe — re-fetch the cached service; fall back to a name
+        // scan so we recover from out-of-band deletes or partial state
+        // persistence failures.
+        let observed;
+        if (output?.serviceId) {
+            observed = yield* connectivity
+                .getDirectoryService({
+                accountId: acct,
+                serviceId: output.serviceId,
+            })
+                .pipe(Effect.catch(() => Effect.succeed(undefined)));
+        }
+        if (!observed) {
+            const match = yield* findServiceByName(name);
+            observed = match;
+        }
+        // Ensure — create if missing. Cloudflare rejects a duplicate
+        // name with a generic error; tolerate by adopting the existing
+        // service (when the caller opted in) and re-applying the
+        // desired configuration.
+        if (!observed || !observed.serviceId) {
+            const result = yield* connectivity
+                .createDirectoryService({
+                accountId: acct,
+                name,
+                type: news.serviceType ?? "http",
+                httpPort: news.httpPort,
+                httpsPort: news.httpsPort,
+                host: news.host,
+            })
+                .pipe(Effect.catch((err) => Effect.gen(function* () {
+                if (!news.adopt)
+                    return yield* Effect.fail(err);
+                const existing = yield* findServiceByName(name);
+                if (!existing || !existing.serviceId) {
+                    return yield* Effect.fail(err);
+                }
+                return yield* connectivity.updateDirectoryService({
                     accountId: acct,
+                    serviceId: existing.serviceId,
                     name,
                     type: news.serviceType ?? "http",
                     httpPort: news.httpPort,
                     httpsPort: news.httpsPort,
                     host: news.host,
-                }).pipe(Effect.catch((err) => Effect.gen(function* () {
-                    if (!news.adopt)
-                        return yield* Effect.fail(err);
-                    const existing = yield* findServiceByName(name);
-                    if (!existing || !existing.serviceId) {
-                        return yield* Effect.fail(err);
-                    }
-                    return yield* updateService({
-                        accountId: acct,
-                        serviceId: existing.serviceId,
-                        name,
-                        type: news.serviceType ?? "http",
-                        httpPort: news.httpPort,
-                        httpsPort: news.httpsPort,
-                        host: news.host,
-                    });
-                })));
-                return formatVpcService(result, acct);
-            }
-            // Sync — the Cloudflare update API replaces all mutable fields
-            // (name, ports, host) atomically, so always issue it so
-            // adoption and routine updates converge.
-            const result = yield* updateService({
-                accountId: acct,
-                serviceId: observed.serviceId,
-                name,
-                type: news.serviceType ?? observed.type ?? "http",
-                httpPort: news.httpPort,
-                httpsPort: news.httpsPort,
-                host: news.host,
-            });
+                });
+            })));
             return formatVpcService(result, acct);
-        }),
-        delete: Effect.fn(function* ({ output }) {
-            yield* deleteService({
+        }
+        // Sync — the Cloudflare update API replaces all mutable fields
+        // (name, ports, host) atomically, so always issue it so
+        // adoption and routine updates converge.
+        const result = yield* connectivity.updateDirectoryService({
+            accountId: acct,
+            serviceId: observed.serviceId,
+            name,
+            type: news.serviceType ?? observed.type ?? "http",
+            httpPort: news.httpPort,
+            httpsPort: news.httpsPort,
+            host: news.host,
+        });
+        return formatVpcService(result, acct);
+    }),
+    delete: Effect.fn(function* ({ output }) {
+        yield* connectivity
+            .deleteDirectoryService({
+            accountId: output.accountId,
+            serviceId: output.serviceId,
+        })
+            .pipe(Effect.catch(() => Effect.void));
+    }),
+    read: Effect.fn(function* ({ id, output, olds }) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        if (output?.serviceId) {
+            return yield* connectivity
+                .getDirectoryService({
                 accountId: output.accountId,
                 serviceId: output.serviceId,
-            }).pipe(Effect.catch(() => Effect.void));
-        }),
-        read: Effect.fn(function* ({ id, output, olds }) {
-            if (output?.serviceId) {
-                return yield* getService({
-                    accountId: output.accountId,
-                    serviceId: output.serviceId,
-                }).pipe(Effect.map((s) => formatVpcService(s, output.accountId)), Effect.catch(() => Effect.succeed(undefined)));
-            }
-            const name = yield* createServiceName(id, olds?.name);
-            const existing = yield* findServiceByName(name);
-            if (!existing || !existing.serviceId)
-                return undefined;
-            return formatVpcService(existing, accountId);
-        }),
-    };
-}));
+            })
+                .pipe(Effect.map((s) => formatVpcService(s, output.accountId)), Effect.catch(() => Effect.succeed(undefined)));
+        }
+        const name = yield* createServiceName(id, olds?.name);
+        const existing = yield* findServiceByName(name);
+        if (!existing || !existing.serviceId)
+            return undefined;
+        return formatVpcService(existing, accountId);
+    }),
+});
 export const formatVpcService = (service, accountId) => {
     let host;
     if ("hostname" in service.host) {

package/lib/Cloudflare/VpcService/VpcService.js.map

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

package/lib/Cloudflare/VpcService/VpcServiceRef.js

@@ -22,7 +22,7 @@ import { formatVpcService } from "./VpcService.js";
  * ```
  */
 export const VpcServiceRef = (props) => Effect.gen(function* () {
-    const { accountId } = yield* CloudflareEnvironment;
+    const { accountId } = yield* yield* CloudflareEnvironment;
     if ("name" in props) {
         const match = yield* connectivity.listDirectoryServices
             .items({ accountId })

package/lib/Cloudflare/VpcService/VpcServiceRef.js.map

@@ -1 +1 @@
-{"version":3,"file":"VpcServiceRef.js","sourceRoot":"","sources":["../../../src/Cloudflare/VpcService/VpcServiceRef.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,0CAA0C,CAAC;AACzE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAqB9E;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE,CACzD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC;IACnD,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,qBAAqB;aACpD,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;aACpB,IAAI,CACH,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,EAC3C,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAClC,CAAC;QACJ,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC;QACrD,SAAS;QACT,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"VpcServiceRef.js","sourceRoot":"","sources":["../../../src/Cloudflare/VpcService/VpcServiceRef.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,0CAA0C,CAAC;AACzE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAqB9E;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE,CACzD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC;IAC1D,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,qBAAqB;aACpD,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;aACpB,IAAI,CACH,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,EAC3C,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAClC,CAAC;QACJ,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC;QACrD,SAAS;QACT,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC"}

package/lib/Cloudflare/Website/StaticSite.d.ts

@@ -1,20 +1,51 @@
 import * as Effect from "effect/Effect";
-import * as Redacted from "effect/Redacted";
-import { Command, type CommandProps } from "../../Build/Command.ts";
+import { type CommandProps } from "../../Build/Command.ts";
 import type { InputProps } from "../../Input.ts";
+import type { Providers } from "../Providers.ts";
 import type { AssetsConfig } from "../Workers/Assets.ts";
-import { Worker, type WorkerAssetsConfig, type WorkerBindingProps, type WorkerProps } from "../Workers/Worker.ts";
+import { Worker, type NormalizedBindings, type WorkerAssetsConfig, type WorkerBindingProps, type WorkerProps } from "../Workers/Worker.ts";
 export interface StaticSiteProps<Bindings extends WorkerBindingProps = {}> extends Omit<WorkerProps<Bindings, WorkerAssetsConfig>, "assets" | "dev">, Omit<CommandProps, "env"> {
     /**
      * Optional configuration for static asset routing behavior.
      * Supports `runWorkerFirst`, `htmlHandling`, `notFoundHandling`, etc.
      */
-    assetsConfig?: AssetsConfig;
+    assets?: AssetsConfig;
+    /**
+     * Local dev configuration. When `alchemy dev` runs, the build command is
+     * skipped and `command` is spawned as a long-lived child process tied to
+     * the stack's scope. Alchemy does not proxy or interpret the process —
+     * the dev server's own URL (e.g. `http://localhost:5173`) is what you
+     * open in the browser.
+     *
+     * @example
+     * ```typescript
+     * Cloudflare.StaticSite("App", {
+     *   command: "npm run build",
+     *   outdir: "dist",
+     *   main: "./src/worker.ts",
+     *   dev: { command: "npm run dev" },
+     * });
+     * ```
+     */
     dev?: {
+        /**
+         * Shell command to run as the local dev server (e.g. `npm run dev`).
+         */
         command: string;
+        /**
+         * Working directory for {@link command}. Defaults to {@link CommandProps.cwd}
+         * (the build command's `cwd`), or `process.cwd()` if neither is set.
+         */
+        cwd?: string;
+        /**
+         * Override for the `url` output if alchemy fails to detect it from the stdout of the dev command
+         */
+        url?: string;
     };
 }
-export type StaticSite = ReturnType<typeof StaticSite>;
+type StaticSiteWorker<Bindings extends WorkerBindingProps> = Worker<{
+    [binding in keyof NormalizedBindings<Bindings, WorkerAssetsConfig>]: NormalizedBindings<Bindings, WorkerAssetsConfig>[binding];
+}>;
 /**
  * A Cloudflare Worker that serves static assets built by a shell command.
  *
@@ -56,7 +87,7 @@ export type StaticSite = ReturnType<typeof StaticSite>;
  * ```
  *
  * @section Asset Configuration
- * Use `assetsConfig` to control how Cloudflare handles routing for
+ * Use `assets` to control how Cloudflare handles routing for
  * your static files — HTML handling, not-found behavior, etc.
  *
  * @example SPA-style routing
@@ -65,7 +96,7 @@ export type StaticSite = ReturnType<typeof StaticSite>;
  *   command: "npm run build",
  *   outdir: "dist",
  *   main: "./src/worker.ts",
- *   assetsConfig: {
+ *   assets: {
  *     htmlHandling: "auto-trailing-slash",
  *     notFoundHandling: "single-page-application",
  *   },
@@ -101,10 +132,31 @@ export type StaticSite = ReturnType<typeof StaticSite>;
  *   },
  * });
  * ```
+ *
+ * @section Class Form
+ * Calling `StaticSite` with no arguments returns a constructor you can
+ * `extend` to declare the Worker as a named class. The class is both
+ * an `Effect` you can `yield*` to deploy and a type you can reference
+ * elsewhere — useful when other resources need to bind to this Worker.
+ *
+ * @example Declaring a Worker class
+ * ```typescript
+ * class Blog extends Cloudflare.StaticSite<Blog>()("Blog", {
+ *   command: "hugo --minify",
+ *   outdir: "public",
+ *   main: "./src/worker.ts",
+ * }) {}
+ *
+ * const site = yield* Blog;
+ * ```
  */
-export declare const StaticSite: <const Bindings extends WorkerBindingProps = {}, Req = never>(id: string, propsEff: InputProps<StaticSiteProps<Bindings>> | Effect.Effect<InputProps<StaticSiteProps<Bindings>>, never, Req>) => Effect.Effect<Worker<{ [binding in keyof ({ [B in keyof Bindings]: Bindings[B] extends Effect.Effect<infer T extends import("../index.ts").WorkerBindingResource, any, any> ? T extends Redacted.Redacted<infer T_1> | import("effect/Config").Config<infer T_1> ? T_1 : T : Extract<Bindings[B], import("../index.ts").WorkerBindingResource>; } & {
-    ASSETS: import("../index.ts").Assets;
-})]: ({ [B in keyof Bindings]: Bindings[B] extends Effect.Effect<infer T extends import("../index.ts").WorkerBindingResource, any, any> ? T extends Redacted.Redacted<infer T_1> | import("effect/Config").Config<infer T_1> ? T_1 : T : Extract<Bindings[B], import("../index.ts").WorkerBindingResource>; } & {
-    ASSETS: import("../index.ts").Assets;
-})[binding]; }>, never, import("../../Provider.ts").Provider<Command> | import("../Providers.ts").Providers | Req>;
+export declare const StaticSite: {
+    <Self>(): {
+        <const Bindings extends WorkerBindingProps = {}, Req = never>(id: string, propsEff: InputProps<StaticSiteProps<Bindings>, "dev"> | Effect.Effect<InputProps<StaticSiteProps<Bindings>, "dev">, never, Req>): Effect.Effect<Self, never, Req | Providers> & {
+            new (): StaticSiteWorker<Bindings>;
+        };
+    };
+    <const Bindings extends WorkerBindingProps = {}, Req = never>(id: string, propsEff: InputProps<StaticSiteProps<Bindings>, "dev"> | Effect.Effect<InputProps<StaticSiteProps<Bindings>, "dev">, never, Req>): Effect.Effect<StaticSiteWorker<Bindings>, never, Req | Providers>;
+};
+export {};
 //# sourceMappingURL=StaticSite.d.ts.map

package/lib/Cloudflare/Website/StaticSite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticSite.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Website/StaticSite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,MAAM,EACN,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,kBAAkB,GAAG,EAAE,CACvE,SACE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,EACjE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC;IAC3B;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,GAAG,CAAC,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFG;AACH,eAAO,MAAM,UAAU,GACrB,KAAK,CAAC,QAAQ,SAAS,kBAAkB,GAAG,EAAE,EAC9C,GAAG,GAAG,KAAK,EAEX,IAAI,MAAM,EACV,UACI,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,GACrC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC;;;;kHA0CzC,CAAC"}
+{"version":3,"file":"StaticSite.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Website/StaticSite.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,MAAM,EACN,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,kBAAkB,GAAG,EAAE,CACvE,SACE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,EACjE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC;IAC3B;;;OAGG;IAEH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;;;;;;;;;;;;OAgBG;IACH,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QACb;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAED,KAAK,gBAAgB,CAAC,QAAQ,SAAS,kBAAkB,IAAI,MAAM,CAAC;KACjE,OAAO,IAAI,MAAM,kBAAkB,CAClC,QAAQ,EACR,kBAAkB,CACnB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC;CAC9D,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuGG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,IAAI,KAAK;QACR,CAAC,KAAK,CAAC,QAAQ,SAAS,kBAAkB,GAAG,EAAE,EAAE,GAAG,GAAG,KAAK,EAC1D,EAAE,EAAE,MAAM,EACV,QAAQ,EACJ,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,GAC5C,MAAM,CAAC,MAAM,CACX,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EAC5C,KAAK,EACL,GAAG,CACJ,GACJ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,CAAC,GAAG;YAC/C,QAAQ,gBAAgB,CAAC,QAAQ,CAAC,CAAC;SACpC,CAAC;KACH,CAAC;IACF,CAAC,KAAK,CAAC,QAAQ,SAAS,kBAAkB,GAAG,EAAE,EAAE,GAAG,GAAG,KAAK,EAC1D,EAAE,EAAE,MAAM,EACV,QAAQ,EACJ,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,GAC5C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,GAC1E,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;CAI7B,CAAC"}

package/lib/Cloudflare/Website/StaticSite.js

@@ -1,7 +1,11 @@
+import * as Output from "alchemy/Output";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
+import { AlchemyContext } from "../../AlchemyContext.js";
 import { Command } from "../../Build/Command.js";
+import { DevServer } from "../../Build/DevServer.js";
 import * as Namespace from "../../Namespace.js";
+import { effectClass } from "../../Util/effect.js";
 import { Worker, } from "../Workers/Worker.js";
 /**
  * A Cloudflare Worker that serves static assets built by a shell command.
@@ -44,7 +48,7 @@ import { Worker, } from "../Workers/Worker.js";
  * ```
  *
  * @section Asset Configuration
- * Use `assetsConfig` to control how Cloudflare handles routing for
+ * Use `assets` to control how Cloudflare handles routing for
  * your static files — HTML handling, not-found behavior, etc.
  *
  * @example SPA-style routing
@@ -53,7 +57,7 @@ import { Worker, } from "../Workers/Worker.js";
  *   command: "npm run build",
  *   outdir: "dist",
  *   main: "./src/worker.ts",
- *   assetsConfig: {
+ *   assets: {
  *     htmlHandling: "auto-trailing-slash",
  *     notFoundHandling: "single-page-application",
  *   },
@@ -89,37 +93,83 @@ import { Worker, } from "../Workers/Worker.js";
  *   },
  * });
  * ```
+ *
+ * @section Class Form
+ * Calling `StaticSite` with no arguments returns a constructor you can
+ * `extend` to declare the Worker as a named class. The class is both
+ * an `Effect` you can `yield*` to deploy and a type you can reference
+ * elsewhere — useful when other resources need to bind to this Worker.
+ *
+ * @example Declaring a Worker class
+ * ```typescript
+ * class Blog extends Cloudflare.StaticSite<Blog>()("Blog", {
+ *   command: "hugo --minify",
+ *   outdir: "public",
+ *   main: "./src/worker.ts",
+ * }) {}
+ *
+ * const site = yield* Blog;
+ * ```
  */
-export const StaticSite = (id, propsEff) => Effect.gen(function* () {
+export const StaticSite = ((id, propsEff) => id === undefined
+    ? (id, propsEff) => effectClass(makeStaticSite(id, propsEff))
+    : makeStaticSite(id, propsEff));
+const makeStaticSite = (id, propsEff) => Effect.gen(function* () {
     const props = Effect.isEffect(propsEff)
         ? propsEff
         : Effect.succeed(propsEff);
-    // TODO(sam): local dev/hmr support?
-    const build = yield* Command("Build", Effect.map(props, (props) => ({
-        command: props.command,
-        cwd: props.cwd,
-        memo: props.memo,
-        outdir: props.outdir,
-        env: props.env
-            ? Object.fromEntries(Object.entries(props.env).flatMap(([k, v]) => {
-                if (v === undefined)
-                    return [];
-                if (typeof v === "string" || Redacted.isRedacted(v))
-                    return [[k, v]];
-                return [[k, JSON.stringify(v)]];
-            }))
-            : undefined,
-    })));
-    return yield* Worker("Worker", Effect.map(props, (props) => ({
-        ...props,
-        assets: {
-            path: build.outdir,
-            hash: build.hash,
-            config: props.assetsConfig,
-        },
-        // Omit the dev command from WorkerProps since it's different from WorkerProps["dev"].
-        // TODO: we'll need to update this when we add local dev support for StaticSite.
-        dev: undefined,
-    })));
+    const { dev: isDevPhase } = yield* AlchemyContext;
+    return yield* Effect.gen(function* () {
+        const resolved = yield* props;
+        const useDevServer = isDevPhase && resolved.dev !== undefined;
+        // In dev mode with a dev.command, declare a DevCommand resource so
+        // the sidecar owns the process lifecycle (survives user-code HMR),
+        // skip the build, and tell Worker not to start a local instance.
+        let devUrl = yield* useDevServer
+            ? DevServer("Dev", {
+                command: resolved.dev.command,
+                cwd: resolved.dev.cwd ??
+                    (typeof resolved.cwd === "string" ? resolved.cwd : undefined),
+            }).pipe(Effect.map((d) => Output.map(d.url, (url) => url ?? resolved.dev?.url ?? false)))
+            : Effect.succeed(false);
+        const build = useDevServer
+            ? undefined
+            : yield* Command("Build", {
+                command: resolved.command,
+                cwd: resolved.cwd,
+                memo: resolved.memo,
+                outdir: resolved.outdir,
+                env: resolved.env
+                    ? Object.fromEntries(Object.entries(resolved.env).flatMap(([k, v]) => {
+                        if (v === undefined)
+                            return [];
+                        if (typeof v === "string" || Redacted.isRedacted(v))
+                            return [[k, v]];
+                        return [[k, JSON.stringify(v)]];
+                    }))
+                    : undefined,
+            });
+        // Pure-static sites don't need a custom Worker entrypoint —
+        // delegate every request straight to the ASSETS binding. Only
+        // injected when the user provided neither `main` nor `script`.
+        const fallbackScript = resolved.main == null && resolved.script == null
+            ? `export default { fetch: (request, env) => env.ASSETS.fetch(request) };`
+            : undefined;
+        return yield* Worker("Worker", {
+            ...resolved,
+            assets: build
+                ? {
+                    directory: build.outdir,
+                    hash: build.hash,
+                    ...resolved.assets,
+                }
+                : undefined,
+            // Opt out of the local Worker in dev when the external DevCommand
+            // is serving the content. The Worker resource still exists in
+            // state with a stub Attributes shape.
+            dev: useDevServer ? devUrl : undefined,
+            script: fallbackScript ?? resolved.script,
+        });
+    });
 }).pipe(Namespace.push(id));
 //# sourceMappingURL=StaticSite.js.map

package/lib/Cloudflare/Website/StaticSite.js.map

@@ -1 +1 @@
-{"version":3,"file":"StaticSite.js","sourceRoot":"","sources":["../../../src/Cloudflare/Website/StaticSite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAqB,MAAM,wBAAwB,CAAC;AAEpE,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EACL,MAAM,GAIP,MAAM,sBAAsB,CAAC;AAkB9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAIxB,EAAU,EACV,QAEoE,EACpE,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACrC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE7B,oCAAoC;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,OAAO,CAC1B,OAAO,EACP,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,EAAE,KAAK,CAAC,GAAG;YACZ,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBAC3C,IAAI,CAAC,KAAK,SAAS;oBAAE,OAAO,EAAE,CAAC;gBAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;oBACjD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClB,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC,CAAC,CACH;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,OAAO,KAAK,CAAC,CAAC,MAAM,CAClB,QAAQ,EACR,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5B,GAAG,KAAK;QACR,MAAM,EAAE;YACN,IAAI,EAAE,KAAK,CAAC,MAAM;YAClB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,YAAY;SAC3B;QACD,sFAAsF;QACtF,gFAAgF;QAChF,GAAG,EAAE,SAAS;KACf,CAAC,CAAC,CACJ,CAAC;AACJ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"StaticSite.js","sourceRoot":"","sources":["../../../src/Cloudflare/Website/StaticSite.ts"],"names":[],"mappings":"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"}