alchemy 0.4.1 → 0.5.1

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/apply.js

@@ -48,14 +48,6 @@ export async function apply(resource, props, options) {
                 }
                 return state.output;
             }
-            const diff = await import("diff");
-            const yaml = await import("yaml");
-            const old = yaml.stringify(oldProps);
-            const news = yaml.stringify(newProps);
-            const patch = diff.createPatch(resource.ID, old, news);
-            // console.log(patch);
-            // if (resource.ID === "what-is-alchemy") {
-            // }
         }
         const phase = state.status === "creating" ? "create" : "update";
         state.status = phase === "create" ? "creating" : "updating";

package/lib/cloudflare/assets.js

@@ -21,7 +21,9 @@ import { getContentType } from "../util/content-type";
  *   }
  * });
  */
-export const Assets = Resource("cloudflare::Asset", async function (id, props) {
+export const Assets = Resource("cloudflare::Asset", {
+    alwaysUpdate: true,
+}, async function (id, props) {
     if (this.phase === "delete") {
         return this.destroy();
     }

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/bucket.d.ts

@@ -28,11 +28,17 @@ export interface BucketProps extends CloudflareApiOptions {
      */
     allowPublicAccess?: boolean;
     /**
-     * Whether to delete the bucket and its contents during resource deletion
+     * Whether to delete the bucket.
      * If set to false, the bucket will remain but the resource will be removed from state
-     * Default: true
+     *
+     * @default true
      */
     delete?: boolean;
+    /**
+     * Whether to empty the bucket and delete all objects during resource deletion
+     * @default false
+     */
+    empty?: boolean;
 }
 /**
  * Output returned after R2 Bucket creation/update
@@ -85,6 +91,14 @@ export interface R2Bucket extends Resource<"cloudflare::R2Bucket">, BucketProps
  *   jurisdiction: "fedramp"
  * });
  *
+ * @example
+ * // Create a bucket that will be automatically emptied when deleted
+ * // This will delete all objects in the bucket before deleting the bucket itself
+ * const temporaryBucket = await R2Bucket("temp-storage", {
+ *   name: "temp-storage",
+ *   empty: true  // All objects will be deleted when this resource is destroyed
+ * });
+ *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export declare const R2Bucket: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<R2Bucket>, id: string, props: BucketProps) => Promise<R2Bucket>);

package/lib/cloudflare/bucket.js

@@ -35,19 +35,28 @@ import { CloudflareAccountId, CloudflareApi, CloudflareApiError, createCloudflar
  *   jurisdiction: "fedramp"
  * });
  *
+ * @example
+ * // Create a bucket that will be automatically emptied when deleted
+ * // This will delete all objects in the bucket before deleting the bucket itself
+ * const temporaryBucket = await R2Bucket("temp-storage", {
+ *   name: "temp-storage",
+ *   empty: true  // All objects will be deleted when this resource is destroyed
+ * });
+ *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export const R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props) {
-    const [api, r2Client] = await Promise.all([
-        createCloudflareApi(props),
-        createR2Client(props),
-    ]);
+    const api = await createCloudflareApi(props);
     const bucketName = props.name || this.id;
     if (this.phase === "delete") {
         console.log("Deleting R2 bucket:", bucketName);
         if (props.delete !== false) {
-            // Empty the bucket first by deleting all objects
-            await emptyBucket(r2Client, bucketName, props.jurisdiction);
+            if (props.empty) {
+                console.log("Emptying R2 bucket:", bucketName);
+                const r2Client = await createR2Client(props);
+                // Empty the bucket first by deleting all objects
+                await emptyBucket(r2Client, bucketName, props.jurisdiction);
+            }
             // Delete R2 bucket
             console.log("Deleting R2 bucket:", bucketName);
             await deleteBucket(api, bucketName, props);

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

@@ -9,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

@@ -9,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/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

package/lib/cloudflare/worker.js

@@ -102,7 +102,9 @@ export const Worker = Resource("cloudflare::Worker", {
         return this.destroy();
     }
     else if (this.phase === "create") {
-        await assertWorkerDoesNotExist(this, api, workerName);
+        if (!props.adopt) {
+            await assertWorkerDoesNotExist(this, api, workerName);
+        }
     }
     const oldBindings = await this.get("bindings");
     // Get the script content - either from props.script, or by bundling

package/lib/internal/docs/providers.js

@@ -55,6 +55,7 @@ async function generateProviderDocs({ provider, outDir, parallel, }) {
                 reasoningEffort: "high",
             },
         },
+        freeze: true,
         temperature: 0.1,
         schema: type({
             groups: type({
@@ -81,7 +82,7 @@ async function generateProviderDocs({ provider, outDir, parallel, }) {
       A file is considered a "Utility" if it contains utility functions that are not resources or clients.
       A file is considered a "Types" if it contains just type definitions and maybe helpers around working with those types.
 
-      The title should be simply the name of the resource's const in code (with spaces added in between each word), e.g. "Bucket" or "Function", except with spaces, e.g. "Static Site" for "const StaticSite". Maintain all other casing.
+      The title should be simply the name of the resource's const in code (with spaces added in between each word), e.g. "Bucket" or "Function", except with spaces, e.g. "StaticSite" for "const StaticSite". Maintain all other casing.
 
       // "Resource Name"
       const ResourceName = Resource(...)

package/lib/os/exec.d.ts

@@ -0,0 +1,103 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
+/**
+ * Properties for executing a shell command
+ */
+export interface ExecProps {
+    /**
+     * The command to execute (including any arguments)
+     */
+    command: string;
+    /**
+     * Whether to memoize the command (only re-run if the command changes)
+     *
+     * @default false
+     */
+    memoize?: boolean;
+    /**
+     * Working directory for the command
+     */
+    cwd?: string;
+    /**
+     * Environment variables to set
+     */
+    env?: Record<string, string>;
+    /**
+     * Maximum buffer size for stdout and stderr (in bytes)
+     * @default 1024 * 1024 (1MB)
+     */
+    maxBuffer?: number;
+    /**
+     * Whether to throw an error if the command exits with a non-zero status
+     */
+    throwOnError?: boolean;
+}
+/**
+ * Output returned after command execution
+ */
+export interface Exec extends Resource<"os::Exec">, ExecProps {
+    /**
+     * Unique identifier for this execution
+     */
+    id: string;
+    /**
+     * Exit code of the command
+     */
+    exitCode: number;
+    /**
+     * Standard output from the command
+     */
+    stdout: string;
+    /**
+     * Standard error from the command
+     */
+    stderr: string;
+    /**
+     * Time at which the command was executed
+     */
+    executedAt: number;
+    /**
+     * Whether the command has completed execution
+     */
+    completed: boolean;
+}
+/**
+ * Execute a shell command
+ *
+ * @example
+ * // Run a simple command
+ * const result = await Exec("list-files", {
+ *   command: "ls -la"
+ * });
+ *
+ * console.log(result.stdout);
+ *
+ * @example
+ * // Run a command in a specific directory with custom environment
+ * const build = await Exec("build-project", {
+ *   command: "npm run build",
+ *   cwd: "./my-project",
+ *   env: { NODE_ENV: "production" }
+ * });
+ *
+ * @example
+ * // Run a command with a larger buffer for output
+ * const logs = await Exec("get-logs", {
+ *   command: "cat large-log-file.log",
+ *   maxBuffer: 10 * 1024 * 1024 // 10MB
+ * });
+ *
+ * @example
+ * // Run a memoized command that only re-executes when the command changes
+ * const memoizedCmd = await Exec("status-check", {
+ *   command: "git status",
+ *   memoize: true
+ * });
+ *
+ * // This won't actually run the command again if nothing has changed
+ * await Exec("status-check", {
+ *   command: "git status",
+ *   memoize: true
+ * });
+ */
+export declare const Exec: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Exec>, id: string, props: ExecProps) => Promise<Exec>);

package/lib/os/exec.js

@@ -0,0 +1,103 @@
+import { exec } from "child_process";
+import { promisify } from "util";
+import { Resource } from "../resource";
+const execAsync = promisify(exec);
+/**
+ * Execute a shell command
+ *
+ * @example
+ * // Run a simple command
+ * const result = await Exec("list-files", {
+ *   command: "ls -la"
+ * });
+ *
+ * console.log(result.stdout);
+ *
+ * @example
+ * // Run a command in a specific directory with custom environment
+ * const build = await Exec("build-project", {
+ *   command: "npm run build",
+ *   cwd: "./my-project",
+ *   env: { NODE_ENV: "production" }
+ * });
+ *
+ * @example
+ * // Run a command with a larger buffer for output
+ * const logs = await Exec("get-logs", {
+ *   command: "cat large-log-file.log",
+ *   maxBuffer: 10 * 1024 * 1024 // 10MB
+ * });
+ *
+ * @example
+ * // Run a memoized command that only re-executes when the command changes
+ * const memoizedCmd = await Exec("status-check", {
+ *   command: "git status",
+ *   memoize: true
+ * });
+ *
+ * // This won't actually run the command again if nothing has changed
+ * await Exec("status-check", {
+ *   command: "git status",
+ *   memoize: true
+ * });
+ */
+export const Exec = Resource("os::Exec", {
+    alwaysUpdate: true,
+}, async function (id, props) {
+    if (this.phase === "delete") {
+        // Nothing to actually delete for an exec command
+        return this.destroy();
+    }
+    else if (this.phase === "update" &&
+        props.memoize &&
+        this.output?.command === props.command) {
+        // If memoize is enabled and the command hasn't changed, return the existing output
+        return this.output;
+    }
+    else {
+        // Default values
+        let stdout = "";
+        let stderr = "";
+        let exitCode = 0;
+        try {
+            console.log(props.command);
+            // Execute the command
+            const result = await execAsync(props.command, {
+                cwd: props.cwd || process.cwd(),
+                env: { ...process.env, ...props.env },
+                maxBuffer: props.maxBuffer || 1024 * 1024, // Default 1MB
+            });
+            stdout = result.stdout;
+            console.log(stdout);
+            stderr = result.stderr;
+            exitCode = 0; // Success
+        }
+        catch (error) {
+            console.log("error", error);
+            if (props.throwOnError) {
+                throw error;
+            }
+            // If not throwing, capture the error information
+            exitCode = error.code || 1;
+            stdout = error.stdout || "";
+            stderr = error.stderr || String(error);
+            console.log(stdout);
+            console.error(stderr);
+        }
+        // Return the execution result
+        return this({
+            id,
+            command: props.command,
+            cwd: props.cwd,
+            env: props.env,
+            maxBuffer: props.maxBuffer,
+            throwOnError: props.throwOnError,
+            memoize: props.memoize,
+            exitCode,
+            stdout,
+            stderr,
+            executedAt: Date.now(),
+            completed: true,
+        });
+    }
+});

package/lib/os/index.d.ts

@@ -0,0 +1 @@
+export * from "./exec";

package/lib/os/index.js

@@ -0,0 +1 @@
+export * from "./exec";

package/lib/secret.d.ts

@@ -5,7 +5,7 @@
  *
  * 1. Globally when initializing the alchemy application:
  * ```ts
- * const app = alchemy("my-app", {
+ * const app = await alchemy("my-app", {
  *   password: process.env.SECRET_PASSPHRASE
  * });
  * ```
@@ -49,7 +49,7 @@ export declare function isSecret(binding: any): binding is Secret;
  *
  * @example
  * // Global password for all secrets
- * const app = alchemy("my-app", {
+ * const app = await alchemy("my-app", {
  *   password: process.env.SECRET_PASSPHRASE
  * });
  *