alchemy 0.3.0 → 0.4.0

package/lib/{util/serde.js → serde.js}

@@ -1,6 +1,6 @@
-import { Scope } from "../scope";
-import { Secret } from "../secret";
-import { decryptWithKey, encryptWithKey } from "./encrypt";
+import { decryptWithKey, encrypt } from "./encrypt";
+import { Scope } from "./scope";
+import { Secret } from "./secret";
 // zero-dependency type guard for ArkType
 function isType(value) {
     return (value &&
@@ -17,7 +17,7 @@ export async function serialize(scope, value, options) {
         }
         return {
             "@secret": options?.encrypt !== false
-                ? await encryptWithKey(value.unencrypted, scope.password)
+                ? await encrypt(value.unencrypted, scope.password)
                 : value.unencrypted,
         };
     }
@@ -26,6 +26,11 @@ export async function serialize(scope, value, options) {
             "@schema": value.toJSON(),
         };
     }
+    else if (value instanceof Date) {
+        return {
+            "@date": value.toISOString(),
+        };
+    }
     else if (value instanceof Scope) {
         return undefined;
     }
@@ -51,6 +56,9 @@ export async function deserialize(scope, value) {
         else if ("@schema" in value) {
             return value["@schema"];
         }
+        else if ("@date" in value) {
+            return new Date(value["@date"]);
+        }
         else {
             return Object.fromEntries(await Promise.all(Object.entries(value).map(async ([key, value]) => [
                 key,

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

@@ -0,0 +1,11 @@
+import type { DefaultTheme, HeadConfig, ThemeOptions } from "vitepress";
+export type VitePressConfigProps = {
+    cwd: string;
+    title?: string;
+    description?: string;
+    head?: HeadConfig[];
+    theme?: ThemeOptions;
+    themeConfig: DefaultTheme.Config;
+};
+export type VitePressConfig = Awaited<ReturnType<typeof VitePressConfig>>;
+export declare function VitePressConfig(props: VitePressConfigProps): Promise<import("../../fs").File>;

package/lib/web/vitepress/config.js

@@ -0,0 +1,32 @@
+import path from "path";
+import { StaticTypeScriptFile } from "../../fs/static-typescript-file";
+export function VitePressConfig(props) {
+    return StaticTypeScriptFile(path.join(props.cwd, ".vitepress", "config.mts"), `import { transformerTwoslash } from "@shikijs/vitepress-twoslash";
+import footnotePlugin from "markdown-it-footnote";
+import { defineConfig } from "vitepress";
+
+// https://vitepress.dev/reference/site-config
+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()],
+    theme: ${JSON.stringify(props.theme ?? {
+        light: "light-plus",
+        dark: "dark-plus",
+    })},
+    config: (md) => md.use(footnotePlugin),
+  },
+  // https://vitepress.dev/reference/default-theme-config
+  themeConfig: ${JSON.stringify({
+        ...props.themeConfig,
+        search: props.themeConfig.search ?? { provider: "local" },
+        nav: props.themeConfig.nav ?? [{ text: "Home", link: "/" }],
+        sidebar: props.themeConfig.sidebar ?? [],
+        socialLinks: props.themeConfig.socialLinks ?? [],
+    })}
+});
+`);
+}

package/lib/web/vitepress/home-page.d.ts

@@ -1,3 +1,5 @@
+import { Document } from "../../ai/document";
+import { StaticTextFile } from "../../fs";
 import type { Secret } from "../../secret";
 /**
  * Image that can be themed for light/dark mode
@@ -151,11 +153,11 @@ export interface HomePageProps {
     /**
      * User prompt describing the design of the home page
      */
-    prompt: string;
+    prompt?: string;
     /**
      * Optional extension to the built-in system prompt
      */
-    systemPromptExtension?: string;
+    system?: string;
     /**
      * Base URL for the OpenAI API
      * @default 'https://api.openai.com/v1'
@@ -179,7 +181,7 @@ export interface HomePageProps {
 /**
  * Output type for the HomePage resource
  */
-export type HomePage = import("../../ai/document").Document;
+export type HomePage = StaticTextFile | Document;
 /**
  * Parse YAML frontmatter to home page config
  */

package/lib/web/vitepress/home-page.js

@@ -1,6 +1,7 @@
-import alchemy from "alchemy";
 import yaml from "yaml";
 import { Document } from "../../ai/document";
+import { alchemy } from "../../alchemy";
+import { StaticTextFile } from "../../fs";
 /**
  * Parse YAML frontmatter to home page config
  */
@@ -90,45 +91,57 @@ Follow these guidelines:
 6. Ensure all links are properly formatted
 7. Use appropriate markdown formatting for headings, lists, etc.
 
-${props.systemPromptExtension || ""}
+${props.system || ""}
 `;
     // Convert hero and features to YAML strings if provided
     const heroYaml = props.hero ? JSON.stringify(props.hero, null, 2) : "";
     const featuresYaml = props.features
         ? JSON.stringify(props.features, null, 2)
         : "";
-    // Create the document using the AI Document resource
-    return Document(`${id}`, {
-        title: props.title,
-        path: props.outFile,
-        baseURL: props.baseURL,
-        apiKey: props.apiKey,
-        model: props.model ?? {
-            id: "claude-3-7-sonnet-latest",
-            provider: "anthropic",
-        },
-        temperature: props.temperature ?? 0.7,
-        prompt: await alchemy `
-${systemPrompt}
-
-Create a VitePress homepage based on the following description:
-${props.prompt}
-
-${props.hero
-            ? `Use this hero section configuration:
-\`\`\`json
-${heroYaml}
-\`\`\``
-            : ""}
-
-${props.features
-            ? `Use these features:
-\`\`\`json
-${featuresYaml}
-\`\`\``
-            : ""}
+    if (props.prompt) {
+        return Document(id, {
+            title: props.title,
+            path: props.outFile,
+            baseURL: props.baseURL,
+            apiKey: props.apiKey,
+            model: props.model ?? {
+                id: "claude-3-7-sonnet-latest",
+                provider: "anthropic",
+            },
+            temperature: props.temperature ?? 0.7,
+            prompt: await alchemy `
+    ${systemPrompt}
+    
+    Create a VitePress homepage based on the following description:
+    ${props.prompt}
     
-    The output should be a complete index.md file with proper YAML frontmatter and markdown content.
-    `,
-    });
+    ${props.hero
+                ? `Use this hero section configuration:
+    \`\`\`json
+    ${heroYaml}
+    \`\`\``
+                : ""}
+    
+    ${props.features
+                ? `Use these features:
+    \`\`\`json
+    ${featuresYaml}
+    \`\`\``
+                : ""}
+        
+        The output should be a complete index.md file with proper YAML frontmatter and markdown content.
+        `,
+        });
+    }
+    else {
+        return StaticTextFile(id, props.outFile, `---
+${yaml.stringify({
+            layout: "home",
+            name: props.title,
+            hero: props.hero,
+            features: props.features,
+        })}
+---
+`);
+    }
 }

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

@@ -1,3 +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,3 +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.d.ts

@@ -1,4 +1,3 @@
-import type { DefaultTheme, ThemeOptions } from "vitepress";
 import type { Context } from "../../context";
 import { Resource } from "../../resource";
 export interface VitePressProjectProps {
@@ -47,11 +46,9 @@ export interface VitePressProjectProps {
     /**
      * The theme options to use
      */
-    theme?: ThemeOptions;
     /**
      * The theme config to use
      */
-    themeConfig: DefaultTheme.Config;
     /**
      * Whether to delete the project folder during the delete phase
      * @default true
@@ -69,5 +66,9 @@ export interface VitePressProject extends VitePressProjectProps, Resource {
      * The name/path of the project
      */
     name: string;
+    /**
+     * The directory of the project
+     */
+    dir: string;
 }
-export declare const VitePressProject: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<VitePressProject>, id: string, props: VitePressProjectProps) => Promise<VitePressProject>);
+export declare const VitepressProject: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<VitePressProject>, id: string, props: VitePressProjectProps) => Promise<VitePressProject>);

package/lib/web/vitepress/vitepress.js

@@ -6,7 +6,7 @@ import { Folder, StaticJsonFile, StaticTextFile, StaticTypeScriptFile, } from ".
 import { Resource } from "../../resource";
 import { InstallDependencies, fixedDependencies } from "./dependencies";
 const execAsync = promisify(exec);
-export const VitePressProject = Resource("project::VitePressProject", {
+export const VitepressProject = Resource("project::VitepressProject", {
     alwaysUpdate: true,
 }, async function (id, props) {
     const dir = props.dir ?? props.name;
@@ -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}`);
                 }
             }
         }
@@ -57,11 +58,18 @@ export const VitePressProject = Resource("project::VitePressProject", {
     await Folder(path.join(cwd, ".vitepress", "theme"));
     await Promise.all([
         StaticTextFile(path.join(cwd, ".gitignore"), `.vitepress/cache\n`),
-        StaticJsonFile(path.join(cwd, "tsconfig.json"), {
-            extends: props.tsconfig?.extends,
-            references: props.tsconfig?.references?.map((path) => ({ path })),
-            compilerOptions: props.tsconfig?.compilerOptions,
-        }),
+        // StaticJsonFile(path.join(cwd, "tsconfig.json"), {
+        //   extends: props.tsconfig?.extends,
+        //   references: props.tsconfig?.references?.map((path) => ({ path })),
+        //   compilerOptions: props.tsconfig?.compilerOptions ?? {
+        //     target: "ES2020",
+        //     module: "ESNext",
+        //     moduleResolution: "Node",
+        //     allowJs: true,
+        //     skipLibCheck: true,
+        //     forceConsistentCasingInFileNames: true,
+        //   },
+        // }),
         //       TypeScriptFile(
         //         path.join(cwd, "alchemy.run.ts"),
         //         `import alchemy from "alchemy";
@@ -232,34 +240,10 @@ export default {
 .DocSearch {
   --docsearch-primary-color: var(--vp-c-brand-1) !important;
 }
-`),
-        StaticTypeScriptFile(path.join(cwd, ".vitepress", "config.mts"), `import { transformerTwoslash } from "@shikijs/vitepress-twoslash";
-import footnotePlugin from "markdown-it-footnote";
-import { defineConfig } from "vitepress";
-
-// https://vitepress.dev/reference/site-config
-export default defineConfig({
-  title: ${JSON.stringify(props.title || "Alchemy")},
-  description: ${JSON.stringify(props.description || "Alchemy Docs")},
-  markdown: {
-    // @ts-ignore
-    codeTransformers: [transformerTwoslash()],
-    theme: ${JSON.stringify(props.theme ?? {
-            light: "light-plus",
-            dark: "dark-plus",
-        })},
-    config: (md) => md.use(footnotePlugin),
-  },
-  // https://vitepress.dev/reference/default-theme-config
-  themeConfig: ${JSON.stringify({
-            ...props.themeConfig,
-            search: props.themeConfig.search ?? { provider: "local" },
-            nav: props.themeConfig.nav ?? [{ text: "Home", link: "/" }],
-            sidebar: props.themeConfig.sidebar ?? [],
-            socialLinks: props.themeConfig.socialLinks ?? [],
-        })}
-});
 `),
     ]);
-    return this(props);
+    return this({
+        ...props,
+        dir,
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.3.0",
+  "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/astro-file.ts

@@ -1,11 +1,9 @@
 import { generateText } from "ai";
-import fs from "node:fs/promises";
-import path from "node:path";
 import prettier from "prettier";
 import type { Context } from "../context";
+import { StaticAstroFile } from "../fs/static-astro-file";
 import { Resource } from "../resource";
 import type { Secret } from "../secret";
-import { ignore } from "../util/ignore";
 import { type ModelConfig, createModel } from "./client";
 
 /**
@@ -161,20 +159,10 @@ export const AstroFile = Resource(
   async function (
     this: Context<AstroFile>,
     id: string,
-    props: AstroFileProps,
+    props: AstroFileProps
   ): Promise<AstroFile> {
-    // Ensure directory exists
-    await fs.mkdir(path.dirname(props.path), { recursive: true });
-
+    // Handle deletion phase
     if (this.phase === "delete") {
-      try {
-        await fs.unlink(props.path);
-      } catch (error: any) {
-        // Ignore if file doesn't exist
-        if (error.code !== "ENOENT") {
-          throw error;
-        }
-      }
       return this.destroy();
     }
 
@@ -213,7 +201,7 @@ export const AstroFile = Resource(
 
       if (retryResult.error) {
         throw new Error(
-          `Failed to generate valid Astro code: ${retryResult.error}`,
+          `Failed to generate valid Astro code: ${retryResult.error}`
         );
       }
 
@@ -235,24 +223,17 @@ export const AstroFile = Resource(
       console.warn("Failed to format Astro code with Prettier:", error);
     }
 
-    if (this.phase === "update" && props.path !== this.props.path) {
-      await ignore("ENOENT", () => fs.unlink(this.props.path));
-    }
-
-    // Write content to file
-    await fs.writeFile(props.path, code);
-
-    // Get file stats for timestamps
-    const stats = await fs.stat(props.path);
+    // Use StaticAstroFile to create/update the file
+    const file = await StaticAstroFile("file", props.path, code);
 
     // Return the resource
     return this({
       ...props,
-      content: code,
-      createdAt: stats.birthtimeMs,
-      updatedAt: stats.mtimeMs,
+      content: file.content,
+      createdAt: Date.now(),
+      updatedAt: Date.now(),
     });
-  },
+  }
 );
 
 /**
@@ -263,7 +244,7 @@ export const AstroFile = Resource(
  * @returns The extracted Astro code or error message
  */
 async function extractAstroCode(
-  text: string,
+  text: string
 ): Promise<{ code: string; error?: string }> {
   const astroCodeRegex = /```astro\s*([\s\S]*?)```/g;
   const matches = Array.from(text.matchAll(astroCodeRegex));

package/src/ai/client.ts

@@ -56,3 +56,62 @@ export function createModel(config: ClientConfig) {
     return openai(config.model?.id ?? "gpt-4o");
   }
 }
+
+/**
+ * Maximum time to retry in milliseconds (5 minutes)
+ */
+const MAX_RETRY_TIME = 5 * 60 * 1000;
+
+/**
+ * Initial delay between retries in milliseconds
+ */
+const INITIAL_RETRY_DELAY = 1000;
+
+/**
+ * Maximum number of retries
+ */
+const MAX_RETRIES = 10;
+
+/**
+ * Handles rate limiting with exponential backoff
+ * @param fn Function to retry
+ * @returns Result of the function
+ * @throws Error if max retries or time is exceeded
+ */
+export async function withRateLimitRetry<T>(fn: () => Promise<T>): Promise<T> {
+  let retryCount = 0;
+  let lastError: Error | null = null;
+  let startTime = Date.now();
+
+  while (true) {
+    try {
+      return await fn();
+    } catch (error: any) {
+      lastError = error;
+
+      console.log("retry error", error);
+
+      // Check if we should retry
+      const isRateLimit = error.statusCode === 429;
+      const timeElapsed = Date.now() - startTime;
+      const shouldRetry =
+        isRateLimit && retryCount < MAX_RETRIES && timeElapsed < MAX_RETRY_TIME;
+
+      if (!shouldRetry) {
+        throw error;
+      }
+
+      // Calculate delay with exponential backoff
+      const delay = Math.min(
+        INITIAL_RETRY_DELAY * Math.pow(2, retryCount),
+        MAX_RETRY_TIME - timeElapsed
+      );
+
+      console.log(`Retrying in ${delay}ms`);
+
+      // Wait before retrying
+      await new Promise((resolve) => setTimeout(resolve, delay));
+      retryCount++;
+    }
+  }
+}