alchemy 0.3.1 → 0.4.0

package/lib/test/bun.js

@@ -32,12 +32,13 @@ alchemy.test = test;
  * ```
  */
 export function test(meta, defaultOptions) {
+    let isFailed = false;
     defaultOptions = defaultOptions ?? {};
     if (defaultOptions.stateStore === undefined &&
         // process.env.CI &&
         process.env.ALCHEMY_STATE_STORE === "cloudflare") {
         defaultOptions.stateStore = (scope) => new R2RestStateStore(scope, {
-            apiKey: process.env.CLOUDFLARE_API_KEY,
+            apiKey: alchemy.secret(process.env.CLOUDFLARE_API_KEY),
             email: process.env.CLOUDFLARE_EMAIL,
             bucketName: process.env.CLOUDFLARE_BUCKET_NAME,
         });
@@ -70,7 +71,7 @@ export function test(meta, defaultOptions) {
     };
     // Clean up test scope after all tests complete
     afterAll(async () => {
-        if (defaultOptions?.destroy !== false) {
+        if (defaultOptions?.destroy !== false && !isFailed) {
             await alchemy.destroy(test.scope);
         }
     });

package/lib/util/sha256.d.ts

@@ -0,0 +1 @@
+export declare function sha256(value: string): string;

package/lib/util/sha256.js

@@ -0,0 +1,4 @@
+import { createHash } from "node:crypto";
+export function sha256(value) {
+    return createHash("sha256").update(value).digest("hex");
+}

package/lib/web/vitepress/config.d.ts

@@ -1,8 +1,9 @@
-import type { DefaultTheme, ThemeOptions } from "vitepress";
+import type { DefaultTheme, HeadConfig, ThemeOptions } from "vitepress";
 export type VitePressConfigProps = {
     cwd: string;
     title?: string;
     description?: string;
+    head?: HeadConfig[];
     theme?: ThemeOptions;
     themeConfig: DefaultTheme.Config;
 };

package/lib/web/vitepress/config.js

@@ -9,6 +9,7 @@ import { defineConfig } from "vitepress";
 export default defineConfig({
   title: ${JSON.stringify(props.title || "Alchemy")},
   description: ${JSON.stringify(props.description || "Alchemy Docs")},
+  head: ${JSON.stringify(props.head || [])},
   markdown: {
     // @ts-ignore
     codeTransformers: [transformerTwoslash()],

package/lib/web/vitepress/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./config";
 export * from "./custom-theme";
 export * from "./home-page";
+export * from "./process-front-matter-files";
 export * from "./vitepress";

package/lib/web/vitepress/index.js

@@ -1,4 +1,5 @@
 export * from "./config";
 export * from "./custom-theme";
 export * from "./home-page";
+export * from "./process-front-matter-files";
 export * from "./vitepress";

package/lib/web/vitepress/process-front-matter-files.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Process markdown files with frontmatter to generate navigation items
+ * @param directoryPath The directory containing markdown files
+ * @param linkPrefix The prefix for navigation links
+ * @returns Sorted array of navigation items with text and link properties
+ */
+export declare function processFrontmatterFiles(directoryPath: string, linkPrefix: string): Promise<{
+    text: string;
+    link: string;
+    items?: {
+        text: string;
+        link: string;
+        items?: {
+            text: string;
+            link: string;
+        }[];
+    }[];
+}[]>;

package/lib/web/vitepress/process-front-matter-files.js

@@ -0,0 +1,68 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+/**
+ * Process markdown files with frontmatter to generate navigation items
+ * @param directoryPath The directory containing markdown files
+ * @param linkPrefix The prefix for navigation links
+ * @returns Sorted array of navigation items with text and link properties
+ */
+export async function processFrontmatterFiles(directoryPath, linkPrefix) {
+    const entries = await fs.readdir(directoryPath, { withFileTypes: true });
+    const processedEntries = await Promise.all(entries
+        .filter((entry) => !entry.name.endsWith("index.md"))
+        .map(async (entry) => {
+        const fullPath = path.join(directoryPath, entry.name);
+        if (entry.isDirectory()) {
+            // Process subdirectory recursively
+            const items = await processFrontmatterFiles(fullPath, `${linkPrefix}/${entry.name}`);
+            // Create section for subdirectory
+            return {
+                text: entry.name.charAt(0).toUpperCase() + entry.name.slice(1),
+                collapsed: false,
+                items,
+                order: 10000, // Default order for directories
+            };
+        }
+        // Process markdown file
+        if (!entry.name.endsWith(".md")) {
+            return null;
+        }
+        const content = await fs.readFile(fullPath, "utf-8");
+        const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+        let order = 10000;
+        let title;
+        if (frontmatterMatch) {
+            const frontmatter = frontmatterMatch[1];
+            const orderMatch = frontmatter.match(/order:\s*(\d+)/);
+            if (orderMatch) {
+                order = parseInt(orderMatch[1]);
+            }
+            const titleMatch = frontmatter.match(/title:\s*(.+)/);
+            if (titleMatch) {
+                title = titleMatch[1].trim();
+            }
+        }
+        // If no title in frontmatter, try to get first heading
+        if (!title) {
+            const headingMatch = content.match(/^#\s+(.+)$/m);
+            if (headingMatch) {
+                title = headingMatch[1].trim();
+            }
+        }
+        // Fall back to filename if no title found
+        if (!title) {
+            const name = entry.name.replace(".md", "");
+            title = name.charAt(0).toUpperCase() + name.slice(1);
+        }
+        return {
+            text: title,
+            link: `${linkPrefix}/${entry.name}`,
+            order,
+        };
+    }));
+    // Filter out null entries and sort by order
+    return processedEntries
+        .filter((entry) => entry !== null)
+        .sort((a, b) => a.order - b.order)
+        .map(({ text, link, items }) => items ? { text, items, collapsed: true } : { text, link });
+}

package/lib/web/vitepress/vitepress.js

@@ -14,8 +14,9 @@ export const VitepressProject = Resource("project::VitepressProject", {
         try {
             if (props.delete !== false) {
                 if (await fs.exists(dir)) {
-                    // Delete the entire project directory
-                    await execAsync(`rm -rf ${dir}`);
+                    await fs.rm(dir, { recursive: true, force: true });
+                    // // Delete the entire project directory
+                    // await execAsync(`rm -rf ${dir}`);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {
@@ -38,16 +38,18 @@
     "@aws-sdk/client-sesv2": "^3.0.0",
     "@aws-sdk/client-sqs": "^3.0.0",
     "@aws-sdk/client-sts": "^3.0.0",
-    "arktype": "^2.0.0",
-    "prettier": "^3.0.0",
     "@octokit/rest": "^21.1.1",
     "ai": "^4.0.0",
+    "arktype": "^2.0.0",
+    "aws4fetch": "^1.0.20",
+    "cloudflare": "^4.0.0",
     "diff": "^7.0.0",
     "esbuild": "^0.25.1",
     "glob": "^10.0.0",
     "hono": "^4.0.0",
-    "libsodium-wrappers": "^0.7.15",
     "jszip": "^3.0.0",
+    "libsodium-wrappers": "^0.7.15",
+    "prettier": "^3.0.0",
     "stripe": "^17.0.0",
     "turndown": "^7.0.0",
     "yaml": "^2.0.0",
@@ -56,6 +58,7 @@
   "devDependencies": {
     "@ai-sdk/anthropic": "^1.1.6",
     "@ai-sdk/openai": "^1.1.9",
+    "@aws-sdk/client-s3": "3.726.1",
     "@biomejs/biome": "^1.9.4",
     "@cloudflare/workers-types": "^4.20250303.0",
     "@octokit/rest": "^21.1.1",
@@ -67,6 +70,7 @@
     "ai": "^4.1.16",
     "arktype": "^2.1.16",
     "change-case": "^5.4.4",
+    "cloudflare": "^4.2.0",
     "libsodium-wrappers": "^0.7.15",
     "openpgp": "^6.1.0",
     "prettier": "^3.5.3",

package/src/ai/document.ts

@@ -11,8 +11,10 @@ import { createModel, withRateLimitRetry, type ModelConfig } from "./client";
 export interface DocumentProps {
   /**
    * Title of the document
+   *
+   * @default id
    */
-  title: string;
+  title?: string;
 
   /**
    * Optional path to the markdown document
@@ -82,12 +84,23 @@ export interface DocumentProps {
    * @default 10000
    */
   maxTokens?: number;
+
+  /**
+   * Freeze the document after creation (do not re-generate on updates)
+   * @default false
+   */
+  freeze?: boolean;
 }
 
 /**
  * A markdown document that can be created, updated, and deleted
  */
 export interface Document extends DocumentProps, Resource<"docs::Document"> {
+  /**
+   * The title of the document
+   */
+  title: string;
+
   /**
    * Content of the document
    */
@@ -221,6 +234,16 @@ export const Document = Resource(
       return this.destroy();
     }
 
+    if (this.phase === "update" && props.freeze) {
+      if (props.path) {
+        const filePath = props.path;
+        const fileId = `${id}-file`;
+
+        await StaticTextFile(fileId, filePath, this.output!.content);
+      }
+      return this(this.output);
+    }
+
     // Use provided system prompt or default
     const system = props.system || DEFAULT_MD_SYSTEM_PROMPT;
 
@@ -266,7 +289,7 @@ export const Document = Resource(
 
       if (retryResult.error) {
         throw new Error(
-          `Failed to generate valid markdown content: ${retryResult.error}`
+          `Failed to generate valid markdown content: ${retryResult.error}\n${retryText}`
         );
       }
 
@@ -283,6 +306,7 @@ export const Document = Resource(
       ],
       createdAt: this.output?.createdAt || Date.now(),
       updatedAt: Date.now(),
+      title: props.title || id,
     };
 
     // Write file if path is provided

package/src/ai/index.ts

@@ -1,4 +1,3 @@
-export * from "./approve";
 export * from "./ark";
 export * from "./astro-file";
 export * from "./css-file";
@@ -6,7 +5,6 @@ export * from "./data";
 export * from "./document";
 export * from "./html-file";
 export * from "./json-file";
-export * from "./review";
 export * from "./typescript-file";
 export * from "./vue-file";
 export * from "./yaml-file";

package/src/alchemy.ts

@@ -40,6 +40,12 @@ export interface Alchemy {
   scope: typeof scope;
   run: typeof run;
   destroy: typeof destroy;
+
+  /**
+   * Get an environment variable and error if it's not set.
+   */
+  env: typeof env;
+
   /**
    * Creates an encrypted secret that can be safely stored in state files.
    * Requires a password to be set either globally in the application options
@@ -88,12 +94,18 @@ function _alchemy(
     | [appName: string, options?: Omit<AlchemyOptions, "appName">]
 ): any {
   if (typeof args[0] === "string") {
-    const [appName, options] = args;
-    return scope(undefined, {
+    const [appName, options] = args as [string, AlchemyOptions?];
+    const root = scope(undefined, {
       ...options,
       appName,
       stage: options?.stage,
     });
+    if (options?.phase === "destroy") {
+      return destroy(root).finally(() => {
+        process.exit(0);
+      });
+    }
+    return root;
   } else {
     const [template, ...values] = args;
     const [, secondLine] = template[0].split("\n");
@@ -141,6 +153,25 @@ function _alchemy(
                 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);
@@ -189,6 +220,7 @@ _alchemy.destroy = destroy;
 _alchemy.run = run;
 _alchemy.scope = scope;
 _alchemy.secret = secret;
+_alchemy.env = env;
 
 export interface AlchemyOptions {
   /**
@@ -311,3 +343,25 @@ async function run<T>(
     await scope.finalize();
   }
 }
+
+export async function env<T = string>(
+  name: string,
+  value?: T | undefined,
+  error?: string
+): Promise<T> {
+  if (value !== undefined) {
+    return value;
+  } else if (typeof process !== undefined) {
+    // we are in a node environment
+    return process.env[name]! as T;
+  } else {
+    // we are in a browser environment
+    try {
+      const { env } = await import("cloudflare:workers");
+      if (name in env) {
+        return env[name as keyof typeof env];
+      }
+    } catch (error) {}
+  }
+  throw new Error(error ?? `Environment variable ${name} is not set`);
+}

package/src/apply.ts

@@ -7,9 +7,8 @@ import {
   type Resource,
   type ResourceProps,
 } from "./resource";
-import { Secret } from "./secret";
+import { serialize } from "./serde";
 import type { State } from "./state";
-import { serialize } from "./util/serde";
 
 export interface ApplyOptions {
   quiet?: boolean;
@@ -56,29 +55,30 @@ export async function apply<Out extends Resource>(
 
     // Skip update if inputs haven't changed and resource is in a stable state
     if (state.status === "created" || state.status === "updated") {
-      const oldProps = JSON.stringify(
-        state.props,
-        (_, value) =>
-          value instanceof Secret
-            ? {
-                "@secret": value.unencrypted,
-              }
-            : value,
-        2
-      );
-      const newProps = JSON.stringify(
-        await serialize(scope, props, {
-          encrypt: false,
-        }),
-        null,
-        2
-      );
-      if (oldProps === newProps && alwaysUpdate !== true) {
+      const oldProps = await serialize(scope, state.props, {
+        encrypt: false,
+      });
+      const newProps = await serialize(scope, props, {
+        encrypt: false,
+      });
+      if (
+        JSON.stringify(oldProps) === JSON.stringify(newProps) &&
+        alwaysUpdate !== true
+      ) {
         if (!quiet) {
           // console.log(`Skip:    "${resource.FQN}" (no changes)`);
         }
         return state.output as Awaited<Out>;
       }
+
+      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";
@@ -141,6 +141,7 @@ export async function apply<Out extends Resource>(
     // }
     return output as any;
   } catch (error) {
+    console.error(new Error().stack);
     scope.fail();
     throw error;
   }

package/src/aws/account-id.ts

@@ -2,10 +2,14 @@ import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 
 const sts = new STSClient({});
 
+export type AccountId = string & {
+  readonly __brand: "AccountId";
+};
+
 /**
  * Helper to get the current AWS account ID
  */
-export async function getAccountId(): Promise<string> {
+export async function AccountId(): Promise<AccountId> {
   const identity = await sts.send(new GetCallerIdentityCommand({}));
-  return identity.Account!;
+  return identity.Account! as AccountId;
 }

package/src/aws/credentials.ts

@@ -0,0 +1,6 @@
+import type { Secret } from "../secret";
+
+export interface AwsCredentials {
+  accessKeyId: Secret;
+  secretAccessKey: Secret;
+}

package/src/aws/oidc/oidc-provider.ts

@@ -9,7 +9,7 @@ import {
 } from "@aws-sdk/client-iam";
 import type { Context } from "../../context";
 import { Resource } from "../../resource";
-import { getAccountId } from "../account-id";
+import { AccountId } from "../account-id";
 
 /**
  * Properties for configuring an AWS OIDC provider for GitHub Actions
@@ -121,7 +121,7 @@ export const OIDCProvider = Resource(
   async function (
     this: Context<OIDCProvider>,
     id: string,
-    props: OIDCProviderProps,
+    props: OIDCProviderProps
   ) {
     // Initialize AWS SDK client
     const client = new IAMClient({
@@ -135,24 +135,24 @@ export const OIDCProvider = Resource(
           const getRole = await client.send(
             new GetRoleCommand({
               RoleName: props.roleArn.split("/").pop(),
-            }),
+            })
           );
 
           if (getRole.Role?.AssumeRolePolicyDocument) {
             const policy = JSON.parse(
-              decodeURIComponent(getRole.Role.AssumeRolePolicyDocument),
+              decodeURIComponent(getRole.Role.AssumeRolePolicyDocument)
             );
 
             // Remove our specific statement while preserving others
             policy.Statement = policy.Statement.filter(
-              (stmt: any) => stmt.Sid !== TRUST_POLICY_SID,
+              (stmt: any) => stmt.Sid !== TRUST_POLICY_SID
             );
 
             await client.send(
               new UpdateAssumeRolePolicyCommand({
                 RoleName: props.roleArn.split("/").pop(),
                 PolicyDocument: JSON.stringify(policy),
-              }),
+              })
             );
           }
 
@@ -160,7 +160,7 @@ export const OIDCProvider = Resource(
           const provider = await client.send(
             new GetOpenIDConnectProviderCommand({
               OpenIDConnectProviderArn: this.output.providerArn,
-            }),
+            })
           );
 
           // Only delete the provider if it exists and has no other tags
@@ -168,7 +168,7 @@ export const OIDCProvider = Resource(
             await client.send(
               new DeleteOpenIDConnectProviderCommand({
                 OpenIDConnectProviderArn: this.output.providerArn,
-              }),
+              })
             );
           }
         } catch (error) {
@@ -197,13 +197,13 @@ export const OIDCProvider = Resource(
                 Value: "alchemy",
               },
             ] as Tag[],
-          }),
+          })
         );
         providerArn = createProvider.OpenIDConnectProviderArn!;
       } catch (error: any) {
         if (error.name === "EntityAlreadyExistsException") {
           // Provider exists, use its ARN
-          providerArn = `arn:aws:iam::${await getAccountId()}:oidc-provider/${url}`;
+          providerArn = `arn:aws:iam::${await AccountId()}:oidc-provider/${url}`;
         } else {
           throw error;
         }
@@ -213,13 +213,13 @@ export const OIDCProvider = Resource(
       const getRole = await client.send(
         new GetRoleCommand({
           RoleName: props.roleArn.split("/").pop(),
-        }),
+        })
       );
 
       let policy: any;
       if (getRole.Role?.AssumeRolePolicyDocument) {
         policy = JSON.parse(
-          decodeURIComponent(getRole.Role.AssumeRolePolicyDocument),
+          decodeURIComponent(getRole.Role.AssumeRolePolicyDocument)
         );
       } else {
         policy = {
@@ -240,7 +240,7 @@ export const OIDCProvider = Resource(
         conditions.StringEquals["token.actions.githubusercontent.com:sub"] =
           props.branches.map(
             (branch) =>
-              `repo:${props.owner}/${props.repository}:ref:refs/heads/${branch}`,
+              `repo:${props.owner}/${props.repository}:ref:refs/heads/${branch}`
           );
       }
 
@@ -248,7 +248,7 @@ export const OIDCProvider = Resource(
         conditions.StringEquals["token.actions.githubusercontent.com:sub"] =
           props.environments.map(
             (env) =>
-              `repo:${props.owner}/${props.repository}:environment:${env}`,
+              `repo:${props.owner}/${props.repository}:environment:${env}`
           );
       }
 
@@ -266,7 +266,7 @@ export const OIDCProvider = Resource(
       // Remove any existing statement with our SID and add the new one
       policy.Statement = [
         ...policy.Statement.filter(
-          (stmt: any) => stmt.Sid !== TRUST_POLICY_SID,
+          (stmt: any) => stmt.Sid !== TRUST_POLICY_SID
         ),
         ourStatement,
       ];
@@ -276,7 +276,7 @@ export const OIDCProvider = Resource(
         new UpdateAssumeRolePolicyCommand({
           RoleName: props.roleArn.split("/").pop(),
           PolicyDocument: JSON.stringify(policy),
-        }),
+        })
       );
 
       return this({
@@ -288,5 +288,5 @@ export const OIDCProvider = Resource(
       console.error("Error configuring OIDC provider:", error);
       throw error;
     }
-  },
+  }
 );