alchemy 0.62.3 → 0.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.62.3",
+  "version": "0.63.0",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
   "homepage": "https://alchemy.run",
@@ -20,7 +20,6 @@
     "build:workers": "bun ./scripts/build-workers.ts",
     "build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && bun run build:cli && bun run build:workers",
     "drizzle:generate": "bun run scripts/drizzle-generate.ts",
-    "docs:gen": "rm -rf ./docs && typedoc",
     "postbuild": "cpx 'src/**/*/types.d.ts' lib && cpx 'src/**/*.txt' lib",
     "publish:npm": "cp ../README.md . && bun run build && bun run build:cli && bun publish && rm README.md"
   },
@@ -41,10 +40,6 @@
       "bun": "./src/llms.ts",
       "import": "./lib/llms.js"
     },
-    "./ai": {
-      "bun": "./src/ai/index.ts",
-      "import": "./lib/ai/index.js"
-    },
     "./aws": {
       "bun": "./src/aws/index.ts",
       "import": "./lib/aws/index.js"
@@ -129,6 +124,10 @@
       "bun": "./src/sentry/index.ts",
       "import": "./lib/sentry/index.js"
     },
+    "./state": {
+      "bun": "./src/state/index.ts",
+      "import": "./lib/state/index.js"
+    },
     "./stripe": {
       "bun": "./src/stripe/index.ts",
       "import": "./lib/stripe/index.js"
@@ -137,48 +136,21 @@
       "bun": "./src/upstash/index.ts",
       "import": "./lib/upstash/index.js"
     },
-    "./vercel": {
-      "bun": "./src/vercel/index.ts",
-      "import": "./lib/vercel/index.js"
-    },
-    "./shadcn": {
-      "bun": "./src/web/shadcn.ts",
-      "import": "./lib/web/shadcn.js"
-    },
-    "./state": {
-      "bun": "./src/state/index.ts",
-      "import": "./lib/state/index.js"
-    },
     "./util": {
       "bun": "./src/util/index.ts",
       "import": "./lib/util/index.js"
     },
