alchemy 0.3.0 → 0.3.1

package/src/cloudflare/static-site-router.ts

@@ -65,21 +65,27 @@ app.notFound(async (ctx) => {
 
   // Fetch from KV
   {
-    const object = await env.ASSETS.getWithMetadata(filePath);
+    const object = await env.ASSETS.getWithMetadata(filePath, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, filePath, object);
     }
   }
   {
     const guess = filePath + (filePath.endsWith("/") ? "" : "/") + "index.html";
-    const object = await env.ASSETS.getWithMetadata(guess);
+    const object = await env.ASSETS.getWithMetadata(guess, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, guess, object);
     }
   }
   {
     const guess = filePath + ".html";
-    const object = await env.ASSETS.getWithMetadata(guess);
+    const object = await env.ASSETS.getWithMetadata(guess, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, guess, object);
     }
@@ -87,12 +93,16 @@ app.notFound(async (ctx) => {
 
   // Handle error page
   if (env.ERROR_PAGE) {
-    const object = await env.ASSETS.getWithMetadata(env.ERROR_PAGE);
+    const object = await env.ASSETS.getWithMetadata(env.ERROR_PAGE, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(404, env.ERROR_PAGE, object);
     }
   } else {
-    const object = await env.ASSETS.getWithMetadata(env.INDEX_PAGE);
+    const object = await env.ASSETS.getWithMetadata(env.INDEX_PAGE, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, env.INDEX_PAGE, object);
     }
@@ -122,7 +132,7 @@ app.notFound(async (ctx) => {
   async function respond(
     status: number,
     filePath: string,
-    object: KVNamespaceGetWithMetadataResult<any, any>,
+    object: KVNamespaceGetWithMetadataResult<any, any>
   ) {
     // build response
     const headers = new Headers();
@@ -131,8 +141,8 @@ app.notFound(async (ctx) => {
       headers.set("content-type", object.metadata.contentType);
       headers.set("cache-control", object.metadata.cacheControl);
     }
-    // TODO: do we need base64 encoded here?
-    // const response = new Response(base64ToArrayBuffer(object.value), {
+
+    // Create response with the raw data directly
     const response = new Response(object.value, {
       status,
       headers,

package/src/cloudflare/static-site.ts

@@ -262,7 +262,7 @@ export const StaticSite = Resource(
   async function (
     this: Context<StaticSite>,
     id: string,
-    props: StaticSiteProps,
+    props: StaticSiteProps
   ) {
     if (this.phase === "delete") {
       // For delete operations, we'll rely on the Worker delete to clean up
@@ -273,7 +273,7 @@ export const StaticSite = Resource(
     // Validate that a name is provided
     if (!props.name) {
       throw new Error(
-        "StaticSite name is required - must be explicitly specified",
+        "StaticSite name is required - must be explicitly specified"
       );
     }
 
@@ -302,7 +302,7 @@ export const StaticSite = Resource(
 
         // Throw a more descriptive error that includes the exit code and stderr
         throw new Error(
-          `Build command "${props.build.command}" failed with exit code ${error.code}:\n${error.stderr || error.message}`,
+          `Build command "${props.build.command}" failed with exit code ${error.code}:\n${error.stderr || error.message}`
         );
       }
     }
@@ -314,7 +314,7 @@ export const StaticSite = Resource(
       }
     } catch (error: any) {
       throw new Error(
-        `Directory "${props.dir}" does not exist: ${error.message}`,
+        `Directory "${props.dir}" does not exist: ${error.message}`
       );
     }
 
@@ -333,6 +333,10 @@ export const StaticSite = Resource(
       generateAssetManifest(props.dir),
     ]);
 
+    console.log({
+      assetManifest,
+    });
+
     // Step 3: Upload assets to KV
     await uploadAssetManifest(api, kv.namespaceId, assetManifest);
 
@@ -356,7 +360,7 @@ export const StaticSite = Resource(
 
     // Create asset manifest banner for static site router
     const assetManifestBanner = `const __ASSET_MANIFEST__ = ${JSON.stringify(
-      Object.fromEntries(assetManifest.map((item) => [item.key, item.hash])),
+      Object.fromEntries(assetManifest.map((item) => [item.key, item.hash]))
     )};\n`;
 
     const bundleOptions = {
@@ -398,7 +402,7 @@ export const StaticSite = Resource(
           Object.entries(routes).map(([key, value]) => [
             `__ROUTE_${value}`,
             key,
-          ]),
+          ])
         ),
       },
     });
@@ -420,5 +424,5 @@ export const StaticSite = Resource(
       url: worker.url,
       routes,
     });
-  },
+  }
 );

package/src/cloudflare/upload-asset-manifest.ts

@@ -17,7 +17,7 @@ type UploadResult = {
 export async function uploadAssetManifest(
   api: CloudflareApi,
   namespaceId: string,
-  manifest: AssetManifest,
+  manifest: AssetManifest
 ): Promise<UploadResult[]> {
   const results: UploadResult[] = [];
 
@@ -59,14 +59,16 @@ export async function uploadAssetManifest(
     const formData = new FormData();
     formData.append("metadata", JSON.stringify(metadata));
 
-    // Add file content as 'value'
-    const blob = new Blob([content]);
+    // Add file content as 'value' - Fix for binary file corruption
+    const blob = new Blob([new Uint8Array(content)], {
+      type: item.contentType,
+    });
     formData.append("value", blob);
 
     try {
       const response = await api.put(
         `/accounts/${api.accountId}/storage/kv/namespaces/${namespaceId}/values/${item.key}`,
-        formData,
+        formData
       );
 
       const result = { item, success: response.ok, status: response.status };

package/src/cloudflare/worker.ts

@@ -16,6 +16,7 @@ import type { DurableObjectNamespace } from "./durable-object-namespace";
 import { isKVNamespace } from "./kv-namespace";
 import type { WorkerScriptMetadata } from "./worker-metadata";
 import type { SingleStepMigration } from "./worker-migration";
+
 /**
  * Properties for creating or updating a Worker
  */
@@ -209,7 +210,7 @@ export const Worker = Resource(
   async function <const B extends Bindings>(
     this: Context<Worker<NoInfer<B>>>,
     id: string,
-    props: WorkerProps<B>,
+    props: WorkerProps<B>
   ): Promise<Worker<B>> {
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi();
@@ -234,7 +235,7 @@ export const Worker = Resource(
     const scriptMetadata = await prepareWorkerMetadata(
       this,
       oldBindings,
-      props,
+      props
     );
 
     // Get the script content - either from props.script, or by bundling
@@ -254,7 +255,7 @@ export const Worker = Resource(
       this,
       api,
       workerName,
-      props.url ?? false,
+      props.url ?? false
     );
 
     // Get current timestamp
@@ -277,17 +278,17 @@ export const Worker = Resource(
       // phantom property
       Env: undefined!,
     });
-  },
+  }
 );
 
 async function deleteWorker<B extends Bindings>(
   ctx: Context<Worker<B>>,
   api: CloudflareApi,
-  workerName: string,
+  workerName: string
 ) {
   // Delete worker
   const deleteResponse = await api.delete(
-    `/accounts/${api.accountId}/workers/scripts/${workerName}`,
+    `/accounts/${api.accountId}/workers/scripts/${workerName}`
   );
 
   // Check for success (2xx status code)
@@ -297,7 +298,7 @@ async function deleteWorker<B extends Bindings>(
       .catch(() => ({ errors: [{ message: deleteResponse.statusText }] }));
     console.error(
       "Error deleting worker:",
-      errorData.errors?.[0]?.message || deleteResponse.statusText,
+      errorData.errors?.[0]?.message || deleteResponse.statusText
     );
   }
 
@@ -308,7 +309,7 @@ async function deleteWorker<B extends Bindings>(
 
     if (!routesResponse.ok) {
       throw new Error(
-        `Could not fetch routes for cleanup: ${routesResponse.status} ${routesResponse.statusText}`,
+        `Could not fetch routes for cleanup: ${routesResponse.status} ${routesResponse.statusText}`
       );
     }
     const routesData: any = await routesResponse.json();
@@ -318,12 +319,12 @@ async function deleteWorker<B extends Bindings>(
       if (ctx.output.routes.includes(route.pattern)) {
         // Delete the route
         const routeDeleteResponse = await api.delete(
-          `/zones/${api.zoneId}/workers/routes/${route.id}`,
+          `/zones/${api.zoneId}/workers/routes/${route.id}`
         );
 
         if (!routeDeleteResponse.ok) {
           console.warn(
-            `Failed to delete route ${route.pattern}: ${routeDeleteResponse.status} ${routeDeleteResponse.statusText}`,
+            `Failed to delete route ${route.pattern}: ${routeDeleteResponse.status} ${routeDeleteResponse.statusText}`
           );
         }
       }
@@ -338,7 +339,7 @@ async function deleteWorker<B extends Bindings>(
         JSON.stringify({ enabled: false }),
         {
           headers: { "Content-Type": "application/json" },
-        },
+        }
       );
     } catch (error) {
       console.warn("Failed to disable worker URL during deletion:", error);
@@ -353,7 +354,7 @@ async function putWorker(
   api: CloudflareApi,
   workerName: string,
   scriptContent: string,
-  scriptMetadata: WorkerMetadata,
+  scriptMetadata: WorkerMetadata
 ) {
   return withExponentialBackoff(
     async () => {
@@ -371,7 +372,7 @@ async function putWorker(
             ? "application/javascript+module"
             : "application/javascript",
         }),
-        scriptName,
+        scriptName
       );
 
       // Add metadata as JSON
@@ -379,7 +380,7 @@ async function putWorker(
         "metadata",
         new Blob([JSON.stringify(scriptMetadata)], {
           type: "application/json",
-        }),
+        })
       );
 
       await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -392,7 +393,7 @@ async function putWorker(
           headers: {
             "Content-Type": "multipart/form-data",
           },
-        },
+        }
       );
 
       // Check if the upload was successful
@@ -416,7 +417,7 @@ async function putWorker(
     },
     (err) => err instanceof NotFoundError,
     10,
-    100,
+    100
   );
 }
 
@@ -441,7 +442,7 @@ interface WorkerMetadata {
 async function prepareWorkerMetadata<B extends Bindings>(
   ctx: Context<Worker<B>>,
   oldBindings: Bindings | undefined,
-  props: WorkerProps,
+  props: WorkerProps
 ): Promise<WorkerMetadata> {
   // Prepare metadata with bindings
   const meta: WorkerMetadata = {
@@ -498,7 +499,7 @@ async function prepareWorkerMetadata<B extends Bindings>(
       });
 
       const oldBinding: DurableObjectNamespace | undefined = Object.values(
-        oldBindings ?? {},
+        oldBindings ?? {}
       )
         ?.filter(isDurableObjectNamespace)
         ?.find((b) => b.id === stableId);
@@ -561,10 +562,10 @@ async function prepareWorkerMetadata<B extends Bindings>(
 async function assertWorkerDoesNotExist<B extends Bindings>(
   ctx: Context<Worker<B>>,
   api: CloudflareApi,
-  workerName: string,
+  workerName: string
 ) {
   const response = await api.get(
-    `/accounts/${api.accountId}/workers/scripts/${workerName}`,
+    `/accounts/${api.accountId}/workers/scripts/${workerName}`
   );
   if (response.status === 404) {
     return true;
@@ -574,24 +575,24 @@ async function assertWorkerDoesNotExist<B extends Bindings>(
 
     if (!metadata) {
       throw new Error(
-        `Worker exists but failed to fetch metadata: ${response.status} ${response.statusText}`,
+        `Worker exists but failed to fetch metadata: ${response.status} ${response.statusText}`
       );
     }
 
     if (
       metadata.default_environment?.script.tags.includes(
-        `alchemy:id:${slugify(ctx.fqn)}`,
+        `alchemy:id:${slugify(ctx.fqn)}`
       )
     ) {
       return true;
     }
 
     throw new Error(
-      `Worker with name '${workerName}' already exists. Please use a unique name.`,
+      `Worker with name '${workerName}' already exists. Please use a unique name.`
     );
   } else {
     throw new Error(
-      `Error checking if worker exists: ${response.status} ${response.statusText} ${await response.text()}`,
+      `Error checking if worker exists: ${response.status} ${response.statusText} ${await response.text()}`
     );
   }
 }
@@ -634,7 +635,7 @@ async function bundleWorkerScript<B extends Bindings>(props: WorkerProps) {
 async function setupRoutes(
   api: CloudflareApi,
   workerName: string,
-  routes: string[],
+  routes: string[]
 ) {
   // Set up routes if provided
   if (routes && routes.length > 0 && api.zoneId) {
@@ -643,7 +644,7 @@ async function setupRoutes(
 
     if (!routesResponse.ok) {
       throw new Error(
-        `Could not fetch routes: ${routesResponse.status} ${routesResponse.statusText}`,
+        `Could not fetch routes: ${routesResponse.status} ${routesResponse.statusText}`
       );
     }
     const routesData: any = await routesResponse.json();
@@ -652,7 +653,7 @@ async function setupRoutes(
     // For each desired route
     for (const pattern of routes) {
       const existingRoute = existingRoutes.find(
-        (r: any) => r.pattern === pattern,
+        (r: any) => r.pattern === pattern
       );
 
       if (existingRoute) {
@@ -663,12 +664,12 @@ async function setupRoutes(
             {
               pattern,
               script: workerName,
-            },
+            }
           );
 
           if (!updateRouteResponse.ok) {
             console.warn(
-              `Failed to update route ${pattern}: ${updateRouteResponse.status} ${updateRouteResponse.statusText}`,
+              `Failed to update route ${pattern}: ${updateRouteResponse.status} ${updateRouteResponse.statusText}`
             );
           }
         }
@@ -679,12 +680,12 @@ async function setupRoutes(
           {
             pattern,
             script: workerName,
-          },
+          }
         );
 
         if (!createRouteResponse.ok) {
           throw new Error(
-            `Failed to create route ${pattern}: ${createRouteResponse.status} ${createRouteResponse.statusText}`,
+            `Failed to create route ${pattern}: ${createRouteResponse.status} ${createRouteResponse.statusText}`
           );
         }
       }
@@ -696,7 +697,7 @@ async function configureURL<B extends Bindings>(
   ctx: Context<Worker<B>>,
   api: CloudflareApi,
   workerName: string,
-  url: boolean,
+  url: boolean
 ) {
   let workerUrl;
   if (url) {
@@ -706,17 +707,17 @@ async function configureURL<B extends Bindings>(
       { enabled: true, previews_enabled: true },
       {
         headers: { "Content-Type": "application/json" },
-      },
+      }
     );
 
     // Get the account's workers.dev subdomain
     const subdomainResponse = await api.get(
-      `/accounts/${api.accountId}/workers/subdomain`,
+      `/accounts/${api.accountId}/workers/subdomain`
     );
 
     if (!subdomainResponse.ok) {
       throw new Error(
-        `Could not fetch workers.dev subdomain: ${subdomainResponse.status} ${subdomainResponse.statusText}`,
+        `Could not fetch workers.dev subdomain: ${subdomainResponse.status} ${subdomainResponse.statusText}`
       );
     }
     const subdomainData: {
@@ -743,11 +744,11 @@ async function configureURL<B extends Bindings>(
       JSON.stringify({ enabled: false }),
       {
         headers: { "Content-Type": "application/json" },
-      },
+      }
     );
     if (!response.ok) {
       throw new Error(
-        `Failed to disable worker URL: ${response.status} ${response.statusText}`,
+        `Failed to disable worker URL: ${response.status} ${response.statusText}`
       );
     }
   }
@@ -756,17 +757,17 @@ async function configureURL<B extends Bindings>(
 
 async function getWorkerScriptMetadata(
   api: CloudflareApi,
-  workerName: string,
+  workerName: string
 ): Promise<WorkerScriptMetadata | undefined> {
   const response = await api.get(
-    `/accounts/${api.accountId}/workers/services/${workerName}`,
+    `/accounts/${api.accountId}/workers/services/${workerName}`
   );
   if (response.status === 404) {
     return undefined;
   }
   if (!response.ok) {
     throw new Error(
-      `Error getting worker script metadata: ${response.status} ${response.statusText}`,
+      `Error getting worker script metadata: ${response.status} ${response.statusText}`
     );
   }
   return ((await response.json()) as any).result as WorkerScriptMetadata;
@@ -775,7 +776,7 @@ async function getWorkerScriptMetadata(
 async function getWorkerBindings(
   api: CloudflareApi,
   workerName: string,
-  environment = "production",
+  environment = "production"
 ) {
   const response = await api.get(
     `/accounts/${api.accountId}/workers/services/${workerName}/environments/${environment}/bindings`,
@@ -784,7 +785,7 @@ async function getWorkerBindings(
         Authorization: `Bearer ${process.env.CLOUDFLARE_API_TOKEN}`,
         "Content-Type": "application/json",
       },
-    },
+    }
   );
 
   if (response.status === 404) {
@@ -793,7 +794,7 @@ async function getWorkerBindings(
 
   if (!response.ok) {
     throw new Error(
-      `Failed to fetch bindings: ${response.status} ${response.statusText}`,
+      `Failed to fetch bindings: ${response.status} ${response.statusText}`
     );
   }
 

package/src/fs/copy-file.ts

@@ -0,0 +1,115 @@
+import fs from "node:fs";
+import type { Context } from "../context";
+import { Resource } from "../resource";
+import { ignore } from "../util/ignore";
+
+/**
+ * Properties for creating a CopyFile resource
+ */
+export interface CopyFileProps {
+  /**
+   * Source path of the file to copy
+   */
+  src: string;
+
+  /**
+   * Destination path where the file should be copied to
+   */
+  dest: string;
+
+  /**
+   * Whether to overwrite the destination file if it already exists
+   * @default true
+   */
+  overwrite?: boolean;
+}
+
+/**
+ * Output returned after CopyFile creation/update
+ */
+export interface CopyFile extends Resource<"fs::CopyFile">, CopyFileProps {
+  /**
+   * Time at which the object was created
+   */
+  createdAt: number;
+
+  /**
+   * Whether the file was successfully copied
+   */
+  copied: boolean;
+}
+
+/**
+ * CopyFile Resource
+ *
+ * Copies a file from a source location to a destination location.
+ *
+ * @example
+ * // Copy a file to a new location
+ * const copiedFile = await CopyFile("config-copy", {
+ *   src: "config.json",
+ *   dest: "backup/config.json"
+ * });
+ *
+ * @example
+ * // Copy a file without overwriting if destination exists
+ * const safeCopy = await CopyFile("safe-copy", {
+ *   src: "data.json",
+ *   dest: "backup/data.json",
+ *   overwrite: false
+ * });
+ */
+export const CopyFile = Resource(
+  "fs::CopyFile",
+  async function (
+    this: Context<CopyFile>,
+    id: string,
+    props: CopyFileProps
+  ): Promise<CopyFile> {
+    const { src, dest, overwrite = true } = props;
+
+    if (this.phase === "delete") {
+      // When deleting, remove the destination file
+      await ignore("ENOENT", async () => fs.promises.unlink(dest));
+      return this.destroy();
+    } else {
+      try {
+        // Check if source file exists
+        await fs.promises.access(src, fs.constants.F_OK);
+
+        // If this is an update and the destination has changed, delete the old file
+        if (
+          this.phase === "update" &&
+          this.output?.dest &&
+          this.output.dest !== dest
+        ) {
+          await ignore("ENOENT", async () =>
+            fs.promises.unlink(this.output.dest)
+          );
+        }
+
+        // Check if destination file exists
+        const destinationExists = await fs.promises
+          .access(dest, fs.constants.F_OK)
+          .then(() => true)
+          .catch(() => false);
+
+        // Copy file if destination doesn't exist or overwrite is true
+        if (!destinationExists || overwrite) {
+          await fs.promises.copyFile(src, dest);
+        }
+
+        return this({
+          src,
+          dest,
+          overwrite,
+          copied: true,
+          createdAt: Date.now(),
+        });
+      } catch (error) {
+        console.error(`Error copying file from ${src} to ${dest}:`, error);
+        throw error;
+      }
+    }
+  }
+);

package/src/fs/file.ts

@@ -72,8 +72,8 @@ alchemy.files = async (
         paths.map(async (path) => [
           path,
           await fs.promises.readFile(path, "utf-8"),
-        ]),
-      ),
+        ])
+      )
     ),
   };
 };
@@ -111,6 +111,19 @@ export interface File extends Resource<"fs::File"> {
  *   path: "logs/app.log",
  *   content: "application log entry"
  * });
+ *
+ * @example
+ * // Update file content and path
+ * let file = await File("config.json", {
+ *   path: "config.json",
+ *   content: '{ "version": "1.0.0" }'
+ * });
+ *
+ * // Later, update the path and content (old file will be removed)
+ * file = await File("config.json", {
+ *   path: "config/config.json",
+ *   content: '{ "version": "1.0.1" }'
+ * });
  */
 export const File = Resource(
   "fs::File",
@@ -120,21 +133,34 @@ export const File = Resource(
     props: {
       path: string;
       content: string;
-    },
+    }
   ): Promise<File> {
     const filePath = props?.path ?? id;
+
     if (this.phase === "delete") {
       await ignore("ENOENT", async () => fs.promises.unlink(filePath));
       return this.destroy();
-    } else {
-      await fs.promises.mkdir(path.dirname(filePath), {
-        recursive: true,
-      });
-      await fs.promises.writeFile(filePath, props.content);
+    } else if (
+      this.phase === "update" &&
+      this.output &&
+      this.output.path !== filePath
+    ) {
+      // If path has changed, delete the old file
+      console.log(
+        `File: Path changed from ${this.output.path} to ${filePath}, removing old file`
+      );
+      await ignore("ENOENT", async () => fs.promises.unlink(this.output.path));
     }
+
+    // Create directory and write file
+    await fs.promises.mkdir(path.dirname(filePath), {
+      recursive: true,
+    });
+    await fs.promises.writeFile(filePath, props.content);
+
     return this({
       path: filePath,
       content: props.content,
     });
-  },
+  }
 );