alchemy 0.62.2 → 0.63.0

package/src/cloudflare/astro/astro.ts

@@ -2,6 +2,7 @@ import { join, resolve } from "node:path";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
+import { withSkipPathValidation } from "../miniflare/paths.ts";
 import { Website, type WebsiteProps } from "../website.ts";
 import type { Worker } from "../worker.ts";
 
@@ -80,6 +81,7 @@ export async function Astro<B extends Bindings>(
       props.entrypoint ??
       (output === "server" ? "dist/_worker.js/index.js" : undefined),
     assets: props.assets ?? "dist",
+    spa: false,
   });
 }
 
@@ -92,7 +94,9 @@ async function resolveOutputType(cwd: string): Promise<"server" | "static"> {
   ];
   for (const candidate of candidates) {
     try {
-      const config = await import(join(cwd, candidate));
+      const config = await withSkipPathValidation(
+        () => import(join(cwd, candidate)),
+      );
       if (
         typeof config.default === "object" &&
         config.default &&

package/src/cloudflare/astro/plugin.ts

@@ -1,7 +1,8 @@
 import cloudflare, { type Options } from "@astrojs/cloudflare";
+import type { AstroIntegration } from "astro";
 import { getPlatformProxyOptions } from "../cloudflare-env-proxy.ts";
 
-const alchemy = (options?: Options) => {
+const alchemy = (options?: Options): AstroIntegration => {
   return cloudflare({
     platformProxy: getPlatformProxyOptions(options?.platformProxy),
     ...options,

package/src/cloudflare/bindings.ts

@@ -4,7 +4,7 @@
  * https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
  */
 import type { Secret } from "../secret.ts";
-import type { AiGatewayResource } from "./ai-gateway.ts";
+import type { AiGateway } from "./ai-gateway.ts";
 import type { Ai } from "./ai.ts";
 import type { AnalyticsEngineDataset } from "./analytics-engine.ts";
 import type { Assets } from "./assets.ts";
@@ -45,7 +45,7 @@ export declare namespace Bindings {
  */
 export type Binding =
   | Ai
-  | AiGatewayResource
+  | AiGateway
   | Assets
   | Container
   | CloudflareSecret

package/src/cloudflare/bound.ts

@@ -21,7 +21,7 @@ import type {
 } from "@cloudflare/workers-types";
 import type { Pipeline } from "cloudflare:pipelines";
 import type { Secret } from "../secret.ts";
-import type { AiGatewayResource as _AiGateway } from "./ai-gateway.ts";
+import type { AiGateway as _AiGateway } from "./ai-gateway.ts";
 import type { Ai as _Ai } from "./ai.ts";
 import type { AnalyticsEngineDataset as _AnalyticsEngineDataset } from "./analytics-engine.ts";
 import type { Assets } from "./assets.ts";

package/src/cloudflare/bucket.ts

@@ -24,7 +24,7 @@ export interface BucketProps extends CloudflareApiOptions {
    * Names can only contain lowercase letters (a-z), numbers (0-9), and hyphens (-)
    * Cannot begin or end with a hyphen
    *
-   * @default - the id of the resource
+   * @default ${app.name}-${app.stage}-${id}
    */
   name?: string;
 
@@ -76,6 +76,16 @@ export interface BucketProps extends CloudflareApiOptions {
    */
   cors?: R2BucketCORSRule[];
 
+  /**
+   * Lifecycle rules for the bucket
+   */
+  lifecycle?: R2BucketLifecycleRule[];
+
+  /**
+   * Lock rules for the bucket
+   */
+  lock?: R2BucketLockRule[];
+
   /**
    * Whether to emulate the bucket locally when Alchemy is running in watch mode.
    */
@@ -94,6 +104,102 @@ export interface BucketProps extends CloudflareApiOptions {
   };
 }
 
+interface R2BucketLifecycleRule {
+  /**
+   * Unique identifier for this rule.
+   */
+  id?: string;
+
+  /**
+   * Conditions that apply to all transitions of this rule.
+   */
+  conditions?: {
+    /**
+     * Transitions will only apply to objects/uploads in the bucket that start with the given prefix, an empty prefix can be provided to scope rule to all objects/uploads.
+     */
+    prefix: string;
+  };
+
+  /**
+   * Whether or not this rule is in effect.
+   * @default true
+   */
+  enabled?: boolean;
+
+  /**
+   * Transition to abort ongoing multipart uploads.
+   */
+  abortMultipartUploadsTransition?: {
+    /**
+     * Condition for lifecycle transitions to apply after an object reaches an age in   seconds.
+     */
+    condition: {
+      /**
+       
+      /**
+       * Maximum age of the object in seconds.
+       */
+      maxAge: number;
+
+      /**
+       * Type of condition.
+       */
+      type: "Age";
+    };
+  };
+
+  /**
+   * Transition to delete objects.
+   */
+  deleteObjectsTransition?: {
+    /**
+     * Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+     */
+    condition: { maxAge: number; type: "Age" } | { date: string; type: "Date" };
+  };
+
+  /**
+   * Transition to change the storage class of objects.
+   */
+  storageClassTransitions?: {
+    /**
+     * Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+     */
+    condition: { maxAge: number; type: "Age" } | { date: string; type: "Date" };
+
+    /**
+     * Storage class for the bucket.
+     */
+    storageClass: "InfrequentAccess";
+  }[];
+}
+
+interface R2BucketLockRule {
+  /**
+   * Unique identifier for this rule.
+   */
+  id?: string;
+
+  /**
+   * Condition to apply a lock rule to an object for how long in seconds.
+   */
+  condition:
+    | { maxAgeSeconds: number; type: "Age" }
+    | { date: string; type: "Date" }
+    | { type: "Indefinite" };
+
+  /**
+   * Whether or not this rule is in effect.
+   * @default true
+   */
+  enabled?: boolean;
+
+  /**
+   * Rule will only apply to objects/uploads in the bucket that start with the given prefix, an empty prefix can be provided to scope rule to all objects/uploads.
+   */
+  prefix?: string;
+}
+
 interface R2BucketCORSRule {
   /**
    * Identifier for this rule.
@@ -246,12 +352,19 @@ const _R2Bucket = Resource(
     id: string,
     props: BucketProps = {},
   ): Promise<R2Bucket> {
-    const bucketName = props.name || id;
+    const bucketName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output?.name !== bucketName) {
+      this.replace();
+    }
+
     const allowPublicAccess = props.allowPublicAccess === true;
     const dev = {
       id: this.output?.dev?.id ?? bucketName,
       remote: props.dev?.remote ?? false,
     };
+    const adopt = props.adopt ?? this.scope.adopt;
 
     if (this.scope.local && !props.dev?.remote) {
       return this({
@@ -289,7 +402,7 @@ const _R2Bucket = Resource(
           if (
             err instanceof CloudflareApiError &&
             err.status === 409 &&
-            props.adopt
+            adopt
           ) {
             return await getBucket(api, bucketName, props);
           }
@@ -305,6 +418,12 @@ const _R2Bucket = Resource(
       if (props.cors?.length) {
         await putBucketCORS(api, bucketName, props);
       }
+      if (props.lifecycle?.length) {
+        await putBucketLifecycleRules(api, bucketName, props);
+      }
+      if (props.lock?.length) {
+        await putBucketLockRules(api, bucketName, props);
+      }
       return this({
         name: bucketName,
         location: bucket.location,
@@ -314,6 +433,8 @@ const _R2Bucket = Resource(
         domain,
         type: "r2_bucket",
         accountId: api.accountId,
+        lifecycle: props.lifecycle,
+        lock: props.lock,
         cors: props.cors,
         dev,
       });
@@ -335,11 +456,21 @@ const _R2Bucket = Resource(
       if (!isDeepStrictEqual(this.output.cors ?? [], props.cors ?? [])) {
         await putBucketCORS(api, bucketName, props);
       }
+      if (
+        !isDeepStrictEqual(this.output.lifecycle ?? [], props.lifecycle ?? [])
+      ) {
+        await putBucketLifecycleRules(api, bucketName, props);
+      }
+      if (!isDeepStrictEqual(this.output.lock ?? [], props.lock ?? [])) {
+        await putBucketLockRules(api, bucketName, props);
+      }
       return this({
         ...this.output,
         allowPublicAccess,
         dev,
         cors: props.cors,
+        lifecycle: props.lifecycle,
+        lock: props.lock,
         domain,
       });
     }
@@ -628,3 +759,111 @@ export async function putBucketCORS(
     ),
   );
 }
+
+export async function putBucketLifecycleRules(
+  api: CloudflareApi,
+  bucketName: string,
+  props: BucketProps,
+) {
+  const rulesBody = Array.isArray(props.lifecycle)
+    ? props.lifecycle.length === 0
+      ? { rules: [] }
+      : {
+          rules: props.lifecycle.map((rule) => ({
+            ...rule,
+            // Required by the API; empty prefix means all objects/uploads
+            conditions: rule.conditions ?? { prefix: "" },
+            // Required by the API
+            enabled: rule.enabled ?? true,
+          })),
+        }
+    : {};
+
+  await extractCloudflareResult(
+    `put R2 bucket lifecycle rules for "${bucketName}"`,
+    api.put(
+      `/accounts/${api.accountId}/r2/buckets/${bucketName}/lifecycle`,
+      rulesBody,
+      { headers: withJurisdiction(props) },
+    ),
+  );
+}
+
+/**
+ * Get lifecycle rules for a bucket
+ */
+export async function getBucketLifecycleRules(
+  api: CloudflareApi,
+  bucketName: string,
+  props: BucketProps = {},
+): Promise<R2BucketLifecycleRule[]> {
+  const res = await api.get(
+    `/accounts/${api.accountId}/r2/buckets/${bucketName}/lifecycle`,
+    { headers: withJurisdiction(props) },
+  );
+  const json: any = await res.json();
+  if (!json?.success) {
+    throw new CloudflareApiError(
+      `Failed to get R2 bucket lifecycle rules for "${bucketName}": ${res.status} ${res.statusText}`,
+      res,
+      json?.errors,
+    );
+  }
+  const rules: any[] = Array.isArray(json.result)
+    ? json.result
+    : (json.result?.rules ?? []);
+  return rules as R2BucketLifecycleRule[];
+}
+
+export async function putBucketLockRules(
+  api: CloudflareApi,
+  bucketName: string,
+  props: BucketProps,
+) {
+  const rulesBody = Array.isArray(props.lock)
+    ? props.lock.length === 0
+      ? { rules: [] }
+      : {
+          rules: props.lock.map((rule) => ({
+            ...rule,
+            // Required by the API
+            enabled: rule.enabled ?? true,
+          })),
+        }
+    : {};
+
+  await extractCloudflareResult(
+    `put R2 bucket lock rules for "${bucketName}"`,
+    api.put(
+      `/accounts/${api.accountId}/r2/buckets/${bucketName}/lock`,
+      rulesBody,
+      { headers: withJurisdiction(props) },
+    ),
+  );
+}
+
+/**
+ * Get lock rules for a bucket
+ */
+export async function getBucketLockRules(
+  api: CloudflareApi,
+  bucketName: string,
+  props: BucketProps = {},
+): Promise<R2BucketLockRule[]> {
+  const res = await api.get(
+    `/accounts/${api.accountId}/r2/buckets/${bucketName}/lock`,
+    { headers: withJurisdiction(props) },
+  );
+  const json: any = await res.json();
+  if (!json?.success) {
+    throw new CloudflareApiError(
+      `Failed to get R2 bucket lock rules for "${bucketName}": ${res.status} ${res.statusText}`,
+      res,
+      json?.errors,
+    );
+  }
+  const rules: any[] = Array.isArray(json.result)
+    ? json.result
+    : (json.result?.rules ?? []);
+  return rules as R2BucketLockRule[];
+}

package/src/cloudflare/compatibility-date.gen.ts

@@ -4,4 +4,4 @@
 /**
  * The default Cloudflare Workers compatibility date, set based on the latest workerd release at the time of build.
  */
-export const DEFAULT_COMPATIBILITY_DATE = "2025-08-16";
+export const DEFAULT_COMPATIBILITY_DATE = "2025-08-23";

package/src/cloudflare/container.ts

@@ -123,8 +123,12 @@ export type Container<T = any> = {
   /** Unique identifier for the container */
   id: string;
 
-  /** Optional human-readable name for the container */
-  name: string;
+  /**
+   * Optional human-readable name for the container
+   *
+   * @default ${app.name}-${app.stage}-${id}
+   */
+  name?: string;
 
   /** Class name used to identify the container in Worker bindings */
   className: string;
@@ -170,7 +174,8 @@ export async function Container<T>(
   id: string,
   props: ContainerProps,
 ): Promise<Container<T>> {
-  const name = props.name ?? id;
+  const scope = Scope.current;
+  const name = props.name ?? scope.createPhysicalName(id);
   const tag =
     props.tag === undefined || props.tag === "latest"
       ? `latest-${Date.now()}`
@@ -191,7 +196,7 @@ export async function Container<T>(
     adopt: props.adopt,
   };
 
-  const isDev = Scope.current.local && !props.dev?.remote;
+  const isDev = scope.local && !props.dev?.remote;
   if (isDev) {
     const image = await Image(id, {
       name: `cloudflare-dev/${name}`, // prefix used by Miniflare
@@ -291,8 +296,10 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
   /**
    * The name of the container application.
    * Must be unique within your Cloudflare account.
+   *
+   * @default ${app}-${stage}-${id}
    */
-  name: string;
+  name?: string;
 
   /**
    * Scheduling policy that controls where and how containers are deployed.
@@ -501,16 +508,20 @@ export const ContainerApplication = Resource(
   "cloudflare::ContainerApplication",
   async function (
     this: Context<ContainerApplication, ContainerApplicationProps>,
-    _id: string,
+    id: string,
     props: ContainerApplicationProps,
   ): Promise<ContainerApplication> {
+    const applicationName = props.name ?? this.scope.createPhysicalName(id);
+
     if (this.scope.local && props.dev) {
       return this({
         id: this.output?.id ?? "",
-        name: props.name,
+        name: applicationName,
       });
     }
 
+    const adopt = props.adopt ?? this.scope.adopt;
+
     const api = await createCloudflareApi(props);
     if (this.phase === "delete") {
       if (this.output?.id) {
@@ -562,8 +573,8 @@ export const ContainerApplication = Resource(
       let application: ContainerApplicationData;
 
       try {
-        application = await createContainerApplication(api, props.adopt, {
-          name: props.name,
+        application = await createContainerApplication(api, adopt, {
+          name: applicationName,
           scheduling_policy: props.schedulingPolicy ?? "default",
           instances: props.instances ?? 1,
           max_instances: props.maxInstances ?? 1,
@@ -588,19 +599,19 @@ export const ContainerApplication = Resource(
       } catch (error) {
         // Check if this is an "already exists" error and adopt is enabled
         if (
-          props.adopt &&
+          adopt &&
           error instanceof Error &&
           error.message.includes("already exists")
         ) {
           // Find the existing container application
           const existingApplication = await findContainerApplicationByName(
             api,
-            props.name,
+            applicationName,
           );
 
           if (!existingApplication) {
             throw new Error(
-              `Failed to find existing container application '${props.name}' for adoption`,
+              `Failed to find existing container application '${applicationName}' for adoption`,
             );
           }
 

package/src/cloudflare/custom-domain.ts

@@ -198,7 +198,7 @@ async function ensureCustomDomain(
 ): Promise<CustomDomain> {
   const environment = props.environment || "production";
   const domainHostname = props.name;
-
+  const adopt = props.adopt ?? context.scope.adopt;
   // Check if domain binding already exists for this account
   const listResponse = await api.get(
     `/accounts/${api.accountId}/workers/domains`,
@@ -239,7 +239,7 @@ async function ensureCustomDomain(
 
   // Handle the case where domain already exists during create phase
   if (context.phase === "create" && bindingExists) {
-    if (!props.adopt) {
+    if (!adopt) {
       throw new Error(
         `CustomDomain for ${domainHostname} already exists in zone ${props.zoneId}. ` +
           "Set adopt: true to take control of the existing domain binding.",

package/src/cloudflare/d1-database.ts

@@ -31,7 +31,7 @@ export interface D1DatabaseProps extends CloudflareApiOptions {
   /**
    * Name of the database
    *
-   * @default id
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -263,17 +263,24 @@ const _D1Database = Resource(
     id: string,
     props: D1DatabaseProps = {},
   ): Promise<D1Database> {
-    const databaseName = props.name ?? id;
+    const databaseName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output?.name !== databaseName) {
+      this.replace();
+    }
+
     const local = this.scope.local && !props.dev?.remote;
     const dev = {
       id: this.output?.dev?.id ?? this.output?.id ?? id,
       remote: props.dev?.remote ?? false,
     };
+    const adopt = props.adopt ?? this.scope.adopt;
 
     if (local) {
       if (props.migrationsFiles && props.migrationsFiles.length > 0) {
         await applyLocalD1Migrations({
-          databaseId: this.output?.id ?? id,
+          databaseId: dev.id,
           migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
           migrations: props.migrationsFiles,
         });
@@ -327,7 +334,7 @@ const _D1Database = Resource(
       } catch (error) {
         // Check if this is a "database already exists" error and adopt is enabled
         if (
-          props.adopt &&
+          adopt &&
           error instanceof CloudflareApiError &&
           error.message.includes("already exists")
         ) {

package/src/cloudflare/dispatch-namespace.ts

@@ -14,6 +14,8 @@ import {
 export interface DispatchNamespaceProps extends CloudflareApiOptions {
   /**
    * Name of the namespace
+   *
+   * @default ${app}-${stage}-${id}
    */
   namespace?: string;
 
@@ -112,7 +114,11 @@ export const DispatchNamespace = Resource(
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
 
-    const namespace = props.namespace ?? id;
+    const namespace =
+      props.namespace ??
+      this.output?.namespace ??
+      this.scope.createPhysicalName(id);
+    const adopt = props.adopt ?? this.scope.adopt;
 
     if (this.phase === "delete") {
       // For delete operations, we need to check if the namespace exists in the output
@@ -132,11 +138,8 @@ export const DispatchNamespace = Resource(
         : Date.now();
 
     if (this.phase === "update") {
-      // Check that the namespace name hasn't changed
-      if (this.output?.namespace && this.output.namespace !== namespace) {
-        throw new Error(
-          `Cannot update dispatch namespace name after creation. Namespace name is immutable. Before: ${this.output.namespace}, After: ${namespace}`,
-        );
+      if (this.output.namespace !== namespace) {
+        this.replace();
       }
       // For updates, just refresh metadata
     } else {
@@ -150,7 +153,7 @@ export const DispatchNamespace = Resource(
       } catch (error) {
         // Check if this is a "namespace already exists" error and adopt is enabled
         if (
-          props.adopt &&
+          adopt &&
           error instanceof CloudflareApiError &&
           error.status === 400 &&
           (error.message.includes("already exists") ||

package/src/cloudflare/hyperdrive.ts

@@ -136,8 +136,10 @@ export type HyperdriveOrigin =
 export interface HyperdriveProps extends CloudflareApiOptions {
   /**
    * Name of the Hyperdrive configuration
+   *
+   * @default ${app}-${stage}-${id}
    */
-  name: string;
+  name?: string;
 
   /**
    * Database connection origin configuration
@@ -182,6 +184,11 @@ export interface Hyperdrive
    */
   id: string;
 
+  /**
+   * Name of the Hyperdrive configuration
+   */
+  name: string;
+
   /**
    * The Cloudflare-generated UUID of the hyperdrive
    */
@@ -311,7 +318,7 @@ export async function Hyperdrive(
  * @internal
  */
 interface InternalHyperdriveProps extends CloudflareApiOptions {
-  name: string;
+  name?: string;
   hyperdriveId?: string;
   origin: HyperdriveOrigin;
   caching?: HyperdriveCaching;
@@ -331,11 +338,14 @@ const _Hyperdrive = Resource(
   ): Promise<Hyperdrive> {
     const hyperdriveId = props.hyperdriveId || this.output?.hyperdriveId;
 
+    const name =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
     if (this.scope.local) {
       return this({
         id,
         hyperdriveId: hyperdriveId || "",
-        name: props.name,
+        name,
         origin: props.origin,
         caching: props.caching,
         mtls: props.mtls,