-    "./web/astro": {
-      "bun": "./src/web/astro.ts",
-      "import": "./lib/web/astro.js"
-    },
-    "./web/tailwind": {
-      "bun": "./src/web/tailwind.ts",
-      "import": "./lib/web/tailwind.js"
-    },
-    "./web/vite": {
-      "bun": "./src/web/vite.ts",
-      "import": "./lib/web/vite.js"
-    },
-    "./web/vitepress": {
-      "bun": "./src/web/vitepress/index.ts",
-      "import": "./lib/web/vitepress/index.js"
+    "./vercel": {
+      "bun": "./src/vercel/index.ts",
+      "import": "./lib/vercel/index.js"
     }
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.0.0",
     "@cloudflare/unenv-preset": "^2.6.1",
-    "@cloudflare/workers-shared": "^0.17.5",
     "@iarna/toml": "^2.2.5",
     "@smithy/node-config-provider": "^4.0.0",
-    "@swc/core": "^1.11.24",
     "aws4fetch": "^1.0.20",
-    "diff": "^8.0.2",
     "env-paths": "^3.0.0",
     "esbuild": "^0.25.1",
     "execa": "^9.6.0",
@@ -188,95 +160,137 @@
     "glob": "^10.0.0",
     "jszip": "^3.0.0",
     "libsodium-wrappers": "^0.7.15",
-    "miniflare": "^4.20250816.0",
+    "miniflare": "^4.20250712.0",
     "neverthrow": "^8.2.0",
     "open": "^10.1.2",
     "openapi-types": "^12.1.3",
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "signal-exit": "^4.1.0",
-    "turndown": "^7.0.0",
     "unenv": "2.0.0-rc.19",
     "ws": "^8.18.3",
     "yaml": "^2.0.0"
   },
   "peerDependencies": {
-    "@ai-sdk/openai": "^1.1.9",
-    "@ai-sdk/openai-compatible": "^0.2.2",
+    "@astrojs/cloudflare": "^12.6.4",
     "@aws-sdk/client-dynamodb": "^3.0.0",
-    "@aws-sdk/client-ec2": "^3.0.0",
     "@aws-sdk/client-iam": "^3.0.0",
     "@aws-sdk/client-lambda": "^3.0.0",
     "@aws-sdk/client-s3": "^3.0.0",
-    "@aws-sdk/client-sagemaker": "^3.0.0",
-    "@aws-sdk/client-ses": "^3.0.0",
     "@aws-sdk/client-sesv2": "^3.0.0",
     "@aws-sdk/client-sqs": "^3.0.0",
     "@aws-sdk/client-ssm": "^3.0.0",
     "@aws-sdk/client-sts": "^3.0.0",
     "@cloudflare/vite-plugin": "^1.10.1",
-    "@libsql/client": "^0.15.9",
+    "@cloudflare/workers-types": "*",
+    "@libsql/client": "^0.15.12",
     "@octokit/rest": "^21.1.1",
-    "ai": "^4.0.0",
-    "arktype": "^2.0.0",
-    "cloudflare": "^4.0.0",
+    "astro": "^5.13.2",
     "drizzle-orm": "^0.44.2",
-    "hono": "^4.0.0",
-    "prettier": "^3.0.0",
-    "stripe": "^17.0.0",
-    "@cloudflare/workers-types": "^4.20250816.0"
+    "rwsdk": "^0.1.36",
+    "stripe": "^17.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@astrojs/cloudflare": {
+      "optional": true
+    },
+    "@aws-sdk/client-dynamodb": {
+      "optional": true
+    },
+    "@aws-sdk/client-iam": {
+      "optional": true
+    },
+    "@aws-sdk/client-lambda": {
+      "optional": true
+    },
+    "@aws-sdk/client-s3": {
+      "optional": true
+    },
+    "@aws-sdk/client-sesv2": {
+      "optional": true
+    },
+    "@aws-sdk/client-sqs": {
+      "optional": true
+    },
+    "@aws-sdk/client-ssm": {
+      "optional": true
+    },
+    "@aws-sdk/client-sts": {
+      "optional": true
+    },
+    "@cloudflare/vite-plugin": {
+      "optional": true
+    },
+    "@cloudflare/workers-types": {
+      "optional": true
+    },
+    "@octokit/rest": {
+      "optional": true
+    },
+    "@libsql/client": {
+      "optional": true
+    },
+    "astro": {
+      "optional": true
+    },
+    "drizzle-orm": {
+      "optional": true
+    },
+    "rwsdk": {
+      "optional": true
+    },
+    "stripe": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@ai-sdk/anthropic": "^1.1.6",
-    "@ai-sdk/openai": "^1.1.9",
-    "@asteasolutions/zod-to-openapi": "^7.3.0",
-    "@aws-sdk/client-resource-groups-tagging-api": "^3.830.0",
+    "@astrojs/cloudflare": "^12.6.4",
+    "@aws-sdk/client-dynamodb": "^3.0.0",
+    "@aws-sdk/client-ec2": "^3.868.0",
+    "@aws-sdk/client-iam": "^3.864.0",
+    "@aws-sdk/client-lambda": "^3.0.0",
     "@aws-sdk/client-s3": "3.726.1",
+    "@aws-sdk/client-sesv2": "^3.0.0",
+    "@aws-sdk/client-sqs": "^3.0.0",
+    "@aws-sdk/client-ssm": "^3.0.0",
+    "@aws-sdk/client-sts": "^3.0.0",
     "@clack/prompts": "^0.11.0",
     "@cloudflare/containers": "^0.0.13",
     "@cloudflare/puppeteer": "^1.0.2",
-    "@iarna/toml": "^2.2.5",
+    "@cloudflare/vite-plugin": "^1.11.6",
+    "@cloudflare/workers-types": "^4.20250805.0",
+    "@libsql/client": "^0.15.12",
     "@octokit/rest": "^21.1.1",
-    "@react-router/dev": "^7.7.1",
     "@sentry/cloudflare": "^9.43.0",
     "@sveltejs/adapter-cloudflare": "^7.1.2",
     "@types/bun": "latest",
-    "@types/diff": "^5.0.0",
+    "@types/debug": "^4.1.12",
     "@types/fs-extra": "^11.0.4",
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/node": "latest",
-    "@types/turndown": "^5.0.5",
     "@types/ws": "^8.18.1",
-    "ai": "^4.1.16",
     "arktype": "^2.1.16",
+    "astro": "^5.13.2",
     "braintrust": "^0.0.201",
-    "change-case": "^5.4.4",
-    "cloudflare": "^4.2.0",
     "cpx": "^1.5.0",
+    "debug": "^4.4.1",
     "dofs": "^0.1.0",
     "drizzle-kit": "^0.31.4",
+    "drizzle-orm": "^0.44.2",
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "grammy": "^1.37.0",
     "jsonc-parse": "^1.5.5",
-    "libsodium-wrappers": "^0.7.15",
     "listr2": "^8.0.0",
-    "nitro-cloudflare-dev": "^0.2.2",
     "nitropack": "^2.12.4",
-    "openpgp": "^6.1.0",
-    "prettier": "^3.5.3",
-    "rwsdk": "^0.1.28",
+    "rwsdk": "^0.1.36",
+    "stripe": "^17.0.0",
     "trpc-cli": "^0.10.2",
     "ts-morph": "^26.0.0",
-    "tsdown": "^0.13.0",
-    "turndown": "^7.2.0",
-    "typedoc": "^0.28.1",
-    "typedoc-plugin-markdown": "^4.6.0",
+    "tsdown": "^0.14.2",
     "typescript": "^5.8.3",
-    "vite": "^6.0.7",
-    "vitepress": "^1.6.3",
+    "undici": "^7.14.0",
     "wrangler": "^4.27.0",
-    "yaml": "^2.7.1",
     "zod": "^4.0.10"
   }
 }

