alchemy 0.4.0 → 0.5.0

package/lib/alchemy.js

@@ -10,7 +10,7 @@ export const alchemy = _alchemy;
  * Implementation of the alchemy function that handles both application scoping
  * and template string interpolation.
  */
-function _alchemy(...args) {
+async function _alchemy(...args) {
     if (typeof args[0] === "string") {
         const [appName, options] = args;
         const root = scope(undefined, {
@@ -19,9 +19,8 @@ function _alchemy(...args) {
             stage: options?.stage,
         });
         if (options?.phase === "destroy") {
-            return destroy(root).finally(() => {
-                process.exit(0);
-            });
+            await destroy(root);
+            return process.exit(0);
         }
         return root;
     }
@@ -32,92 +31,90 @@ function _alchemy(...args) {
             ? secondLine.match(/^(\s*)/)?.[1]?.length || 0
             : 0;
         const indent = " ".repeat(leadingSpaces);
-        return (async () => {
-            const { isFileCollection, isFileRef } = await import("./fs");
-            const appendices = {};
-            const stringValues = await Promise.all(values.map(async function resolve(value) {
-                if (typeof value === "string") {
-                    return indent + value;
-                }
-                else if (value === null) {
-                    return "null";
-                }
-                else if (value === undefined) {
-                    return "undefined";
-                }
-                else if (typeof value === "number" ||
-                    typeof value === "boolean" ||
-                    typeof value === "bigint") {
-                    return value.toString();
-                }
-                else if (value instanceof Promise) {
-                    return resolve(await value);
+        const { isFileCollection, isFileRef } = await import("./fs");
+        const appendices = {};
+        const stringValues = await Promise.all(values.map(async function resolve(value) {
+            if (typeof value === "string") {
+                return indent + value;
+            }
+            else if (value === null) {
+                return "null";
+            }
+            else if (value === undefined) {
+                return "undefined";
+            }
+            else if (typeof value === "number" ||
+                typeof value === "boolean" ||
+                typeof value === "bigint") {
+                return value.toString();
+            }
+            else if (value instanceof Promise) {
+                return resolve(await value);
+            }
+            else if (isFileRef(value)) {
+                if (!(value.path in appendices)) {
+                    appendices[value.path] = await fs.readFile(value.path, "utf-8");
                 }
-                else if (isFileRef(value)) {
-                    if (!(value.path in appendices)) {
-                        appendices[value.path] = await fs.readFile(value.path, "utf-8");
-                    }
+                return `[${path.basename(value.path)}](${value.path})`;
+            }
+            else if (isFileCollection(value)) {
+                return Object.entries(value.files)
+                    .map(([filePath, content]) => {
+                    appendices[filePath] = content;
+                    return `[${path.basename(filePath)}](${filePath})`;
+                })
+                    .join("\n\n");
+            }
+            else if (Array.isArray(value)) {
+                return (await Promise.all(value.map(async (value, i) => `${i}. ${await resolve(value)}`))).join("\n");
+            }
+            else if (typeof value === "object" &&
+                typeof value.path === "string") {
+                if (typeof value.content === "string") {
+                    appendices[value.path] = value.content;
                     return `[${path.basename(value.path)}](${value.path})`;
                 }
-                else if (isFileCollection(value)) {
-                    return Object.entries(value.files)
-                        .map(([filePath, content]) => {
-                        appendices[filePath] = content;
-                        return `[${path.basename(filePath)}](${filePath})`;
-                    })
-                        .join("\n\n");
-                }
-                else if (Array.isArray(value)) {
-                    return (await Promise.all(value.map(async (value, i) => `${i}. ${await resolve(value)}`))).join("\n");
-                }
-                else if (typeof value === "object" &&
-                    typeof value.path === "string") {
-                    if (typeof value.content === "string") {
-                        appendices[value.path] = value.content;
-                        return `[${path.basename(value.path)}](${value.path})`;
-                    }
-                    else {
-                        appendices[value.path] = await fs.readFile(value.path, "utf-8");
-                        return `[${path.basename(value.path)}](${value.path})`;
-                    }
-                }
-                else if (typeof value === "object") {
-                    return (await Promise.all(Object.entries(value).map(async ([key, value]) => {
-                        return `* ${key}: ${await resolve(value)}`;
-                    }))).join("\n");
-                }
                 else {
-                    // TODO: support other types
-                    console.log(value);
-                    throw new Error(`Unsupported value type: ${value}`);
+                    appendices[value.path] = await fs.readFile(value.path, "utf-8");
+                    return `[${path.basename(value.path)}](${value.path})`;
                 }
-            }));
-            // Construct the string template by joining template parts with interpolated values
-            const lines = template
-                .map((part) => part
-                .split("\n")
-                .map((line) => line.startsWith(indent) ? line.slice(indent.length) : line)
-                .join("\n"))
-                .flatMap((part, i) => i < stringValues.length ? [part, stringValues[i] ?? ""] : [part])
-                .join("")
-                .split("\n");
-            // Collect and sort appendices by file path
-            return [
-                // format the user prompt and trim the first line if it's empty
-                lines.length > 1 && lines[0].replaceAll(" ", "").length === 0
-                    ? lines.slice(1).join("\n")
-                    : lines.join("\n"),
-                // sort appendices by path and include at the end of the prompt
-                Object.entries(appendices)
-                    .sort(([a], [b]) => a.localeCompare(b))
-                    .map(([filePath, content]) => {
-                    const extension = path.extname(filePath).slice(1);
-                    const codeTag = extension ? extension : "";
-                    return `// ${filePath}\n\`\`\`${codeTag}\n${content}\n\`\`\``;
-                })
-                    .join("\n\n"),
-            ].join("\n");
-        })();
+            }
+            else if (typeof value === "object") {
+                return (await Promise.all(Object.entries(value).map(async ([key, value]) => {
+                    return `* ${key}: ${await resolve(value)}`;
+                }))).join("\n");
+            }
+            else {
+                // TODO: support other types
+                console.log(value);
+                throw new Error(`Unsupported value type: ${value}`);
+            }
+        }));
+        // Construct the string template by joining template parts with interpolated values
+        const lines = template
+            .map((part) => part
+            .split("\n")
+            .map((line) => line.startsWith(indent) ? line.slice(indent.length) : line)
+            .join("\n"))
+            .flatMap((part, i) => i < stringValues.length ? [part, stringValues[i] ?? ""] : [part])
+            .join("")
+            .split("\n");
+        // Collect and sort appendices by file path
+        return [
+            // format the user prompt and trim the first line if it's empty
+            lines.length > 1 && lines[0].replaceAll(" ", "").length === 0
+                ? lines.slice(1).join("\n")
+                : lines.join("\n"),
+            // sort appendices by path and include at the end of the prompt
+            Object.entries(appendices)
+                .sort(([a], [b]) => a.localeCompare(b))
+                .map(([filePath, content]) => {
+                const extension = path.extname(filePath).slice(1);
+                const codeTag = extension ? extension : "";
+                return `// ${filePath}\n\`\`\`${codeTag}\n${content}\n\`\`\``;
+            })
+                .join("\n\n"),
+        ].join("\n");
     }
 }
 _alchemy.destroy = destroy;

package/lib/cloudflare/assets.d.ts

@@ -0,0 +1,74 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
+/**
+ * Properties for creating or updating Assets
+ */
+export interface AssetsProps {
+    /**
+     * Path to a directory containing static assets to be uploaded
+     * These files will be served by Cloudflare's Workers runtime
+     */
+    path: string;
+}
+/**
+ * Output returned after Assets creation/update
+ */
+export interface Assets extends Resource<"cloudflare::Asset">, AssetsProps {
+    /**
+     * The type of binding
+     */
+    type: "assets";
+    /**
+     * The ID of the assets bundle
+     */
+    id: string;
+    /**
+     * Asset files that were found
+     */
+    files: AssetFile[];
+    /**
+     * Time at which the assets were created
+     */
+    createdAt: number;
+    /**
+     * Time at which the assets were last updated
+     */
+    updatedAt: number;
+}
+/**
+ * Represents a single asset file
+ */
+export interface AssetFile {
+    /**
+     * Path relative to the assets directory
+     */
+    path: string;
+    /**
+     * Full filesystem path to the file
+     */
+    filePath: string;
+    /**
+     * Content type of the file
+     */
+    contentType: string;
+}
+/**
+ * Cloudflare Assets represent a collection of static files that can be uploaded and served
+ * by Cloudflare Workers.
+ *
+ * @example
+ * // Create a basic assets bundle from a local directory
+ * const staticAssets = await Assets("static", {
+ *   path: "./src/assets"
+ * });
+ *
+ * // Use these assets with a worker
+ * const worker = await Worker("frontend", {
+ *   name: "frontend-worker",
+ *   entrypoint: "./src/worker.ts",
+ *   bindings: {
+ *     ASSETS: staticAssets
+ *   }
+ * });
+ */
+export declare const Assets: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Assets>, id: string, props: AssetsProps) => Promise<Assets>);

package/lib/cloudflare/assets.js

@@ -0,0 +1,75 @@
+import * as fs from "fs/promises";
+import * as path from "path";
+import { Resource } from "../resource";
+import { getContentType } from "../util/content-type";
+/**
+ * Cloudflare Assets represent a collection of static files that can be uploaded and served
+ * by Cloudflare Workers.
+ *
+ * @example
+ * // Create a basic assets bundle from a local directory
+ * const staticAssets = await Assets("static", {
+ *   path: "./src/assets"
+ * });
+ *
+ * // Use these assets with a worker
+ * const worker = await Worker("frontend", {
+ *   name: "frontend-worker",
+ *   entrypoint: "./src/worker.ts",
+ *   bindings: {
+ *     ASSETS: staticAssets
+ *   }
+ * });
+ */
+export const Assets = Resource("cloudflare::Asset", {
+    alwaysUpdate: true,
+}, async function (id, props) {
+    if (this.phase === "delete") {
+        return this.destroy();
+    }
+    try {
+        // Check if the assets directory exists
+        const stats = await fs.stat(props.path);
+        if (!stats.isDirectory()) {
+            throw new Error(`Assets path ${props.path} is not a directory`);
+        }
+    }
+    catch (error) {
+        throw new Error(`Assets directory ${props.path} does not exist or is not accessible`);
+    }
+    // Recursively get all files in the assets directory
+    const filesList = await getFilesRecursively(props.path);
+    // Create asset file objects
+    const files = filesList.map((filePath) => {
+        const relativePath = path.relative(props.path, filePath);
+        const normalizedPath = relativePath.split(path.sep).join("/"); // Ensure forward slashes for URLs
+        return {
+            path: normalizedPath,
+            filePath,
+            contentType: getContentType(filePath),
+        };
+    });
+    // Get current timestamp
+    const now = Date.now();
+    // Construct the output
+    return this({
+        id,
+        type: "assets",
+        path: props.path,
+        files,
+        createdAt: this.output?.createdAt || now,
+        updatedAt: now,
+    });
+});
+// Helper functions for file operations
+async function getFilesRecursively(dir) {
+    const files = await fs.readdir(dir, { withFileTypes: true });
+    const allFiles = await Promise.all(files.map(async (file) => {
+        const path = `${dir}/${file.name}`;
+        if (file.isDirectory()) {
+            return getFilesRecursively(path);
+        }
+        return path;
+    }));
+    return allFiles.flat();
+}

package/lib/cloudflare/bindings.d.ts

@@ -4,6 +4,7 @@
  * https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
  */
 import type { Secret } from "../secret";
+import type { Assets } from "./assets";
 import type { R2Bucket } from "./bucket";
 import type { DurableObjectNamespace } from "./durable-object-namespace";
 import type { KVNamespace } from "./kv-namespace";
@@ -14,8 +15,12 @@ export type Bindings = {
 /**
  * L2 Binding Resources.
  */
-export type Binding = DurableObjectNamespace | KVNamespace | Worker | R2Bucket | Secret | string;
+export type Binding = DurableObjectNamespace | KVNamespace | Worker | R2Bucket | Secret | string | Assets;
 export declare function isDurableObjectNamespace(binding: Binding): binding is DurableObjectNamespace;
+/**
+ * Check if a binding is an Assets resource
+ */
+export declare function isAssets(binding: Binding): binding is Assets;
 /**
  * Union type for all Worker binding types (API spec)
  */

package/lib/cloudflare/bindings.js

@@ -1,3 +1,9 @@
 export function isDurableObjectNamespace(binding) {
     return (typeof binding === "object" && binding.type === "durable_object_namespace");
 }
+/**
+ * Check if a binding is an Assets resource
+ */
+export function isAssets(binding) {
+    return typeof binding === "object" && binding.type === "assets";
+}

package/lib/cloudflare/bound.d.ts

@@ -1,7 +1,8 @@
 import type { Secret } from "../secret";
+import type { Assets } from "./assets";
 import type { Binding } from "./bindings";
 import type { R2Bucket as _R2Bucket } from "./bucket";
 import type { DurableObjectNamespace as _DurableObjectNamespace } from "./durable-object-namespace";
 import type { KVNamespace as _KVNamespace } from "./kv-namespace";
 import type { Worker as _Worker } from "./worker";
-export type Bound<T extends Binding> = T extends _DurableObjectNamespace ? DurableObjectNamespace : T extends _KVNamespace ? KVNamespace : T extends _Worker ? Worker : T extends _R2Bucket ? R2Bucket : T extends Secret ? string : never;
+export type Bound<T extends Binding> = T extends _DurableObjectNamespace ? DurableObjectNamespace : T extends _KVNamespace ? KVNamespace : T extends _Worker ? Worker : T extends _R2Bucket ? R2Bucket : T extends Secret ? string : T extends Assets ? Service : Service;

package/lib/cloudflare/custom-domain.d.ts

@@ -41,8 +41,7 @@ export interface CustomDomain extends Resource<"cloudflare::CustomDomain">, Cust
 }
 /**
  * Configure custom domain for a Cloudflare Worker using the Cloudflare Custom Domains API
- * This attaches a worker (either a standard Worker or the one backing a StaticSite)
- * to a specific hostname within a zone.
+ * This attaches a worker to a specific hostname within a zone.
  *
  * @example
  * // Bind a domain to a standard Cloudflare Worker
@@ -57,19 +56,6 @@ export interface CustomDomain extends Resource<"cloudflare::CustomDomain">, Cust
  *   workerName: apiWorker.name // Use the name from the Worker resource
  * });
  *
- * @example
- * // Bind a domain to a Cloudflare Static Site
- * const mySite = await StaticSite("landing-page", {
- *   name: "my-landing-page-site", // This becomes the underlying worker name
- *   dir: "./dist/landing-page"
- * });
- *
- * const siteDomain = await CustomDomain("site-domain-binding", {
- *   name: "www.example.com",
- *   zoneId: "YOUR_ZONE_ID", // Replace with actual Zone ID
- *   workerName: mySite.name // Use the name from the StaticSite resource
- * });
- *
  * @see https://developers.cloudflare.com/api/resources/workers/subresources/domains/
  */
 export declare const CustomDomain: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<CustomDomain>, logicalId: string, props: CustomDomainProps) => Promise<CustomDomain>);

