alchemy 0.3.0 → 0.4.0

package/src/{util/serde.ts → serde.ts}

@@ -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";
 
 import type { Type } from "arktype";
 
@@ -18,7 +18,7 @@ export async function serialize(
   value: any,
   options?: {
     encrypt?: boolean;
-  },
+  }
 ): Promise<any> {
   if (Array.isArray(value)) {
     return Promise.all(value.map((value) => serialize(scope, value, options)));
@@ -29,13 +29,17 @@ export async function serialize(
     return {
       "@secret":
         options?.encrypt !== false
-          ? await encryptWithKey(value.unencrypted, scope.password)
+          ? await encrypt(value.unencrypted, scope.password)
           : value.unencrypted,
     };
   } else if (isType(value)) {
     return {
       "@schema": value.toJSON(),
     };
+  } else if (value instanceof Date) {
+    return {
+      "@date": value.toISOString(),
+    };
   } else if (value instanceof Scope) {
     return undefined;
   } else if (value && typeof value === "object") {
@@ -44,8 +48,8 @@ export async function serialize(
         Object.entries(value).map(async ([key, value]) => [
           key,
           await serialize(scope, value, options),
-        ]),
-      ),
+        ])
+      )
     );
   }
   return value;
@@ -54,7 +58,7 @@ export async function serialize(
 export async function deserialize(scope: Scope, value: any): Promise<any> {
   if (Array.isArray(value)) {
     return await Promise.all(
-      value.map(async (item) => await deserialize(scope, item)),
+      value.map(async (item) => await deserialize(scope, item))
     );
   } else if (value && typeof value === "object") {
     if (typeof value["@secret"] === "string") {
@@ -64,14 +68,16 @@ export async function deserialize(scope: Scope, value: any): Promise<any> {
       return new Secret(await decryptWithKey(value["@secret"], scope.password));
     } 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,
             await deserialize(scope, value),
-          ]),
-        ),
+          ])
+        )
       );
     }
   }

package/src/test/bun.ts

@@ -78,7 +78,7 @@ type test = {
     name: string,
     options: TestOptions,
     fn: (scope: Scope) => Promise<any>,
-    timeout?: number,
+    timeout?: number
   ): void;
 
   /**
@@ -121,6 +121,7 @@ type test = {
  * ```
  */
 export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
+  let isFailed = false;
   defaultOptions = defaultOptions ?? {};
   if (
     defaultOptions.stateStore === undefined &&
@@ -129,7 +130,7 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
   ) {
     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!,
       });
@@ -150,7 +151,7 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
     {
       // parent: globalTestScope,
       stateStore: defaultOptions?.stateStore,
-    },
+    }
   );
   test.scope = localTestScope;
 
@@ -170,7 +171,7 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
 
   // Clean up test scope after all tests complete
   afterAll(async () => {
-    if (defaultOptions?.destroy !== false) {
+    if (defaultOptions?.destroy !== false && !isFailed) {
       await alchemy.destroy(test.scope);
     }
   });
@@ -192,8 +193,8 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
       obj && typeof obj === "object"
         ? Object.fromEntries(
             Object.entries(obj).flatMap(([k, v]) =>
-              v !== undefined ? [[k, v]] : [],
-            ),
+              v !== undefined ? [[k, v]] : []
+            )
           )
         : {};
 
@@ -229,7 +230,7 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
             }
           }
         });
-      },
+      }
     );
   }
 }

package/src/util/sha256.ts

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

package/src/web/vitepress/config.ts

@@ -0,0 +1,50 @@
+import path from "path";
+import type { DefaultTheme, HeadConfig, ThemeOptions } from "vitepress";
+import { StaticTypeScriptFile } from "../../fs/static-typescript-file";
+
+export type VitePressConfigProps = {
+  cwd: string;
+  title?: string;
+  description?: string;
+  head?: HeadConfig[];
+  theme?: ThemeOptions;
+  themeConfig: DefaultTheme.Config;
+};
+
+export type VitePressConfig = Awaited<ReturnType<typeof VitePressConfig>>;
+
+export function VitePressConfig(props: VitePressConfigProps) {
+  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/src/web/vitepress/home-page.ts

@@ -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";
 import type { Secret } from "../../secret";
 
 /**
@@ -184,12 +185,12 @@ 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
@@ -218,7 +219,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
@@ -313,7 +314,7 @@ 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
@@ -322,42 +323,53 @@ ${props.systemPromptExtension || ""}
     ? 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}
     
-    The output should be a complete index.md file with proper YAML frontmatter and markdown content.
-    `,
-  });
+    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}
+    \`\`\``
+        : ""
+    }
+        
+        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/src/web/vitepress/index.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/src/web/vitepress/process-front-matter-files.ts

@@ -0,0 +1,98 @@
+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: string,
+  linkPrefix: string
+): Promise<
+  {
+    text: string;
+    link: string;
+    items?: {
+      text: string;
+      link: string;
+      items?: { text: string; link: string }[];
+    }[];
+  }[]
+> {
+  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 }
+    ) as any;
+}

package/src/web/vitepress/vitepress.ts

@@ -2,7 +2,6 @@ import { exec } from "child_process";
 import fs from "fs/promises";
 import path from "path";
 import { promisify } from "util";
-import type { DefaultTheme, ThemeOptions } from "vitepress";
 import type { Context } from "../../context";
 import {
   Folder,
@@ -70,12 +69,12 @@ export interface VitePressProjectProps {
   /**
    * The theme options to use
    */
-  theme?: ThemeOptions;
+  // theme?: ThemeOptions;
 
   /**
    * The theme config to use
    */
-  themeConfig: DefaultTheme.Config;
+  // themeConfig: DefaultTheme.Config;
 
   /**
    * Whether to delete the project folder during the delete phase
@@ -96,25 +95,31 @@ export interface VitePressProject extends VitePressProjectProps, Resource {
    * The name/path of the project
    */
   name: string;
+
+  /**
+   * The directory of the project
+   */
+  dir: string;
 }
 