package/src/alchemy.ts

@@ -1,6 +1,3 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-
 import { execArgv } from "node:process";
 import { onExit } from "signal-exit";
 import { ReplacedSignal } from "./apply.ts";
@@ -14,12 +11,10 @@ import {
   ResourceSeq,
   type PendingResource,
 } from "./resource.ts";
-import { isRuntime } from "./runtime/global.ts";
 import { DEFAULT_STAGE, Scope, type ProviderCredentials } from "./scope.ts";
 import { secret } from "./secret.ts";
 import type { StateStoreType } from "./state.ts";
 import type { LoggerApi } from "./util/cli.ts";
-import { logger } from "./util/logger.ts";
 import { TelemetryClient } from "./util/telemetry/client.ts";
 
 /**
@@ -71,10 +66,6 @@ export interface Alchemy {
    * or locally in the current scope.
    */
   secret: typeof secret;
-  /**
-   * Whether the current runtime is the Cloudflare Workers runtime.
-   */
-  isRuntime: boolean;
 
   /**
    * Creates a new application scope with the given name and options.
@@ -95,74 +86,51 @@ export interface Alchemy {
    * });
    */
   (appName: string, options?: Omit<AlchemyOptions, "appName">): Promise<Scope>;
-  /**
-   * Template literal tag that supports file interpolation for documentation.
-   * Automatically formats the content and appends file contents as code blocks.
-   *
-   * @example
-   * // Generate documentation using file contents
-   * await Document("api-docs", {
-   *   prompt: await alchemy`
-   *     Generate docs using the contents of:
-   *     ${alchemy.file("README.md")}
-   *     ${alchemy.file("./.cursorrules")}
-   *
-   *     And here are the source files:
-   *     ${alchemy.files(files)}
-   *   `
-   * });
-   */
-  (template: TemplateStringsArray, ...values: any[]): Promise<string>;
 }
 
 _alchemy.destroy = destroy;
 _alchemy.run = run;
 _alchemy.secret = secret;
 _alchemy.env = env;
