alchemy 2.0.0-beta.4 → 2.0.0-beta.test-export-fix-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.test-export-fix-4",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
@@ -201,16 +201,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@clack/prompts": "^0.11.0",
     "@ai-sdk/anthropic": "^3.0.31",
     "@ai-sdk/openai": "^3.0.23",
     "@ai-sdk/provider": "^3.0.8",
     "@aws-sdk/credential-providers": "^3.0.0",
-    "@distilled.cloud/aws": "^0.10.2",
-    "@distilled.cloud/cloudflare": "^0.10.2",
+    "@distilled.cloud/aws": "^0.10.0",
+    "@distilled.cloud/cloudflare": "^0.10.0",
     "@distilled.cloud/cloudflare-rolldown-plugin": "0.3.0",
     "@distilled.cloud/cloudflare-vite-plugin": "0.2.0",
-    "@distilled.cloud/core": "^0.10.2",
+    "@distilled.cloud/core": "^0.10.0",
     "@effect/vitest": "4.0.0-beta.48",
     "@libsql/client": "^0.17.0",
     "@octokit/rest": "^22.0.1",

package/src/AWS/EC2/VpcEndpoint.ts

@@ -9,10 +9,10 @@ import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
 import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
 import type { AccountID } from "../Account.ts";
 import { Account } from "../Account.ts";
-import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 import type { RouteTableId } from "./RouteTable.ts";
 import type { SecurityGroupId } from "./SecurityGroup.ts";
@@ -595,11 +595,11 @@ const waitForVpcEndpointAvailable = (
       return yield* new VpcEndpointNotFound({ vpcEndpointId });
     }
 