-export const VitePressProject = Resource(
-  "project::VitePressProject",
+export const VitepressProject = Resource(
+  "project::VitepressProject",
   {
     alwaysUpdate: true,
   },
   async function (
     this: Context<VitePressProject>,
     id: string,
-    props: VitePressProjectProps,
+    props: VitePressProjectProps
   ): Promise<VitePressProject> {
     const dir = props.dir ?? props.name;
     if (this.phase === "delete") {
       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}`);
           }
         }
       } catch (error) {
@@ -130,7 +135,7 @@ export const VitePressProject = Resource(
           path: dir,
           delete: props.delete,
         })
-      ).path,
+      ).path
     );
 
     // Initialize package.json
@@ -164,11 +169,19 @@ export const VitePressProject = Resource(
 
     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"),
@@ -206,7 +219,7 @@ export default {
     ctx.app.use(TwoslashFloatingVue);
   },
 } satisfies ThemeConfig;
-  `,
+  `
       ),
       StaticTextFile(
         path.join(cwd, ".vitepress", "theme", "style.css"),
@@ -348,42 +361,13 @@ 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/lib/internal/getting-started.d.ts

@@ -1,10 +0,0 @@
-import { Document } from "alchemy/ai";
-import type { Folder } from "alchemy/fs";
-export interface GettingStartedProps {
-    /**
-     * The output directory for the getting started document.
-     */
-    outDir: string | Folder;
-}
-export type GettingStarted = Document;
-export declare function GettingStarted({ outDir, }: GettingStartedProps): Promise<Document>;

package/lib/internal/getting-started.js

@@ -1,94 +0,0 @@
-import alchemy from "alchemy";
-import { Document } from "alchemy/ai";
-import path from "path";
-export async function GettingStarted({ outDir, }) {
-    outDir = typeof outDir === "string" ? outDir : outDir.path;
-    return Document(`docs/getting-started`, {
-        title: "Getting Started with Alchemy",
-        path: path.join(outDir, "index.md"),
-        prompt: await alchemy `
-      You are a technical writer creating a getting started guide for Alchemy, an infrastructure as code (IaC) framework.
-      See ${alchemy.file("../README.md")} to understand the overview of Alchemy.
-      See ${alchemy.file("../.cursorrules")} to better understand the structure and conventions of Alchemy.
-
-      See ${alchemy.file("../alchemy/test/cloudflare/worker.test.ts")} for an example of how testing works.
-
-      Write a comprehensive getting started guide for Alchemy that covers the following topics:
-      
-      # Getting Started with Alchemy
-      
-      (Brief introduction to Alchemy as an infrastructure as code framework)
-      
-      ## Installation
-      
-      \`\`\`bash
-      # Install Alchemy
-      bun add alchemy
-      \`\`\`
-      
-      ## Creating Your First Alchemy Project
-      
-      (Step-by-step guide to creating a basic Alchemy project)
-      
-      \`\`\`ts
-      // Example of a simple Alchemy project
-      import alchemy from "alchemy";
-      
-      // Sample code here
-      \`\`\`
-      
-      ## Core Concepts
-      
-      ### Resources
-      
-      (Explanation of Alchemy resources and how they work)
-      
-      \`\`\`ts
-      // Example of creating a resource
-      \`\`\`
-      
-      ### Context
-      
-      (Explanation of Alchemy context and lifecycle management)
-      
-      \`\`\`ts
-      // Example of working with context
-      \`\`\`
-      
-      ## Working with Secrets
-      
-      (How to handle secrets in Alchemy)
-      
-      \`\`\`ts
-      // Example of using alchemy.secret()
-      const apiKey = alchemy.secret("API_KEY");
-      \`\`\`
-      
-      ## Testing
-      
-      (How to test Alchemy resources)
-      
-      \`\`\`ts
-      // Example of testing Alchemy resources
-      \`\`\`
-      
-      ## Deployment
-      
-      (How to deploy resources with Alchemy)
-      
-      \`\`\`ts
-      // Example of deployment
-      \`\`\`
-      
-      ## Next Steps
-      
-      (Where to go next to learn more about Alchemy)
-      
-      > [!CAUTION]
-      > Avoid the temptation to over explain or over describe. Focus on concise, simple, high value snippets.
-      
-      > [!TIP]
-      > Make sure the examples follow a natural progression from minimal examples to more complex use cases.
-    `,
-    });
-}