alchemy 0.21.0 → 0.22.1

package/src/cloudflare/website.ts

@@ -1,11 +1,15 @@
-import fs from "node:fs/promises";
 import path from "node:path";
-import { alchemy } from "../alchemy.js";
-import { Exec } from "../os/exec.js";
-import { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Worker, type AssetsConfig, type WorkerProps } from "./worker.js";
-import { WranglerJson } from "./wrangler.json.js";
+import { alchemy } from "../alchemy.ts";
+import { Exec } from "../os/exec.ts";
+import { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import {
+  DEFAULT_COMPATIBILITY_DATE,
+  Worker,
+  type AssetsConfig,
+  type WorkerProps,
+} from "./worker.ts";
+import { WranglerJson } from "./wrangler.json.ts";
 
 export interface WebsiteProps<B extends Bindings>
   extends Omit<WorkerProps<B>, "name" | "assets" | "entrypoint"> {
@@ -69,9 +73,6 @@ export async function Website<B extends Bindings>(
   const wrangler = props.wrangler ?? true;
 
   return alchemy.run(id, async () => {
-    // building the site requires a wrangler.jsonc file to start
-    // - so initialize an empty one if it doesn't exist
-
     const cwd = path.resolve(props.cwd || process.cwd());
     const fileName =
       typeof wrangler === "boolean"
@@ -84,35 +85,17 @@ export async function Website<B extends Bindings>(
     const wranglerMain =
       typeof wrangler === "object" ? (wrangler.main ?? props.main) : props.main;
 
-    if (wrangler) {
-      try {
-        await fs.access(wranglerPath!);
-      } catch {
-        await fs.writeFile(
-          wranglerPath!,
-          JSON.stringify(
-            {
-              name: id,
-              main: wranglerMain,
-              compatibility_date: new Date().toISOString().split("T")[0],
-              compatibility_flags: props.compatibilityFlags ?? [],
-            },
-            null,
-            2,
-          ),
-        );
-      }
-    }
+    const workerName = props.name ?? id;
 
-    await Exec("build", {
-      cwd,
-      command: props.command,
-    });
+    const assetDir =
+      typeof props.assets === "string"
+        ? props.assets
+        : (props.assets?.dist ?? "dist");
 
-    // @ts-expect-error - the WorkerProps union type not happy
-    const worker = await Worker("worker", {
+    const workerProps = {
       ...props,
-      name: props.name ?? id,
+      compatibilityDate: props.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE,
+      name: workerName,
       entrypoint: props.main,
       assets: {
         html_handling: "auto-trailing-slash",
@@ -130,25 +113,36 @@ export default {
 };`,
       url: true,
       adopt: true,
-      bindings: {
-        ...props.bindings,
-        ASSETS: await Assets("assets", {
-          path:
-            typeof props.assets === "string"
-              ? props.assets
-              : (props.assets?.dist ?? "dist"),
-        }),
-      },
-    });
+    } as WorkerProps<any> & { name: string };
 
     if (wrangler) {
       await WranglerJson("wrangler.jsonc", {
         path: wranglerPath,
-        worker,
+        worker: workerProps,
         main: wranglerMain,
+        // hard-code the assets directory because we haven't yet included the assets binding
+        assets: {
+          binding: "ASSETS",
+          directory: assetDir,
+        },
       });
     }
 
-    return worker as Website<B>;
+    await Exec("build", {
+      cwd,
+      command: props.command,
+    });
+
+    return (await Worker("worker", {
+      ...workerProps,
+      bindings: {
+        ...workerProps.bindings,
+        // we don't include the Assets binding until after build to make sure the asset manifest is correct
+        // we generate the wrangler.json using all the bind
+        ASSETS: await Assets("assets", {
+          path: assetDir,
+        }),
+      },
+    } as WorkerProps<any> & { name: string })) as Website<B>;
   });
 }

package/src/cloudflare/worker-assets.ts

@@ -1,10 +1,10 @@
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { getContentType } from "../util/content-type.js";
-import type { CloudflareApi } from "./api.js";
-import type { Assets } from "./assets.js";
-import type { AssetsConfig, WorkerProps } from "./worker.js";
+import { getContentType } from "../util/content-type.ts";
+import type { CloudflareApi } from "./api.ts";
+import type { Assets } from "./assets.ts";
+import type { AssetsConfig, WorkerProps } from "./worker.ts";
 
 export interface AssetUploadResult {
   completionToken: string;

package/src/cloudflare/worker-metadata.ts

@@ -1,18 +1,18 @@
-import type { Context } from "../context.js";
-import { slugify } from "../util/slugify.js";
+import type { Context } from "../context.ts";
+import { slugify } from "../util/slugify.ts";
 import {
   Self,
   type Bindings,
   type WorkerBindingDurableObjectNamespace,
   type WorkerBindingSpec,
-} from "./bindings.js";
+} from "./bindings.ts";
 import {
   isDurableObjectNamespace,
   type DurableObjectNamespace,
-} from "./durable-object-namespace.js";
-import { createAssetConfig, type AssetUploadResult } from "./worker-assets.js";
-import type { SingleStepMigration } from "./worker-migration.js";
-import type { AssetsConfig, Worker, WorkerProps } from "./worker.js";
+} from "./durable-object-namespace.ts";
+import { createAssetConfig, type AssetUploadResult } from "./worker-assets.ts";
+import type { SingleStepMigration } from "./worker-migration.ts";
+import type { AssetsConfig, Worker, WorkerProps } from "./worker.ts";
 
 /**
  * Metadata returned by Cloudflare API for a worker script

package/src/cloudflare/worker-stub.ts

@@ -1,11 +1,11 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
+} from "./api.ts";
 
 /**
  * Properties for creating a Worker stub

package/src/cloudflare/worker.ts

@@ -1,60 +1,60 @@
 import path from "node:path";
-import type { Context } from "../context.js";
-import type { BundleProps } from "../esbuild/bundle.js";
-import { InnerResourceScope, Resource, ResourceKind } from "../resource.js";
-import { getBindKey, tryGetBinding } from "../runtime/bind.js";
-import { isRuntime } from "../runtime/global.js";
-import { bootstrapPlugin } from "../runtime/plugin.js";
-import { Scope } from "../scope.js";
-import { Secret, secret } from "../secret.js";
-import { serializeScope } from "../serde.js";
-import type { type } from "../type.js";
-import { withExponentialBackoff } from "../util/retry.js";
-import { slugify } from "../util/slugify.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import type { BundleProps } from "../esbuild/bundle.ts";
+import { InnerResourceScope, Resource, ResourceKind } from "../resource.ts";
+import { getBindKey, tryGetBinding } from "../runtime/bind.ts";
+import { isRuntime } from "../runtime/global.ts";
+import { bootstrapPlugin } from "../runtime/plugin.ts";
+import { Scope } from "../scope.ts";
+import { Secret, secret } from "../secret.ts";
+import { serializeScope } from "../serde.ts";
+import type { type } from "../type.ts";
+import { withExponentialBackoff } from "../util/retry.ts";
+import { slugify } from "../util/slugify.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
   createCloudflareApi,
-} from "./api.js";
-import type { Assets } from "./assets.js";
+} from "./api.ts";
+import type { Assets } from "./assets.ts";
 import {
   type Binding,
   type Bindings,
   Json,
   type WorkerBindingSpec,
-} from "./bindings.js";
-import type { Bound } from "./bound.js";
-import { isBucket } from "./bucket.js";
-import { bundleWorkerScript } from "./bundle/bundle-worker.js";
-import { isD1Database } from "./d1-database.js";
+} from "./bindings.ts";
+import type { Bound } from "./bound.ts";
+import { isBucket } from "./bucket.ts";
+import { bundleWorkerScript } from "./bundle/bundle-worker.ts";
+import { isD1Database } from "./d1-database.ts";
 import {
   DurableObjectNamespace,
   isDurableObjectNamespace,
-} from "./durable-object-namespace.js";
+} from "./durable-object-namespace.ts";
 import {
   type EventSource,
   type QueueEventSource,
   isQueueEventSource,
-} from "./event-source.js";
-import { isKVNamespace } from "./kv-namespace.js";
-import { isPipeline } from "./pipeline.js";
+} from "./event-source.ts";
+import { isKVNamespace } from "./kv-namespace.ts";
+import { isPipeline } from "./pipeline.ts";
 import {
   QueueConsumer,
   deleteQueueConsumer,
   listQueueConsumers,
-} from "./queue-consumer.js";
-import { type QueueResource, isQueue } from "./queue.js";
-import { isVectorizeIndex } from "./vectorize-index.js";
-import { type AssetUploadResult, uploadAssets } from "./worker-assets.js";
+} from "./queue-consumer.ts";
+import { type QueueResource, isQueue } from "./queue.ts";
+import { isVectorizeIndex } from "./vectorize-index.ts";
+import { type AssetUploadResult, uploadAssets } from "./worker-assets.ts";
 import {
   type WorkerMetadata,
   type WorkerScriptMetadata,
   prepareWorkerMetadata,
-} from "./worker-metadata.js";
-import type { SingleStepMigration } from "./worker-migration.js";
-import { WorkerStub, isWorkerStub } from "./worker-stub.js";
-import { type Workflow, upsertWorkflow } from "./workflow.js";
+} from "./worker-metadata.ts";
+import type { SingleStepMigration } from "./worker-migration.ts";
+import { WorkerStub, isWorkerStub } from "./worker-stub.ts";
+import { type Workflow, upsertWorkflow } from "./workflow.ts";
 
 /**
  * Configuration options for static assets
@@ -683,6 +683,8 @@ export function Worker<const B extends Bindings>(
   });
 }
 
+export const DEFAULT_COMPATIBILITY_DATE = "2025-04-20";
+
 export const _Worker = Resource(
   "cloudflare::Worker",
   {
@@ -699,7 +701,8 @@ export const _Worker = Resource(
     // Use the provided name
     const workerName = props.name ?? id;
 
-    const compatibilityDate = props.compatibilityDate ?? "2025-04-20";
+    const compatibilityDate =
+      props.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE;
     const compatibilityFlags = props.compatibilityFlags ?? [];
 
     const uploadWorkerScript = async (props: WorkerProps<B>) => {

package/src/cloudflare/workflow.ts

@@ -1,6 +1,6 @@
-import { handleApiError } from "./api-error.js";
-import type { CloudflareApi } from "./api.js";
-import type { Binding } from "./bindings.js";
+import { handleApiError } from "./api-error.ts";
+import type { CloudflareApi } from "./api.ts";
+import type { Binding } from "./bindings.ts";
 
 export interface WorkflowProps {
   /**

package/src/cloudflare/wrangler.json.ts

@@ -7,7 +7,7 @@ import type { DurableObjectNamespace } from "./durable-object-namespace.js";
 import type { EventSource } from "./event-source.js";
 import { isQueueEventSource } from "./event-source.js";
 import { isQueue } from "./queue.js";
-import type { Worker } from "./worker.js";
+import type { Worker, WorkerProps } from "./worker.js";
 
 /**
  * Properties for wrangler.json configuration file
@@ -17,7 +17,11 @@ export interface WranglerJsonProps {
   /**
    * The worker to generate the wrangler.json file for
    */
-  worker: Worker<any>;
+  worker:
+    | Worker
+    | (WorkerProps<any> & {
+        name: string;
+      });
   /**
    * Path to write the wrangler.json file to
    *
@@ -31,6 +35,16 @@ export interface WranglerJsonProps {
    * @default worker.entrypoint
    */
   main?: string;
+
+  /**
+   * Path to the assets directory
+   *
+   * @default inferred from the worker's Asset bindings
+   */
+  assets?: {
+    binding: string;
+    directory: string;
+  };
 }
 
 /**
@@ -92,6 +106,7 @@ export const WranglerJson = Resource(
       // see: https://developers.cloudflare.com/workers/configuration/compatibility-dates/
       compatibility_date: worker.compatibilityDate,
       compatibility_flags: props.worker.compatibilityFlags,
+      assets: props.assets,
     };
 
     // Process bindings if they exist

package/src/cloudflare/zone.ts

@@ -1,7 +1,7 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { handleApiError } from "./api-error.js";
-import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { handleApiError } from "./api-error.ts";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
 import type {
   AlwaysUseHTTPSValue,
   AutomaticHTTPSRewritesValue,
@@ -20,7 +20,7 @@ import type {
   UpdateZoneSettingParams,
   WebSocketsValue,
   ZeroRTTValue,
-} from "./zone-settings.js";
+} from "./zone-settings.ts";
 
 /**
  * Properties for creating or updating a Zone

package/src/context.ts

@@ -1,4 +1,4 @@
-import { DestroyedSignal } from "./destroy.js";
+import { DestroyedSignal } from "./destroy.ts";
 import {
   ResourceFQN,
   ResourceID,
@@ -7,9 +7,9 @@ import {
   ResourceSeq,
   type Resource,
   type ResourceProps,
-} from "./resource.js";
-import type { Scope } from "./scope.js";
-import type { State } from "./state.js";
+} from "./resource.ts";
+import type { Scope } from "./scope.ts";
+import type { State } from "./state.ts";
 
 export type Context<
   Out extends Resource,

package/src/destroy.ts

@@ -1,5 +1,5 @@
-import { alchemy } from "./alchemy.js";
-import { context } from "./context.js";
+import { alchemy } from "./alchemy.ts";
+import { context } from "./context.ts";
 import {
   resolveDeletionHandler,
   type Resource,
@@ -8,8 +8,8 @@ import {
   ResourceKind,
   ResourceScope,
   ResourceSeq,
-} from "./resource.js";
-import { Scope } from "./scope.js";
+} from "./resource.ts";
+import { Scope } from "./scope.ts";
 
 export class DestroyedSignal extends Error {}
 

package/src/dns/import-dns.ts

@@ -1,6 +1,6 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { DEFAULT_RECORD_TYPES, type DnsRecordType } from "./record.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { DEFAULT_RECORD_TYPES, type DnsRecordType } from "./record.ts";
 
 /**
  * DNS record response structure from Cloudflare DNS API

package/src/dns/index.ts

@@ -1,2 +1,2 @@
-export * from "./import-dns.js";
-export * from "./record.js";
+export * from "./import-dns.ts";
+export * from "./record.ts";

package/src/esbuild/bundle.ts

@@ -2,8 +2,8 @@ import type esbuild from "esbuild";
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
 
 /**
  * Properties for creating or updating an esbuild bundle

package/src/esbuild/index.ts

@@ -1 +1 @@
-export * from "./bundle.js";
+export * from "./bundle.ts";

package/src/fs/copy-file.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { ignore } from "../util/ignore.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { ignore } from "../util/ignore.ts";
 
 /**
  * Properties for creating a CopyFile resource

package/src/fs/file-system-state-store.ts

@@ -1,10 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-import { ResourceScope } from "../resource.js";
-import type { Scope } from "../scope.js";
-import { serialize } from "../serde.js";
-import { deserializeState, type State, type StateStore } from "../state.js";
-import { ignore } from "../util/ignore.js";
+import { ResourceScope } from "../resource.ts";
+import type { Scope } from "../scope.ts";
+import { serialize } from "../serde.ts";
+import { deserializeState, type State, type StateStore } from "../state.ts";
+import { ignore } from "../util/ignore.ts";
 
 const stateRootDir = path.join(process.cwd(), ".alchemy");
 

package/src/fs/file.ts

@@ -1,14 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { ignore } from "../util/ignore.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { ignore } from "../util/ignore.ts";
 
-import { alchemy } from "../alchemy.js";
-import type { FileCollection } from "./file-collection.js";
-import type { FileRef } from "./file-ref.js";
+import { alchemy } from "../alchemy.ts";
+import type { FileCollection } from "./file-collection.ts";
+import type { FileRef } from "./file-ref.ts";
 
-declare module "../alchemy.js" {
+declare module "../alchemy.ts" {
   interface Alchemy {
     /**
      * Creates a reference to a file in the filesystem.

package/src/fs/folder.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { ignore } from "../util/ignore.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { ignore } from "../util/ignore.ts";
 
 export interface FolderProps {
   /**

package/src/fs/index.ts

@@ -1,14 +1,14 @@
-export * from "./copy-file.js";
-export * from "./file-collection.js";
-export * from "./file-ref.js";
-export * from "./file-system-state-store.js";
-export * from "./file.js";
-export * from "./folder.js";
-export * from "./static-astro-file.js";
-export * from "./static-css-file.js";
-export * from "./static-html-file.js";
-export * from "./static-json-file.js";
-export * from "./static-text-file.js";
-export * from "./static-typescript-file.js";
-export * from "./static-vue-file.js";
-export * from "./static-yaml-file.js";
+export * from "./copy-file.ts";
+export * from "./file-collection.ts";
+export * from "./file-ref.ts";
+export * from "./file-system-state-store.ts";
+export * from "./file.ts";
+export * from "./folder.ts";
+export * from "./static-astro-file.ts";
+export * from "./static-css-file.ts";
+export * from "./static-html-file.ts";
+export * from "./static-json-file.ts";
+export * from "./static-text-file.ts";
+export * from "./static-typescript-file.ts";
+export * from "./static-vue-file.ts";
+export * from "./static-yaml-file.ts";

package/src/fs/static-astro-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 export type StaticAstroFile = File;
 

package/src/fs/static-css-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 export type StaticCSSFile = File;
 

package/src/fs/static-html-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 export type StaticHTMLFile = File;
 

package/src/fs/static-json-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 /**
  * Creates a JSON file with formatted content

package/src/fs/static-text-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 /**
  * Creates a plain text file

package/src/fs/static-typescript-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 /**
  * Creates a TypeScript file with formatted content using prettier

package/src/fs/static-vue-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 
 export type StaticVueFile = File;
 

package/src/fs/static-yaml-file.ts

@@ -1,4 +1,4 @@
-import { File } from "./file.js";
+import { File } from "./file.ts";
 /**
  * Creates a YAML file with formatted content
  *

package/src/github/index.ts

@@ -1,2 +1,2 @@
-export * from "./repository-environment.js";
-export * from "./secret.js";
+export * from "./repository-environment.ts";
+export * from "./secret.ts";

package/src/github/repository-environment.ts

@@ -1,6 +1,6 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { createGitHubClient, verifyGitHubAuth } from "./client.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { createGitHubClient, verifyGitHubAuth } from "./client.ts";
 
 /**
  * Properties for creating or updating a GitHub Repository Environment

package/src/github/secret.ts

@@ -1,8 +1,8 @@
 import sodium from "libsodium-wrappers";
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import type { Secret } from "../secret.js";
-import { createGitHubClient, verifyGitHubAuth } from "./client.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import type { Secret } from "../secret.ts";
+import { createGitHubClient, verifyGitHubAuth } from "./client.ts";
 /**
  * Properties for creating or updating a GitHub Secret
  */