alchemy 0.37.2 → 0.38.1

package/src/scope.ts

@@ -1,16 +1,32 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import type { Phase } from "./alchemy.ts";
-import { destroyAll } from "./destroy.ts";
+import { destroy, destroyAll } from "./destroy.ts";
 import { FileSystemStateStore } from "./fs/file-system-state-store.ts";
-import { ResourceID, type PendingResource } from "./resource.ts";
-import type { StateStore, StateStoreType } from "./state.ts";
+import {
+  ResourceFQN,
+  ResourceID,
+  ResourceKind,
+  ResourceScope,
+  ResourceSeq,
+  type PendingResource,
+  type Resource,
+  type ResourceProps,
+} from "./resource.ts";
+import type { State, StateStore, StateStoreType } from "./state.ts";
 import {
   createDummyLogger,
   createLoggerInstance,
   type LoggerApi,
 } from "./util/cli.ts";
+import { AsyncMutex } from "./util/mutex.ts";
 import type { ITelemetryClient } from "./util/telemetry/client.ts";
 
+export class RootScopeStateAttemptError extends Error {
+  constructor() {
+    super("Root scope cannot contain state");
+  }
+}
+
 export interface ScopeOptions {
   appName?: string;
   stage?: string;
@@ -24,6 +40,11 @@ export interface ScopeOptions {
   logger?: LoggerApi;
 }
 
+export type PendingDeletions = Array<{
+  resource: Resource<string>;
+  oldProps?: ResourceProps;
+}>;
+
 // TODO: support browser
 const DEFAULT_STAGE = process.env.ALCHEMY_STAGE ?? process.env.USER ?? "dev";
 
@@ -47,7 +68,7 @@ export class Scope {
     new AsyncLocalStorage<Scope>());
   public static globals: Scope[] = (globalThis.__ALCHEMY_GLOBALS__ ??= []);
 
-  public static get(): Scope | undefined {
+  public static getScope(): Scope | undefined {
     const scope = Scope.storage.getStore();
     if (!scope) {
       if (Scope.globals.length > 0) {
@@ -63,7 +84,7 @@ export class Scope {
   }
 
   public static get current(): Scope {
-    const scope = Scope.get();
+    const scope = Scope.getScope();
     if (!scope) throw new Error("Not running within an Alchemy Scope");
     return scope;
   }
@@ -81,6 +102,7 @@ export class Scope {
   public readonly phase: Phase;
   public readonly logger: LoggerApi;
   public readonly telemetryClient: ITelemetryClient;
+  public readonly dataMutex: AsyncMutex;
 
   private isErrored = false;
   private finalized = false;
@@ -96,7 +118,7 @@ export class Scope {
         `Scope name ${this.scopeName} cannot contain double colons`,
       );
     }
-    this.parent = options.parent ?? Scope.get();
+    this.parent = options.parent ?? Scope.getScope();
     this.stage = options?.stage ?? this.parent?.stage ?? DEFAULT_STAGE;
     this.parent?.children.set(this.scopeName!, this);
     this.quiet = options.quiet ?? this.parent?.quiet ?? false;
@@ -131,6 +153,7 @@ export class Scope {
     }
     this.telemetryClient =
       options.telemetryClient ?? this.parent?.telemetryClient!;
+    this.dataMutex = new AsyncMutex();
   }
 
   public get root(): Scope {
@@ -141,7 +164,7 @@ export class Scope {
     return root;
   }
 
-  public async delete(resourceID: ResourceID) {
+  public async deleteResource(resourceID: ResourceID) {
     await this.state.delete(resourceID);
     this.resources.delete(resourceID);
   }
@@ -158,7 +181,7 @@ export class Scope {
     if (this.parent) {
       return [...this.parent.chain, ...thisScope];
     }
-    return [...app, this.stage, ...thisScope];
+    return [...app, ...thisScope];
   }
 
   public fail() {
@@ -179,6 +202,78 @@ export class Scope {
     return [...this.chain, resourceID].join("/");
   }
 
+  /**
+   * Centralizes the "lock → locate the right scope → hand the caller a live
+   * ScopeState instance and a persist() helper".
+   *
+   * @param fn   Your operation on the scope state.
+   *             • `state` is already resolved and, if we're at the root, created.
+   *             • `persist` will write the (possibly-mutated) state back.
+   */
+  private async withScopeState<R>(
+    fn: (
+      state: State<string, ResourceProps | undefined, Resource<string>>, // current state for this.scopeName
+      persist: (
+        next: State<string, ResourceProps | undefined, Resource<string>>,
+      ) => Promise<void>, // helper to save changes
+    ) => Promise<R>,
+  ): Promise<R> {
+    return this.dataMutex.lock(async () => {
+      // 1. We must know where to look.
+      if (!this.parent || !this.scopeName) {
+        throw new RootScopeStateAttemptError();
+      }
+
+      // 2. Pull (or lazily create) the state bucket we care about.
+      const isRoot = this.parent.scopeName === this.root.scopeName;
+      const state =
+        (await this.parent.state.get(this.scopeName)) ??
+        (isRoot
+          ? {
+              //todo(michael): should this have a different type cause its root?
+              kind: "alchemy::Scope",
+              id: this.scopeName!,
+              fqn: this.root.fqn(this.scopeName!),
+              seq: this.seq(),
+              status: "created",
+              data: {},
+              output: {
+                [ResourceID]: this.scopeName!,
+                [ResourceFQN]: this.root.fqn(this.scopeName!),
+                [ResourceKind]: "alchemy::Scope",
+                [ResourceScope]: this,
+                [ResourceSeq]: this.seq(),
+              },
+              props: {},
+            }
+          : undefined);
+
+      if (!state) throw new RootScopeStateAttemptError();
+
+      return fn(state, (updated) =>
+        this.parent!.state.set(this.scopeName!, updated),
+      );
+    });
+  }
+
+  public async set<T>(key: string, value: T): Promise<void> {
+    return this.withScopeState<void>(async (state, persist) => {
+      state.data[key] = value;
+      await persist(state); // only one line to save!
+    });
+  }
+
+  public async get<T>(key: string): Promise<T> {
+    return this.withScopeState<T>(async (state) => state.data[key]);
+  }
+
+  public async delete(key: string): Promise<void> {
+    return this.withScopeState<void>(async (state, persist) => {
+      delete state.data[key];
+      await persist(state);
+    });
+  }
+
   public async run<T>(fn: (scope: Scope) => Promise<T>): Promise<T> {
     return Scope.storage.run(this, () => fn(this));
   }
@@ -198,7 +293,11 @@ export class Scope {
     return null;
   }
 
-  public async finalize() {
+  public async finalize(force?: boolean) {
+    const shouldForce =
+      force ||
+      this.parent === undefined ||
+      this?.parent?.scopeName === this.root.scopeName;
     if (this.phase === "read") {
       this.rootTelemetryClient?.record({
         event: "app.success",
@@ -206,7 +305,7 @@ export class Scope {
       });
       return;
     }
-    if (this.finalized) {
+    if (this.finalized && !shouldForce) {
       return;
     }
     if (this.parent === undefined && Scope.globals.length > 0) {
@@ -227,12 +326,23 @@ export class Scope {
       const orphanIds = Array.from(
         resourceIds.filter((id) => !aliveIds.has(id)),
       );
+
+      if (shouldForce) {
+        await this.destroyPendingDeletions();
+        await Promise.all(
+          Array.from(this.children.values()).map((child) =>
+            child.finalize(shouldForce),
+          ),
+        );
+      }
+
       const orphans = await Promise.all(
         orphanIds.map(async (id) => (await this.state.get(id))!.output),
       );
       await destroyAll(orphans, {
         quiet: this.quiet,
         strategy: "sequential",
+        force: shouldForce,
       });
       this.rootTelemetryClient?.record({
         event: "app.success",
@@ -250,6 +360,31 @@ export class Scope {
     await this.rootTelemetryClient?.finalize();
   }
 
+  public async destroyPendingDeletions() {
+    const pendingDeletions =
+      (await this.get<PendingDeletions>("pendingDeletions").catch((e) => {
+        if (e instanceof RootScopeStateAttemptError) {
+          return [];
+        }
+        throw e;
+      })) ?? [];
+    if (pendingDeletions) {
+      for (const { resource, oldProps } of pendingDeletions) {
+        //todo(michael): ugly hack due to the way scope is serialized
+        const realResource = this.resources.get(resource[ResourceID])!;
+        resource[ResourceScope] = realResource?.[ResourceScope] ?? this;
+        await destroy(resource, {
+          quiet: this.quiet,
+          strategy: "sequential",
+          replace: {
+            props: oldProps,
+            output: resource,
+          },
+        });
+      }
+    }
+  }
+
   /**
    * Defers execution of a function until the Alchemy application finalizes.
    */

package/src/sentry/project.ts

@@ -347,7 +347,7 @@ export const Project = Resource(
         }
 
         if (!response.ok) {
-          throw new Error(`API error: ${response.statusText}`);
+          throw new Error(`API error: ${await response.text()}`);
         }
 
         const data = (await response.json()) as Omit<

package/src/util/logger.ts

@@ -4,7 +4,7 @@ import type { LoggerApi } from "./cli.ts";
 export const logger = new Proxy({} as LoggerApi, {
   get: (_, prop: keyof LoggerApi) => {
     const logger =
-      Scope.get()?.logger ??
+      Scope.getScope()?.logger ??
       ({
         log: console.log,
         error: console.error,

package/src/util/mutex.ts

@@ -0,0 +1,33 @@
+/**
+ * Simple async mutex that ensures only one async operation executes at a time
+ */
+export class AsyncMutex {
+  private locked = false;
+  private queue: Array<() => void> = [];
+
+  async lock<T>(operation: () => Promise<T>): Promise<T> {
+    return new Promise<T>((resolve, reject) => {
+      const execute = async () => {
+        this.locked = true;
+        try {
+          const result = await operation();
+          resolve(result);
+        } catch (error) {
+          reject(error);
+        } finally {
+          this.locked = false;
+          const next = this.queue.shift();
+          if (next) {
+            next();
+          }
+        }
+      };
+
+      if (this.locked) {
+        this.queue.push(execute);
+      } else {
+        execute();
+      }
+    });
+  }
+}

package/templates/astro/.vscode/extensions.json

@@ -0,0 +1,4 @@
+{
+  "recommendations": ["astro-build.astro-vscode"],
+  "unwantedRecommendations": []
+}

package/templates/astro/.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "./node_modules/.bin/astro dev",
+      "name": "Development server",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

package/templates/astro/README.md

@@ -0,0 +1,48 @@
+# Astro Starter Kit: Basics
+
+```sh
+bun create astro@latest -- --template basics
+```
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
+[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/basics)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/basics/devcontainer.json)
+
+> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
+
+![just-the-basics](https://github.com/withastro/astro/assets/2244813/a0a5533c-a856-4198-8470-2d67b1d7c554)
+
+## 🚀 Project Structure
+
+Inside of your Astro project, you'll see the following folders and files:
+
+```text
+/
+├── public/
+│   └── favicon.svg
+├── src/
+│   ├── layouts/
+│   │   └── Layout.astro
+│   └── pages/
+│       └── index.astro
+└── package.json
+```
+
+To learn more about the folder structure of an Astro project, refer to [our guide on project structure](https://docs.astro.build/en/basics/project-structure/).
+
+## 🧞 Commands
+
+All commands are run from the root of the project, from a terminal:
+
+| Command                   | Action                                           |
+| :------------------------ | :----------------------------------------------- |
+| `bun install`             | Installs dependencies                            |
+| `bun dev`             | Starts local dev server at `localhost:4321`      |
+| `bun build`           | Build your production site to `./dist/`          |
+| `bun preview`         | Preview your build locally, before deploying     |
+| `bun astro ...`       | Run CLI commands like `astro add`, `astro check` |
+| `bun astro -- --help` | Get help using the Astro CLI                     |
+
+## 👀 Want to learn more?
+
+Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).

package/templates/astro/_env.example

@@ -0,0 +1 @@
+ALCHEMY_PASSWORD=change-me

package/templates/astro/_gitignore

@@ -0,0 +1,27 @@
+# build output
+dist/
+
+# generated types
+.astro/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+# jetbrains setting folder
+.idea/
+
+.alchemy/
+.env

package/templates/astro/alchemy.run.ts

@@ -0,0 +1,16 @@
+/// <reference types="@types/node" />
+
+import alchemy from "alchemy";
+import { Astro } from "alchemy/cloudflare";
+
+const app = await alchemy("my-alchemy-app");
+
+export const worker = await Astro("website", {
+  command: "bun run build",
+});
+
+console.log({
+  url: worker.url,
+});
+
+await app.finalize();

package/templates/astro/astro.config.mjs

@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import cloudflare from '@astrojs/cloudflare';
+
+// https://astro.build/config
+export default defineConfig({
+  output: 'server',
+  adapter: cloudflare(),
+});

package/templates/astro/package.json

@@ -0,0 +1,23 @@
+{
+  "type": "module",
+  "name": "astro",
+  "version": "0.0.1",
+  "scripts": {
+    "astro": "astro",
+    "build": "astro check && astro build",
+    "deploy": "bun --env-file=./.env ./alchemy.run.ts",
+    "destroy": "bun --env-file=./.env ./alchemy.run.ts --destroy",
+    "dev": "astro dev",
+    "preview": "astro preview"
+  },
+  "dependencies": {
+    "astro": "^5.10.0"
+  },
+  "devDependencies": {
+    "alchemy": "workspace:*",
+    "@astrojs/cloudflare": "^12.6.0",
+    "miniflare": "^4.20250617.3",
+    "@cloudflare/workers-types": "^4.20250620.0",
+    "typescript": "^5.8.3"
+  }
+}

package/templates/astro/public/favicon.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
+    <path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
+    <style>
+        path { fill: #000; }
+        @media (prefers-color-scheme: dark) {
+            path { fill: #FFF; }
+        }
+    </style>
+</svg>

package/templates/astro/src/assets/astro.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" width="115" height="48"><path fill="#17191E" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="url(#a)" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="#17191E" d="M.02 30.31s4.02-1.95 8.05-1.95l3.04-9.4c.11-.45.44-.76.82-.76.37 0 .7.31.82.76l3.04 9.4c4.77 0 8.05 1.95 8.05 1.95L17 11.71c-.2-.56-.53-.91-.98-.91H7.83c-.44 0-.76.35-.97.9L.02 30.31Zm42.37-5.97c0 1.64-2.05 2.62-4.88 2.62-1.85 0-2.5-.45-2.5-1.41 0-1 .8-1.49 2.65-1.49 1.67 0 3.09.03 4.73.23v.05Zm.03-2.04a21.37 21.37 0 0 0-4.37-.36c-5.32 0-7.82 1.25-7.82 4.18 0 3.04 1.71 4.2 5.68 4.2 3.35 0 5.63-.84 6.46-2.92h.14c-.03.5-.05 1-.05 1.4 0 1.07.18 1.16 1.06 1.16h4.15a16.9 16.9 0 0 1-.36-4c0-1.67.06-2.93.06-4.62 0-3.45-2.07-5.64-8.56-5.64-2.8 0-5.9.48-8.26 1.19.22.93.54 2.83.7 4.06 2.04-.96 4.95-1.37 7.2-1.37 3.11 0 3.97.71 3.97 2.15v.57Zm11.37 3c-.56.07-1.33.07-2.12.07-.83 0-1.6-.03-2.12-.1l-.02.58c0 2.85 1.87 4.52 8.45 4.52 6.2 0 8.2-1.64 8.2-4.55 0-2.74-1.33-4.09-7.2-4.39-4.58-.2-4.99-.7-4.99-1.28 0-.66.59-1 3.65-1 3.18 0 4.03.43 4.03 1.35v.2a46.13 46.13 0 0 1 4.24.03l.02-.55c0-3.36-2.8-4.46-8.2-4.46-6.08 0-8.13 1.49-8.13 4.39 0 2.6 1.64 4.23 7.48 4.48 4.3.14 4.77.62 4.77 1.28 0 .7-.7 1.03-3.71 1.03-3.47 0-4.35-.48-4.35-1.47v-.13Zm19.82-12.05a17.5 17.5 0 0 1-6.24 3.48c.03.84.03 2.4.03 3.24l1.5.02c-.02 1.63-.04 3.6-.04 4.9 0 3.04 1.6 5.32 6.58 5.32 2.1 0 3.5-.23 5.23-.6a43.77 43.77 0 0 1-.46-4.13c-1.03.34-2.34.53-3.78.53-2 0-2.82-.55-2.82-2.13 0-1.37 0-2.65.03-3.84 2.57.02 5.13.07 6.64.11-.02-1.18.03-2.9.1-4.04-2.2.04-4.65.07-6.68.07l.07-2.93h-.16Zm13.46 6.04a767.33 767.33 0 0 1 .07-3.18H82.6c.07 1.96.07 3.98.07 6.92 0 2.95-.03 4.99-.07 6.93h5.18c-.09-1.37-.11-3.68-.11-5.65 0-3.1 1.26-4 4.12-4 1.33 0 2.28.16 3.1.46.03-1.16.26-3.43.4-4.43-.86-.25-1.81-.41-2.96-.41-2.46-.03-4.26.98-5.1 3.38l-.17-.02Zm22.55 3.65c0 2.5-1.8 3.66-4.64 3.66-2.81 0-4.61-1.1-4.61-3.66s1.82-3.52 4.61-3.52c2.82 0 4.64 1.03 4.64 3.52Zm4.71-.11c0-4.96-3.87-7.18-9.35-7.18-5.5 0-9.23 2.22-9.23 7.18 0 4.94 3.49 7.59 9.21 7.59 5.77 0 9.37-2.65 9.37-7.6Z"/><defs><linearGradient id="a" x1="6.33" x2="19.43" y1="40.8" y2="34.6" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient></defs></svg>

package/templates/astro/src/assets/background.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="1024" fill="none"><path fill="url(#a)" fill-rule="evenodd" d="M-217.58 475.75c91.82-72.02 225.52-29.38 341.2-44.74C240 415.56 372.33 315.14 466.77 384.9c102.9 76.02 44.74 246.76 90.31 366.31 29.83 78.24 90.48 136.14 129.48 210.23 57.92 109.99 169.67 208.23 155.9 331.77-13.52 121.26-103.42 264.33-224.23 281.37-141.96 20.03-232.72-220.96-374.06-196.99-151.7 25.73-172.68 330.24-325.85 315.72-128.6-12.2-110.9-230.73-128.15-358.76-12.16-90.14 65.87-176.25 44.1-264.57-26.42-107.2-167.12-163.46-176.72-273.45-10.15-116.29 33.01-248.75 124.87-320.79Z" clip-rule="evenodd" style="opacity:.154"/><path fill="url(#b)" fill-rule="evenodd" d="M1103.43 115.43c146.42-19.45 275.33-155.84 413.5-103.59 188.09 71.13 409 212.64 407.06 413.88-1.94 201.25-259.28 278.6-414.96 405.96-130 106.35-240.24 294.39-405.6 265.3-163.7-28.8-161.93-274.12-284.34-386.66-134.95-124.06-436-101.46-445.82-284.6-9.68-180.38 247.41-246.3 413.54-316.9 101.01-42.93 207.83 21.06 316.62 6.61Z" clip-rule="evenodd" style="opacity:.154"/><defs><linearGradient id="b" x1="373" x2="1995.44" y1="1100" y2="118.03" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient><linearGradient id="a" x1="107.37" x2="1130.66" y1="1993.35" y2="1026.31" gradientUnits="userSpaceOnUse"><stop stop-color="#3245FF"/><stop offset="1" stop-color="#BC52EE"/></linearGradient></defs></svg>