alchemy 0.50.0 → 0.51.0

package/src/cloudflare/certificate-pack.ts

@@ -7,7 +7,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
-import type { Zone } from "./zone.ts";
+import { findZoneForHostname, type Zone } from "./zone.ts";
 
 /**
  * Certificate Authority options for Advanced Certificate Packs
@@ -298,8 +298,18 @@ export const CertificatePack = Resource(
         const deleteResponse = await api.delete(
           `/zones/${zoneId}/ssl/certificate_packs/${this.output.id}`,
         );
-
-        if (!deleteResponse.ok && deleteResponse.status !== 404) {
+        const deleteResponseJson = (await deleteResponse.json()) as {
+          errors: Array<{ code: number }>;
+        };
+        const isCurrentlyDeleting =
+          deleteResponse.status === 400 &&
+          deleteResponseJson.errors[0].code === 1406;
+
+        if (
+          !deleteResponse.ok &&
+          deleteResponse.status !== 404 &&
+          !isCurrentlyDeleting
+        ) {
           await handleApiError(
             deleteResponse,
             "delete",
@@ -314,96 +324,7 @@ export const CertificatePack = Resource(
     }
 
     if (this.phase === "update" && this.output?.id) {
-      // Validate immutable properties
-      const currentPack = this.output;
-
-      if (props.certificateAuthority !== currentPack.certificateAuthority) {
-        throw new Error(
-          `Cannot change certificateAuthority from '${currentPack.certificateAuthority}' to '${props.certificateAuthority}'. Certificate Authority is immutable after creation. You must delete and recreate the certificate pack.`,
-        );
-      }
-
-      if (
-        JSON.stringify(props.hosts.sort()) !==
-        JSON.stringify(currentPack.hosts.sort())
-      ) {
-        throw new Error(
-          `Cannot change hosts from [${currentPack.hosts.join(", ")}] to [${props.hosts.join(", ")}]. Hosts are immutable after creation. You must delete and recreate the certificate pack.`,
-        );
-      }
-
-      if (props.validationMethod !== currentPack.validationMethod) {
-        throw new Error(
-          `Cannot change validationMethod from '${currentPack.validationMethod}' to '${props.validationMethod}'. Validation method is immutable after creation. You must delete and recreate the certificate pack.`,
-        );
-      }
-
-      if (props.validityDays !== currentPack.validityDays) {
-        throw new Error(
-          `Cannot change validityDays from ${currentPack.validityDays} to ${props.validityDays}. Validity period is immutable after creation. You must delete and recreate the certificate pack.`,
-        );
-      }
-
-      const type = props.type || "advanced";
-      if (type !== currentPack.type) {
-        throw new Error(
-          `Cannot change type from '${currentPack.type}' to '${type}'. Type is immutable after creation. You must delete and recreate the certificate pack.`,
-        );
-      }
-
-      // Only cloudflareBranding can be updated
-      if (props.cloudflareBranding !== currentPack.cloudflareBranding) {
-        logger.log(
-          `Updating certificate pack cloudflare branding from ${currentPack.cloudflareBranding} to ${props.cloudflareBranding}`,
-        );
-
-        const updateResponse = await api.patch(
-          `/zones/${zoneId}/ssl/certificate_packs/${this.output.id}`,
-          {
-            cloudflare_branding: props.cloudflareBranding || false,
-          },
-        );
-
-        if (!updateResponse.ok) {
-          await handleApiError(
-            updateResponse,
-            "update",
-            "certificate pack",
-            this.output.id,
-          );
-        }
-      }
-
-      // Get updated certificate pack details
-      const response = await api.get(
-        `/zones/${zoneId}/ssl/certificate_packs/${this.output.id}`,
-      );
-
-      if (!response.ok) {
-        await handleApiError(
-          response,
-          "get",
-          "certificate pack",
-          this.output.id,
-        );
-      }
-
-      const updatedPack = (
-        (await response.json()) as { result: CloudflareCertificatePack }
-      ).result;
-
-      return this({
-        id: updatedPack.id,
-        certificateAuthority: updatedPack.certificate_authority,
-        cloudflareBranding: updatedPack.cloudflare_branding,
-        hosts: updatedPack.hosts,
-        status: updatedPack.status,
-        type: updatedPack.type,
-        validationMethod: updatedPack.validation_method,
-        validityDays: updatedPack.validity_days,
-        zoneId: updatedPack.zone_id,
-        zoneName: zoneName,
-      });
+      this.replace();
     }
 
     // Create new certificate pack
@@ -438,13 +359,13 @@ export const CertificatePack = Resource(
       return this({
         id: existingPack.id,
         certificateAuthority: existingPack.certificate_authority,
-        cloudflareBranding: existingPack.cloudflare_branding,
+        cloudflareBranding: props.cloudflareBranding ?? false,
         hosts: existingPack.hosts,
         status: existingPack.status,
         type: existingPack.type,
         validationMethod: existingPack.validation_method,
         validityDays: existingPack.validity_days,
-        zoneId: existingPack.zone_id,
+        zoneId,
         zoneName: zoneName,
       });
     }
@@ -498,13 +419,13 @@ export const CertificatePack = Resource(
     return this({
       id: createdPack.id,
       certificateAuthority: createdPack.certificate_authority,
-      cloudflareBranding: createdPack.cloudflare_branding,
+      cloudflareBranding: props.cloudflareBranding ?? false,
       hosts: createdPack.hosts,
       status: createdPack.status,
       type: createdPack.type,
       validationMethod: createdPack.validation_method,
       validityDays: createdPack.validity_days,
-      zoneId: createdPack.zone_id,
+      zoneId,
       zoneName: zoneName,
     });
   },
@@ -516,13 +437,11 @@ export const CertificatePack = Resource(
 interface CloudflareCertificatePack {
   id: string;
   certificate_authority: CertificateAuthority;
-  cloudflare_branding: boolean;
   hosts: string[];
   status: CertificatePackStatus;
   type: "advanced";
   validation_method: ValidationMethod;
   validity_days: ValidityDays;
-  zone_id: string;
 }
 
 /**
@@ -591,58 +510,6 @@ export async function waitForCertificatePackActive(
   );
 }
 
-/**
- * Helper function to find zone ID from a hostname
- * Searches for the zone that matches the hostname or its parent domains
- *
- * @param api CloudflareApi instance
- * @param hostname The hostname to find the zone for
- * @returns Promise resolving to the zone ID and zone name
- */
-async function findZoneForHostname(
-  api: CloudflareApi,
-  hostname: string,
-): Promise<{ zoneId: string; zoneName: string }> {
-  // Remove wildcard prefix if present
-  const cleanHostname = hostname.replace(/^\*\./, "");
-
-  // Get all zones and find the best match
-  const response = await api.get("/zones");
-
-  if (!response.ok) {
-    throw new Error(`Failed to list zones: ${response.statusText}`);
-  }
-
-  const zonesData = (await response.json()) as {
-    result: Array<{ id: string; name: string }>;
-  };
-
-  // Find the zone that best matches the hostname
-  // We look for the longest matching zone name (most specific)
-  let bestMatch: { zoneId: string; zoneName: string } | null = null;
-  let longestMatch = 0;
-
-  for (const zone of zonesData.result) {
-    if (
-      cleanHostname === zone.name ||
-      cleanHostname.endsWith(`.${zone.name}`)
-    ) {
-      if (zone.name.length > longestMatch) {
-        longestMatch = zone.name.length;
-        bestMatch = { zoneId: zone.id, zoneName: zone.name };
-      }
-    }
-  }
-
-  if (!bestMatch) {
-    throw new Error(
-      `Could not find zone for hostname '${hostname}'. Available zones: ${zonesData.result.map((z) => z.name).join(", ")}`,
-    );
-  }
-
-  return bestMatch;
-}
-
 /**
  * Helper function to find existing certificate packs that match the given configuration
  * Used to adopt existing certificates instead of creating duplicates
@@ -657,7 +524,9 @@ async function findMatchingCertificatePack(
   zoneId: string,
   props: CertificatePackProps,
 ): Promise<CloudflareCertificatePack | null> {
-  const response = await api.get(`/zones/${zoneId}/ssl/certificate_packs`);
+  const response = await api.get(
+    `/zones/${zoneId}/ssl/certificate_packs?status=all`,
+  );
 
   if (!response.ok) {
     throw new Error(`Failed to list certificate packs: ${response.statusText}`);
@@ -686,6 +555,13 @@ async function findMatchingCertificatePack(
       const allHostsCovered = props.hosts.every((host) => packHosts.has(host));
 
       if (allHostsCovered) {
+        // If Cloudflare branding is enabled, ensure that the cert pack is cloudflare branded`
+        if (
+          props.cloudflareBranding &&
+          !pack.hosts.some((host) => host.endsWith("sni.cloudflaressl.com"))
+        ) {
+          continue;
+        }
         logger.log(
           `Found existing certificate pack ${pack.id} that covers all requested hosts`,
         );

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

package/src/cloudflare/index.ts

@@ -4,6 +4,9 @@ export * from "./ai-gateway.ts";
 export * from "./ai.ts";
 export * from "./analytics-engine.ts";
 export * from "./api-error.ts";
+export * from "./api-gateway-operation.ts";
+export * from "./api-schema.ts";
+export * from "./api-shield.ts";
 export * from "./api.ts";
 export * from "./assets.ts";
 export * from "./astro.ts";

package/src/cloudflare/zone.ts

@@ -610,3 +610,55 @@ export interface CloudflareZone {
   modified_on: string;
   activated_on: string | null;
 }
+
+/**
+ * Helper function to find zone ID from a hostname
+ * Searches for the zone that matches the hostname or its parent domains
+ *
+ * @param api CloudflareApi instance
+ * @param hostname The hostname to find the zone for
+ * @returns Promise resolving to the zone ID and zone name
+ */
+export async function findZoneForHostname(
+  api: CloudflareApi,
+  hostname: string,
+): Promise<{ zoneId: string; zoneName: string }> {
+  // Remove wildcard prefix if present
+  const cleanHostname = hostname.replace(/^\*\./, "");
+
+  // Get all zones and find the best match
+  const response = await api.get("/zones");
+
+  if (!response.ok) {
+    throw new Error(`Failed to list zones: ${response.statusText}`);
+  }
+
+  const zonesData = (await response.json()) as {
+    result: Array<{ id: string; name: string }>;
+  };
+
+  // Find the zone that best matches the hostname
+  // We look for the longest matching zone name (most specific)
+  let bestMatch: { zoneId: string; zoneName: string } | null = null;
+  let longestMatch = 0;
+
+  for (const zone of zonesData.result) {
+    if (
+      cleanHostname === zone.name ||
+      cleanHostname.endsWith(`.${zone.name}`)
+    ) {
+      if (zone.name.length > longestMatch) {
+        longestMatch = zone.name.length;
+        bestMatch = { zoneId: zone.id, zoneName: zone.name };
+      }
+    }
+  }
+
+  if (!bestMatch) {
+    throw new Error(
+      `Could not find zone for hostname '${hostname}'. Available zones: ${zonesData.result.map((z) => z.name).join(", ")}`,
+    );
+  }
+
+  return bestMatch;
+}