-    if (ep.State === "available") {
+    if (ep.State === "Available") {
       return ep;
     }
 
-    if (ep.State === "failed" || ep.State === "rejected") {
+    if (ep.State === "Failed" || ep.State === "Rejected") {
       return yield* new VpcEndpointFailed({
         vpcEndpointId,
         errorCode: ep.LastError?.Code,
@@ -641,7 +641,7 @@ const waitForVpcEndpointDeleted = (
 
     const ep = result.VpcEndpoints?.[0];
 
-    if (!ep || ep.State === "deleted") {
+    if (!ep || ep.State === "Deleted") {
       return; // Successfully deleted
     }
 

package/src/Cloudflare/Website/StaticSite.ts

@@ -83,41 +83,28 @@ export type StaticSite = ReturnType<typeof StaticSite>;
  * });
  * ```
  */
-export const StaticSite = <
-  const Bindings extends WorkerBindingProps = {},
-  Req = never,
->(
+export const StaticSite = <const Bindings extends WorkerBindingProps = {}>(
   id: string,
-  propsEff:
-    | InputProps<StaticSiteProps<Bindings>>
-    | Effect.Effect<InputProps<StaticSiteProps<Bindings>>, never, Req>,
+  props: InputProps<StaticSiteProps<Bindings>>,
 ) =>
   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,
-      })),
-    );
+    const build = yield* Command("Build", {
+      command: props.command,
+      cwd: props.cwd,
+      memo: props.memo,
+      outdir: props.outdir,
+      env: props.env,
+    });
+
+    const worker = yield* Worker<Bindings, WorkerAssetsConfig>("Worker", {
+      ...props,
+      assets: {
+        path: build.outdir,
+        hash: build.hash,
+        config: props.assetsConfig,
+      },
+    });
 
-    return yield* Worker<Bindings, WorkerAssetsConfig, Req>(
-      "Worker",
-      Effect.map(props, (props) => ({
-        ...props,
-        assets: {
-          path: build.outdir,
-          hash: build.hash,
-          config: props.assetsConfig,
-        },
-      })),
-    );
+    return worker;
   }).pipe(Namespace.push(id));

package/src/Cloudflare/Website/Vite.ts

@@ -1,4 +1,3 @@
-import * as Effect from "effect/Effect";
 import type { MemoOptions } from "../../Build/Memo.ts";
 import type { InputProps } from "../../Input.ts";
 import {
@@ -107,26 +106,15 @@ export interface ViteProps<
  * });
  * ```
  */
-export const Vite = <
-  const Bindings extends WorkerBindingProps = {},
-  Req = never,
->(
+export const Vite = <const Bindings extends WorkerBindingProps = {}>(
   id: string,
-  propsEff?:
-    | InputProps<ViteProps<Bindings>>
-    | Effect.Effect<InputProps<ViteProps<Bindings>>, never, Req>,
+  props: InputProps<ViteProps<Bindings>> = {},
 ) =>
-  Worker<Bindings, WorkerAssetsConfig, Req>(
-    id,
-    Effect.map(
-      Effect.isEffect(propsEff) ? propsEff : Effect.succeed(propsEff),
-      (props) => ({
-        ...props,
-        main: undefined!,
-        vite: {
-          rootDir: props?.rootDir,
-          memo: props?.memo,
-        },
-      }),
-    ),
-  );
+  Worker<Bindings, WorkerAssetsConfig>(id, {
+    ...props,
+    main: undefined!,
+    vite: {
+      rootDir: props.rootDir,
+      memo: props.memo,
+    },
+  });

package/src/Cloudflare/Workers/Worker.ts

@@ -2,7 +2,6 @@ import type * as cf from "@cloudflare/workers-types";
 import cloudflareRolldown from "@distilled.cloud/cloudflare-rolldown-plugin";
 import cloudflareVite from "@distilled.cloud/cloudflare-vite-plugin";
 import * as workers from "@distilled.cloud/cloudflare/workers";
-import * as zones from "@distilled.cloud/cloudflare/zones";
 import type * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
@@ -248,12 +247,6 @@ export interface WorkerProps<
   env?: Record<string, string | Redacted.Redacted<string>>;
   exports?: string[];
   bindings?: Bindings;
-  /**
-   * One or more custom hostnames (e.g. `"app.example.com"`) to bind to this
-   * Worker. The Cloudflare Zone is inferred from the hostname — the zone must
-   * already exist in the account.
-   */
-  domain?: string | string[];
   build?: {
     /**
      * Whether to generate a metafile for the worker bundle.
@@ -274,7 +267,6 @@ export type Worker<Bindings extends WorkerBindings = any> = Resource<
     tags: string[] | undefined;
     durableObjectNamespaces: Record<string, string>;
     accountId: string;
-    domains: { hostname: string; id: string; zoneId: string }[];
     hash?: {
       assets: string | undefined;
       bundle: string | undefined;
@@ -622,21 +614,16 @@ export const Worker: Platform<
   <
     const Bindings extends WorkerBindingProps,
     const Assets extends WorkerAssetsConfig | undefined = undefined,
-    Req = never,
   >(
     id: string,
-    props:
-      | InputProps<WorkerProps<Bindings, Assets>>
-      | Effect.Effect<InputProps<WorkerProps<Bindings, Assets>>, never, Req>,
+    props: InputProps<WorkerProps<Bindings, Assets>>,
   ): Effect.Effect<
     Worker<{
       [binding in keyof NormalizedBindings<
         Bindings,
         Assets
       >]: NormalizedBindings<Bindings, Assets>[binding];
-    }>,
-    never,
-    Req | Providers
+    }>
   >;
 } = Platform(WorkerTypeId, {
   onCreate: Effect.fnUntraced(function* (
@@ -925,10 +912,6 @@ export const WorkerProvider = () =>
       const getSubdomain = yield* workers.getSubdomain;
       const listScripts = yield* workers.listScripts;
       const putScript = yield* workers.putScript;
-      const putDomain = yield* workers.putDomain;
-      const listDomains = yield* workers.listDomains;
-      const deleteDomain = yield* workers.deleteDomain;
-      const listZones = yield* zones.listZones;
       const telemetry = yield* CloudflareLogs;
       const defaultCompatibilityDate = yield* Effect.promise(() =>
         // @ts-expect-error no types for workerd
@@ -955,95 +938,6 @@ export const WorkerProvider = () =>
               maxLength: 54,
             }).pipe(Effect.map((name) => name.toLowerCase()));
 
-      const normalizeDomains = (
-        domain: string | string[] | undefined,
-      ): string[] =>
-        domain === undefined
-          ? []
-          : Array.isArray(domain)
-            ? Array.from(new Set(domain))
-            : [domain];
-
-      /**
-       * Infer the Cloudflare Zone ID for a given hostname by listing the
-       * account's zones and matching the hostname against each zone's name —
-       * walking up the DNS label hierarchy until a match is found.
-       */
-      const inferZoneIdForHostname = (
-        hostname: string,
-        zoneCache: Map<string, string>,
-      ) =>
-        Effect.gen(function* () {
-          const cached = zoneCache.get(hostname);
-          if (cached) return cached;
-
-          const zoneList = yield* listZones({}).pipe(
-            Effect.map((response) => response.result ?? []),
-          );
-          for (const zone of zoneList) {
-            zoneCache.set(zone.name, zone.id);
-          }
-
-          const parts = hostname.split(".");
-          for (let i = 0; i < parts.length - 1; i++) {
-            const candidate = parts.slice(i).join(".");
-            const match = zoneList.find((z) => z.name === candidate);
-            if (match) {
-              zoneCache.set(hostname, match.id);
-              return match.id;
-            }
-          }
-          return yield* Effect.die(
-            `Could not infer Cloudflare Zone for hostname "${hostname}". ` +
-              "Ensure the parent zone exists in this account.",
-          );
-        });
-
-      const reconcileDomains = (
-        scriptName: string,
-        desired: string[],
-        previous: Worker["Attributes"]["domains"],
-      ) =>
-        Effect.gen(function* () {
-          const desiredSet = new Set(desired);
-          const toRemove = previous.filter((p) => !desiredSet.has(p.hostname));
-          yield* Effect.all(
-            toRemove.map((d) =>
-              deleteDomain({ accountId, domainId: d.id }).pipe(
-                Effect.catchTag("DomainNotFound", () => Effect.void),
-              ),
-            ),
-            { concurrency: "unbounded" },
-          );
-
-          if (desired.length === 0) return [];
-
-          const zoneCache = new Map<string, string>();
-          const applied = yield* Effect.all(
-            desired.map((hostname) =>
-              Effect.gen(function* () {
-                const zoneId = yield* inferZoneIdForHostname(
-                  hostname,
-                  zoneCache,
-                );
-                const res = yield* putDomain({
-                  accountId,
-                  hostname,
-                  service: scriptName,
-                  zoneId,
-                });
-                return {
-                  hostname,
-                  id: res.id ?? "",
-                  zoneId: res.zoneId ?? zoneId,
-                };
-              }),
-            ),
-            { concurrency: "unbounded" },
-          );
-          return applied;
-        });
-
       const createAlchemyWorkerTags = (id: string) => [
         `alchemy:stack:${stack.name}`,
         `alchemy:stage:${stack.stage}`,
@@ -1744,18 +1638,6 @@ ${[
           );
           yield* setWorkerSubdomain(name, enable);
         }
-        const desiredDomains = normalizeDomains(news.domain);
-        const previousDomains = output?.domains ?? [];
-        if (desiredDomains.length > 0 || previousDomains.length > 0) {
-          yield* session.note(
-            `Reconciling custom domains (${desiredDomains.length}) ...`,
-          );
-        }
-        const domains = yield* reconcileDomains(
-          name,
-          desiredDomains,
-          previousDomains,
-        );
         return {
           workerId: worker.id ?? name,
           workerName: name,
@@ -1767,7 +1649,6 @@ ${[
           tags: settings.tags ?? metadata.tags,
           durableObjectNamespaces,
           accountId,
-          domains,
           hash,
         } satisfies Worker["Attributes"];
       });
@@ -1813,14 +1694,7 @@ ${[
           if (!output) {
             return;
           }
-          const newDomains = normalizeDomains(news.domain).sort();
-          const oldDomains = (output?.domains ?? [])
-            .map((d) => d.hostname)
-            .sort();
-          const domainsChanged =
-            newDomains.length !== oldDomains.length ||
-            newDomains.some((d, i) => d !== oldDomains[i]);
-          if (domainsChanged || (yield* hasChanged(id, news, output))) {
+          if (yield* hasChanged(id, news, output)) {
             return {
               action: "update",
               stables:
@@ -1949,7 +1823,6 @@ ${[
             tags: existingSettings?.tags ?? tags,
             durableObjectNamespaces,
             accountId,
-            domains: [],
           } satisfies Worker["Attributes"];
         }),
         read: Effect.fnUntraced(
@@ -1959,28 +1832,23 @@ ${[
             yield* Effect.logInfo(
               `Cloudflare Worker read: checking ${workerName}`,
             );
-            const [worker, subdomain, settings, domainsList] =
-              yield* Effect.all([
-                listScripts({
-                  accountId,
-                }).pipe(
-                  Effect.map((workers) =>
-                    workers.result.find((worker) => worker.id === workerName),
-                  ),
+            const [worker, subdomain, settings] = yield* Effect.all([
+              listScripts({
+                accountId,
+              }).pipe(
+                Effect.map((workers) =>
+                  workers.result.find((worker) => worker.id === workerName),
                 ),
-                getScriptSubdomain({
-                  accountId,
-                  scriptName: workerName,
-                }),
-                getScriptSettings({
-                  accountId,
-                  scriptName: workerName,
-                }),
-                listDomains({
-                  accountId,
-                  service: workerName,
-                }).pipe(Effect.map((r) => r.result ?? [])),
-              ]);
+              ),
+              getScriptSubdomain({
+                accountId,
+                scriptName: workerName,
+              }),
+              getScriptSettings({
+                accountId,
+                scriptName: workerName,
+              }),
+            ]);
             if (!worker) {
               yield* Effect.logInfo(
                 `Cloudflare Worker read: ${workerName} not found in script list`,
@@ -2002,11 +1870,6 @@ ${[
               durableObjectNamespaces: getDurableObjectNamespaces(
                 settings.bindings,
               ),
-              domains: domainsList.flatMap((d) =>
-                d.id && d.hostname && d.zoneId
-                  ? [{ id: d.id, hostname: d.hostname, zoneId: d.zoneId }]
-                  : [],
-              ),
             } satisfies Worker["Attributes"];
           },
           (effect) =>
@@ -2108,17 +1971,6 @@ ${[
           yield* Effect.logInfo(
             `Cloudflare Worker delete: deleting ${output.workerName}`,
           );
-          if (output.domains?.length) {
-            yield* Effect.all(
-              output.domains.map((d) =>
-                deleteDomain({
-                  accountId: output.accountId,
-                  domainId: d.id,
-                }).pipe(Effect.catchTag("DomainNotFound", () => Effect.void)),
-              ),
-              { concurrency: "unbounded" },
-            );
-          }
           yield* deleteScript({
             accountId: output.accountId,
             scriptName: output.workerName,

package/src/Platform.ts

@@ -220,15 +220,10 @@ export const Platform = <
             //     return new Response("Hello, world!");
             //   }
             // }
-            resource(
-              id,
-              Effect.isEffect(props)
-                ? Effect.map(props, (p: any) => ({ ...p, isExternal: true }))
-                : {
-                    ...props,
-                    isExternal: true,
-                  },
-            )
+            resource(id, {
+              ...props,
+              isExternal: true,
+            })
           : Effect.flatMap(
               // this is a tagged resource
               Effect.serviceOption(cls.Self),

package/src/Resource.ts

@@ -31,10 +31,10 @@ export type ResourceConstructor<R extends ResourceLike, Req = never> = {
           },
         ]
   ): Effect.Effect<R, never, Req>;
-  <PropsReq = never>(
-    id: string,
-    props: Effect.Effect<Input<R["Props"]>, never, PropsReq>,
-  ): Effect.Effect<R, never, PropsReq | Req>;
+  // <PropsReq = never>(
+  //   id: string,
+  //   props: Effect.Effect<Input<R["Props"]>, never, PropsReq>,
+  // ): Effect.Effect<R, never, PropsReq | Req>;
 };
 
 export type ResourceClassWithMethods<