-_alchemy.isRuntime = isRuntime;
 
 /**
- * Implementation of the alchemy function that handles both application scoping
- * and template string interpolation.
+ * Implementation of the alchemy function.
  */
 async function _alchemy(
-  ...args:
-    | [template: TemplateStringsArray, ...values: any[]]
-    | [appName: string, options?: Omit<AlchemyOptions, "appName">]
-): Promise<Scope | string | never> {
-  if (typeof args[0] === "string") {
-    const [appName, options] = args as [string, AlchemyOptions?];
-
-    const cliArgs = process.argv.slice(2);
-    const cliOptions = {
-      phase: cliArgs.includes("--destroy")
-        ? "destroy"
-        : cliArgs.includes("--read")
-          ? "read"
-          : "up",
-      local: cliArgs.includes("--local") || cliArgs.includes("--dev"),
-      watch: cliArgs.includes("--watch") || execArgv.includes("--watch"),
-      quiet: cliArgs.includes("--quiet"),
-      force: cliArgs.includes("--force"),
-      // Parse stage argument (--stage my-stage) functionally and inline as a property declaration
-      stage: (function parseStage() {
-        const i = cliArgs.indexOf("--stage");
-        return i !== -1 && i + 1 < cliArgs.length
-          ? cliArgs[i + 1]
-          : process.env.STAGE;
-      })(),
-      password: process.env.ALCHEMY_PASSWORD,
-    } satisfies Partial<AlchemyOptions>;
-    const mergedOptions = {
-      ...cliOptions,
-      ...options,
-    };
-    if (
-      mergedOptions.stateStore === undefined &&
-      process.env.CI &&
-      process.env.ALCHEMY_CI_STATE_STORE_CHECK !== "false"
-    ) {
-      throw new Error(`You are running Alchemy in a CI environment with the default local state store. 
+  appName: string,
+  options?: Omit<AlchemyOptions, "appName">,
+): Promise<Scope> {
+  const cliArgs = process.argv.slice(2);
+  const cliOptions = {
+    phase: cliArgs.includes("--destroy")
+      ? "destroy"
+      : cliArgs.includes("--read")
+        ? "read"
+        : "up",
+    local: cliArgs.includes("--local") || cliArgs.includes("--dev"),
+    watch: cliArgs.includes("--watch") || execArgv.includes("--watch"),
+    quiet: cliArgs.includes("--quiet"),
+    force: cliArgs.includes("--force"),
+    // Parse stage argument (--stage my-stage) functionally and inline as a property declaration
+    stage: (function parseStage() {
+      const i = cliArgs.indexOf("--stage");
+      return i !== -1 && i + 1 < cliArgs.length
+        ? cliArgs[i + 1]
+        : process.env.STAGE;
+    })(),
+    password: process.env.ALCHEMY_PASSWORD,
+    adopt: cliArgs.includes("--adopt"),
+  } satisfies Partial<AlchemyOptions>;
+  const mergedOptions = {
+    ...cliOptions,
+    ...options,
+  };
+  if (
+    mergedOptions.stateStore === undefined &&
+    process.env.CI &&
+    process.env.ALCHEMY_CI_STATE_STORE_CHECK !== "false"
+  ) {
+    throw new Error(`You are running Alchemy in a CI environment with the default local state store. 
 This can lead to orphaned infrastructure and is rarely what you want to do.
 
 Instead, you should choose a persistent state store:
@@ -173,165 +141,45 @@ You can read more about State and State Stores here: https://alchemy.run/concept
 
 If this is a mistake, you can disable this check by setting the ALCHEMY_CI_STATE_STORE_CHECK=false.
 `);
-    }
+  }
 
-    const phase = isRuntime ? "read" : (mergedOptions?.phase ?? "up");
-    const telemetryClient =
-      mergedOptions?.parent?.telemetryClient ??
-      TelemetryClient.create({
-        phase,
-        enabled: mergedOptions?.telemetry ?? true,
-        quiet: mergedOptions?.quiet ?? false,
-      });
-    const root = new Scope({
-      ...mergedOptions,
-      parent: undefined,
-      scopeName: appName,
+  const phase = mergedOptions?.phase ?? "up";
+  const telemetryClient =
+    mergedOptions?.parent?.telemetryClient ??
+    TelemetryClient.create({
       phase,
-      password: mergedOptions?.password ?? process.env.ALCHEMY_PASSWORD,
-      telemetryClient,
+      enabled: mergedOptions?.telemetry ?? true,
+      quiet: mergedOptions?.quiet ?? false,
     });
-    onExit((code) => {
-      root.cleanup().then(() => {
-        code = code === 130 ? 0 : (code ?? 0);
-        process.exit(code);
-      });
-      return true;
-    });
-    const stageName = mergedOptions?.stage ?? DEFAULT_STAGE;
-    const stage = new Scope({
-      ...mergedOptions,
-      parent: root,
-      scopeName: stageName,
-      stage: stageName,
+  const root = new Scope({
+    ...mergedOptions,
+    parent: undefined,
+    scopeName: appName,
+    phase,
+    password: mergedOptions?.password ?? process.env.ALCHEMY_PASSWORD,
+    telemetryClient,
+  });
+  onExit((code) => {
+    root.cleanup().then(() => {
+      code = code === 130 ? 0 : (code ?? 0);
+      process.exit(code);
     });
-    try {
-      Scope.storage.enterWith(root);
-      Scope.storage.enterWith(stage);
-    } catch {
-      // we are in Cloudflare Workers, we will emulate the enterWith behavior
-      // see Scope.finalize for where we pop the global scope
-      Scope.globals.push(root);
-      Scope.globals.push(stage);
-    }
-    if (mergedOptions?.phase === "destroy") {
-      await destroy(stage);
-      return process.exit(0);
-    }
-    return root;
+    return true;
+  });
+  const stageName = mergedOptions?.stage ?? DEFAULT_STAGE;
+  const stage = new Scope({
+    ...mergedOptions,
+    parent: root,
+    scopeName: stageName,
+    stage: stageName,
+  });
+  Scope.storage.enterWith(root);
+  Scope.storage.enterWith(stage);
+  if (mergedOptions?.phase === "destroy") {
+    await destroy(stage);
+    return process.exit(0);
   }
-  const [template, ...values] = args;
-  const [, secondLine] = template[0].split("\n");
-  const leadingSpaces = secondLine
-    ? secondLine.match(/^(\s*)/)?.[1]?.length || 0
-    : 0;
-  const indent = " ".repeat(leadingSpaces);
-
-  const [{ isFileRef }, { isFileCollection }] = await Promise.all([
-    import("./fs/file-ref.js"),
-    import("./fs/file-collection.js"),
-  ]);
-
-  const appendices: Record<string, string> = {};
-
-  const stringValues = await Promise.all(
-    values.map(async function resolve(value): Promise<string> {
-      if (typeof value === "string") {
-        return indent + value;
-      }
-      if (value === null) {
-        return "null";
-      }
-      if (value === undefined) {
-        return "undefined";
-      }
-      if (
-        typeof value === "number" ||
-        typeof value === "boolean" ||
-        typeof value === "bigint"
-      ) {
-        return value.toString();
-      }
-      if (value instanceof Promise) {
-        return resolve(await value);
-      }
-      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})`;
-      }
-      if (isFileCollection(value)) {
-        return Object.entries(value.files)
-          .map(([filePath, content]) => {
-            appendices[filePath] = content;
-            return `[${path.basename(filePath)}](${filePath})`;
-          })
-          .join("\n\n");
-      }
-      if (Array.isArray(value)) {
-        return (
-          await Promise.all(
-            value.map(async (value, i) => `${i}. ${await resolve(value)}`),
-          )
-        ).join("\n");
-      }
-      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})`;
-        }
-        appendices[value.path] = await fs.readFile(value.path, "utf-8");
-        return `[${path.basename(value.path)}](${value.path})`;
-      }
-      if (typeof value === "object") {
-        return (
-          await Promise.all(
-            Object.entries(value).map(async ([key, value]) => {
-              return `* ${key}: ${await resolve(value)}`;
-            }),
-          )
-        ).join("\n");
-      }
-      // TODO: support other types
-      logger.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");
+  return root;
 }
 
 export type Phase = "up" | "destroy" | "read";
@@ -414,6 +262,12 @@ export interface AlchemyOptions {
    * If not provided, the default fallback logger will be used.
    */
   logger?: LoggerApi;
+  /**
+   * Whether to adopt resources if they already exist but are not yet managed by your Alchemy app.
+   *
+   * @default false
+   */
+  adopt?: boolean;
 }
 
 export interface ScopeOptions extends AlchemyOptions {
@@ -463,7 +317,7 @@ async function run<T>(
   const telemetryClient =
     options?.parent?.telemetryClient ??
     TelemetryClient.create({
-      phase: isRuntime ? "read" : (options?.phase ?? "up"),
+      phase: options?.phase ?? "up",
       enabled: options?.telemetry ?? true,
       quiet: options?.quiet ?? false,
     });