alchemy 0.66.0 → 0.68.0

package/bin/alchemy.ts

@@ -1,21 +1,25 @@
 import { createCli } from "trpc-cli";
+import { configure } from "./commands/configure.ts";
 import { create } from "./commands/create.ts";
 import { deploy } from "./commands/deploy.ts";
 import { destroy } from "./commands/destroy.ts";
 import { dev } from "./commands/dev.ts";
+import { init } from "./commands/init.ts";
 import { login } from "./commands/login.ts";
+import { logout } from "./commands/logout.ts";
 import { run } from "./commands/run.ts";
-import { init } from "./commands/init.ts";
 import { getPackageVersion } from "./services/get-package-version.ts";
 import { t } from "./trpc.ts";
 
 const router = t.router({
   create,
   init,
-  login,
   deploy,
   destroy,
   dev,
+  login,
+  logout,
+  configure,
   run,
 });
 

package/bin/commands/configure.ts

@@ -0,0 +1,194 @@
+import {
+  confirm,
+  group,
+  intro,
+  isCancel,
+  log,
+  multiselect,
+  outro,
+  password,
+  select,
+  text,
+} from "@clack/prompts";
+import pc from "picocolors";
+import z from "zod";
+import { Credentials, Profile, Provider } from "../../src/auth.ts";
+import { CloudflareAuth } from "../../src/cloudflare/auth.ts";
+import { listCloudflareAccounts } from "../../src/cloudflare/user.ts";
+import { authProcedure, CancelSignal } from "../trpc.ts";
+import { cloudflareLogin } from "./login.ts";
+
+export const configure = authProcedure
+  .meta({
+    description: "configure a profile",
+  })
+  .input(
+    z.object({
+      profile: z
+        .string()
+        .optional()
+        .meta({ alias: "p" })
+        .describe("the profile to configure"),
+    }),
+  )
+  .mutation(async ({ input }) => {
+    intro(pc.cyan("🧪 Configure Profile"));
+    const name = await promptForProfileName(input);
+    const profile = await Profile.get(name);
+    if (profile) {
+      log.info(`Profile: ${pc.bold(name)}`);
+      for (const [provider, providerProfile] of Object.entries(profile)) {
+        const description = [
+          `- ${pc.bold(provider)}: ${providerProfile.metadata.name} (${pc.dim(providerProfile.metadata.id)})`,
+          `  - Method: ${pc.dim(providerProfile.method)}`,
+          ...(providerProfile.scopes?.length
+            ? [`  - Scopes: ${pc.dim(providerProfile.scopes.join(", "))}`]
+            : []),
+        ];
+        log.info(description.join("\n"));
+      }
+      if (
+        (await confirm({
+          message: `Update profile ${pc.bold(name)}?`,
+          initialValue: false,
+        })) !== true
+      ) {
+        throw new CancelSignal();
+      }
+    }
+    const method = await select({
+      message: `Select a login method for ${pc.bold("Cloudflare")}`,
+      options: [
+        { label: "OAuth", value: "oauth", hint: "Recommended" },
+        { label: "API Token", value: "api-token" },
+        { label: "Global API Key", value: "api-key", hint: "Legacy" },
+      ],
+      initialValue: "oauth" as const,
+    });
+    if (isCancel(method)) {
+      throw new CancelSignal();
+    }
+    const credentials = await promptForCredentials(method);
+    await Credentials.set(
+      { profile: name, provider: "cloudflare" },
+      credentials,
+    );
+    const account = await promptForCloudflareAccount(credentials);
+    await Provider.set(
+      { profile: name, provider: "cloudflare" },
+      {
+        method,
+        metadata: account,
+        scopes: "scopes" in credentials ? credentials.scopes : undefined,
+      },
+    );
+    outro(pc.green(`✅ Configured profile ${pc.bold(name)}`));
+  });
+
+const promptForProfileName = async (input: { profile?: string }) => {
+  input.profile = input.profile?.trim();
+  if (input.profile) {
+    return input.profile;
+  }
+  const name = await text({
+    message: "Enter profile name",
+    defaultValue: "default",
+    placeholder: "default",
+  });
+  if (isCancel(name)) {
+    throw new CancelSignal();
+  }
+  return name.trim() || "default";
+};
+
+/**
+ * Prompts the user to enter credentials for a given method.
+ */
+const promptForCredentials = async (
+  method: "oauth" | "api-token" | "api-key",
+): Promise<Credentials> => {
+  switch (method) {
+    case "oauth": {
+      const customizeScopes = await confirm({
+        message: "Customize scopes?",
+        initialValue: false,
+      });
+      let scopes: string[];
+      if (customizeScopes) {
+        const selection = await multiselect({
+          message: "Select scopes",
+          options: Object.entries(CloudflareAuth.ALL_SCOPES).map(
+            ([scope, hint]) => ({
+              label: pc.bold(scope),
+              value: scope,
+              hint,
+            }),
+          ),
+          initialValues: CloudflareAuth.DEFAULT_SCOPES,
+        });
+        if (isCancel(selection)) {
+          throw new CancelSignal();
+        }
+        scopes = selection;
+      } else {
+        scopes = CloudflareAuth.DEFAULT_SCOPES;
+      }
+      return await cloudflareLogin(scopes);
+    }
+    case "api-token": {
+      const apiToken = await password({
+        message: "Enter API token",
+      });
+      if (isCancel(apiToken)) {
+        throw new CancelSignal();
+      }
+      return {
+        type: "api-token",
+        apiToken,
+      };
+    }
+    case "api-key": {
+      const { apiKey, email } = await group(
+        {
+          apiKey: () =>
+            password({
+              message: "Enter API key",
+            }),
+          email: () =>
+            text({
+              message: "Enter API email",
+            }),
+        },
+        {
+          onCancel: () => {
+            throw new CancelSignal();
+          },
+        },
+      );
+      return {
+        type: "api-key",
+        apiKey,
+        email,
+      };
+    }
+  }
+};
+
+/**
+ * Lists Cloudflare accounts and prompts the user to select one.
+ */
+export const promptForCloudflareAccount = async (credentials: Credentials) => {
+  const accounts = await listCloudflareAccounts(credentials);
+  const account = await select({
+    message: "Select an account",
+    options: accounts.map((account) => ({
+      label: account.name,
+      value: { id: account.id, name: account.name },
+      hint: account.id,
+    })),
+  });
+  if (isCancel(account)) {
+    throw new CancelSignal();
+  }
+  return account;
+};

