alchemy 0.5.1 → 0.6.0

package/lib/cloudflare/r2-rest-state-store.d.ts

@@ -1,10 +1,10 @@
 import type { Scope } from "../scope";
-import type { Secret } from "../secret";
 import type { State, StateStore } from "../state";
+import { type CloudflareApiOptions } from "./api";
 /**
  * Options for CloudflareR2StateStore
  */
-export interface CloudflareR2StateStoreOptions {
+export interface CloudflareR2StateStoreOptions extends CloudflareApiOptions {
     /**
      * The prefix to use for object keys in the R2 bucket
      * This allows multiple state stores to use the same R2 bucket
@@ -15,18 +15,6 @@ export interface CloudflareR2StateStoreOptions {
      * Required - the bucket must already exist
      */
     bucketName: string;
-    /**
-     * API key to use (overrides CLOUDFLARE_API_KEY env var)
-     */
-    apiKey?: Secret;
-    /**
-     * Account ID to use (overrides CLOUDFLARE_ACCOUNT_ID env var)
-     */
-    accountId?: string;
-    /**
-     * Email to use with API Key authentication (overrides CLOUDFLARE_EMAIL env var)
-     */
-    email?: string;
 }
 /**
  * State store implementation using Cloudflare R2 API
@@ -34,12 +22,10 @@ export interface CloudflareR2StateStoreOptions {
  */
 export declare class R2RestStateStore implements StateStore {
     readonly scope: Scope;
+    private readonly options;
     private api;
     private prefix;
     private bucketName;
-    private apiKey;
-    private accountId;
-    private email;
     private initialized;
     /**
      * Create a new CloudflareR2StateStore

package/lib/cloudflare/r2-rest-state-store.js

@@ -1,18 +1,16 @@
 import { deserialize, serialize } from "../serde";
 import { withExponentialBackoff } from "../util/retry";
-import { createCloudflareApi } from "./api";
+import { createCloudflareApi, } from "./api";
 /**
  * State store implementation using Cloudflare R2 API
  * Uses R2 for immediate consistency compared to KV's eventual consistency
  */
 export class R2RestStateStore {
     scope;
+    options;
     api;
     prefix;
     bucketName;
-    apiKey;
-    accountId;
-    email;
     initialized = false;
     /**
      * Create a new CloudflareR2StateStore
@@ -22,6 +20,7 @@ export class R2RestStateStore {
      */
     constructor(scope, options) {
         this.scope = scope;
+        this.options = options;
         // Use the scope's chain to build the prefix, similar to how FileSystemStateStore builds its directory
         const scopePath = scope.chain.join("/");
         this.prefix = options.prefix
@@ -31,9 +30,6 @@ export class R2RestStateStore {
             throw new Error("bucketName is required for CloudflareR2StateStore");
         }
         this.bucketName = options.bucketName;
-        this.apiKey = options.apiKey;
-        this.accountId = options.accountId;
-        this.email = options.email;
         // We'll initialize the API in init() to allow for async creation
         this.api = null;
     }
@@ -44,11 +40,7 @@ export class R2RestStateStore {
         if (this.initialized)
             return;
         // Create Cloudflare API client with automatic account discovery
-        this.api = await createCloudflareApi({
-            apiKey: this.apiKey,
-            accountId: this.accountId,
-            email: this.email,
-        });
+        this.api = await createCloudflareApi(this.options);
         this.initialized = true;
     }
     /**

package/lib/cloudflare/worker.d.ts

@@ -1,13 +1,14 @@
 import type { Context } from "../context";
 import { type BundleProps } from "../esbuild/bundle";
 import { Resource } from "../resource";
+import { type CloudflareApiOptions } from "./api";
 import { type Bindings } from "./bindings";
 import type { Bound } from "./bound";
 import type { SingleStepMigration } from "./worker-migration";
 /**
  * Properties for creating or updating a Worker
  */
-export interface WorkerProps<B extends Bindings = Bindings> {
+export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareApiOptions {
     /**
      * The worker script content (JavaScript or WASM)
      * One of script, entryPoint, or bundle must be provided
@@ -36,11 +37,6 @@ export interface WorkerProps<B extends Bindings = Bindings> {
      * This is mandatory - must be explicitly specified
      */
     name: string;
-    /**
-     * Routes to associate with this worker
-     * Format: example.com/* or *.example.com/*
-     */
-    routes?: string[];
     /**
      * Bindings to attach to the worker
      */

package/lib/cloudflare/worker.js

@@ -6,7 +6,7 @@ import { isSecret } from "../secret";
 import { getContentType } from "../util/content-type";
 import { withExponentialBackoff } from "../util/retry";
 import { slugify } from "../util/slugify";
-import { createCloudflareApi } from "./api";
+import { createCloudflareApi, } from "./api";
 import { isAssets, isDurableObjectNamespace, } from "./bindings";
 import { isKVNamespace } from "./kv-namespace";
 /**
@@ -90,7 +90,7 @@ export const Worker = Resource("cloudflare::Worker", {
     alwaysUpdate: true,
 }, async function (id, props) {
     // Create Cloudflare API client with automatic account discovery
-    const api = await createCloudflareApi();
+    const api = await createCloudflareApi(props);
     // Use the provided name
     const workerName = props.name;
     // Validate input - we need either script, entryPoint, or bundle
@@ -133,8 +133,6 @@ export const Worker = Resource("cloudflare::Worker", {
     await putWorker(api, workerName, scriptContent, scriptMetadata);
     // TODO: it is less than ideal that this can fail, resulting in state problem
     await this.set("bindings", props.bindings);
-    // Handle routes if requested
-    await setupRoutes(api, workerName, props.routes || []);
     // Handle worker URL if requested
     const workerUrl = await configureURL(this, api, workerName, props.url ?? false);
     // Get current timestamp
@@ -146,7 +144,6 @@ export const Worker = Resource("cloudflare::Worker", {
         name: workerName,
         script: scriptContent,
         format: props.format || "esm", // Include format in the output
-        routes: props.routes || [],
         bindings: props.bindings ?? {},
         env: props.env,
         observability: scriptMetadata.observability,
@@ -167,25 +164,6 @@ async function deleteWorker(ctx, api, workerName) {
             .catch(() => ({ errors: [{ message: deleteResponse.statusText }] }));
         console.error("Error deleting worker:", errorData.errors?.[0]?.message || deleteResponse.statusText);
     }
-    // Also remove any associated routes if they exist
-    if (ctx.output?.routes && ctx.output.routes.length > 0 && api.zoneId) {
-        // First get existing routes to find their IDs
-        const routesResponse = await api.get(`/zones/${api.zoneId}/workers/routes`);
-        if (!routesResponse.ok) {
-            throw new Error(`Could not fetch routes for cleanup: ${routesResponse.status} ${routesResponse.statusText}`);
-        }
-        const routesData = await routesResponse.json();
-        const existingRoutes = routesData.result || [];
-        for (const route of existingRoutes) {
-            if (ctx.output.routes.includes(route.pattern)) {
-                // Delete the route
-                const routeDeleteResponse = await api.delete(`/zones/${api.zoneId}/workers/routes/${route.id}`);
-                if (!routeDeleteResponse.ok) {
-                    console.warn(`Failed to delete route ${route.pattern}: ${routeDeleteResponse.status} ${routeDeleteResponse.statusText}`);
-                }
-            }
-        }
-    }
     // Disable the URL if it was enabled
     if (ctx.output?.url) {
         try {
@@ -421,44 +399,6 @@ async function bundleWorkerScript(props) {
         throw new Error("Error reading bundle");
     }
 }
-async function setupRoutes(api, workerName, routes) {
-    // Set up routes if provided
-    if (routes && routes.length > 0 && api.zoneId) {
-        // First get existing routes
-        const routesResponse = await api.get(`/zones/${api.zoneId}/workers/routes`);
-        if (!routesResponse.ok) {
-            throw new Error(`Could not fetch routes: ${routesResponse.status} ${routesResponse.statusText}`);
-        }
-        const routesData = await routesResponse.json();
-        const existingRoutes = routesData.result || [];
-        // For each desired route
-        for (const pattern of routes) {
-            const existingRoute = existingRoutes.find((r) => r.pattern === pattern);
-            if (existingRoute) {
-                // Update if script name doesn't match
-                if (existingRoute.script !== workerName) {
-                    const updateRouteResponse = await api.put(`/zones/${api.zoneId}/workers/routes/${existingRoute.id}`, {
-                        pattern,
-                        script: workerName,
-                    });
-                    if (!updateRouteResponse.ok) {
-                        console.warn(`Failed to update route ${pattern}: ${updateRouteResponse.status} ${updateRouteResponse.statusText}`);
-                    }
-                }
-            }
-            else {
-                // Create new route
-                const createRouteResponse = await api.post(`/zones/${api.zoneId}/workers/routes`, {
-                    pattern,
-                    script: workerName,
-                });
-                if (!createRouteResponse.ok) {
-                    throw new Error(`Failed to create route ${pattern}: ${createRouteResponse.status} ${createRouteResponse.statusText}`);
-                }
-            }
-        }
-    }
-}
 async function configureURL(ctx, api, workerName, url) {
     let workerUrl;
     if (url) {
@@ -557,6 +497,7 @@ async function uploadAssets(api, workerName, assets) {
     // Process each bucket of files
     for (const bucket of buckets) {
         const formData = new FormData();
+        let totalBytes = 0;
         // Add each file in the bucket to the form
         for (const fileHash of bucket) {
             // Find the file with this hash
@@ -575,6 +516,7 @@ async function uploadAssets(api, workerName, assets) {
             const blob = new Blob([base64Content], {
                 type: getContentType(file.filePath),
             });
+            totalBytes += blob.size;
             formData.append(fileHash, blob, fileHash);
         }
         // Upload this batch of files

package/lib/cloudflare/zone.d.ts

@@ -1,19 +1,15 @@
 import type { Context } from "../context";
 import { Resource } from "../resource";
+import { type CloudflareApiOptions } from "./api";
 import type { AlwaysUseHTTPSValue, AutomaticHTTPSRewritesValue, BrotliValue, DevelopmentModeValue, EarlyHintsValue, EmailObfuscationValue, HTTP2Value, HTTP3Value, HotlinkProtectionValue, IPv6Value, MinTLSVersionValue, SSLValue, TLS13Value, WebSocketsValue, ZeroRTTValue } from "./zone-settings";
 /**
  * Properties for creating or updating a Zone
  */
-export interface ZoneProps {
+export interface ZoneProps extends CloudflareApiOptions {
     /**
      * The domain name for the zone
      */
     name: string;
-    /**
-     * Account ID to use for the zone
-     * If not provided, will use the default account
-     */
-    accountId?: string;
     /**
      * The type of zone to create
      * "full" - Full zone implies that DNS is hosted with Cloudflare

package/lib/cloudflare/zone.js

@@ -57,9 +57,7 @@ import { createCloudflareApi } from "./api";
  */
 export const Zone = Resource("cloudflare::Zone", async function (id, props) {
     // Create Cloudflare API client with automatic account discovery
-    const api = await createCloudflareApi({
-        accountId: props.accountId,
-    });
+    const api = await createCloudflareApi(props);
     if (this.phase === "delete") {
         if (this.output?.id) {
             // Delete zone

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export type * from "./context";
 export * from "./resource";
+export type * from "./scope";
 export * from "./secret";
 export * from "./state";
 export * from "./util/ignore";

package/lib/internal/docs/providers.js

@@ -21,13 +21,6 @@ export async function Providers({ srcDir, outDir, filter, parallel = true, }) {
     }))
         .filter((dirent) => dirent.isDirectory() && !exclude.includes(dirent.name))
         .map((dirent) => path.join(dirent.parentPath, dirent.name));
-    // For each provider, list all files
-    if (filter === false) {
-        return [];
-    }
-    else if (typeof filter === "number") {
-        providers = providers.slice(0, filter);
-    }
     if (parallel) {
         return await Promise.all(providers.map((provider) => generateProviderDocs({ provider, outDir, parallel })));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {
@@ -39,6 +39,7 @@
     "@aws-sdk/client-sesv2": "^3.0.0",
     "@aws-sdk/client-sqs": "^3.0.0",
     "@aws-sdk/client-sts": "^3.0.0",
+    "@iarna/toml": "^2.2.5",
     "@octokit/rest": "^21.1.1",
     "ai": "^4.0.0",
     "arktype": "^2.0.0",
@@ -53,6 +54,7 @@
     "prettier": "^3.0.0",
     "stripe": "^17.0.0",
     "turndown": "^7.0.0",
+    "xdg-app-paths": "^8.0.0",
     "yaml": "^2.0.0",
     "zod": "^3.0.0"
   },
@@ -62,6 +64,7 @@
     "@aws-sdk/client-s3": "3.726.1",
     "@biomejs/biome": "^1.9.4",
     "@cloudflare/workers-types": "^4.20250303.0",
+    "@iarna/toml": "^2.2.5",
     "@octokit/rest": "^21.1.1",
     "@types/bun": "latest",
     "@types/diff": "^5.0.0",
@@ -82,6 +85,7 @@
     "vite": "^6.0.7",
     "vitepress": "^1.6.3",
     "wrangler": "^3.114.0",
+    "xdg-app-paths": "^8.3.0",
     "yaml": "^2.7.1"
   }
 }

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

@@ -3,7 +3,7 @@ import type { Context } from "../context";
 import { Resource } from "../resource";
 import { Secret } from "../secret";
 import { sha256 } from "../util/sha256";
-import { createCloudflareApi } from "./api";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api";
 
 /**
  * Permission group for a token policy
@@ -63,7 +63,7 @@ export interface TokenCondition {
 /**
  * Properties for creating or updating an Account API Token
  */
-export interface AccountApiTokenProps {
+export interface AccountApiTokenProps extends CloudflareApiOptions {
   /**
    * Name of the token
    */
@@ -162,6 +162,10 @@ export interface AccountApiToken
 /**
  * Creates a Cloudflare Account API Token with specified permissions.
  *
+ * Note: Requires a Cloudflare API Key or Token with admin-level account access.
+ * The OAuth token from `wrangler login` is NOT sufficient for this operation.
+ * You must use an API token with permission to manage account API tokens.
+ *
  * @see https://developers.cloudflare.com/api/resources/accounts/subresources/tokens/methods/create/
  *
  * @example
@@ -222,7 +226,7 @@ export const AccountApiToken = Resource(
     props: AccountApiTokenProps
   ): Promise<AccountApiToken> {
     // Create Cloudflare API client with automatic account discovery
-    const api = await createCloudflareApi();
+    const api = await createCloudflareApi(props);
 
     if (this.phase === "delete") {
       // Delete token if we have an ID

package/src/cloudflare/account-id.ts

@@ -0,0 +1,12 @@
+import { getCloudflareUserInfo, type CloudflareAuthOptions } from "./auth";
+
+export type CloudflareAccountId = string & {
+  readonly __brand: "CloudflareAccountId";
+};
+
+export async function CloudflareAccountId(
+  options: CloudflareAuthOptions
+): Promise<CloudflareAccountId> {
+  const userInfo = await getCloudflareUserInfo(options);
+  return userInfo.accounts[0].id as CloudflareAccountId;
+}

package/src/cloudflare/api-error.ts

@@ -0,0 +1,58 @@
+/**
+ * Custom error class for Cloudflare API errors
+ * Includes HTTP status information from the Response
+ */
+export class CloudflareApiError extends Error {
+  /**
+   * HTTP status code
+   */
+  status: number;
+
+  /**
+   * HTTP status text
+   */
+  statusText: string;
+
+  /**
+   * Raw error data from the API
+   */
+  errorData?: any;
+
+  /**
+   * Create a new CloudflareApiError
+   */
+  constructor(message: string, response: Response, errorData?: any) {
+    super(message);
+    this.name = "CloudflareApiError";
+    this.status = response.status;
+    this.statusText = response.statusText;
+    this.errorData = errorData;
+
+    // Ensure instanceof works correctly
+    Object.setPrototypeOf(this, CloudflareApiError.prototype);
+  }
+}
+
+/**
+ * Helper function to handle API errors
+ *
+ * @param response The fetch Response object
+ * @param action The action being performed (e.g., "creating", "deleting")
+ * @param resourceType The type of resource being acted upon (e.g., "R2 bucket", "Worker")
+ * @param resourceName The name/identifier of the specific resource
+ * @returns Never returns - always throws an error
+ */
+export async function handleApiError(
+  response: Response,
+  action: string,
+  resourceType: string,
+  resourceName: string
+): Promise<never> {
+  const json: any = await response.json();
+  const errors: { message: string }[] = json.errors || [
+    { message: response.statusText },
+  ];
+  const errorMessage = `Error ${action} ${resourceType} '${resourceName}': ${errors[0]?.message || response.statusText}`;
+
+  throw new CloudflareApiError(errorMessage, response, errors);
+}