package/lib/cloudflare/custom-domain.js

@@ -2,8 +2,7 @@ import { Resource } from "../resource";
 import { CloudflareApi, createCloudflareApi, handleApiError } from "./api";
 /**
  * Configure custom domain for a Cloudflare Worker using the Cloudflare Custom Domains API
- * This attaches a worker (either a standard Worker or the one backing a StaticSite)
- * to a specific hostname within a zone.
+ * This attaches a worker to a specific hostname within a zone.
  *
  * @example
  * // Bind a domain to a standard Cloudflare Worker
@@ -18,19 +17,6 @@ import { CloudflareApi, createCloudflareApi, handleApiError } from "./api";
  *   workerName: apiWorker.name // Use the name from the Worker resource
  * });
  *
- * @example
- * // Bind a domain to a Cloudflare Static Site
- * const mySite = await StaticSite("landing-page", {
- *   name: "my-landing-page-site", // This becomes the underlying worker name
- *   dir: "./dist/landing-page"
- * });
- *
- * const siteDomain = await CustomDomain("site-domain-binding", {
- *   name: "www.example.com",
- *   zoneId: "YOUR_ZONE_ID", // Replace with actual Zone ID
- *   workerName: mySite.name // Use the name from the StaticSite resource
- * });
- *
  * @see https://developers.cloudflare.com/api/resources/workers/subresources/domains/
  */
 export const CustomDomain = Resource("cloudflare::CustomDomain", async function (logicalId, // Changed param name from id to logicalId for clarity

package/lib/cloudflare/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./account-api-token";
 export * from "./api";
+export * from "./assets";
 export * from "./bindings";
 export * from "./bucket";
 export * from "./custom-domain";
@@ -8,7 +9,6 @@ export * from "./durable-object-namespace";
 export * from "./kv-namespace";
 export * from "./permission-groups";
 export * from "./r2-rest-state-store";
-export * from "./static-site";
 export * from "./worker";
 export * from "./wrangler.json";
 export * from "./zone";

package/lib/cloudflare/index.js

@@ -1,5 +1,6 @@
 export * from "./account-api-token";
 export * from "./api";
+export * from "./assets";
 export * from "./bindings";
 export * from "./bucket";
 export * from "./custom-domain";
@@ -8,7 +9,6 @@ export * from "./durable-object-namespace";
 export * from "./kv-namespace";
 export * from "./permission-groups";
 export * from "./r2-rest-state-store";
-export * from "./static-site";
 export * from "./worker";
 export * from "./wrangler.json";
 export * from "./zone";

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

@@ -74,13 +74,22 @@ export class R2RestStateStore {
                 params.append("cursor", cursor);
             }
             const listPath = `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects?${params.toString()}`;
-            const response = await this.api.get(listPath);
-            if (!response.ok) {
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`);
-            }
+            const response = await withExponentialBackoff(async () => {
+                const response = await this.api.get(listPath);
+                if (!response.ok) {
+                    const errorData = await response.json().catch(() => ({
+                        errors: [{ message: response.statusText }],
+                    }));
+                    throw new Error(`Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`);
+                }
+                return response;
+            }, 
+            // Retry on transient errors
+            (error) => error.message?.includes("502") ||
+                error.message?.includes("503") ||
+                error.message?.includes("timeout"), 5, // 5 retry attempts
+            1000 // Start with 1 second delay
+            );
             const data = (await response.json());
             // The result structure may be under "result" key in Cloudflare's API
             const result = data.result || data;
@@ -114,15 +123,27 @@ export class R2RestStateStore {
     async get(key) {
         await this.ensureInitialized();
         try {
-            const response = await this.api.get(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
-            if (!response.ok) {
-                if (response.status === 404) {
-                    return undefined;
+            const response = await withExponentialBackoff(async () => {
+                const response = await this.api.get(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
+                if (!response.ok) {
+                    if (response.status === 404) {
+                        return response;
+                    }
+                    const errorData = await response.json().catch(() => ({
+                        errors: [{ message: response.statusText }],
+                    }));
+                    throw new Error(`Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`);
                 }
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`);
+                return response;
+            }, 
+            // Retry on transient errors
+            (error) => error.message?.includes("502") ||
+                error.message?.includes("503") ||
+                error.message?.includes("timeout"), 5, // 5 retry attempts
+            1000 // Start with 1 second delay
+            );
+            if (response.status === 404) {
+                return undefined;
             }
             // Parse and deserialize the state data
             const rawData = await response.json();