package/bin/commands/login.ts

@@ -1,63 +1,107 @@
-import { cancel, intro, log, outro } from "@clack/prompts";
+import { confirm, intro, log, outro } from "@clack/prompts";
+import open from "open";
 import pc from "picocolors";
-import { zod as z } from "trpc-cli";
-import { DEFAULT_SCOPES, wranglerLogin } from "../../src/cloudflare/oauth.ts";
-import { throwWithContext } from "../errors.ts";
-import { loggedProcedure, ExitSignal } from "../trpc.ts";
+import z from "zod";
+import { Credentials, Provider } from "../../src/auth.ts";
+import { CloudflareAuth } from "../../src/cloudflare/auth.ts";
+import { authProcedure, CancelSignal } from "../trpc.ts";
 
-export const login = loggedProcedure
+export const login = authProcedure
   .meta({
-    description: "login to Cloudflare",
+    description: "login to a provider",
   })
   .input(
-    z.tuple([
-      z.object({
-        scopes: z
-          .array(z.string())
-          .optional()
-          .default([])
-          .describe("cloudflare OAuth scopes to authorize"),
-        defaultScopes: z
-          .boolean()
-          .optional()
-          .default(true)
-          .describe(
-            "whether to include the default Wrangler scopes when authenticating",
-          ),
-      }),
-    ]),
+    z.object({
+      provider: z
+        .enum(["cloudflare"])
+        .default("cloudflare")
+        .meta({ positional: true })
+        .describe("the provider to login to"),
+      profile: z
+        .string()
+        .default("default")
+        .meta({ alias: "p" })
+        .describe("the profile to login to"),
+    }),
   )
