alchemy 0.17.2 → 0.19.0

package/src/cloudflare/website.ts

@@ -66,6 +66,7 @@ export async function Website<B extends Bindings>(
   if (props.bindings?.ASSETS) {
     throw new Error("ASSETS binding is reserved for internal use");
   }
+  const wrangler = props.wrangler ?? true;
 
   return alchemy.run(id, async () => {
     // building the site requires a wrangler.jsonc file to start
@@ -73,19 +74,17 @@ export async function Website<B extends Bindings>(
 
     const cwd = path.resolve(props.cwd || process.cwd());
     const fileName =
-      typeof props.wrangler === "boolean"
+      typeof wrangler === "boolean"
         ? "wrangler.jsonc"
-        : typeof props.wrangler === "string"
-          ? props.wrangler
-          : (props.wrangler?.path ?? "wrangler.jsonc");
+        : typeof wrangler === "string"
+          ? wrangler
+          : (wrangler?.path ?? "wrangler.jsonc");
     const wranglerPath =
       fileName && path.relative(cwd, path.join(cwd, fileName));
     const wranglerMain =
-      typeof props.wrangler === "object"
-        ? (props.wrangler.main ?? props.main)
-        : props.main;
+      typeof wrangler === "object" ? (wrangler.main ?? props.main) : props.main;
 
-    if (props.wrangler) {
+    if (wrangler) {
       try {
         await fs.access(wranglerPath!);
       } catch {
@@ -142,7 +141,7 @@ export default {
       },
     });
 
-    if (props.wrangler) {
+    if (wrangler) {
       await WranglerJson("wrangler.jsonc", {
         path: wranglerPath,
         worker,

package/src/destroy.ts

@@ -1,14 +1,13 @@
 import { alchemy } from "./alchemy.js";
 import { context } from "./context.js";
 import {
-  PROVIDERS,
+  resolveDeletionHandler,
+  type Resource,
   ResourceFQN,
   ResourceID,
   ResourceKind,
   ResourceScope,
   ResourceSeq,
-  type Provider,
-  type Resource,
 } from "./resource.js";
 import { Scope } from "./scope.js";
 
@@ -70,9 +69,7 @@ export async function destroy<Type extends string>(
     return await destroy(scope, options);
   }
 
-  const Provider: Provider<Type> | undefined = PROVIDERS.get(
-    instance[ResourceKind],
-  );
+  const Provider = resolveDeletionHandler(instance[ResourceKind]);
   if (!Provider) {
     throw new Error(
       `Cannot destroy resource "${instance[ResourceFQN]}" type ${instance[ResourceKind]} - no provider found. You may need to import the provider in your alchemy.config.ts.`,
@@ -124,7 +121,7 @@ export async function destroy<Type extends string>(
           nestedScope = scope;
           return await Provider.handler.bind(ctx)(
             instance[ResourceID],
-            state.props,
+            state.props!,
           );
         },
       );

package/src/resource.ts

@@ -2,7 +2,38 @@ import { apply } from "./apply.js";
 import type { Context } from "./context.js";
 import { Scope as _Scope, type Scope } from "./scope.js";
 
-export const PROVIDERS = new Map<ResourceKind, Provider<string, any>>();
+export const PROVIDERS: Map<ResourceKind, Provider<string, any>> = new Map<
+  ResourceKind,
+  Provider<string, any>
+>();
+const DYNAMIC_RESOURCE_RESOLVERS: DynamicResourceResolver[] = [];
+
+export type DynamicResourceResolver = (
+  typeName: string,
+) => Provider | undefined;
+
+/**
+ * Register a function that will be called if a Resource Type cannot be found during deletion.
+ */
+export function registerDynamicResource(
+  handler: DynamicResourceResolver,
+): void {
+  DYNAMIC_RESOURCE_RESOLVERS.push(handler);
+}
+
+export function resolveDeletionHandler(typeName: string): Provider | undefined {
+  const provider: Provider<string, any> | undefined = PROVIDERS.get(typeName);
+  if (provider) {
+    return provider;
+  }
+  for (const handler of DYNAMIC_RESOURCE_RESOLVERS) {
+    const result = handler(typeName);
+    if (result) {
+      return result;
+    }
+  }
+  return undefined;
+}
 
 export type ResourceID = string;
 export const ResourceID = Symbol.for("alchemy::ResourceID");

package/src/test/bun.ts

@@ -191,7 +191,7 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
 
     return it(
       testName,
-      async () =>
+      () =>
         alchemy.run(
           testName,
           {
@@ -199,7 +199,6 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
             parent: scope,
           },
           async (scope) => {
-            // Enter test scope since bun calls from different scope
             await scope.run(() => fn(scope));
           },
         ),