@@ -208,13 +229,22 @@ export class R2RestStateStore {
      */
     async delete(key) {
         await this.ensureInitialized();
-        const response = await this.api.delete(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
-        if (!response.ok && response.status !== 404) {
-            const errorData = await response.json().catch(() => ({
-                errors: [{ message: response.statusText }],
-            }));
-            throw new Error(`Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`);
-        }
+        await withExponentialBackoff(async () => {
+            const response = await this.api.delete(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
+            if (!response.ok && response.status !== 404) {
+                const errorData = await response.json().catch(() => ({
+                    errors: [{ message: response.statusText }],
+                }));
+                throw new Error(`Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`);
+            }
+            return response;
+        }, 
+        // Retry on transient errors
+        (error) => error.message?.includes("502") ||
+            error.message?.includes("503") ||
+            error.message?.includes("timeout"), 5, // 5 retry attempts
+        1000 // Start with 1 second delay
+        );
     }
     /**
      * Convert key for storage by replacing slashes with colons

package/lib/cloudflare/worker.d.ts

@@ -74,6 +74,10 @@ export interface WorkerProps<B extends Bindings = Bindings> {
      * Migrations to apply to the worker
      */
     migrations?: SingleStepMigration;
+    /**
+     * Whether to adopt the Worker if it already exists when creating
+     */
+    adopt?: boolean;
 }
 /**
  * Output returned after Worker creation/update
@@ -166,6 +170,20 @@ export interface Worker<B extends Bindings = Bindings> extends Resource<"cloudfl
  *   }
  * });
  *
+ * @example
+ * // Create a worker with static assets:
+ * const staticAssets = await Assets("static", {
+ *   path: "./src/assets"
+ * });
+ *
+ * const frontendWorker = await Worker("frontend", {
+ *   name: "frontend-worker",
+ *   entrypoint: "./src/worker.ts",
+ *   bindings: {
+ *     ASSETS: staticAssets
+ *   }
+ * });
+ *
  * @see https://developers.cloudflare.com/workers/
  */
 export declare const Worker: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | (<const B extends Bindings>(this: Context<Worker<NoInfer<B>>>, id: string, props: WorkerProps<B>) => Promise<Worker<B>>);