-  .mutation(async ({ input: [options] }) => {
-    try {
-      intro(pc.cyan("🔐 Cloudflare Login"));
-
-      const scopes = options.defaultScopes
-        ? Array.from(new Set([...DEFAULT_SCOPES, ...options.scopes]))
-        : options.scopes;
-      if (scopes.length === 0) {
-        cancel(
-          "No scopes provided. Please provide at least one scope or remove the --exclude-default-scopes flag.",
-        );
-        return;
-      }
-      const result = await wranglerLogin(scopes, (message) => {
-        log.step(message);
-      });
-
-      if (result.isErr()) {
-        throwWithContext(result.error, "Login failed");
-      }
-
-      outro(pc.green("✅ Login successful!"));
-    } catch (error) {
-      if (error instanceof Error) {
-        log.error(`${pc.red("Error:")} ${error.message}`);
-        if (error.stack && process.env.DEBUG) {
-          log.error(`${pc.gray("Stack trace:")}\n${error.stack}`);
-        }
-      } else {
-        log.error(pc.red(String(error)));
-      }
-      throw new ExitSignal(1);
+  .mutation(async ({ input }) => {
+    intro(pc.cyan("🧪 Login"));
+    const provider = await Provider.get<CloudflareAuth.Metadata>(input);
+    if (!provider) {
+      outro(
+        pc.red(
+          [
+            `❌ ${pc.bold(input.provider)} is not configured on profile "${pc.bold(input.profile)}".`,
+            "Please run `alchemy configure` to configure this provider.",
+          ].join("\n"),
+        ),
+      );
+      return;
+    }
+    if (provider.method !== "oauth") {
+      outro(
+        pc.red(
+          [
+            `❌ ${pc.bold(input.provider)} is not configured to use OAuth.`,
+            "If you would like to use OAuth, please run `alchemy configure` to switch your login method.",
+          ].join("\n"),
+        ),
+      );
+      return;
     }
+    if (!provider.scopes || provider.scopes.length === 0) {
+      outro(
+        pc.red(
+          [
+            `❌ ${pc.bold(input.provider)} is not configured with any scopes.`,
+            "Please run `alchemy configure` to configure this provider.",
+          ].join("\n"),
+        ),
+      );
+      return;
+    }
+    await confirmIfOverwrite(input);
+    const credentials = await cloudflareLogin(provider.scopes);
+    await Credentials.set(input, credentials);
+    outro(
+      `✅ Signed in to ${input.provider} as ${pc.bold(provider.metadata.name)} ${pc.dim(`(${provider.metadata.id})`)}`,
+    );
   });
+
+const confirmIfOverwrite = async (input: {
+  provider: string;
+  profile: string;
+}) => {
+  const existing = await Credentials.get(input).catch(() => undefined);
+  if (existing) {
+    log.step(
+      `You are already logged in to ${pc.bold(input.provider)} on profile "${pc.bold(input.profile)}".`,
+    );
+    const overwrite = await confirm({
+      message: "Would you like to overwrite?",
+      initialValue: false,
+    });
+    if (overwrite !== true) {
+      throw new CancelSignal();
+    }
+  }
+};
+
+export const cloudflareLogin = async (scopes: string[]) => {
+  const authorization = CloudflareAuth.client.authorize([
+    ...scopes,
+    "offline_access", // required for refresh tokens
+  ]);
+  log.step(
+    [
+      "Opening browser to authorize with Cloudflare...",
+      "",
+      pc.gray(
+        "If you are not automatically redirected, please open the following URL in your browser:",
+      ),
+      authorization.url,
+    ].join("\n"),
+  );
+  await open(authorization.url);
+  return await CloudflareAuth.client.callback(authorization);
+};

package/bin/commands/logout.ts

@@ -0,0 +1,66 @@
+import { confirm, intro, log, outro } from "@clack/prompts";
+import pc from "picocolors";
+import z from "zod";
+import { Credentials, Provider } from "../../src/auth.ts";
+import { CloudflareAuth } from "../../src/cloudflare/auth.ts";
+import { authProcedure, CancelSignal } from "../trpc.ts";
+
+export const logout = authProcedure
+  .meta({
+    description: "logout from a provider",
+  })
+  .input(
+    z.object({
+      provider: z
+        .enum(["cloudflare"])
+        .default("cloudflare")
+        .meta({ positional: true })
+        .describe("the provider to logout from"),
+      profile: z
+        .string()
+        .default("default")
+        .meta({ alias: "p" })
+        .describe("the profile to logout from"),
+      yes: z
+        .boolean()
+        .default(false)
+        .meta({ alias: "y" })
+        .describe("skip confirmation"),
+    }),
+  )
+  .mutation(async ({ input }) => {
+    intro(pc.cyan("🧪 Logout"));
+    const provider = await Provider.get<CloudflareAuth.Metadata>(input);
+    const credentials = await Credentials.get(input);
+    if (!credentials) {
+      outro(
+        pc.red(
+          `❌ Not logged in to ${input.provider} on profile "${input.profile}".`,
+        ),
+      );
+      return;
+    }
+    log.step(
+      [
+        `Logging out from provider ${input.provider} on profile "${input.profile}"`,
+        ...(provider
+          ? [`Account: ${provider.metadata.name} (${provider.metadata.id})`]
+          : []),
+        `Credentials: ${credentials.type}`,
+      ].join("\n"),
+    );
+    if (!input.yes) {
+      const overwrite = await confirm({
+        message: "Continue?",
+        initialValue: false,
+      });
+      if (overwrite !== true) {
+        throw new CancelSignal();
+      }
+    }
+    if (credentials.type === "oauth") {
+      await CloudflareAuth.client.revoke(credentials);
+    }
+    await Credentials.del(input);
+    outro(`✅ Signed out from ${pc.bold(input.provider)}.`);
+  });

package/bin/services/find-workspace-root.ts

@@ -42,7 +42,7 @@ const rootFiles = [
   // nx
   "nx.json",
   // turbo
-  "turbo.json",
+  // "turbo.json",
   // rush
   "rush.json",
 ];

package/bin/trpc.ts

@@ -1,7 +1,9 @@
-import { trpcServer } from "trpc-cli";
+import { cancel, log } from "@clack/prompts";
+import pc from "picocolors";
+import { trpcServer, type TrpcCliMeta } from "trpc-cli";
 import { TelemetryClient } from "../src/util/telemetry/client.ts";
 
-export const t = trpcServer.initTRPC.create();
+export const t = trpcServer.initTRPC.meta<TrpcCliMeta>().create();
 
 export class ExitSignal extends Error {
   constructor(public code: 0 | 1 = 0) {
@@ -10,6 +12,8 @@ export class ExitSignal extends Error {
   }
 }
 
+export class CancelSignal extends Error {}
+
 const loggingMiddleware = t.middleware(async ({ path, next }) => {
   const telemetry = TelemetryClient.create({
     enabled: true,
@@ -50,3 +54,24 @@ const loggingMiddleware = t.middleware(async ({ path, next }) => {
 });
 
 export const loggedProcedure = t.procedure.use(loggingMiddleware);
+
+// wrap procedure to improve error handling
+// TODO(john): use this pattern for other procedures
+export const authProcedure = loggedProcedure.use(async (opts) => {
+  const result = await opts.next();
+  if (result.ok) return result;
+  if (result.error.cause instanceof CancelSignal) {
+    cancel(pc.red("Operation cancelled."));
+    return result;
+  }
+  if (result.error.cause instanceof ExitSignal) return result;
+  log.error(pc.red("An unexpected error occurred."));
+  log.error(
+    result.error.message
+      .split("\n")
+      .map((line) => pc.gray(`  ${line}`))
+      .join("\n"),
+  );
+  cancel();
+  throw new ExitSignal(1);
+});

package/lib/alchemy.d.ts

@@ -99,6 +99,12 @@ export interface AlchemyOptions {
      * @default false
      */
     force?: boolean;
+    /**
+     * Whether to create a tunnel for supported resources.
+     *
+     * @default false
+     */
+    tunnel?: boolean;
     /**
      * Name to scope the resource state under (e.g. `.alchemy/{stage}/..`).
      *

package/lib/alchemy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alchemy.d.ts","sourceRoot":"","sources":["../src/alchemy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"alchemy.d.ts","sourceRoot":"","sources":["../src/alchemy.ts"],"names":[],"mappings":"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"}

package/lib/alchemy.js

@@ -37,6 +37,7 @@ async function _alchemy(appName, options) {
         watch: cliArgs.includes("--watch") || execArgv.includes("--watch"),
         quiet: cliArgs.includes("--quiet"),
         force: cliArgs.includes("--force"),
+        tunnel: cliArgs.includes("--tunnel"),
         // Parse stage argument (--stage my-stage) functionally and inline as a property declaration
         stage: (function parseStage() {
             const i = cliArgs.indexOf("--stage");

package/lib/alchemy.js.map

@@ -1 +1 @@
-{"version":3,"file":"alchemy.js","sourceRoot":"","sources":["../src/alchemy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EACL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,WAAW,GAEZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,KAAK,EAA4B,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAO7D,MAAM,CAAC,MAAM,OAAO,GAAY,QAAe,CAAC;AAkEhD,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;AAC3B,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;AACnB,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;AACzB,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;AAEnB;;GAEG;AACH,KAAK,UAAU,QAAQ,CACrB,OAAe,EACf,OAAyC;IAEzC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,4EAA4E;IAC5E,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC,SAAS,WAAW,CAClB,MAAc,EACd,YAAgB;QAEhB,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,CACL,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAC9D,CAAC;IACT,CAAC;IACD,MAAM,UAAU,GAAG;QACjB,KAAK,EACH,GAAG,IAAI,GAAG,KAAK,OAAO;YACpB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAC7B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC1B,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,IAAI;QACd,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;QAClE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAClC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAClC,4FAA4F;QAC5F,KAAK,EAAE,CAAC,SAAS,UAAU;YACzB,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM;gBACvC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;QACxB,CAAC,CAAC,EAAE;QACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;QACtC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAClC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;KAC7B,CAAC;IACpC,MAAM,aAAa,GAAG;QACpB,GAAG,UAAU;QACb,GAAG,OAAO;KACX,CAAC;IACF,IACE,aAAa,CAAC,UAAU,KAAK,SAAS;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,OAAO,EACpD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC;;;;;;;;;;CAUnB,CAAC,CAAC;IACD,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,EAAE,KAAK,IAAI,IAAI,CAAC;IAC3C,MAAM,eAAe,GACnB,aAAa,EAAE,MAAM,EAAE,eAAe;QACtC,eAAe,CAAC,MAAM,CAAC;YACrB,KAAK;YACL,OAAO,EAAE,aAAa,EAAE,SAAS,IAAI,IAAI;YACzC,KAAK,EAAE,aAAa,EAAE,KAAK,IAAI,KAAK;SACrC,CAAC,CAAC;IACL,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC;QACrB,GAAG,aAAa;QAChB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,OAAO;QAClB,KAAK;QACL,QAAQ,EAAE,aAAa,EAAE,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB;QACjE,eAAe;QACf,UAAU,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO;KAC5D,CAAC,CAAC;IACH,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACvB,IAAI,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,aAAa,EAAE,KAAK,IAAI,aAAa,CAAC;IACxD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,GAAG,aAAa;QAChB,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,SAAS;QACpB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,aAAa,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;QACvC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAoHD;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,GAAG,CAChB,GAAG,IAME;IAEL,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,GACrB,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;QAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAE,IAIC,CAAC;IACT,MAAM,eAAe,GACnB,OAAO,EAAE,MAAM,EAAE,eAAe;QAChC,eAAe,CAAC,MAAM,CAAC;YACrB,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,IAAI;YAC7B,OAAO,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI;YACnC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK;SAC/B,CAAC,CAAC;IACL,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC;QACvB,GAAG,OAAO;QACV,MAAM,EAAE,OAAO,EAAE,MAAM;QACvB,SAAS,EAAE,EAAE;QACb,eAAe;KAChB,CAAC,CAAC;IACH,IAAI,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,KAAK,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,UAAU,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClD,uFAAuF;YACvF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG;gBACb,CAAC,UAAU,CAAC,EAAE,EAAE;gBAChB,CAAC,WAAW,CAAC,EAAE,EAAE;gBACjB,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,IAAI;gBAC1B,CAAC,aAAa,CAAC,EAAE,MAAM;gBACvB,CAAC,WAAW,CAAC,EAAE,GAAG;gBAClB,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,YAAY;aACnD,CAAC;YACX,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,EAAE;gBACF,GAAG;gBACH,IAAI,EAAE,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,SAAS;gBACjB,MAAM;aACE,CAAC;YACX,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,MAAM,CAAC,MAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpC,MAAM,IAAI,KAAK,CACb,2DAA2D,IAAI,CAAC,IAAI,MAAM,EAAE,EAAE,CAC/E,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,MAAO,CAAC,SAAS,CAAC,GAAG,CAC1B,EAAE,EACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAoB,CACpE,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,GAAG,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC;QAC5B,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,QAAQ,CAAC;YACpB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"alchemy.js","sourceRoot":"","sources":["../src/alchemy.ts"],"names":[],"mappings":"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"}

package/lib/apply.d.ts

@@ -1,10 +1,10 @@
-import { type PendingResource, type Resource, type ResourceProps } from "./resource.ts";
+import { type PendingResource, type Resource, type ResourceAttributes, type ResourceProps } from "./resource.ts";
 export interface ApplyOptions {
     quiet?: boolean;
     alwaysUpdate?: boolean;
     noop?: boolean;
 }
-export declare function apply<Out extends Resource>(resource: PendingResource<Out>, props: ResourceProps | undefined, options?: ApplyOptions): Promise<Awaited<Out>>;
+export declare function apply<Out extends ResourceAttributes>(resource: PendingResource<Out>, props: ResourceProps | undefined, options?: ApplyOptions): Promise<Awaited<Out> & Resource>;
 export declare function isReplacedSignal(error: any): error is ReplacedSignal;
 export declare class ReplacedSignal extends Error {
     readonly kind = "ReplacedSignal";

package/lib/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,eAAe,EAEpB,KAAK,QAAQ,EACb,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAQvB,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,KAAK,CAAC,GAAG,SAAS,QAAQ,EACxC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,EAC9B,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAEvB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,cAAc,CAEpE;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,QAAQ,CAAC,IAAI,oBAAoB;IAC1B,KAAK,EAAE,OAAO,CAAC;gBAEV,KAAK,CAAC,EAAE,OAAO;CAI5B"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../src/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,eAAe,EAEpB,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAQvB,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,KAAK,CAAC,GAAG,SAAS,kBAAkB,EAClD,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,EAC9B,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAElC;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,cAAc,CAEpE;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,QAAQ,CAAC,IAAI,oBAAoB;IAC1B,KAAK,EAAE,OAAO,CAAC;gBAEV,KAAK,CAAC,EAAE,OAAO;CAI5B"}

package/lib/apply.js

@@ -189,7 +189,7 @@ async function _apply(resource, props, options) {
                 parent: scope,
                 destroyStrategy: provider.options?.destroyStrategy ?? "sequential",
                 noop: options?.noop,
-            }, async () => await provider.handler.bind(ctx)(resource[ResourceID], props));
+            }, async () => ctx(await provider.handler.bind(ctx)(resource[ResourceID], props)));
         }
         catch (error) {
             if (error instanceof ReplacedSignal) {
@@ -219,20 +219,23 @@ async function _apply(resource, props, options) {
                     isResource: true,
                     parent: scope,
                     noop: options?.noop,
-                }, async () => provider.handler.bind(context({
-                    scope,
-                    phase: "create",
-                    kind: resource[ResourceKind],
-                    id: resource[ResourceID],
-                    fqn: resource[ResourceFQN],
-                    seq: resource[ResourceSeq],
-                    props: state.props,
-                    state: state,
-                    isReplacement: true,
-                    replace: () => {
-                        throw new Error(`Resource ${resource[ResourceKind]} ${resource[ResourceFQN]} cannot be replaced in create phase.`);
-                    },
-                }))(resource[ResourceID], props));
+                }, async () => {
+                    const ctx = context({
+                        scope,
+                        phase: "create",
+                        kind: resource[ResourceKind],
+                        id: resource[ResourceID],
+                        fqn: resource[ResourceFQN],
+                        seq: resource[ResourceSeq],
+                        props: state.props,
+                        state: state,
+                        isReplacement: true,
+                        replace: () => {
+                            throw new Error(`Resource ${resource[ResourceKind]} ${resource[ResourceFQN]} cannot be replaced in create phase.`);
+                        },
+                    });
+                    return ctx(await provider.handler.bind(ctx)(resource[ResourceID], props));
+                });
             }
             else {
                 throw error;