alchemy 0.62.3 → 0.63.1

package/src/aws/ses.ts

@@ -1,27 +1,14 @@
-import {
-  CreateConfigurationSetCommand,
-  CreateEmailIdentityCommand,
-  DeleteConfigurationSetCommand,
-  DeleteEmailIdentityCommand,
-  type DeliveryOptions,
-  GetConfigurationSetCommand,
-  GetEmailIdentityCommand,
-  NotFoundException,
-  PutConfigurationSetDeliveryOptionsCommand,
-  PutConfigurationSetReputationOptionsCommand,
-  PutConfigurationSetSendingOptionsCommand,
-  PutConfigurationSetSuppressionOptionsCommand,
-  PutConfigurationSetTrackingOptionsCommand,
-  PutEmailIdentityDkimAttributesCommand,
-  type ReputationOptions,
-  SESv2Client,
-  type SendingOptions,
-  type SuppressionOptions,
-  type TrackingOptions,
+import type {
+  DeliveryOptions,
+  ReputationOptions,
+  SendingOptions,
+  SuppressionOptions,
+  TrackingOptions,
 } from "@aws-sdk/client-sesv2";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -165,6 +152,23 @@ export const SES = Resource(
     props: SESProps,
   ): Promise<SES> {
     // Create SES client
+    const {
+      CreateConfigurationSetCommand,
+      CreateEmailIdentityCommand,
+      DeleteConfigurationSetCommand,
+      DeleteEmailIdentityCommand,
+      GetConfigurationSetCommand,
+      GetEmailIdentityCommand,
+      NotFoundException,
+      PutConfigurationSetDeliveryOptionsCommand,
+      PutConfigurationSetReputationOptionsCommand,
+      PutConfigurationSetSendingOptionsCommand,
+      PutConfigurationSetSuppressionOptionsCommand,
+      PutConfigurationSetTrackingOptionsCommand,
+      PutEmailIdentityDkimAttributesCommand,
+      SESv2Client,
+    } = await importPeer(import("@aws-sdk/client-sesv2"), "ses::SES");
+
     const client = new SESv2Client({});
 
     // Resource ID is either based on the configuration set name or email identity

package/src/aws/ssm-parameter.ts

@@ -1,18 +1,10 @@
-import {
-  AddTagsToResourceCommand,
-  DeleteParameterCommand,
-  GetParameterCommand,
-  ParameterAlreadyExists,
-  ParameterNotFound,
-  PutParameterCommand,
-  SSMClient,
-  type Tag,
-} from "@aws-sdk/client-ssm";
+import type { Tag } from "@aws-sdk/client-ssm";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { type Secret, isSecret } from "../secret.ts";
 import { ignore } from "../util/ignore.ts";
 import { logger } from "../util/logger.ts";
+import { importPeer } from "../util/peer.ts";
 
 /**
  * Base properties shared by all SSM Parameter types
@@ -20,8 +12,10 @@ import { logger } from "../util/logger.ts";
 interface SSMParameterBaseProps {
   /**
    * Name of the parameter
+   *
+   * @default ${app}-${stage}-${id}
    */
-  name: string;
+  name?: string;
 
   /**
    * Description of the parameter's purpose
@@ -101,6 +95,11 @@ export type SSMParameter = Resource<"ssm::Parameter"> & {
    */
   arn: string;
 
+  /**
+   * Name of the SSM Parameter.
+   */
+  name: string;
+
   /**
    * Version of the parameter
    */
@@ -176,17 +175,33 @@ export const SSMParameter = Resource(
   "ssm::Parameter",
   async function (
     this: Context<SSMParameter>,
-    _id: string,
+    id: string,
     props: SSMParameterProps,
   ): Promise<SSMParameter> {
+    const {
+      AddTagsToResourceCommand,
+      DeleteParameterCommand,
+      GetParameterCommand,
+      ParameterAlreadyExists,
+      ParameterNotFound,
+      PutParameterCommand,
+      SSMClient,
+    } = await importPeer(import("@aws-sdk/client-ssm"), "ssm::Parameter");
     const client = new SSMClient({});
 
+    const parameterName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.name !== parameterName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       try {
         await ignore(ParameterNotFound.name, () =>
           client.send(
             new DeleteParameterCommand({
-              Name: props.name,
+              Name: parameterName,
             }),
           ),
         );
@@ -217,7 +232,7 @@ export const SSMParameter = Resource(
       try {
         await client.send(
           new PutParameterCommand({
-            Name: props.name,
+            Name: parameterName,
             Value: parameterValue,
             Type: parameterType,
             Description: props.description,
@@ -247,7 +262,7 @@ export const SSMParameter = Resource(
         if (error instanceof ParameterAlreadyExists) {
           await client.send(
             new PutParameterCommand({
-              Name: props.name,
+              Name: parameterName,
               Value: parameterValue,
               Type: parameterType,
               Description: props.description,
@@ -278,7 +293,7 @@ export const SSMParameter = Resource(
           await client.send(
             new AddTagsToResourceCommand({
               ResourceType: "Parameter",
-              ResourceId: props.name,
+              ResourceId: parameterName,
               Tags: tags,
             }),
           );
@@ -290,13 +305,15 @@ export const SSMParameter = Resource(
       // Get the updated parameter
       const parameter = await client.send(
         new GetParameterCommand({
-          Name: props.name,
+          Name: parameterName,
           WithDecryption: true,
         }),
       );
 
       if (!parameter?.Parameter) {
-        throw new Error(`Failed to create or update parameter ${props.name}`);
+        throw new Error(
+          `Failed to create or update parameter ${parameterName}`,
+        );
       }
 
       return this({
@@ -304,12 +321,15 @@ export const SSMParameter = Resource(
         arn: parameter.Parameter.ARN!,
         version: parameter.Parameter.Version!,
         lastModifiedDate: parameter.Parameter.LastModifiedDate!,
-        name: parameter.Parameter.Name ?? props.name,
+        name: parameter.Parameter.Name ?? parameterName,
         value: props.value,
         type: (parameter.Parameter.Type as any) ?? parameterType,
       } as SSMParameter);
     } catch (error: any) {
-      logger.error(`Error creating/updating parameter ${props.name}:`, error);
+      logger.error(
+        `Error creating/updating parameter ${parameterName}:`,
+        error,
+      );
       throw error;
     }
   },

package/src/aws/table.ts

@@ -1,14 +1,8 @@
-import {
-  CreateTableCommand,
-  DeleteTableCommand,
-  DescribeTableCommand,
-  DynamoDBClient,
-  type KeySchemaElement,
-  ResourceNotFoundException,
-} from "@aws-sdk/client-dynamodb";
+import type { KeySchemaElement } from "@aws-sdk/client-dynamodb";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -17,8 +11,10 @@ import { retry } from "./retry.ts";
 export interface TableProps {
   /**
    * Name of the DynamoDB table
+   *
+   * @default ${app}-${stage}-${id}
    */
-  tableName: string;
+  tableName?: string;
 
   /**
    * Primary partition key (hash key) configuration
@@ -88,6 +84,11 @@ export interface Table extends Resource<"dynamo::Table">, TableProps {
    */
   arn: string;
 
+  /**
+   * Name of the DynamoDB Table.
+   */
+  tableName: string;
+
   /**
    * ARN of the table's stream if enabled
    * Format: arn:aws:dynamodb:region:account-id:table/table-name/stream/timestamp
@@ -140,17 +141,33 @@ export const Table = Resource(
   "dynamo::Table",
   async function (
     this: Context<Table>,
-    _id: string,
+    id: string,
     props: TableProps,
   ): Promise<Table> {
+    const {
+      CreateTableCommand,
+      DeleteTableCommand,
+      DescribeTableCommand,
+      DynamoDBClient,
+      ResourceNotFoundException,
+    } = await importPeer(import("@aws-sdk/client-dynamodb"), "dynamo::Table");
     const client = new DynamoDBClient({});
 
+    const tableName =
+      props.tableName ??
+      this.output?.tableName ??
+      this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output?.tableName !== tableName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       await retry(async () => {
         await ignore(ResourceNotFoundException.name, () =>
           client.send(
             new DeleteTableCommand({
-              TableName: props.tableName,
+              TableName: tableName,
             }),
           ),
         );
@@ -165,7 +182,7 @@ export const Table = Resource(
         try {
           await client.send(
             new DescribeTableCommand({
-              TableName: props.tableName,
+              TableName: tableName,
             }),
           );
           // If we get here, table still exists
@@ -184,7 +201,7 @@ export const Table = Resource(
 
       if (!tableDeleted) {
         throw new Error(
-          `Timed out waiting for table ${props.tableName} to be deleted`,
+          `Timed out waiting for table ${tableName} to be deleted`,
         );
       }
 
@@ -222,7 +239,7 @@ export const Table = Resource(
         // First check if table already exists
         const describeResponse = await client.send(
           new DescribeTableCommand({
-            TableName: props.tableName,
+            TableName: tableName,
           }),
         );
 
@@ -240,7 +257,7 @@ export const Table = Resource(
           // Table doesn't exist, try to create it
           await client.send(
             new CreateTableCommand({
-              TableName: props.tableName,
+              TableName: tableName,
               AttributeDefinitions: attributeDefinitions,
               KeySchema: keySchema,
               BillingMode: props.billingMode || "PAY_PER_REQUEST",
@@ -277,7 +294,7 @@ export const Table = Resource(
           async () =>
             await client.send(
               new DescribeTableCommand({
-                TableName: props.tableName,
+                TableName: tableName,
               }),
             ),
         );
@@ -302,13 +319,14 @@ export const Table = Resource(
 
     if (!tableActive) {
       throw new Error(
-        `Timed out waiting for table ${props.tableName} to become active`,
+        `Timed out waiting for table ${tableName} to become active`,
       );
     }
 
     return this({
       ...props,
       arn: tableDescription!.TableArn!,
+      tableName,
       streamArn: tableDescription!.LatestStreamArn,
       tableId: tableDescription!.TableId!,
     });

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;