alchemy 0.12.21 → 0.13.0

package/src/cloudflare/ai-gateway.ts

@@ -154,7 +154,7 @@ export const AiGateway = Resource(
   async function (
     this: Context<AiGateway>,
     id: string,
-    props: AiGatewayProps = {}
+    props: AiGatewayProps = {},
   ): Promise<AiGateway> {
     const api = await createCloudflareApi(props);
     const gatewayPath = `/accounts/${api.accountId}/ai-gateway/gateways/${id}`;
@@ -199,7 +199,7 @@ export const AiGateway = Resource(
         if (getResponse.status === 200) {
           // Gateway exists, treat as update (PUT)
           console.log(
-            `AI Gateway '${id}' already exists. Updating existing resource.`
+            `AI Gateway '${id}' already exists. Updating existing resource.`,
           );
           const requestBody = mapPropsToApi(id, mergedProps, false);
           response = await api.put(gatewayPath, requestBody);
@@ -248,14 +248,14 @@ export const AiGateway = Resource(
       logpushPublicKey: apiResource.logpush_public_key,
       type: "ai_gateway",
     });
-  }
+  },
 );
 
 // Helper function to map props to the API request body format
 function mapPropsToApi(
   id: string,
   props: AiGatewayProps,
-  includeIdInBody: boolean = false
+  includeIdInBody = false,
 ): Record<string, any> {
   const body: Record<string, any> = {};
   if (includeIdInBody) {

package/src/cloudflare/ai.ts

@@ -2,7 +2,7 @@
  * @see https://developers.cloudflare.com/workers-ai/
  */
 export class Ai<Models extends AiModelListType = AiModelListType> {
-  public readonly type: "ai" = "ai";
+  public readonly type = "ai";
 
   /**
    * @internal

package/src/cloudflare/api-error.ts

@@ -46,7 +46,7 @@ export async function handleApiError(
   response: Response,
   action: string,
   resourceType: string,
-  resourceName: string
+  resourceName: string,
 ): Promise<never> {
   const text = await response.text();
   let json: any;

package/src/cloudflare/api.ts

@@ -48,7 +48,7 @@ export interface CloudflareApiOptions {
  * @returns Promise resolving to a CloudflareApi instance
  */
 export async function createCloudflareApi(
-  options: Partial<CloudflareApiOptions> = {}
+  options: Partial<CloudflareApiOptions> = {},
 ): Promise<CloudflareApi> {
   const userInfo = await getCloudflareUserInfo(options);
   return new CloudflareApi({
@@ -77,7 +77,7 @@ export class CloudflareApi {
   constructor(
     private readonly options: CloudflareApiOptions & {
       accountId: string;
-    }
+    },
   ) {
     this.accountId = options.accountId;
     this.baseUrl = options.baseUrl ?? "https://api.cloudflare.com/client/v4";
@@ -130,7 +130,7 @@ export class CloudflareApi {
       // transient errors should be retried aggressively
       (error) => error instanceof InternalError,
       5, // Maximum 5 attempts (1 initial + 4 retries)
-      1000 // Start with 1s delay, will exponentially increase
+      1000, // Start with 1s delay, will exponentially increase
     );
   }
 
@@ -153,7 +153,7 @@ export class CloudflareApi {
   async post(
     path: string,
     body: any,
-    init: RequestInit = {}
+    init: RequestInit = {},
   ): Promise<Response> {
     const requestBody =
       body instanceof FormData
@@ -170,7 +170,7 @@ export class CloudflareApi {
   async put(
     path: string,
     body: any,
-    init: RequestInit = {}
+    init: RequestInit = {},
   ): Promise<Response> {
     const requestBody = body instanceof FormData ? body : JSON.stringify(body);
     return this.fetch(path, { ...init, method: "PUT", body: requestBody });
@@ -182,7 +182,7 @@ export class CloudflareApi {
   async patch(
     path: string,
     body: any,
-    init: RequestInit = {}
+    init: RequestInit = {},
   ): Promise<Response> {
     return this.fetch(path, {
       ...init,
@@ -199,8 +199,4 @@ export class CloudflareApi {
   }
 }
 
-class InternalError extends Error {
-  constructor(message: string) {
-    super(message);
-  }
-}
+class InternalError extends Error {}

package/src/cloudflare/assets.ts

@@ -92,7 +92,7 @@ export const Assets = Resource(
   async function (
     this: Context<Assets>,
     id: string,
-    props: AssetsProps
+    props: AssetsProps,
   ): Promise<Assets> {
     if (this.phase === "delete") {
       return this.destroy();
@@ -106,7 +106,7 @@ export const Assets = Resource(
       }
     } catch (error) {
       throw new Error(
-        `Assets directory ${props.path} does not exist or is not accessible`
+        `Assets directory ${props.path} does not exist or is not accessible`,
       );
     }
 
@@ -137,7 +137,7 @@ export const Assets = Resource(
       createdAt: this.output?.createdAt || now,
       updatedAt: now,
     });
-  }
+  },
 );
 
 // Helper functions for file operations
@@ -151,7 +151,7 @@ async function getFilesRecursively(dir: string): Promise<string[]> {
         return getFilesRecursively(path);
       }
       return path;
-    })
+    }),
   );
 
   return allFiles.flat();

package/src/cloudflare/auth.ts

@@ -77,7 +77,7 @@ export interface CloudflareOrganization {
 const userInfoCache: Record<string, CloudflareUserInfo> = {};
 
 export async function getCloudflareUserInfo(
-  options: CloudflareAuthOptions
+  options: CloudflareAuthOptions,
 ): Promise<CloudflareUserInfo> {
   const cacheKey = JSON.stringify({
     apiKey: options.apiKey?.unencrypted,
@@ -94,7 +94,7 @@ export async function getCloudflareUserInfo(
   if (!user.ok) {
     if (user.status === 403) {
       throw new Error(
-        "Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?"
+        "Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?",
       );
     }
     await handleApiError(user, "getting", "user", "user");
@@ -103,7 +103,7 @@ export async function getCloudflareUserInfo(
     "https://api.cloudflare.com/client/v4/accounts",
     {
       headers,
-    }
+    },
   );
   const userInfo: CloudflareUserInfo = {
     ...((await user.json()) as any).result,
@@ -114,7 +114,7 @@ export async function getCloudflareUserInfo(
 }
 
 export async function getCloudflareAuthHeaders(
-  options: CloudflareAuthOptions = {}
+  options: CloudflareAuthOptions = {},
 ): Promise<Record<string, string>> {
   // Check for API Token (preferred method)
   const apiToken =
@@ -145,7 +145,7 @@ export async function getCloudflareAuthHeaders(
   }
 
   throw new Error(
-    "Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?"
+    "Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?",
   );
 }
 
@@ -169,7 +169,7 @@ async function getUserEmailFromApiKey(apiKey: string): Promise<string> {
 
     if (!response.ok) {
       throw new Error(
-        `Failed to get user information: ${response.status} ${response.statusText}`
+        `Failed to get user information: ${response.status} ${response.statusText}`,
       );
     }
 
@@ -192,13 +192,13 @@ async function getUserEmailFromApiKey(apiKey: string): Promise<string> {
   } catch (error) {
     console.error("Error retrieving email from Cloudflare API:", error);
     throw new Error(
-      "Failed to automatically discover email for API Key authentication"
+      "Failed to automatically discover email for API Key authentication",
     );
   }
 }
 
 async function refreshAuthToken(
-  options: WranglerConfig
+  options: WranglerConfig,
 ): Promise<WranglerConfig> {
   const response = await fetch("https://dash.cloudflare.com/oauth2/token", {
     method: "POST",
@@ -214,7 +214,7 @@ async function refreshAuthToken(
 
   if (!response.ok) {
     throw new Error(
-      `Failed to refresh auth token: ${response.status} ${response.statusText}`
+      `Failed to refresh auth token: ${response.status} ${response.statusText}`,
     );
   }
 
@@ -226,7 +226,7 @@ async function refreshAuthToken(
   options.oauth_token = data.access_token;
   options.refresh_token = data.refresh_token;
   options.expiration_time = new Date(
-    Date.now() + data.expires_in * 1000
+    Date.now() + data.expires_in * 1000,
   ).toISOString();
   options.scopes = data.scope?.split(" ") || [];
 
@@ -280,7 +280,7 @@ async function readWranglerConfig(): Promise<WranglerConfig> {
   const configPath = await findWranglerConfig();
   try {
     const config = (authConfigCache[configPath] ??= await parseTOML(
-      await fs.readFile(configPath, "utf-8")
+      await fs.readFile(configPath, "utf-8"),
     ));
     config.path = configPath;
 
@@ -307,7 +307,7 @@ async function findWranglerConfig(): Promise<string> {
   const environment = process.env.WRANGLER_API_ENVIRONMENT ?? "production";
   const filePath = path.join(
     "config",
-    `${environment === "production" ? "default.toml" : `${environment}.toml`}`
+    `${environment === "production" ? "default.toml" : `${environment}.toml`}`,
   );
 
   const xdgAppPaths = (await import("xdg-app-paths")).default;
@@ -318,7 +318,7 @@ async function findWranglerConfig(): Promise<string> {
   // Check for the .wrangler directory in root if it is not there then use the XDG compliant path.
   wranglerConfigPath = path.join(
     (await isDirectory(legacyConfigDir)) ? legacyConfigDir : configDir,
-    filePath
+    filePath,
   );
   return wranglerConfigPath;
 }

package/src/cloudflare/bucket.ts

@@ -3,7 +3,7 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import type { Secret } from "../secret.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
-import { CloudflareApi, createCloudflareApi } from "./api.js";
+import { type CloudflareApi, createCloudflareApi } from "./api.js";
 
 /**
  * Properties for creating or updating an R2 Bucket
@@ -162,7 +162,7 @@ export const R2Bucket = Resource(
   async function (
     this: Context<R2Bucket>,
     id: string,
-    props: BucketProps = {}
+    props: BucketProps = {},
   ): Promise<R2Bucket> {
     const api = await createCloudflareApi(props);
     const bucketName = props.name || this.id;
@@ -184,38 +184,37 @@ export const R2Bucket = Resource(
 
       // Return void (a deleted bucket has no content)
       return this.destroy();
-    } else {
-      if (this.phase === "create") {
-        try {
-          await createBucket(api, bucketName, props);
-        } catch (err) {
-          if (err instanceof CloudflareApiError && err.status === 409) {
-            if (!props.adopt) {
-              throw err;
-            }
-          } else {
+    }
+    if (this.phase === "create") {
+      try {
+        await createBucket(api, bucketName, props);
+      } catch (err) {
+        if (err instanceof CloudflareApiError && err.status === 409) {
+          if (!props.adopt) {
             throw err;
           }
+        } else {
+          throw err;
         }
       }
+    }
 
-      await updatePublicAccess(
-        api,
-        bucketName,
-        props.allowPublicAccess === true,
-        props.jurisdiction
-      );
+    await updatePublicAccess(
+      api,
+      bucketName,
+      props.allowPublicAccess === true,
+      props.jurisdiction,
+    );
 
-      return this({
-        name: bucketName,
-        location: props.locationHint || "default",
-        creationDate: new Date(),
-        jurisdiction: props.jurisdiction || "default",
-        type: "r2_bucket",
-        accountId: api.accountId,
-      });
-    }
-  }
+    return this({
+      name: bucketName,
+      location: props.locationHint || "default",
+      creationDate: new Date(),
+      jurisdiction: props.jurisdiction || "default",
+      type: "r2_bucket",
+      accountId: api.accountId,
+    });
+  },
 );
 
 /**
@@ -248,7 +247,7 @@ export function createR2Client(config?: R2ClientConfig): Promise<R2Client> {
 
   if (!accessKeyId || !secretAccessKey) {
     throw new Error(
-      "R2_ACCESS_KEY_ID and R2_SECRET_ACCESS_KEY environment variables are required"
+      "R2_ACCESS_KEY_ID and R2_SECRET_ACCESS_KEY environment variables are required",
     );
   }
 
@@ -287,8 +286,8 @@ interface CloudflareBucketResponse {
  * @returns Modified headers object
  */
 export function withJurisdiction(
-  headers: Record<string, string> = {},
-  props: BucketProps | { jurisdiction?: string } | string | undefined
+  headers: Record<string, string>,
+  props: BucketProps | { jurisdiction?: string } | string | undefined,
 ): Record<string, string> {
   // Clone the headers object to avoid modifying the original
   const result = { ...headers };
@@ -313,12 +312,12 @@ export function withJurisdiction(
 export async function getBucket(
   api: CloudflareApi,
   bucketName: string,
-  props: BucketProps = {}
+  props: BucketProps = {},
 ): Promise<CloudflareBucketResponse> {
   const headers = withJurisdiction({}, props);
   const getResponse = await api.get(
     `/accounts/${api.accountId}/r2/buckets/${bucketName}`,
-    { headers }
+    { headers },
   );
 
   if (!getResponse.ok) {
@@ -335,7 +334,7 @@ export async function getBucket(
 
   throw new CloudflareApiError(
     `Error getting R2 bucket '${bucketName}': ${errorData.errors?.[0]?.message || getResponse.statusText}`,
-    getResponse
+    getResponse,
   );
 }
 
@@ -345,7 +344,7 @@ export async function getBucket(
 export async function createBucket(
   api: CloudflareApi,
   bucketName: string,
-  props: BucketProps = {}
+  props: BucketProps = {},
 ): Promise<CloudflareBucketResponse> {
   // Create new R2 bucket
   const createPayload: any = {
@@ -361,7 +360,7 @@ export async function createBucket(
   const createResponse = await api.post(
     `/accounts/${api.accountId}/r2/buckets`,
     createPayload,
-    { headers }
+    { headers },
   );
 
   if (!createResponse.ok) {
@@ -369,7 +368,7 @@ export async function createBucket(
       createResponse,
       "creating",
       "R2 bucket",
-      bucketName
+      bucketName,
     );
   }
 
@@ -382,14 +381,14 @@ export async function createBucket(
 export async function deleteBucket(
   api: CloudflareApi,
   bucketName: string,
-  props: BucketProps
+  props: BucketProps,
 ): Promise<void> {
   // Delete R2 bucket
   const headers = withJurisdiction({}, props);
 
   const deleteResponse = await api.delete(
     `/accounts/${api.accountId}/r2/buckets/${bucketName}`,
-    { headers }
+    { headers },
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -398,7 +397,7 @@ export async function deleteBucket(
     }));
     throw new CloudflareApiError(
       `Error deleting R2 bucket '${bucketName}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`,
-      deleteResponse
+      deleteResponse,
     );
   }
 }
@@ -416,11 +415,11 @@ export async function listObjects(
   r2: R2Client,
   bucketName: string,
   continuationToken?: string,
-  jurisdiction?: string
+  jurisdiction?: string,
 ): Promise<{ objects: { Key: string }[]; continuationToken?: string }> {
   // List objects in the bucket
   const url = new URL(
-    `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}`
+    `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}`,
   );
   if (continuationToken) {
     url.searchParams.set("continuation-token", continuationToken);
@@ -433,7 +432,7 @@ export async function listObjects(
   if (!listResponse.ok) {
     throw new CloudflareApiError(
       `Failed to list objects: ${listResponse.statusText}`,
-      listResponse
+      listResponse,
     );
   }
 
@@ -450,7 +449,7 @@ export async function listObjects(
   // Get continuation token if present using regex
   const tokenMatch =
     /<NextContinuationToken>([^<]+)<\/NextContinuationToken>/.exec(
-      responseText
+      responseText,
     );
   const nextContinuationToken = tokenMatch ? tokenMatch[1] : undefined;
 
@@ -463,7 +462,7 @@ export async function listObjects(
 export async function emptyBucket(
   r2: R2Client,
   bucketName: string,
-  jurisdiction?: string
+  jurisdiction?: string,
 ): Promise<void> {
   let continuationToken: string | undefined;
   let totalDeleted = 0;
@@ -476,7 +475,7 @@ export async function emptyBucket(
         r2,
         bucketName,
         continuationToken,
-        jurisdiction
+        jurisdiction,
       );
 
       continuationToken = nextToken;
@@ -497,16 +496,16 @@ export async function emptyBucket(
           `;
 
           const deleteUrl = new URL(
-            `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}?delete`
+            `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}?delete`,
           );
 
           console.log(
-            `Deleting ${batch.length} objects from bucket ${bucketName}`
+            `Deleting ${batch.length} objects from bucket ${bucketName}`,
           );
 
           const headers = withJurisdiction(
             { "Content-Type": "application/xml" },
-            jurisdiction
+            jurisdiction,
           );
 
           const deleteResponse = await r2.fetch(deleteUrl.toString(), {
@@ -518,7 +517,7 @@ export async function emptyBucket(
           if (!deleteResponse.ok) {
             throw new CloudflareApiError(
               `Failed to delete objects: ${deleteResponse.statusText}`,
-              deleteResponse
+              deleteResponse,
             );
           }
 
@@ -528,7 +527,7 @@ export async function emptyBucket(
     } while (continuationToken);
 
     console.log(
-      `Successfully emptied bucket ${bucketName}, deleted ${totalDeleted} objects total`
+      `Successfully emptied bucket ${bucketName}, deleted ${totalDeleted} objects total`,
     );
   } catch (error) {
     if (error instanceof CloudflareApiError && error.status === 404) {
@@ -550,7 +549,7 @@ export async function updatePublicAccess(
   api: CloudflareApi,
   bucketName: string,
   allowPublicAccess: boolean,
-  jurisdiction?: string
+  jurisdiction?: string,
 ): Promise<void> {
   const headers = withJurisdiction({}, jurisdiction);
 
@@ -559,7 +558,7 @@ export async function updatePublicAccess(
     {
       enabled: allowPublicAccess,
     },
-    { headers }
+    { headers },
   );
 
   if (!response.ok) {
@@ -567,7 +566,7 @@ export async function updatePublicAccess(
       response,
       "updating public access for",
       "R2 bucket",
-      bucketName
+      bucketName,
     );
   }
 }
@@ -581,8 +580,8 @@ export async function setCorsConfiguration(
   allowedOrigins: string[] = ["*"],
   allowedMethods: string[] = ["GET", "HEAD", "PUT", "POST", "DELETE"],
   allowedHeaders: string[] = ["*"],
-  maxAgeSeconds: number = 3600,
-  jurisdiction?: string
+  maxAgeSeconds = 3600,
+  jurisdiction?: string,
 ): Promise<void> {
   try {
     // Construct CORS XML configuration
@@ -599,12 +598,12 @@ export async function setCorsConfiguration(
     `;
 
     const url = new URL(
-      `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}?cors`
+      `https://${r2.accountId}.r2.cloudflarestorage.com/${bucketName}?cors`,
     );
 
     const headers = withJurisdiction(
       { "Content-Type": "application/xml" },
-      jurisdiction
+      jurisdiction,
     );
 
     const response = await r2.fetch(url.toString(), {
@@ -616,7 +615,7 @@ export async function setCorsConfiguration(
     if (!response.ok) {
       throw new CloudflareApiError(
         `Failed to set CORS configuration: ${response.statusText}`,
-        response
+        response,
       );
     }
 
@@ -624,7 +623,7 @@ export async function setCorsConfiguration(
   } catch (error) {
     console.error(
       `Failed to set CORS configuration for bucket ${bucketName}:`,
-      error
+      error,
     );
     throw error;
   }
@@ -660,7 +659,7 @@ export async function listBuckets(
     cursor?: string;
     direction?: "asc" | "desc";
     jurisdiction?: string;
-  } = {}
+  } = {},
 ): Promise<R2BucketInfo[]> {
   // Build query parameters
   const params = new URLSearchParams();
@@ -682,7 +681,7 @@ export async function listBuckets(
   }
 
   // Build URL with query parameters
-  const path = `/accounts/${api.accountId}/r2/buckets${params.toString() ? "?" + params.toString() : ""}`;
+  const path = `/accounts/${api.accountId}/r2/buckets${params.toString() ? `?${params.toString()}` : ""}`;
 
   // Set jurisdiction header if provided
   const headers = withJurisdiction({}, options.jurisdiction);
@@ -693,7 +692,7 @@ export async function listBuckets(
   if (!response.ok) {
     throw new CloudflareApiError(
       `Failed to list buckets: ${response.statusText}`,
-      response
+      response,
     );
   }