package/src/destroy.ts

@@ -11,6 +11,7 @@ import {
   ResourceSeq,
 } from "./resource.ts";
 import { isScope, type PendingDeletions, Scope } from "./scope.ts";
+import type { State } from "./state.ts";
 import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
 
@@ -108,12 +109,29 @@ export async function destroy<Type extends string>(
       });
     }
 
-    const state = await scope.state.get(instance[ResourceID]);
-
-    if (state === undefined) {
-      return;
+    let state: State;
+    let props: ResourceProps | undefined;
+    if (options?.replace) {
+      props = options.replace.props;
+      state = {
+        output: options.replace.output!,
+        status: "deleting",
+        oldProps: options.replace.props,
+        data: {},
+        kind: instance[ResourceKind],
+        id: instance[ResourceID],
+        fqn: instance[ResourceFQN],
+        seq: instance[ResourceSeq],
+        props,
+      };
+    } else {
+      const _state = await scope.state.get(instance[ResourceID]);
+      if (_state === undefined) {
+        return;
+      }
+      state = _state;
+      props = state.props;
     }
-
     const ctx = context({
       scope,
       phase: "delete",
@@ -121,20 +139,8 @@ export async function destroy<Type extends string>(
       id: instance[ResourceID],
       fqn: instance[ResourceFQN],
       seq: instance[ResourceSeq],
-      props: options?.replace?.props ?? state.props,
-      state: options?.replace?.output
-        ? {
-            output: options.replace.output,
-            status: "deleting",
-            oldProps: options.replace.props,
-            data: {},
-            kind: instance[ResourceKind],
-            id: instance[ResourceID],
-            fqn: instance[ResourceFQN],
-            seq: instance[ResourceSeq],
-            props: options.replace.props,
-          }
-        : state,
+      props,
+      state,
       // TODO(sam|michael): should this always be false or !!options?.replace
       isReplacement: false,
       replace: () => {
@@ -157,7 +163,7 @@ export async function destroy<Type extends string>(
           nestedScope = options?.replace?.props == null ? scope : undefined;
           return await Provider.handler.bind(ctx)(
             instance[ResourceID],
-            options?.replace?.props ?? state.props!,
+            ctx.props,
           );
         },
       );

package/src/scope.ts

@@ -142,7 +142,6 @@ export class Scope {
   private isSkipped = false;
   private finalized = false;
   private startedAt = performance.now();
-
   private deferred: (() => Promise<any>)[] = [];
 
   public get appName(): string {
@@ -345,13 +344,13 @@ export class Scope {
   }
 
   public async set<T>(key: string, value: T): Promise<void> {
-    return this.withScopeState<void>(async (state, persist) => {
+    await this.withScopeState<void>(async (state, persist) => {
       state.data[key] = value;
       await persist(state); // only one line to save!
     });
   }
 
-  public async get<T>(key: string): Promise<T> {
+  public get<T>(key: string): Promise<T> {
     return this.withScopeState<T>(async (state) => state.data[key]);
   }
 
@@ -475,6 +474,7 @@ export class Scope {
         }
         throw e;
       })) ?? [];
+
     //todo(michael): remove once we deprecate doss; see: https://github.com/sam-goodwin/alchemy/issues/585
     let hasCorruptedResources = false;
     if (pendingDeletions) {

package/templates/tanstack-start/package.json

@@ -11,9 +11,9 @@
     "start": "node .output/server/index.mjs"
   },
   "dependencies": {
-    "@tanstack/react-router": "^1.128.3",
-    "@tanstack/react-router-devtools": "^1.128.3",
-    "@tanstack/react-start": "^1.128.3",
+    "@tanstack/react-router": "^1.129.2",
+    "@tanstack/react-router-devtools": "^1.129.2",
+    "@tanstack/react-start": "^1.129.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "tailwind-merge": "3",

package/templates/tanstack-start/vite.config.ts

@@ -1,5 +1,6 @@
 import tailwindcss from "@tailwindcss/vite";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
+import viteReact from "@vitejs/plugin-react";
 import { cloudflareWorkersDevEnvironmentShim } from "alchemy/cloudflare";
 import { defineConfig, PluginOption } from "vite";
 import tsConfigPaths from "vite-tsconfig-paths";
@@ -23,12 +24,7 @@ export default defineConfig({
     tanstackStart({
       target: "cloudflare-module",
       customViteReactPlugin: true,
-      tsr: {
-        routeTreeFileHeader: [
-          "/** biome-ignore-all lint/suspicious/noExplicitAny: code generated by @tanstack/react-start */",
-        ],
-        quoteStyle: "double",
-      },
     }),
+    viteReact(),
   ],
 });