alchemy 0.21.0 → 0.22.1

package/src/cloudflare/bundle/wasm-plugin.ts

@@ -0,0 +1,57 @@
+import type esbuild from "esbuild";
+import fs from "node:fs";
+import path from "node:path";
+
+export const wasmPlugin: esbuild.Plugin = {
+  name: "wasm",
+  setup(build) {
+    // Resolve ".wasm" files to a path with a namespace
+    build.onResolve({ filter: /\.wasm$/ }, (args) => {
+      // If this is the import inside the stub module, import the
+      // binary itself. Put the path in the "wasm-binary" namespace
+      // to tell our binary load callback to load the binary file.
+      if (args.namespace === "wasm-stub") {
+        return {
+          path: args.path,
+          namespace: "wasm-binary",
+        };
+      }
+
+      // Otherwise, generate the JavaScript stub module for this
+      // ".wasm" file. Put it in the "wasm-stub" namespace to tell
+      // our stub load callback to fill it with JavaScript.
+      //
+      // Resolve relative paths to absolute paths here since this
+      // resolve callback is given "resolveDir", the directory to
+      // resolve imports against.
+      if (args.resolveDir === "") {
+        return; // Ignore unresolvable paths
+      }
+      return {
+        path: path.isAbsolute(args.path)
+          ? args.path
+          : path.join(args.resolveDir, args.path),
+        namespace: "wasm-stub",
+      };
+    });
+
+    // Virtual modules in the "wasm-stub" namespace are filled with
+    // the JavaScript code for compiling the WebAssembly binary. The
+    // binary itself is imported from a second virtual module.
+    build.onLoad({ filter: /.*/, namespace: "wasm-stub" }, async (args) => ({
+      contents: `import wasm from ${JSON.stringify(args.path)}
+        export default (imports) =>
+          WebAssembly.instantiate(wasm, imports).then(
+            result => result.instance.exports)`,
+    }));
+
+    // Virtual modules in the "wasm-binary" namespace contain the
+    // actual bytes of the WebAssembly file. This uses esbuild's
+    // built-in "binary" loader instead of manually embedding the
+    // binary data inside JavaScript code ourselves.
+    build.onLoad({ filter: /.*/, namespace: "wasm-binary" }, async (args) => ({
+      contents: await fs.promises.readFile(args.path),
+      loader: "binary",
+    }));
+  },
+};

package/src/cloudflare/custom-domain.ts

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

package/src/cloudflare/d1-clone.ts

