alchemy 0.57.2 → 0.59.0

package/src/cloudflare/bucket.ts

@@ -1,6 +1,7 @@
 import { isDeepStrictEqual } from "node:util";
 import type { Context } from "../context.ts";
 import { Resource, ResourceKind } from "../resource.ts";
+import { Scope } from "../scope.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
 import { CloudflareApiError } from "./api-error.ts";
 import {
@@ -12,6 +13,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
+import { deleteMiniflareBinding } from "./miniflare/delete.ts";
 
 /**
  * Properties for creating or updating an R2 Bucket
@@ -83,6 +85,12 @@ export interface BucketProps extends CloudflareApiOptions {
      * @default false
      */
     remote?: boolean;
+
+    /**
+     * Set when `Scope.local` is true to force update to the bucket even if it was already deployed live.
+     * @internal
+     */
+    force?: boolean;
   };
 }
 
@@ -127,7 +135,7 @@ interface R2BucketCORSRule {
  * Output returned after R2 Bucket creation/update
  */
 export type R2Bucket = Resource<"cloudflare::R2Bucket"> &
-  Omit<BucketProps, "delete"> & {
+  Omit<BucketProps, "delete" | "dev"> & {
     /**
      * Resource type identifier
      */
@@ -152,6 +160,22 @@ export type R2Bucket = Resource<"cloudflare::R2Bucket"> &
      * The `r2.dev` subdomain for the bucket, if `allowPublicAccess` is true
      */
     domain: string | undefined;
+
+    /**
+     * Development mode properties
+     * @internal
+     */
+    dev: {
+      /**
+       * The ID of the bucket in development mode
+       */
+      id: string;
+
+      /**
+       * Whether the bucket is running remotely
+       */
+      remote: boolean;
+    };
   };
 
 export function isBucket(resource: Resource): resource is R2Bucket {
@@ -202,88 +226,122 @@ export function isBucket(resource: Resource): resource is R2Bucket {
  *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
-export const R2Bucket = Resource(
+export async function R2Bucket(
+  id: string,
+  props: BucketProps = {},
+): Promise<R2Bucket> {
+  return await _R2Bucket(id, {
+    ...props,
+    dev: {
+      ...(props.dev ?? {}),
+      force: Scope.current.local,
+    },
+  });
+}
+
+const _R2Bucket = Resource(
   "cloudflare::R2Bucket",
   async function (
     this: Context<R2Bucket>,
-    _id: string,
+    id: string,
     props: BucketProps = {},
   ): Promise<R2Bucket> {
-    const api = await createCloudflareApi(props);
-    const bucketName = props.name || this.id;
+    const bucketName = props.name || id;
     const allowPublicAccess = props.allowPublicAccess === true;
+    const dev = {
+      id: this.output?.dev?.id ?? bucketName,
+      remote: props.dev?.remote ?? false,
+    };
+
+    if (this.scope.local && !props.dev?.remote) {
+      return this({
+        name: this.output?.name ?? "",
+        location: this.output?.location ?? "",
+        creationDate: this.output?.creationDate ?? new Date(),
+        jurisdiction: this.output?.jurisdiction ?? "default",
+        allowPublicAccess,
+        domain: this.output?.domain,
+        type: "r2_bucket",
+        accountId: this.output?.accountId ?? "",
+        cors: props.cors,
+        dev,
+      });
+    }
+
+    const api = await createCloudflareApi(props);
+
+    if (this.phase === "delete") {
+      if (props.delete !== false) {
+        if (this.output.dev?.id) {
+          await deleteMiniflareBinding("r2", this.output.dev.id);
+        }
+        if (props.empty) {
+          await emptyBucket(api, bucketName, props);
+        }
+        await deleteBucket(api, bucketName, props);
+      }
+      return this.destroy();
+    }
 
-    switch (this.phase) {
-      case "create": {
-        const bucket = await createBucket(api, bucketName, props).catch(
-          async (err) => {
-            if (
-              err instanceof CloudflareApiError &&
-              err.status === 409 &&
-              props.adopt
-            ) {
-              return await getBucket(api, bucketName, props);
-            }
-            throw err;
-          },
+    if (this.phase === "create" || !this.output?.name) {
+      const bucket = await createBucket(api, bucketName, props).catch(
+        async (err) => {
+          if (
+            err instanceof CloudflareApiError &&
+            err.status === 409 &&
+            props.adopt
+          ) {
+            return await getBucket(api, bucketName, props);
+          }
+          throw err;
+        },
+      );
+      const domain = await putManagedDomain(
+        api,
+        bucketName,
+        allowPublicAccess,
+        props.jurisdiction,
+      );
+      if (props.cors?.length) {
+        await putBucketCORS(api, bucketName, props);
+      }
+      return this({
+        name: bucketName,
+        location: bucket.location,
+        creationDate: new Date(bucket.creation_date),
+        jurisdiction: bucket.jurisdiction,
+        allowPublicAccess,
+        domain,
+        type: "r2_bucket",
+        accountId: api.accountId,
+        cors: props.cors,
+        dev,
+      });
+    } else {
+      if (bucketName !== this.output.name) {
+        throw new Error(
+          `Cannot update R2Bucket name after creation. Bucket name is immutable. Before: ${this.output.name}, After: ${bucketName}`,
         );
-        const domain = await putManagedDomain(
+      }
+      let domain = this.output.domain;
+      if (!!domain !== allowPublicAccess) {
+        domain = await putManagedDomain(
           api,
           bucketName,
           allowPublicAccess,
           props.jurisdiction,
         );
-        if (props.cors?.length) {
-          await putBucketCORS(api, bucketName, props);
-        }
-        return this({
-          name: bucketName,
-          location: bucket.location,
-          creationDate: new Date(bucket.creation_date),
-          jurisdiction: bucket.jurisdiction,
-          allowPublicAccess,
-          domain,
-          type: "r2_bucket",
-          accountId: api.accountId,
-          cors: props.cors,
-          dev: props.dev,
-        });
       }
-      case "update": {
-        if (bucketName !== this.output.name) {
-          throw new Error(
-            `Cannot update R2Bucket name after creation. Bucket name is immutable. Before: ${this.output.name}, After: ${bucketName}`,
-          );
-        }
-        let domain = this.output.domain;
-        if (!!domain !== allowPublicAccess) {
-          domain = await putManagedDomain(
-            api,
-            bucketName,
-            allowPublicAccess,
-            props.jurisdiction,
-          );
-        }
-        if (!isDeepStrictEqual(this.output.cors ?? [], props.cors ?? [])) {
-          await putBucketCORS(api, bucketName, props);
-        }
-        return this({
-          ...this.output,
-          allowPublicAccess,
-          dev: props.dev,
-          cors: props.cors,
-          domain,
-        });
-      }
-      case "delete": {
-        if (props.delete !== false) {
-          if (props.empty) {
-            await emptyBucket(api, bucketName, props);
-          }
-          await deleteBucket(api, bucketName, props);
-        }
-        return this.destroy();
+      if (!isDeepStrictEqual(this.output.cors ?? [], props.cors ?? [])) {
+        await putBucketCORS(api, bucketName, props);
       }
+      return this({
+        ...this.output,
+        allowPublicAccess,
+        dev,
+        cors: props.cors,
+        domain,
+      });
     }
   },
 );

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-06";
+export const DEFAULT_COMPATIBILITY_DATE = "2025-08-07";

package/src/cloudflare/container.ts

@@ -368,6 +368,15 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
    * @default false
    */
   adopt?: boolean;
+
+  /**
+   * If true, the container application will not be created, but will be retained if it already exists.
+   * This is used for local development.
+   *
+   * @default `false`
+   * @internal
+   */
+  dev?: boolean;
 }
 
 /**
@@ -495,6 +504,13 @@ export const ContainerApplication = Resource(
     _id: string,
     props: ContainerApplicationProps,
   ): Promise<ContainerApplication> {
+    if (this.scope.local && props.dev) {
+      return this({
+        id: this.output?.id ?? "",
+        name: props.name,
+      });
+    }
+
     const api = await createCloudflareApi(props);
     if (this.phase === "delete") {
       if (this.output?.id) {
@@ -503,6 +519,7 @@ export const ContainerApplication = Resource(
       }
       return this.destroy();
     }
+
     // Prefer the immutable repo digest if present. Falls back to the tag reference.
     const imageReference = props.image.repoDigest ?? props.image.imageRef;
 
@@ -518,7 +535,7 @@ export const ContainerApplication = Resource(
         },
       },
     };
-    if (this.phase === "update") {
+    if (this.phase === "update" && this.output?.id) {
       const application = await updateContainerApplication(
         api,
         this.output.id,

package/src/cloudflare/custom-domain.ts

@@ -43,6 +43,15 @@ export interface CustomDomainProps extends CloudflareApiOptions {
    * @default false
    */
   adopt?: boolean;
+
+  /**
+   * If true, the custom domain will not be created, but will be retained if it already exists.
+   * This is used for local development.
+   *
+   * @default `Scope.local`
+   * @internal
+   */
+  dev?: boolean;
 }
 
 /**
@@ -114,6 +123,18 @@ export const CustomDomain = Resource(
     logicalId: string, // Changed param name from id to logicalId for clarity
     props: CustomDomainProps,
   ): Promise<CustomDomain> {
+    if (this.scope.local && props.dev) {
+      const now = Date.now();
+      return this({
+        ...props,
+        id: this.output?.id ?? "noop-domain",
+        zoneId: props.zoneId ?? "noop-zone",
+        environment: props.environment ?? "production",
+        createdAt: this.output?.createdAt ?? now,
+        updatedAt: now,
+      });
+    }
+
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
 
@@ -121,6 +142,7 @@ export const CustomDomain = Resource(
       await deleteCustomDomain(this, api, logicalId, props);
       return this.destroy();
     }
+
     // Create or Update phase
     return await ensureCustomDomain(this, api, logicalId, {
       ...props,

package/src/cloudflare/d1-database.ts

@@ -11,6 +11,7 @@ import {
 import { cloneD1Database } from "./d1-clone.ts";
 import { applyLocalD1Migrations } from "./d1-local-migrations.ts";
 import { applyMigrations, listMigrationsFiles } from "./d1-migrations.ts";
+import { deleteMiniflareBinding } from "./miniflare/delete.ts";
 
 const DEFAULT_MIGRATIONS_TABLE = "d1_migrations";
 
@@ -126,7 +127,6 @@ export function isD1Database(resource: Resource): resource is D1Database {
 export type D1Database = Resource<"cloudflare::D1Database"> &
   Pick<
     D1DatabaseProps,
-    | "dev"
     | "migrationsDir"
     | "migrationsTable"
     | "primaryLocationHint"
@@ -142,6 +142,22 @@ export type D1Database = Resource<"cloudflare::D1Database"> &
      * The name of the database
      */
     name: string;
+
+    /**
+     * Development mode properties
+     * @internal
+     */
+    dev: {
+      /**
+       * The ID of the database in development mode
+       */
+      id: string;
+
+      /**
+       * Whether the database is running remotely
+       */
+      remote: boolean;
+    };
   };
 
 /**
@@ -247,19 +263,14 @@ const _D1Database = Resource(
     id: string,
     props: D1DatabaseProps = {},
   ): Promise<D1Database> {
-    const api = await createCloudflareApi(props);
     const databaseName = props.name ?? id;
+    const local = this.scope.local && !props.dev?.remote;
+    const dev = {
+      id: this.output?.dev?.id ?? this.output?.id ?? id,
+      remote: props.dev?.remote ?? false,
+    };
 
-    if (this.phase === "delete") {
-      if (props.delete !== false && this.output?.id !== id) {
-        await deleteDatabase(api, this.output?.id);
-      }
-      // Return void (a deleted database has no content)
-      return this.destroy();
-    }
-    let dbData: CloudflareD1Response;
-
-    if (this.scope.local && !props.dev?.remote) {
+    if (local) {
       if (props.migrationsFiles && props.migrationsFiles.length > 0) {
         await applyLocalD1Migrations({
           databaseId: this.output?.id ?? id,
@@ -269,22 +280,36 @@ const _D1Database = Resource(
       }
       return this({
         type: "d1",
-        // we may not have an ID yet if we're creating a new database locally first
-        // so set it to the resource ID which we can later use to detect that a DB needs to be created during an `update`
-        id: this.output?.id ?? id,
+        id: this.output?.id ?? "",
         name: databaseName,
         readReplication: props.readReplication,
         primaryLocationHint: props.primaryLocationHint,
         migrationsDir: props.migrationsDir,
         migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
-        dev: props.dev,
+        dev,
       });
-    } else if (
+    }
+
+    const api = await createCloudflareApi(props);
+
+    if (this.phase === "delete") {
+      if (this.output.dev?.id) {
+        await deleteMiniflareBinding("d1", this.output.dev.id);
+      }
+      if (props.delete !== false && this.output?.id) {
+        await deleteDatabase(api, this.output.id);
+      }
+      // Return void (a deleted database has no content)
+      return this.destroy();
+    }
+    let dbData: CloudflareD1Response;
+
+    if (
       this.phase === "create" ||
       // this is true IFF the database was created locally before any live deployment
       // in that case, we should still go through the create flow for "update"
       // after that, the ID will remain the UUID for the lifetime of the database
-      this.output.id === id
+      !this.output?.id
     ) {
       logger.log("Creating D1 database:", databaseName);
       try {
@@ -387,7 +412,7 @@ const _D1Database = Resource(
       name: databaseName,
       readReplication: dbData.result.read_replication,
       primaryLocationHint: props.primaryLocationHint,
-      dev: props.dev,
+      dev,
       migrationsDir: props.migrationsDir,
       migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
     });

package/src/cloudflare/d1-import.ts

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import { logger } from "../util/logger.ts";
+import type { CloudflareApiResponse } from "./api-response.ts";
 import type { CloudflareApi } from "./api.ts";
 
 /**
@@ -194,20 +195,6 @@ interface ImportPollingResponse {
   upload_url?: string;
 }
 
-/**
- * Cloudflare API response structure
- */
-interface CloudflareApiResponse<T> {
-  result: T;
-  success: boolean;
-  errors: Array<{
-    message: string;
-  }>;
-  messages: Array<{
-    message: string;
-  }>;
-}
-
 /**
  * Calculates MD5 hash for a string
  */