alchemy 0.62.3 → 0.63.0

package/src/cloudflare/account-api-token.ts

@@ -88,7 +88,7 @@ export interface AccountApiTokenProps extends CloudflareApiOptions {
   /**
    * Name of the token
    */
-  name: string;
+  name?: string;
 
   /**
    * Policies that define what the token can access
@@ -252,12 +252,14 @@ export const AccountApiToken = Resource(
   "cloudflare::AccountApiToken",
   async function (
     this: Context<AccountApiToken>,
-    _id: string,
+    id: string,
     props: AccountApiTokenProps,
   ): Promise<AccountApiToken> {
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
 
+    const tokenName = props.name ?? this.scope.createPhysicalName(id);
+
     if (this.phase === "delete") {
       // Delete token if we have an ID
       if (this.output?.id) {
@@ -270,10 +272,10 @@ export const AccountApiToken = Resource(
             const errorData: any = await deleteResponse.json().catch(() => ({
               errors: [{ message: deleteResponse.statusText }],
             }));
-            logger.error(`Error deleting token '${props.name}':`, errorData);
+            logger.error(`Error deleting token '${tokenName}':`, errorData);
           }
         } catch (error) {
-          logger.error(`Error deleting token '${props.name}':`, error);
+          logger.error(`Error deleting token '${tokenName}':`, error);
         }
       }
 
@@ -288,7 +290,7 @@ export const AccountApiToken = Resource(
 
     // Transform our properties to API format
     const apiPayload = {
-      name: props.name,
+      name: tokenName,
       policies: props.policies.map((policy) => ({
         effect: policy.effect,
         permission_groups: policy.permissionGroups.map((pg) =>
@@ -362,7 +364,7 @@ export const AccountApiToken = Resource(
       }));
 
       throw new Error(
-        `Error ${this.phase === "update" ? "updating" : "creating"} token '${props.name}': ${
+        `Error ${this.phase === "update" ? "updating" : "creating"} token '${tokenName}': ${
           errorData.errors?.[0]?.message || response.statusText
         }`,
       );
@@ -376,7 +378,7 @@ export const AccountApiToken = Resource(
     } else {
       if (!this.output?.value) {
         throw new Error(
-          `Token '${props.name}' was created but we have no record of its value. Try deleting and recreating the token.`,
+          `Token '${tokenName}' was created but we have no record of its value. Try deleting and recreating the token.`,
         );
       }
       tokenValue = this.output?.value;

package/src/cloudflare/ai-gateway.ts

@@ -1,15 +1,19 @@
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
-import { bind } from "../runtime/bind.ts";
 import { logger } from "../util/logger.ts";
 import { handleApiError } from "./api-error.ts";
 import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
-import type { Bound } from "./bound.ts";
 
 /**
  * Properties for creating or updating a Cloudflare AI Gateway.
  */
 export interface AiGatewayProps extends CloudflareApiOptions {
+  /**
+   * Name of the AI Gateway.
+   *
+   * @default ${app.name}-${app.stage}-${id}
+   */
+  gatewayName?: string;
   /**
    * Invalidate cache on update.
    * @default true
@@ -88,7 +92,7 @@ export interface AiGatewayProps extends CloudflareApiOptions {
  * Output returned after Cloudflare AI Gateway creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export interface AiGatewayResource
+export interface AiGateway
   extends Resource<"cloudflare::AiGateway">,
     AiGatewayProps {
   /**
@@ -128,8 +132,6 @@ export interface AiGatewayResource
   type: "ai_gateway";
 }
 
-export type AiGateway = AiGatewayResource & Bound<AiGatewayResource>;
-
 /**
  * Represents a Cloudflare AI Gateway.
  *
@@ -154,30 +156,25 @@ export type AiGateway = AiGatewayResource & Bound<AiGatewayResource>;
  *   logpushPublicKey: "mypublickey..." // Replace with actual public key
  * });
  */
-export async function AiGateway(
-  name: string,
-  props: AiGatewayProps = {},
-): Promise<AiGateway> {
-  const gateway = await AiGatewayResource(name, props);
-  const binding = await bind(gateway);
-  return {
-    ...gateway,
-    getLog: binding.getLog,
-    getUrl: binding.getUrl,
-    patchLog: binding.patchLog,
-    run: binding.run,
-  } as AiGateway;
-}
-
-const AiGatewayResource = Resource(
+export const AiGateway = Resource(
   "cloudflare::AiGateway",
   async function (
-    this: Context<AiGatewayResource>,
+    this: Context<AiGateway>,
     id: string,
     props: AiGatewayProps = {},
-  ): Promise<AiGatewayResource> {
+  ): Promise<AiGateway> {
     const api = await createCloudflareApi(props);
-    const gatewayPath = `/accounts/${api.accountId}/ai-gateway/gateways/${id}`;
+    const gatewayName =
+      props.gatewayName ??
+      this.output?.gatewayName ??
+      this.output?.id ?? // name and ID are the same
+      this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output?.id !== gatewayName) {
+      this.replace();
+    }
+
+    const gatewayPath = `/accounts/${api.accountId}/ai-gateway/gateways/${gatewayName}`;
     const gatewaysPath = `/accounts/${api.accountId}/ai-gateway/gateways`;
 
     if (this.phase === "delete") {
@@ -185,10 +182,15 @@ const AiGatewayResource = Resource(
         const deleteResponse = await api.delete(gatewayPath);
         // Only swallow 404 Not Found errors, all other errors should be handled
         if (!deleteResponse.ok && deleteResponse.status !== 404) {
-          await handleApiError(deleteResponse, "delete", "ai gateway", id);
+          await handleApiError(
+            deleteResponse,
+            "delete",
+            "ai gateway",
+            gatewayName,
+          );
         }
       } catch (error) {
-        logger.error(`Error deleting AI Gateway ${id}:`, error);
+        logger.error(`Error deleting AI Gateway ${gatewayName}:`, error);
         throw error;
       }
       return this.destroy();
@@ -211,37 +213,37 @@ const AiGatewayResource = Resource(
     try {
       if (this.phase === "update") {
         // Update existing gateway (PUT request)
-        const requestBody = mapPropsToApi(id, mergedProps, false);
+        const requestBody = mapPropsToApi(gatewayName, mergedProps, false);
         response = await api.put(gatewayPath, requestBody);
       } else {
-        // Check if gateway exists before creating (to avoid conflict)
+        // Check if gateway exists before creating (to avogatewayName conflict)
         const getResponse = await api.get(gatewayPath);
         if (getResponse.status === 200) {
           // Gateway exists, treat as update (PUT)
           logger.log(
-            `AI Gateway '${id}' already exists. Updating existing resource.`,
+            `AI Gateway '${gatewayName}' already exists. Updating existing resource.`,
           );
-          const requestBody = mapPropsToApi(id, mergedProps, false);
+          const requestBody = mapPropsToApi(gatewayName, mergedProps, false);
           response = await api.put(gatewayPath, requestBody);
         } else if (getResponse.status === 404) {
           // Gateway doesn't exist, create new (POST request)
-          const requestBody = mapPropsToApi(id, mergedProps, true); // Include 'id' in POST body
+          const requestBody = mapPropsToApi(gatewayName, mergedProps, true); // Include 'gatewayName' in POST body
           response = await api.post(gatewaysPath, requestBody);
         } else {
           // Unexpected error during GET check
-          await handleApiError(getResponse, "get", "ai gateway", id);
+          await handleApiError(getResponse, "get", "ai gateway", gatewayName);
         }
       }
 
       if (!response?.ok) {
         const action = this.phase === "update" ? "update" : "create";
-        await handleApiError(response!, action, "ai gateway", id);
+        await handleApiError(response!, action, "ai gateway", gatewayName);
       }
 
       const data: { result: Record<string, any> } = await response!.json();
       apiResource = data.result;
     } catch (error) {
-      logger.error(`Error ${this.phase} AI Gateway '${id}':`, error);
+      logger.error(`Error ${this.phase} AI Gateway '${gatewayName}':`, error);
       throw error; // Re-throw the error to fail the deployment
     }
 
@@ -249,6 +251,7 @@ const AiGatewayResource = Resource(
     return this({
       ...mergedProps, // Start with the input props (including defaults)
       id: apiResource.id,
+      gatewayName,
       accountId: apiResource.account_id,
       accountTag: apiResource.account_tag,
       createdAt: apiResource.created_at,

package/src/cloudflare/api-schema.ts

@@ -48,33 +48,33 @@ export interface APISchemaProps<S extends OpenAPIV3.Document>
 /**
  * APISchema resource attributes.
  */
-export interface APISchema<S extends OpenAPIV3.Document = OpenAPIV3.Document>
-  extends Resource<"cloudflare::APISchema"> {
-  /**
-   * Schema ID
-   */
-  id: string;
-
-  /**
-   * Name for the schema
-   */
-  name: string;
+export type APISchema<S extends OpenAPIV3.Document = OpenAPIV3.Document> =
+  Resource<"cloudflare::APISchema"> & {
+    /**
+     * Schema ID
+     */
+    id: string;
+
+    /**
+     * Name for the schema
+     */
+    name: string;
 
-  /**
-   * The API Schema
-   */
-  schema: S;
+    /**
+     * The API Schema
+     */
+    schema: S;
 
-  /**
-   * Source of the schema
-   */
-  source: string;
+    /**
+     * Source of the schema
+     */
+    source: string;
 
-  /**
-   * Whether validation is enabled
-   */
-  enabled: boolean;
-}
+    /**
+     * Whether validation is enabled
+     */
+    enabled: boolean;
+  };
 
 /**
  * Cloudflare API Gateway Schema manages OpenAPI v3 schemas for API validation.
@@ -160,10 +160,17 @@ export const APISchema = Resource("cloudflare::APISchema", async function <
 
   let schemaDetails: CloudflareSchemaDetails;
 
+  const schemaName =
+    props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+  if (this.phase === "update" && this.output?.name !== schemaName) {
+    this.replace();
+  }
+
   if (this.phase === "update" && this.output?.id) {
     // Check if we need to replace due to name, schema content change, or disabling validation
     if (
-      props.name !== this.output.name ||
+      schemaName !== this.output.name ||
       JSON.stringify(parsedSchema) !== JSON.stringify(this.output.schema) ||
       (this.output.enabled === true && props.enabled === false)
     ) {
@@ -179,7 +186,7 @@ export const APISchema = Resource("cloudflare::APISchema", async function <
     // Create new schema
     schemaDetails = await uploadSchema(api, zoneId, {
       file: yaml.stringify(parsedSchema),
-      name: props.name || id,
+      name: schemaName,
       validation_enabled: props.enabled !== false,
     });
   }

package/src/cloudflare/api-shield.ts

@@ -28,7 +28,7 @@ export interface APIShieldProps<S extends string | URL | OpenAPIV3.Document>
   /**
    * The name of the schema validation
    *
-   * @default id
+   * @default ${app.name}-${app.stage}-${id}
    */
   name?: string;
 
@@ -165,6 +165,11 @@ export interface ValidationSettings {
  */
 export interface APIShield<S extends OpenAPIV3.Document = OpenAPIV3.Document>
   extends Resource<"cloudflare::APIShield"> {
+  /**
+   * Name of the API Shield.
+   */
+  name: string;
+
   /**
    * The schema resource
    */
@@ -409,6 +414,13 @@ const _APIShield = Resource(
       return this.destroy();
     }
 
+    const schemaName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output?.name !== schemaName) {
+      this.replace();
+    }
+
     // Update global settings
     const defaultAction = props.defaultMitigation || "none";
     await updateGlobalSettings(api, zoneId, {
@@ -419,7 +431,7 @@ const _APIShield = Resource(
     const schema = await APISchema("schema", {
       schema: props.schema,
       zone: props.zone,
-      name: props.name ?? id,
+      name: schemaName,
       enabled: props.enabled,
       accountId: props.accountId,
       apiKey: props.apiKey,
@@ -431,6 +443,7 @@ const _APIShield = Resource(
     return this({
       zoneId,
       schema,
+      name: schemaName,
       operations: await Promise.all(
         parseSchemaOperations(schema.schema).map(async (parsedOp) => {
           let operationAction = defaultAction;

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";