alchemy 0.11.3 → 0.11.4

package/lib/cloudflare/vite-site.js

@@ -29,17 +29,31 @@ export async function ViteSite(id, props) {
             command: props.command,
         });
         const staticAssets = await Assets("assets", {
-            path: props.assets ?? "./dist",
+            path: props.assets ??
+                (await (async () => {
+                    try {
+                        await fs.access(path.join("dist", "client", "index.html"));
+                        return path.join(".", "dist", "client");
+                    }
+                    catch {
+                        return path.join(".", "dist");
+                    }
+                })()),
         });
         const worker = await Worker("worker", {
             name: props.name ?? id,
             entrypoint: props.main,
+            assets: {
+                html_handling: "auto-trailing-slash",
+                not_found_handling: "single-page-application",
+                run_worker_first: false,
+            },
             script: props.main
                 ? undefined
                 : `
 export default {
   async fetch(request, env) {
-    return env.ASSETS.fetch(request);
+    return new Response("Not Found", { status: 404 });
   },
 };`,
             url: true,

package/lib/cloudflare/worker.d.ts

@@ -5,6 +5,40 @@ import { type CloudflareApiOptions } from "./api";
 import { type Bindings } from "./bindings";
 import type { Bound } from "./bound";
 import type { SingleStepMigration } from "./worker-migration";
+/**
+ * Configuration options for static assets
+ */
+export interface AssetsConfig {
+    /**
+     * The contents of a _headers file (used to attach custom headers on asset responses)
+     */
+    _headers?: string;
+    /**
+     * The contents of a _redirects file (used to apply redirects or proxy paths ahead of asset serving)
+     */
+    _redirects?: string;
+    /**
+     * Determines the redirects and rewrites of requests for HTML content
+     * @default "auto-trailing-slash"
+     */
+    html_handling?: "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash" | "none";
+    /**
+     * Determines the response when a request does not match a static asset, and there is no Worker script
+     */
+    not_found_handling?: "none" | "404-page" | "single-page-application";
+    /**
+     * When true, requests will always invoke the Worker script.
+     * Otherwise, attempt to serve an asset matching the request, falling back to the Worker script.
+     */
+    run_worker_first?: boolean;
+    /**
+     * When true and the incoming request matches an asset, that will be served instead of invoking the Worker script.
+     * When false, requests will always invoke the Worker script.
+     * @default true
+     * @deprecated
+     */
+    serve_directly?: boolean;
+}
 /**
  * Properties for creating or updating a Worker
  */
@@ -83,6 +117,10 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
      * The compatibility flags for the worker
      */
     compatibilityFlags?: string[];
+    /**
+     * Configuration for static assets
+     */
+    assets?: AssetsConfig;
 }
 /**
  * Output returned after Worker creation/update
@@ -110,6 +148,10 @@ export interface Worker<B extends Bindings = Bindings> extends Resource<"cloudfl
      * The bindings that were created
      */
     bindings: B | undefined;
+    /**
+     * Configuration for static assets
+     */
+    assets?: AssetsConfig;
     Env: {
         [bindingName in keyof B]: Bound<B[bindingName]>;
     };

package/lib/cloudflare/worker.js

@@ -132,7 +132,7 @@ export const Worker = Resource("cloudflare::Worker", {
         // In the future, we might want to support multiple asset bindings
         const assetBinding = assetsBindings[0];
         // Upload the assets and get the completion token
-        assetUploadResult = await uploadAssets(api, workerName, assetBinding.assets);
+        assetUploadResult = await uploadAssets(api, workerName, assetBinding.assets, props.assets);
     }
     // Prepare metadata with bindings
     const scriptMetadata = await prepareWorkerMetadata(this, oldBindings, props, assetUploadResult);
@@ -165,6 +165,8 @@ export const Worker = Resource("cloudflare::Worker", {
         createdAt: now,
         updatedAt: now,
         url: workerUrl,
+        // Include assets configuration in the output
+        assets: props.assets,
         // phantom property
         Env: undefined,
     });
@@ -236,6 +238,35 @@ class NotFoundError extends Error {
         this.name = "NotFoundError";
     }
 }
+/**
+ * Creates asset configuration object from provided config or defaults
+ */
+function createAssetConfig(config) {
+    const assetConfig = {
+        html_handling: "auto-trailing-slash",
+    };
+    if (config) {
+        if (config._headers !== undefined) {
+            assetConfig._headers = config._headers;
+        }
+        if (config._redirects !== undefined) {
+            assetConfig._redirects = config._redirects;
+        }
+        if (config.html_handling !== undefined) {
+            assetConfig.html_handling = config.html_handling;
+        }
+        if (config.not_found_handling !== undefined) {
+            assetConfig.not_found_handling = config.not_found_handling;
+        }
+        if (config.run_worker_first !== undefined) {
+            assetConfig.run_worker_first = config.run_worker_first;
+        }
+        if (config.serve_directly !== undefined) {
+            assetConfig.serve_directly = config.serve_directly;
+        }
+    }
+    return assetConfig;
+}
 async function prepareWorkerMetadata(ctx, oldBindings, props, assetUploadResult) {
     // Prepare metadata with bindings
     const meta = {
@@ -260,8 +291,16 @@ async function prepareWorkerMetadata(ctx, oldBindings, props, assetUploadResult)
         meta.assets = {
             jwt: assetUploadResult.completionToken,
         };
+        // Initialize config from assetUploadResult if it exists
         if (assetUploadResult.assetConfig) {
-            meta.assets.config = assetUploadResult.assetConfig;
+            meta.assets.config = {
+                ...assetUploadResult.assetConfig,
+            };
+        }
+        // If there's no config from assetUploadResult but we have props.assets,
+        // we need to create the config ourselves (this handles the case when no assets were uploaded)
+        if (!meta.assets.config && props.assets) {
+            meta.assets.config = createAssetConfig(props.assets);
         }
     }
     const bindings = (props.bindings ?? {});
@@ -538,9 +577,12 @@ async function getWorkerBindings(api, workerName, environment = "production") {
  * @param api CloudflareApi instance
  * @param workerName Name of the worker
  * @param assets Assets resource containing files to upload
+ * @param assetConfig Configuration for the assets
  * @returns Completion token for the assets upload
  */
-async function uploadAssets(api, workerName, assets) {
+async function uploadAssets(api, workerName, assets, assetConfig) {
+    // Process the assets configuration once at the beginning
+    const processedConfig = createAssetConfig(assetConfig);
     // Generate the file manifest
     const fileMetadata = {};
     // Process each file in the assets
@@ -561,7 +603,10 @@ async function uploadAssets(api, workerName, assets) {
     const sessionData = (await uploadSessionResponse.json());
     // If there are no buckets, assets are already uploaded or empty
     if (!sessionData.result.buckets || sessionData.result.buckets.length === 0) {
-        return { completionToken: sessionData.result.jwt };
+        return {
+            completionToken: sessionData.result.jwt,
+            assetConfig: processedConfig,
+        };
     }
     // Upload the files in batches as specified by the API
     let completionToken = sessionData.result.jwt;
@@ -607,12 +652,10 @@ async function uploadAssets(api, workerName, assets) {
             completionToken = uploadData.result.jwt;
         }
     }
-    // Return the final completion token
+    // Return the final completion token with asset configuration
     return {
         completionToken,
-        assetConfig: {
-            html_handling: "auto-trailing-slash",
-        },
+        assetConfig: processedConfig,
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {

package/src/cloudflare/vite-site.ts

@@ -82,18 +82,31 @@ export async function ViteSite<B extends Bindings>(
     });
 
     const staticAssets = await Assets("assets", {
-      path: props.assets ?? "./dist",
+      path:
+        props.assets ??
+        (await (async () => {
+          try {
+            await fs.access(path.join("dist", "client", "index.html"));
+            return path.join(".", "dist", "client");
+          } catch {
+            return path.join(".", "dist");
+          }
+        })()),
     });
-
     const worker = await Worker("worker", {
       name: props.name ?? id,
       entrypoint: props.main,
+      assets: {
+        html_handling: "auto-trailing-slash",
+        not_found_handling: "single-page-application",
+        run_worker_first: false,
+      },
       script: props.main
         ? undefined
         : `
 export default {
   async fetch(request, env) {
-    return env.ASSETS.fetch(request);
+    return new Response("Not Found", { status: 404 });
   },
 };`,
       url: true,

package/src/cloudflare/worker.ts

@@ -19,6 +19,50 @@ import type { WorkerScriptMetadata } from "./worker-metadata";
 import type { SingleStepMigration } from "./worker-migration";
 import { upsertWorkflow, type Workflow } from "./workflow";
 
+/**
+ * Configuration options for static assets
+ */
+export interface AssetsConfig {
+  /**
+   * The contents of a _headers file (used to attach custom headers on asset responses)
+   */
+  _headers?: string;
+
+  /**
+   * The contents of a _redirects file (used to apply redirects or proxy paths ahead of asset serving)
+   */
+  _redirects?: string;
+
+  /**
+   * Determines the redirects and rewrites of requests for HTML content
+   * @default "auto-trailing-slash"
+   */
+  html_handling?:
+    | "auto-trailing-slash"
+    | "force-trailing-slash"
+    | "drop-trailing-slash"
+    | "none";
+
+  /**
+   * Determines the response when a request does not match a static asset, and there is no Worker script
+   */
+  not_found_handling?: "none" | "404-page" | "single-page-application";
+
+  /**
+   * When true, requests will always invoke the Worker script.
+   * Otherwise, attempt to serve an asset matching the request, falling back to the Worker script.
+   */
+  run_worker_first?: boolean;
+
+  /**
+   * When true and the incoming request matches an asset, that will be served instead of invoking the Worker script.
+   * When false, requests will always invoke the Worker script.
+   * @default true
+   * @deprecated
+   */
+  serve_directly?: boolean;
+}
+
 /**
  * Properties for creating or updating a Worker
  */
@@ -110,6 +154,11 @@ export interface WorkerProps<B extends Bindings = Bindings>
    * The compatibility flags for the worker
    */
   compatibilityFlags?: string[];
+
+  /**
+   * Configuration for static assets
+   */
+  assets?: AssetsConfig;
 }
 
 /**
@@ -146,6 +195,11 @@ export interface Worker<B extends Bindings = Bindings>
    */
   bindings: B | undefined;
 
+  /**
+   * Configuration for static assets
+   */
+  assets?: AssetsConfig;
+
   // phantom property (for typeof myWorker.Env)
   Env: {
     [bindingName in keyof B]: Bound<B[bindingName]>;
@@ -291,7 +345,8 @@ export const Worker = Resource(
       assetUploadResult = await uploadAssets(
         api,
         workerName,
-        assetBinding.assets
+        assetBinding.assets,
+        props.assets
       );
     }
 
@@ -342,6 +397,8 @@ export const Worker = Resource(
       createdAt: now,
       updatedAt: now,
       url: workerUrl,
+      // Include assets configuration in the output
+      assets: props.assets,
       // phantom property
       Env: undefined!,
     });
@@ -480,19 +537,50 @@ interface WorkerMetadata {
   assets?: {
     jwt?: string;
     keep_assets?: boolean;
-    config?: {
-      html_handling?: "auto-trailing-slash" | "none";
-      not_found_handling?: "none" | "fall-through";
-    };
+    config?: AssetsConfig;
   };
 }
 
 interface AssetUploadResult {
   completionToken: string;
-  assetConfig?: {
-    html_handling?: "auto-trailing-slash" | "none";
-    not_found_handling?: "none" | "fall-through";
+  assetConfig?: AssetsConfig;
+}
+
+/**
+ * Creates asset configuration object from provided config or defaults
+ */
+function createAssetConfig(config?: AssetsConfig): AssetsConfig {
+  const assetConfig: AssetsConfig = {
+    html_handling: "auto-trailing-slash",
   };
+
+  if (config) {
+    if (config._headers !== undefined) {
+      assetConfig._headers = config._headers;
+    }
+
+    if (config._redirects !== undefined) {
+      assetConfig._redirects = config._redirects;
+    }
+
+    if (config.html_handling !== undefined) {
+      assetConfig.html_handling = config.html_handling;
+    }
+
+    if (config.not_found_handling !== undefined) {
+      assetConfig.not_found_handling = config.not_found_handling;
+    }
+
+    if (config.run_worker_first !== undefined) {
+      assetConfig.run_worker_first = config.run_worker_first;
+    }
+
+    if (config.serve_directly !== undefined) {
+      assetConfig.serve_directly = config.serve_directly;
+    }
+  }
+
+  return assetConfig;
 }
 
 async function prepareWorkerMetadata<B extends Bindings>(
@@ -526,8 +614,17 @@ async function prepareWorkerMetadata<B extends Bindings>(
       jwt: assetUploadResult.completionToken,
     };
 
+    // Initialize config from assetUploadResult if it exists
     if (assetUploadResult.assetConfig) {
-      meta.assets.config = assetUploadResult.assetConfig;
+      meta.assets.config = {
+        ...assetUploadResult.assetConfig,
+      };
+    }
+
+    // If there's no config from assetUploadResult but we have props.assets,
+    // we need to create the config ourselves (this handles the case when no assets were uploaded)
+    if (!meta.assets.config && props.assets) {
+      meta.assets.config = createAssetConfig(props.assets);
     }
   }
 
@@ -910,13 +1007,18 @@ interface UploadResponse {
  * @param api CloudflareApi instance
  * @param workerName Name of the worker
  * @param assets Assets resource containing files to upload
+ * @param assetConfig Configuration for the assets
  * @returns Completion token for the assets upload
  */
 async function uploadAssets(
   api: CloudflareApi,
   workerName: string,
-  assets: Assets
+  assets: Assets,
+  assetConfig?: WorkerProps["assets"]
 ): Promise<AssetUploadResult> {
+  // Process the assets configuration once at the beginning
+  const processedConfig = createAssetConfig(assetConfig);
+
   // Generate the file manifest
   const fileMetadata: Record<string, FileMetadata> = {};
 
@@ -949,7 +1051,10 @@ async function uploadAssets(
 
   // If there are no buckets, assets are already uploaded or empty
   if (!sessionData.result.buckets || sessionData.result.buckets.length === 0) {
-    return { completionToken: sessionData.result.jwt };
+    return {
+      completionToken: sessionData.result.jwt,
+      assetConfig: processedConfig,
+    };
   }
 
   // Upload the files in batches as specified by the API
@@ -1013,12 +1118,10 @@ async function uploadAssets(
     }
   }
 
-  // Return the final completion token
+  // Return the final completion token with asset configuration
   return {
     completionToken,
-    assetConfig: {
-      html_handling: "auto-trailing-slash",
-    },
+    assetConfig: processedConfig,
   };
 }