@@ -1,14 +1,14 @@
-import type { CloudflareApi } from "./api.js";
+import type { CloudflareApi } from "./api.ts";
 import {
   exportD1Database,
   type ExportD1DatabaseOptions,
   type ExportD1DatabaseResult,
-} from "./d1-export.js";
+} from "./d1-export.ts";
 import {
   importD1Database,
   type ImportD1DatabaseOptions,
   type ImportD1DatabaseResult,
-} from "./d1-import.js";
+} from "./d1-import.ts";
 
 /**
  * Options for cloning a D1 database

package/src/cloudflare/d1-database.ts

@@ -1,14 +1,14 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind, type Bound } from "../runtime/bind.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind, type Bound } from "../runtime/bind.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import { cloneD1Database } from "./d1-clone.js";
-import { applyMigrations, listMigrationsFiles } from "./d1-migrations.js";
+} from "./api.ts";
+import { cloneD1Database } from "./d1-clone.ts";
+import { applyMigrations, listMigrationsFiles } from "./d1-migrations.ts";
 
 /**
  * Properties for creating or updating a D1 Database

package/src/cloudflare/d1-export.ts

@@ -1,4 +1,4 @@
-import type { CloudflareApi } from "./api.js"; // Ensure CloudflareApi is exported if not already
+import type { CloudflareApi } from "./api.ts"; // Ensure CloudflareApi is exported if not already
 
 /**
  * Options for exporting a D1 database

package/src/cloudflare/d1-import.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import type { CloudflareApi } from "./api.js";
+import type { CloudflareApi } from "./api.ts";
 
 /**
  * Options for importing SQL into a D1 database

package/src/cloudflare/d1-migrations.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { handleApiError } from "./api-error.js";
-import type { CloudflareApi } from "./api.js";
+import { handleApiError } from "./api-error.ts";
+import type { CloudflareApi } from "./api.ts";
 
 export interface D1MigrationOptions {
   migrationsFiles: Array<{ id: string; sql: string }>;

package/src/cloudflare/dns-records.ts

@@ -1,16 +1,16 @@
-import type { Context } from "../context.js";
+import type { Context } from "../context.ts";
 import type {
   DnsRecord as BaseDnsRecord,
   DnsRecordType,
   DnsRecordWithMetadata,
-} from "../dns/record.js";
-import { Resource } from "../resource.js";
+} from "../dns/record.ts";
+import { Resource } from "../resource.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
   createCloudflareApi,
-} from "./api.js";
-import type { CloudflareResponse } from "./response.js";
+} from "./api.ts";
+import type { CloudflareResponse } from "./response.ts";
 
 /**
  * Cloudflare DNS Record response format

package/src/cloudflare/durable-object-namespace.ts

@@ -1,4 +1,4 @@
-import type { Binding } from "./bindings.js";
+import type { Binding } from "./bindings.ts";
 
 /**
  * Properties for creating a Durable Object Namespace

package/src/cloudflare/event-source.ts

@@ -1,5 +1,5 @@
-import type { QueueConsumerSettings } from "./queue-consumer.js";
-import type { QueueResource } from "./queue.js";
+import type { QueueConsumerSettings } from "./queue-consumer.ts";
+import type { QueueResource } from "./queue.ts";
 
 /**
  * Base interface for event sources that can be bound to a Worker

package/src/cloudflare/hyperdrive.ts

@@ -1,10 +1,10 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { tryGetBinding } from "../runtime/bind.js";
-import type { Secret } from "../secret.js";
-import { handleApiError } from "./api-error.js";
-import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
-import type { Bound } from "./bound.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { tryGetBinding } from "../runtime/bind.ts";
+import type { Secret } from "../secret.ts";
+import { handleApiError } from "./api-error.ts";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Origin configuration for a PostgreSQL database connection

package/src/cloudflare/index.ts

@@ -1,39 +1,40 @@
-export * from "./account-api-token.js";
-export * from "./account-id.js";
-export * from "./ai-gateway.js";
-export * from "./ai.js";
-export * from "./api-error.js";
-export * from "./api.js";
-export * from "./assets.js";
-export * from "./bindings.js";
-export * from "./bound.js";
-export * from "./browser-rendering.js";
-export * from "./bucket.js";
-export * from "./bundle/external.js";
-export * from "./bundle/local-dev-cloudflare-shim.js";
-export * from "./custom-domain.js";
-export * from "./d1-clone.js";
-export * from "./d1-database.js";
-export * from "./d1-export.js";
-export * from "./d1-import.js";
-export * from "./dns-records.js";
-export * from "./durable-object-namespace.js";
-export * from "./hyperdrive.js";
-export * from "./kv-namespace.js";
-export * from "./nuxt.js";
-export * from "./permission-groups.js";
-export * from "./pipeline.js";
-export * from "./queue-consumer.js";
-export * from "./queue.js";
-export * from "./r2-rest-state-store.js";
-export * from "./redwood.js";
-export * from "./route.js";
-export * from "./tanstack-start.js";
-export * from "./vectorize-index.js";
-export * from "./vectorize-metadata-index.js";
-export * from "./vite.js";
-export * from "./website.js";
-export * from "./worker.js";
-export { Workflow } from "./workflow.js";
-export * from "./wrangler.json.js";
-export * from "./zone.js";
+export * from "./account-api-token.ts";
+export * from "./account-id.ts";
+export * from "./ai-gateway.ts";
+export * from "./ai.ts";
+export * from "./api-error.ts";
+export * from "./api.ts";
+export * from "./assets.ts";
+export * from "./bindings.ts";
+export * from "./bound.ts";
+export * from "./browser-rendering.ts";
+export * from "./bucket.ts";
+export * from "./bundle/external.ts";
+export * from "./bundle/local-dev-cloudflare-shim.ts";
+export * from "./custom-domain.ts";
+export * from "./d1-clone.ts";
+export * from "./d1-database.ts";
+export * from "./d1-export.ts";
+export * from "./d1-import.ts";
+export * from "./dns-records.ts";
+export * from "./durable-object-namespace.ts";
+export * from "./hyperdrive.ts";
+export * from "./kv-namespace.ts";
+export * from "./nuxt.ts";
+export * from "./permission-groups.ts";
+export * from "./pipeline.ts";
+export * from "./queue-consumer.ts";
+export * from "./queue.ts";
+export * from "./r2-rest-state-store.ts";
+export * from "./react-router.ts";
+export * from "./redwood.ts";
+export * from "./route.ts";
+export * from "./tanstack-start.ts";
+export * from "./vectorize-index.ts";
+export * from "./vectorize-metadata-index.ts";
+export * from "./vite.ts";
+export * from "./website.ts";
+export * from "./worker.ts";
+export { Workflow } from "./workflow.ts";
+export * from "./wrangler.json.ts";
+export * from "./zone.ts";

package/src/cloudflare/kv-namespace.ts

@@ -1,14 +1,14 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { withExponentialBackoff } from "../util/retry.js";
-import { handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { withExponentialBackoff } from "../util/retry.ts";
+import { handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Properties for creating or updating a KV Namespace

package/src/cloudflare/nuxt.ts

@@ -1,7 +1,8 @@
-import type { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Website, type WebsiteProps } from "./website.js";
-import type { Worker } from "./worker.js";
+import path from "node:path";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 /**
  * Properties for creating a Nuxt resource.
@@ -57,7 +58,7 @@ export async function Nuxt<B extends Bindings>(
     // Default entry point for cloudflare-module preset
     main: props?.main ?? "./index.ts",
     // Default static assets directory for cloudflare-module preset
-    assets: props?.assets ?? "./.output/public",
+    assets: props?.assets ?? path.join(".output", "public"),
     // Ensure nodejs_compat flag is included for Nuxt compatibility
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
     // Enable wrangler by default, common for Nuxt/Cloudflare deployments

package/src/cloudflare/permission-groups.ts

@@ -1,6 +1,6 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
 
 /**
  * Cloudflare permission group as returned by the API

package/src/cloudflare/pipeline.ts

@@ -1,14 +1,14 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import type { Secret } from "../secret.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import type { Secret } from "../secret.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Settings for compression of pipeline output

package/src/cloudflare/queue-consumer.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { QueueResource } from "./queue.js";
+} from "./api.ts";
+import type { QueueResource } from "./queue.ts";
 
 /**
  * Settings for configuring a Queue Consumer

package/src/cloudflare/queue.ts

@@ -1,13 +1,13 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Settings for a Cloudflare Queue

package/src/cloudflare/r2-rest-state-store.ts

@@ -1,15 +1,15 @@
-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 { withExponentialBackoff } from "../util/retry.js";
-import { CloudflareApiError, handleApiError } from "./api-error.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 { withExponentialBackoff } from "../util/retry.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
   createCloudflareApi,
-} from "./api.js";
-import { createBucket, getBucket } from "./bucket.js";
+} from "./api.ts";
+import { createBucket, getBucket } from "./bucket.ts";
 
 /**
  * Options for CloudflareR2StateStore

package/src/cloudflare/react-router.ts

@@ -0,0 +1,45 @@
+import path from "node:path";
+import type { Assets } from "./assets.js";
+import type { Bindings } from "./bindings.js";
+import { Website, type WebsiteProps } from "./website.js";
+import type { Worker } from "./worker.js";
+
+export interface ReactRouterProps<B extends Bindings> extends WebsiteProps<B> {}
+
+// don't allow the ASSETS to be overriden
+export type ReactRouter<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+export async function ReactRouter<B extends Bindings>(
+  id: string,
+  props: ReactRouterProps<B>,
+): Promise<ReactRouter<B>> {
+  const defaultAssets = path.join("build", "client");
+  return Website(id, {
+    ...props,
+    // Alchemy should bundle the result of `vite built`, not the user's main
+    // TODO: we probably need bundling to properly handle WASM/rules
+    main: path.join(props.cwd ?? process.cwd(), "build", "server", "index.js"),
+    wrangler: {
+      // wrangler should point to the user's main (e.g. `worker.ts`), unless overridden
+      main:
+        typeof props.wrangler === "object"
+          ? (props.wrangler.main ?? props.main)
+          : props.main,
+      // write to wrangler.json by default but respect overrides
+      path:
+        typeof props.wrangler === "string"
+          ? props.wrangler
+          : typeof props.wrangler === "object"
+            ? props.wrangler.path
+            : undefined,
+    },
+    assets:
+      typeof props.assets === "object"
+        ? {
+            dist: props.assets.dist ?? defaultAssets,
+          }
+        : (props.assets ?? defaultAssets),
+  });
+}

package/src/cloudflare/redwood.ts

@@ -1,8 +1,8 @@
 import path from "node:path";
-import type { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Website, type WebsiteProps } from "./website.js";
-import type { Worker } from "./worker.js";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface RedwoodProps<B extends Bindings> extends WebsiteProps<B> {}
 

package/src/cloudflare/route.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Worker } from "./worker.js";
+} from "./api.ts";
+import type { Worker } from "./worker.ts";
 
 /**
  * Properties for creating or updating a Route

package/src/cloudflare/tanstack-start.ts

@@ -1,7 +1,7 @@
-import type { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Website, type WebsiteProps } from "./website.js";
-import type { Worker } from "./worker.js";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface TanStackStartProps<B extends Bindings>
   extends WebsiteProps<B> {}

package/src/cloudflare/user.ts

@@ -1,9 +1,9 @@
-import type { Secret } from "../secret.js";
-import { CloudflareApiError } from "./api-error.js";
+import type { Secret } from "../secret.ts";
+import { CloudflareApiError } from "./api-error.ts";
 import {
   getCloudflareAuthHeaders,
   type CloudflareAuthOptions,
-} from "./auth.js";
+} from "./auth.ts";
 
 export interface CloudflareAccount {
   name: string;

package/src/cloudflare/vectorize-index.ts

@@ -1,13 +1,13 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Properties for creating or updating a Vectorize Index

package/src/cloudflare/vectorize-metadata-index.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { VectorizeIndexResource } from "./vectorize-index.js";
+} from "./api.ts";
+import type { VectorizeIndexResource } from "./vectorize-index.ts";
 
 /**
  * Properties for creating or deleting a Vectorize Metadata Index

package/src/cloudflare/vite.ts

@@ -1,8 +1,8 @@
 import path from "node:path";
-import type { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Website, type WebsiteProps } from "./website.js";
-import type { Worker } from "./worker.js";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface ViteProps<B extends Bindings> extends WebsiteProps<B> {}