alchemy 0.43.4 → 0.44.0

package/src/cloudflare/container.ts

@@ -96,6 +96,7 @@ export async function Container<T>(
   const image = await Image(id, {
     name: `${api.accountId}/${name}`,
     tag,
+    build: props.build,
     registry: {
       server: "registry.cloudflare.com",
       username: credentials.username || credentials.user!,
@@ -148,6 +149,15 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
     namespaceId: string;
   };
   rollout?: ContainerApplicationRollout;
+  /**
+   * Whether to adopt an existing container application with the same name.
+   *
+   * If `true`, the resource will attempt to adopt an existing container application
+   * instead of failing when one already exists with the same name.
+   *
+   * @default false
+   */
+  adopt?: boolean;
 }
 
 export type SchedulingPolicy =
@@ -155,7 +165,8 @@ export type SchedulingPolicy =
   | "gpu"
   | "regional"
   | "fill_metals"
-  | "default";
+  | "default"
+  | (string & {});
 
 export interface ContainerApplication
   extends Resource<"cloudflare::ContainerApplication"> {
@@ -232,6 +243,21 @@ export interface ContainerApplication
  *     })
  *   }
  * });
+ *
+ * @example
+ * // Adopt an existing container application
+ * const existingApp = await ContainerApplication("existing-app", {
+ *   name: "existing-app",
+ *   adopt: true, // Will adopt instead of failing if already exists
+ *   image: await Image("updated-app", {
+ *     name: "updated-app",
+ *     build: {
+ *       context: "./docker/updated"
+ *     }
+ *   }),
+ *   instances: 2,
+ *   maxInstances: 5
+ * });
  */
 export const ContainerApplication = Resource(
   "cloudflare::ContainerApplication",
@@ -287,29 +313,78 @@ export const ContainerApplication = Resource(
         name: application.name,
       });
     } else {
-      const application = await createContainerApplication(api, {
-        name: props.name,
-        scheduling_policy: props.schedulingPolicy ?? "default",
-        instances: props.instances ?? 1,
-        max_instances: props.maxInstances ?? 1,
-        durable_objects: props.durableObjects
-          ? {
-              namespace_id: props.durableObjects.namespaceId,
-            }
-          : undefined,
-        constraints: {
-          tier: 1,
-        },
-        configuration: {
-          image: imageReference,
-          instance_type: props.instanceType ?? "dev",
-          observability: {
-            logs: {
-              enabled: true,
+      let application: ContainerApplicationData;
+
+      try {
+        application = await createContainerApplication(api, {
+          name: props.name,
+          scheduling_policy: props.schedulingPolicy ?? "default",
+          instances: props.instances ?? 1,
+          max_instances: props.maxInstances ?? 1,
+          durable_objects: props.durableObjects
+            ? {
+                namespace_id: props.durableObjects.namespaceId,
+              }
+            : undefined,
+          constraints: {
+            tier: 1,
+          },
+          configuration: {
+            image: imageReference,
+            instance_type: props.instanceType ?? "dev",
+            observability: {
+              logs: {
+                enabled: true,
+              },
             },
           },
-        },
-      });
+        });
+      } catch (error) {
+        // Check if this is an "already exists" error and adopt is enabled
+        if (
+          props.adopt &&
+          error instanceof Error &&
+          error.message.includes("already exists")
+        ) {
+          // Find the existing container application
+          const existingApplication = await findContainerApplicationByName(
+            api,
+            props.name,
+          );
+
+          if (!existingApplication) {
+            throw new Error(
+              `Failed to find existing container application '${props.name}' for adoption`,
+            );
+          }
+
+          // Update the existing application with new properties
+          application = await updateContainerApplication(
+            api,
+            existingApplication.id,
+            {
+              instances: props.instances ?? existingApplication.instances,
+              max_instances:
+                props.maxInstances ?? existingApplication.max_instances,
+              scheduling_policy:
+                props.schedulingPolicy ?? existingApplication.scheduling_policy,
+              configuration,
+            },
+          );
+
+          // Create a rollout for the updated configuration
+          await createContainerApplicationRollout(api, application.id, {
+            description: "Update configuration on adoption",
+            strategy: "rolling",
+            kind: props.rollout?.kind ?? "full_auto",
+            step_percentage: props.rollout?.stepPercentage ?? 25,
+            target_configuration: configuration,
+          });
+        } else {
+          // Re-throw the error if adopt is false or different error
+          throw error;
+        }
+      }
 
       return this({
         id: application.id,
@@ -321,7 +396,7 @@ export const ContainerApplication = Resource(
 
 export interface ContainerApplicationData {
   name: string;
-  scheduling_policy: string;
+  scheduling_policy: SchedulingPolicy;
   instances: number;
   max_instances: number;
   constraints: {
@@ -377,6 +452,14 @@ export async function listContainerApplications(
   );
 }
 
+export async function findContainerApplicationByName(
+  api: CloudflareApi,
+  name: string,
+): Promise<ContainerApplicationData | undefined> {
+  const applications = await listContainerApplications(api);
+  return applications.find((app) => app.name === name);
+}
+
 export interface CreateContainerApplicationBody {
   name: string;
   max_instances: number;
@@ -492,12 +575,14 @@ export async function deleteContainerApplication(
     `/accounts/${api.accountId}/containers/applications/${applicationId}`,
   );
   const result = (await response.json()) as any;
-  if (response.ok) {
-    return result.result;
+  // Treat missing applications as already-deleted so that destroy() is idempotent
+  if (response.ok || response.status === 404) {
+    return result?.result;
   }
-  throw Error(
-    `Failed to delete container application: ${result.errors?.map((e: { message: string }) => e.message).join(", ") ?? "Unknown error"}`,
-  );
+  const errorMessages = Array.isArray(result?.errors)
+    ? result.errors.map((e: { message: string }) => e.message).join(", ")
+    : (result?.error ?? "Unknown error");
+  throw Error(`Failed to delete container application: ${errorMessages}`);
 }
 
 interface CreateRolloutApplicationRequest {

package/src/cloudflare/redirect-rule.ts

@@ -408,7 +408,7 @@ async function createRedirectRule(
     description: ruleset.description,
     kind: ruleset.kind,
     phase: ruleset.phase,
-    rules: [...ruleset.rules, newRule],
+    rules: [...(ruleset.rules ?? []), newRule],
   });
 
   if (!response.ok) {

package/src/cloudflare/website.ts

@@ -10,7 +10,7 @@ import {
   type AssetsConfig,
   type WorkerProps,
 } from "./worker.ts";
-import { WranglerJson } from "./wrangler.json.ts";
+import { WranglerJson, type WranglerJsonSpec } from "./wrangler.json.ts";
 
 export interface WebsiteProps<B extends Bindings>
   extends Omit<WorkerProps<B>, "name" | "assets" | "entrypoint"> {
@@ -102,6 +102,25 @@ export interface WebsiteProps<B extends Bindings>
     command: string;
     url: string;
   };
+
+  /**
+   * Transform hooks to modify generated configuration files
+   */
+  transform?: {
+    /**
+     * Hook to modify the wrangler.json object before it's written
+     *
+     * This function receives the generated wrangler.json spec and should return
+     * a modified version. It's applied as the final transformation before the
+     * file is written to disk.
+     *
+     * @param spec - The generated wrangler.json specification
+     * @returns The modified wrangler.json specification
+     */
+    wrangler?: (
+      spec: WranglerJsonSpec,
+    ) => WranglerJsonSpec | Promise<WranglerJsonSpec>;
+  };
 }
 
 export type Website<B extends Bindings> = B extends { ASSETS: any }
@@ -193,6 +212,7 @@ export default {
             // path must be relative to the wrangler.jsonc file
             directory: path.relative(wranglerDir, assetsDirPath),
           },
+          transform: props.transform,
         });
       }
 

package/src/cloudflare/worker/miniflare.ts

@@ -1,8 +1,9 @@
-import type {
-  Miniflare,
-  MiniflareOptions,
-  RemoteProxyConnectionString,
-  WorkerOptions,
+import {
+  MiniflareCoreError,
+  type Miniflare,
+  type MiniflareOptions,
+  type RemoteProxyConnectionString,
+  type WorkerOptions,
 } from "miniflare";
 import path from "node:path";
 import { findOpenPort } from "../../util/find-open-port.ts";
@@ -66,7 +67,9 @@ class MiniflareServer {
       }),
     );
     if (this.miniflare) {
-      await this.miniflare.setOptions(await this.miniflareOptions());
+      await withErrorRewrite(
+        this.miniflare.setOptions(await this.miniflareOptions()),
+      );
     } else {
       const { Miniflare } = await import("miniflare").catch(() => {
         throw new Error(
@@ -81,9 +84,8 @@ class MiniflareServer {
           process.exit(0);
         }
       });
-
       this.miniflare = new Miniflare(await this.miniflareOptions());
-      await this.miniflare.ready;
+      await withErrorRewrite(this.miniflare.ready);
     }
     const existing = this.servers.get(worker.name);
     if (existing) {
@@ -191,6 +193,29 @@ class MiniflareServer {
   }
 }
 
+export class ExternalDependencyError extends Error {
+  constructor() {
+    super(
+      'Miniflare detected an external dependency that could not be resolved. This typically occurs when the "nodejs_compat" or "nodejs_als" compatibility flag is not enabled.',
+    );
+  }
+}
+
+async function withErrorRewrite<T>(promise: Promise<T>) {
+  try {
+    return await promise;
+  } catch (error) {
+    if (
+      error instanceof MiniflareCoreError &&
+      error.code === "ERR_MODULE_STRING_SCRIPT"
+    ) {
+      throw new ExternalDependencyError();
+    } else {
+      throw error;
+    }
+  }
+}
+
 declare global {
   var _ALCHEMY_MINIFLARE_SERVER: MiniflareServer | undefined;
 }

package/src/cloudflare/worker-metadata.ts

@@ -351,6 +351,21 @@ export async function prepareWorkerMetadata(
 
   const bindings = (props.bindings ?? {}) as Bindings;
 
+  // Validate that all Container and DurableObjectNamespace bindings have unique IDs
+  const bindingIds = new Map<string, string>();
+  for (const [bindingName, binding] of Object.entries(bindings)) {
+    if (typeof binding === "object" && binding !== null && "id" in binding) {
+      if (isDurableObjectNamespace(binding) || isContainer(binding)) {
+        if (bindingIds.has(binding.id)) {
+          throw new Error(
+            `Duplicate binding ID '${binding.id}' found for bindings '${bindingIds.get(binding.id)}' and '${bindingName}'. Container and DurableObjectNamespace bindings must have unique IDs.`,
+          );
+        }
+        bindingIds.set(binding.id, bindingName);
+      }
+    }
+  }
+
   // Convert bindings to the format expected by the API
   for (const [bindingName, binding] of Object.entries(bindings)) {
     // Create a copy of the binding to avoid modifying the original

package/src/cloudflare/wrangler.json.ts

@@ -47,6 +47,25 @@ export interface WranglerJsonProps {
     binding: string;
     directory: string;
   };
+
+  /**
+   * Transform hooks to modify generated configuration files
+   */
+  transform?: {
+    /**
+     * Hook to modify the wrangler.json object before it's written
+     *
+     * This function receives the generated wrangler.json spec and should return
+     * a modified version. It's applied as the final transformation before the
+     * file is written to disk.
+     *
+     * @param spec - The generated wrangler.json specification
+     * @returns The modified wrangler.json specification
+     */
+    wrangler?: (
+      spec: WranglerJsonSpec,
+    ) => WranglerJsonSpec | Promise<WranglerJsonSpec>;
+  };
 }
 
 /**
@@ -156,14 +175,19 @@ export const WranglerJson = Resource(
       spec.assets.directory = path.relative(dirname, spec.assets.directory);
     }
 
+    // Apply the wrangler configuration hook as the final transformation
+    const finalSpec = props.transform?.wrangler
+      ? await props.transform.wrangler(spec)
+      : spec;
+
     await fs.mkdir(dirname, { recursive: true });
-    await fs.writeFile(filePath, await formatJson(spec));
+    await fs.writeFile(filePath, await formatJson(finalSpec));
 
     // Return the resource
     return this({
       ...props,
       path: path.relative(cwd, filePath),
-      spec,
+      spec: finalSpec,
       createdAt: Date.now(),
       updatedAt: Date.now(),
     });
@@ -216,6 +240,7 @@ export interface WranglerJsonSpec {
    */
   ai?: {
     binding: string;
+    experimental_remote?: boolean;
   };
 
   /**
@@ -223,6 +248,7 @@ export interface WranglerJsonSpec {
    */
   browser?: {
     binding: string;
+    experimental_remote?: boolean;
   };
 
   /**
@@ -230,6 +256,7 @@ export interface WranglerJsonSpec {
    */
   images?: {
     binding: string;
+    experimental_remote?: boolean;
   };
 
   /**
@@ -242,6 +269,7 @@ export interface WranglerJsonSpec {
      * The ID of the KV namespace used during `wrangler dev`
      */
     preview_id?: string;
+    experimental_remote?: boolean;
   }[];
 
   /**
@@ -266,6 +294,7 @@ export interface WranglerJsonSpec {
      * The preview name of this R2 bucket at the edge.
      */
     preview_bucket_name?: string;
+    experimental_remote?: boolean;
   }[];
 
   /**
@@ -308,6 +337,7 @@ export interface WranglerJsonSpec {
   vectorize?: {
     binding: string;
     index_name: string;
+    experimental_remote?: boolean;
   }[];
 
   /**
@@ -327,6 +357,7 @@ export interface WranglerJsonSpec {
      * The ID of the D1 database used during `wrangler dev`
      */
     preview_database_id?: string;
+    experimental_remote?: boolean;
   }[];
 
   /**
@@ -398,6 +429,7 @@ export interface WranglerJsonSpec {
   dispatch_namespaces?: {
     binding: string;
     namespace: string;
+    experimental_remote?: boolean;
   }[];
 }
 
@@ -412,8 +444,12 @@ function processBindings(
   workerCwd: string,
 ): void {
   // Arrays to collect different binding types
-  const kvNamespaces: { binding: string; id: string; preview_id: string }[] =
-    [];
+  const kvNamespaces: {
+    binding: string;
+    id: string;
+    preview_id: string;
+    experimental_remote?: boolean;
+  }[] = [];
   const durableObjects: {
     name: string;
     class_name: string;
@@ -440,6 +476,7 @@ function processBindings(
     database_name: string;
     migrations_dir?: string;
     preview_database_id: string;
+    experimental_remote?: boolean;
   }[] = [];
   const queues: {
     producers: { queue: string; binding: string }[];
@@ -459,7 +496,11 @@ function processBindings(
   const new_sqlite_classes: string[] = [];
   const new_classes: string[] = [];
 
-  const vectorizeIndexes: { binding: string; index_name: string }[] = [];
+  const vectorizeIndexes: {
+    binding: string;
+    index_name: string;
+    experimental_remote?: boolean;
+  }[] = [];
   const analyticsEngineDatasets: { binding: string; dataset: string }[] = [];
   const hyperdrive: {
     binding: string;
@@ -475,6 +516,7 @@ function processBindings(
   const dispatchNamespaces: {
     binding: string;
     namespace: string;
+    experimental_remote?: boolean;
   }[] = [];
   const containers: {
     class_name: string;
@@ -527,6 +569,9 @@ function processBindings(
         binding: bindingName,
         id: id,
         preview_id: id,
+        ...("dev" in binding && binding.dev?.remote
+          ? { experimental_remote: true }
+          : {}),
       });
     } else if (
       typeof binding === "object" &&
@@ -550,6 +595,7 @@ function processBindings(
         binding: bindingName,
         bucket_name: binding.name,
         preview_bucket_name: binding.name,
+        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
       });
     } else if (binding.type === "secret") {
       // Secret binding
@@ -573,6 +619,7 @@ function processBindings(
         database_name: binding.name,
         migrations_dir: binding.migrationsDir,
         preview_database_id: binding.id,
+        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
       });
     } else if (binding.type === "queue") {
       queues.producers.push({
@@ -583,6 +630,8 @@ function processBindings(
       vectorizeIndexes.push({
         binding: bindingName,
         index_name: binding.name,
+        // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
+        experimental_remote: true,
       });
     } else if (binding.type === "browser") {
       if (spec.browser) {
@@ -590,6 +639,8 @@ function processBindings(
       }
       spec.browser = {
         binding: bindingName,
+        // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
+        experimental_remote: true,
       };
     } else if (binding.type === "ai") {
       if (spec.ai) {
@@ -597,6 +648,8 @@ function processBindings(
       }
       spec.ai = {
         binding: bindingName,
+        // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
+        experimental_remote: true,
       };
     } else if (binding.type === "images") {
       if (spec.images) {
@@ -604,6 +657,8 @@ function processBindings(
       }
       spec.images = {
         binding: bindingName,
+        // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
+        experimental_remote: true,
       };
     } else if (binding.type === "analytics_engine") {
       analyticsEngineDatasets.push({
@@ -648,6 +703,7 @@ function processBindings(
       dispatchNamespaces.push({
         binding: bindingName,
         namespace: binding.namespaceName,
+        experimental_remote: true,
       });
     } else if (binding.type === "secret_key") {
       // no-op

package/src/context.ts

@@ -46,6 +46,10 @@ export interface BaseContext<Out extends Resource> {
   id: ResourceID;
   fqn: ResourceFQN;
   scope: Scope;
+  /**
+   * Indicates whether this resource is being created as a replacement for another resource
+   */
+  isReplacement: boolean;
   get<T>(key: string): Promise<T | undefined>;
   set<T>(key: string, value: T): Promise<void>;
   delete<T>(key: string): Promise<T | undefined>;
@@ -88,6 +92,7 @@ export function context<
   state,
   replace,
   props,
+  isReplacement = false,
 }: {
   scope: Scope;
   phase: "create" | "update" | "delete";
@@ -98,6 +103,7 @@ export function context<
   props: Props;
   state: State<Kind, Props, Out>;
   replace: () => never;
+  isReplacement?: boolean;
 }): Context<Out> {
   type InternalSymbols =
     | typeof ResourceID
@@ -133,6 +139,7 @@ export function context<
     output: state.output,
     props,
     replace,
+    isReplacement,
     get: (key: string) => state.data[key],
     set: async (key: string, value: any) => {
       state.data[key] = value;

package/src/destroy.ts

@@ -119,6 +119,7 @@ export async function destroy<Type extends string>(
       seq: instance[ResourceSeq],
       props: options?.replace?.props ?? state.props,
       state,
+      isReplacement: false,
       replace: () => {
         throw new Error("Cannot replace a resource that is being deleted");
       },