alchemy 0.65.1 → 0.67.0

package/src/cloudflare/worker-metadata.ts

@@ -3,11 +3,10 @@ import { logger } from "../util/logger.ts";
 import { memoize } from "../util/memoize.ts";
 import { extractCloudflareResult } from "./api-response.ts";
 import type { CloudflareApi } from "./api.ts";
-import {
-  Self,
-  type Bindings,
-  type WorkerBindingDurableObjectNamespace,
-  type WorkerBindingSpec,
+import type {
+  Bindings,
+  WorkerBindingDurableObjectNamespace,
+  WorkerBindingSpec,
 } from "./bindings.ts";
 import { isContainer, type Container } from "./container.ts";
 import {
@@ -392,11 +391,12 @@ export async function prepareWorkerMetadata(
         name: bindingName,
         text: binding,
       });
-    } else if (binding === Self) {
+    } else if (binding.type === "cloudflare::Worker::Self") {
       meta.bindings.push({
         type: "service",
         name: bindingName,
         service: props.workerName,
+        entrypoint: binding.__entrypoint__,
       });
     } else if (binding.type === "d1") {
       meta.bindings.push({
@@ -416,6 +416,8 @@ export async function prepareWorkerMetadata(
         type: "service",
         name: bindingName,
         service: "service" in binding ? binding.service : binding.name,
+        entrypoint:
+          "__entrypoint__" in binding ? binding.__entrypoint__ : undefined,
       });
     } else if (binding.type === "durable_object_namespace") {
       meta.bindings.push({
@@ -491,12 +493,6 @@ export async function prepareWorkerMetadata(
         name: bindingName,
         index_name: binding.name,
       });
-    } else if (binding.type === "ai_gateway") {
-      // AI Gateway binding - just needs the name property
-      meta.bindings.push({
-        type: "ai",
-        name: bindingName,
-      });
     } else if (binding.type === "hyperdrive") {
       // Hyperdrive binding
       meta.bindings.push({
@@ -510,6 +506,12 @@ export async function prepareWorkerMetadata(
         name: bindingName,
       });
     } else if (binding.type === "ai") {
+      const existing = meta.bindings.find((b) => b.type === "ai");
+      if (existing) {
+        throw new Error(
+          `Workers cannot have multiple AI bindings. Binding "${bindingName}" conflicts with "${existing.name}".`,
+        );
+      }
       meta.bindings.push({
         type: "ai",
         name: bindingName,

package/src/cloudflare/worker.ts

@@ -15,6 +15,7 @@ import {
 import type { Assets } from "./assets.ts";
 import type {
   Bindings,
+  Self,
   WorkerBindingDurableObjectNamespace,
   WorkerBindingSpec,
 } from "./bindings.ts";
@@ -58,6 +59,8 @@ import { Workflow, isWorkflow, upsertWorkflow } from "./workflow.ts";
 // Previous versions of `Worker` used the `Bundle` resource.
 // This import is here to avoid errors when destroying the `Bundle` resource.
 import "../esbuild/bundle.ts";
+import { Scope } from "../scope.ts";
+import type { WorkerRef } from "./worker-ref.ts";
 
 /**
  * Configuration options for static assets
@@ -330,11 +333,19 @@ export interface BaseWorkerProps<
          * @default false
          */
         remote?: boolean;
+        /**
+         * Whether to expose the worker via a Cloudflare Tunnel.
+         *
+         * @default false
+         */
+        tunnel?: boolean;
         url?: undefined;
       }
     | {
         url: string;
         remote?: undefined;
+        tunnel?: undefined;
+        port?: undefined;
       };
 
   /**
@@ -699,6 +710,25 @@ export function Worker<const B extends Bindings>(
   return _Worker(id, props as WorkerProps<B>);
 }
 
+Worker.experimentalEntrypoint = <RPC extends Rpc.WorkerEntrypointBranded>(
+  worker: Worker | WorkerRef | Self,
+  entrypoint: string,
+) => {
+  if (Scope.getScope()?.local) {
+    logger.warn(
+      "Worker.experimentalEntrypoint is not supported in local development. See: https://github.com/cloudflare/workers-sdk/issues/10681",
+    );
+  }
+  return {
+    ...worker,
+    // we rename the entrypoint in order to prevent collisions with entrypoint on Worker
+    __entrypoint__: entrypoint,
+  } as (Worker | WorkerRef) & {
+    __entrypoint__?: string;
+    __rpc__?: RPC;
+  };
+};
+
 const _Worker = Resource(
   "cloudflare::Worker",
   {
@@ -755,7 +785,9 @@ const _Worker = Resource(
         compatibilityDate,
         compatibilityFlags,
         outdir:
-          props.bundle?.outdir ?? path.join(cwd, ".alchemy", "out", workerName),
+          props.bundle?.outdir ??
+          // the out folder can't be moved to the root of a monorepo, it must be ${cwd} or else miniflare throws a fit
+          path.join(process.cwd(), ".alchemy", "out", workerName),
         sourceMap: "sourceMap" in props ? props.sourceMap : undefined,
       });
 
@@ -812,7 +844,7 @@ const _Worker = Resource(
       if (options.bundle.isOk()) {
         await options.bundle.value.delete?.();
       }
-      await deleteMiniflareWorkerData(options.name, {
+      await deleteMiniflareWorkerData(this.scope, options.name, {
         durableObjects: options.durableObjects,
         workflows: options.workflows,
       });
@@ -852,7 +884,8 @@ const _Worker = Resource(
           eventSources: props.eventSources,
           assets: props.assets,
           bundle,
-          port: (props.dev as { port?: number } | undefined)?.port,
+          port: props.dev?.port,
+          tunnel: props.dev?.tunnel ?? this.scope.tunnel,
         });
         this.onCleanup(() => controller.dispose());
       }

package/src/cloudflare/wrangler.json.ts

@@ -5,11 +5,7 @@ import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
 import { isSecret } from "../secret.ts";
 import { assertNever } from "../util/assert-never.ts";
-import {
-  Self,
-  type Bindings,
-  type WorkerBindingRateLimit,
-} from "./bindings.ts";
+import type { Bindings, WorkerBindingRateLimit } from "./bindings.ts";
 import type { R2BucketJurisdiction } from "./bucket.ts";
 import type { DurableObjectNamespace } from "./durable-object-namespace.ts";
 import type { EventSource } from "./event-source.ts";
@@ -371,6 +367,7 @@ export interface WranglerJsonSpec {
     binding: string;
     service: string;
     environment?: string;
+    entrypoint?: string;
   }[];
 
   /**
@@ -534,8 +531,12 @@ function processBindings(
     preview_bucket_name: string;
     jurisdiction?: R2BucketJurisdiction;
   }[] = [];
-  const services: { binding: string; service: string; environment?: string }[] =
-    [];
+  const services: {
+    binding: string;
+    service: string;
+    environment?: string;
+    entrypoint?: string;
+  }[] = [];
   const secrets: string[] = [];
   const workflows: {
     name: string;
@@ -625,17 +626,20 @@ function processBindings(
     } else if (writeSecrets && isSecret(binding)) {
       spec.vars ??= {};
       spec.vars[bindingName] = binding as any;
-    } else if (binding === Self) {
+    } else if (binding.type === "cloudflare::Worker::Self") {
       // Self(service) binding
       services.push({
         binding: bindingName,
         service: workerName,
+        entrypoint: binding.__entrypoint__,
       });
     } else if (binding.type === "service") {
       // Service binding
       services.push({
         binding: bindingName,
         service: "name" in binding ? binding.name : binding.service,
+        entrypoint:
+          "__entrypoint__" in binding ? binding.__entrypoint__ : undefined,
       });
     } else if (binding.type === "kv_namespace") {
       // KV Namespace binding
@@ -759,8 +763,6 @@ function processBindings(
         binding: bindingName,
         dataset: binding.dataset,
       });
-    } else if (binding.type === "ai_gateway") {
-      // no-op
     } else if (binding.type === "version_metadata") {
       if (spec.version_metadata) {
         throw new Error(
@@ -775,7 +777,7 @@ function processBindings(
         binding: bindingName,
         id: binding.hyperdriveId,
         localConnectionString: writeSecrets
-          ? binding.dev.origin.unencrypted
+          ? binding.dev?.origin.unencrypted
           : undefined,
       });
     } else if (binding.type === "pipeline") {
@@ -816,6 +818,7 @@ function processBindings(
         class_name: binding.className,
       });
     } else {
+      console.log("binding", binding);
       // biome-ignore lint/correctness/noVoidTypeReturn: it returns never
       return assertNever(binding);
     }

package/src/llms.cloudflare.txt

@@ -269,7 +269,7 @@ const worker = await Worker("my-worker", {
 ### 2. Enable Development Compatibility
 ```typescript
 // Generate wrangler.json for local development
-await WranglerJson("wrangler.json", {
+await WranglerJson({
   worker,
 });
 ```

package/src/scope.ts

@@ -28,6 +28,7 @@ import {
 } from "./util/idempotent-spawn.ts";
 import { logger } from "./util/logger.ts";
 import { AsyncMutex } from "./util/mutex.ts";
+import { ALCHEMY_ROOT } from "./util/root-dir.ts";
 import type { ITelemetryClient } from "./util/telemetry/client.ts";
 
 export class RootScopeStateAttemptError extends Error {
@@ -56,6 +57,12 @@ export interface ScopeOptions extends ProviderCredentials {
    * @default - `true` if ran with `alchemy dev`, `alchemy watch`, `bun --watch ./alchemy.run.ts`
    */
   watch?: boolean;
+  /**
+   * Whether to create a tunnel for supported resources.
+   *
+   * @default false
+   */
+  tunnel?: boolean;
   /**
    * Apply updates to resources even if there are no changes.
    *
@@ -89,6 +96,20 @@ export interface ScopeOptions extends ProviderCredentials {
    * @default false
    */
   adopt?: boolean;
+  /**
+   * The path to the root directory of the project.
+   *
+   * @default process.cwd()
+   */
+  rootDir?: string;
+  /**
+   * Whether this is the application that was selected with `--app`
+   *
+   * `true` if the application was selected with `--app`
+   * `false` if the application was not selected with `--app`
+   * `undefined` if the program was not run with `--app`
+   */
+  isSelected?: boolean;
 }
 
 /**
@@ -171,13 +192,16 @@ export class Scope {
   public readonly phase: Phase;
   public readonly local: boolean;
   public readonly watch: boolean;
+  public readonly tunnel: boolean;
   public readonly force: boolean;
   public readonly adopt: boolean;
   public readonly destroyStrategy: DestroyStrategy;
   public readonly logger: LoggerApi;
   public readonly telemetryClient: ITelemetryClient;
   public readonly dataMutex: AsyncMutex;
+  public readonly rootDir: string;
   public readonly dotAlchemy: string;
+  public readonly isSelected: boolean | undefined;
 
   // Provider credentials for scope-level credential overrides
   public readonly providerCredentials: ProviderCredentials;
@@ -208,23 +232,28 @@ export class Scope {
       phase,
       local,
       watch,
+      tunnel,
       force,
       destroyStrategy,
       telemetryClient,
       logger,
       adopt,
       dotAlchemy,
+      rootDir,
+      isSelected,
       ...providerCredentials
     } = options;
 
-    this.dotAlchemy =
-      dotAlchemy ??
-      this.parent?.dotAlchemy ??
-      path.join(process.cwd(), ".alchemy");
-
     this.scopeName = scopeName;
     this.name = this.scopeName;
     this.parent = parent ?? Scope.getScope();
+    this.rootDir = rootDir ?? this.parent?.rootDir ?? ALCHEMY_ROOT;
+    this.isSelected = isSelected ?? this.parent?.isSelected;
+
+    this.dotAlchemy =
+      dotAlchemy ??
+      this.parent?.dotAlchemy ??
+      path.resolve(this.rootDir, ".alchemy");
 
     // Store provider credentials (TypeScript ensures no conflicts with core options)
     this.providerCredentials = providerCredentials as ProviderCredentials;
@@ -263,6 +292,7 @@ export class Scope {
 
     this.local = local ?? this.parent?.local ?? false;
     this.watch = watch ?? this.parent?.watch ?? false;
+    this.tunnel = tunnel ?? this.parent?.tunnel ?? false;
     this.force = force ?? this.parent?.force ?? false;
     this.adopt = adopt ?? this.parent?.adopt ?? false;
     this.destroyStrategy =
@@ -306,7 +336,9 @@ export class Scope {
   >(
     // TODO(sam): validate uniqueness? Ensure a flat .logs/${id}.log dir? Or nest in scope dirs?
     id: string,
-    options: Omit<IdempotentSpawnOptions, "log" | "stateFile">,
+    options: Omit<IdempotentSpawnOptions, "log" | "stateFile"> & {
+      extract?: E;
+    },
   ): Promise<E extends undefined ? undefined : string> {
     const logsDir = path.join(this.dotAlchemy, "logs");
     const pidsDir = path.join(this.dotAlchemy, "pids");

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

@@ -6,7 +6,6 @@ import { deserialize, serialize } from "../serde.ts";
 import type { State, StateStore } from "../state.ts";
 import { ignore } from "../util/ignore.ts";
 
-const stateRootDir = path.join(process.cwd(), ".alchemy");
 const ALCHEMY_SEPERATOR_CHAR = process.platform === "win32" ? "-" : ":";
 
 export class FileSystemStateStore implements StateStore {
@@ -18,7 +17,7 @@ export class FileSystemStateStore implements StateStore {
       rootDir?: string;
     },
   ) {
-    this.dir = path.join(options?.rootDir ?? stateRootDir, ...scope.chain);
+    this.dir = path.join(options?.rootDir ?? scope.dotAlchemy, ...scope.chain);
   }
 
   async init(): Promise<void> {

package/src/state/sqlite-state-store.ts

@@ -1,7 +1,8 @@
 import type { Config as LibSQLConfig } from "@libsql/client";
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import path from "node:path";
 import type { Scope } from "../scope.ts";
+import { exists } from "../util/exists.ts";
 import { memoize } from "../util/memoize.ts";
 import { importPeer } from "../util/peer.ts";
 import { MIGRATIONS_DIRECTORY } from "./migrations.ts";
@@ -27,6 +28,7 @@ interface BunSQLiteStateStoreOptions {
   readwrite?: boolean;
   safeIntegers?: boolean;
   strict?: boolean;
+  dotAlchemy?: string;
 }
 
 interface LibSQLStateStoreOptions extends Omit<LibSQLConfig, "url"> {
@@ -50,6 +52,11 @@ interface LibSQLStateStoreOptions extends Omit<LibSQLConfig, "url"> {
    * https://github.com/libsql/libsql-client-ts#supported-urls
    */
   url?: string;
+  /**
+   * The path to the .alchemy directory.
+   * @default "./.alchemy"
+   */
+  dotAlchemy?: string;
 }
 
 interface AutoSQLiteStateStoreOptions {
@@ -64,6 +71,12 @@ interface AutoSQLiteStateStoreOptions {
    * @default ".alchemy/state.sqlite"
    */
   filename?: string;
+
+  /**
+   * The path to the .alchemy directory.
+   * @default "./.alchemy"
+   */
+  dotAlchemy?: string;
 }
 
 type SQLiteStateStoreOptions =
@@ -80,7 +93,10 @@ export class SQLiteStateStore extends StateStoreProxy {
   }
 
   async provision(): Promise<StateStoreProxy.Dispatch> {
-    const db = await createDatabase(this.options);
+    const db = await createDatabase({
+      ...(this.options ?? {}),
+      dotAlchemy: this.scope.dotAlchemy,
+    });
     const { SQLiteStateStoreOperations } = await import("./operations.js");
     const operations = new SQLiteStateStoreOperations(db, {
       chain: this.scope.chain,
@@ -97,17 +113,23 @@ const createDatabase = memoize(
       case "libsql":
         return await createLibSQLDatabase(options);
       default: {
-        return await createDefaultDatabase(options?.filename);
+        return await createDefaultDatabase(
+          options?.filename,
+          options?.dotAlchemy,
+        );
       }
     }
   },
 );
 
-async function createDefaultDatabase(filename: string | undefined) {
+async function createDefaultDatabase(
+  filename: string | undefined,
+  dotAlchemy: string | undefined,
+) {
   if ("Bun" in globalThis) {
-    return createBunSQLiteDatabase({ engine: "bun", filename });
+    return createBunSQLiteDatabase({ engine: "bun", filename, dotAlchemy });
   }
-  return createLibSQLDatabase({ engine: "libsql", filename });
+  return createLibSQLDatabase({ engine: "libsql", filename, dotAlchemy });
 }
 
 async function createBunSQLiteDatabase(
@@ -122,8 +144,8 @@ async function createBunSQLiteDatabase(
   const filename =
     options?.filename ??
     process.env.ALCHEMY_STATE_FILE ??
-    ".alchemy/state.sqlite";
-  ensureDirectory(filename);
+    path.join(options?.dotAlchemy ?? ".alchemy", "state.sqlite");
+  await ensureDirectory(filename);
   const { Database } = await import("bun:sqlite");
   const { drizzle } = await importPeer(
     import("drizzle-orm/bun-sqlite"),
@@ -135,7 +157,11 @@ async function createBunSQLiteDatabase(
   // options are passed in, so here's some ugly destructuring!
   const { engine: _engine, filename: _filename, ...rest } = options ?? {};
   const bunOptions = Object.keys(rest).length > 0 ? rest : undefined;
-  const client = new Database(filename, bunOptions);
+  const client = new Database(filename, {
+    readwrite: true,
+    create: true,
+    ...bunOptions,
+  });
   client.exec("PRAGMA journal_mode = WAL;");
   const db = drizzle(client, {
     schema,
@@ -149,10 +175,11 @@ async function createLibSQLDatabase(
 ) {
   const url =
     options?.url ??
-    `file:${options?.filename ?? process.env.ALCHEMY_STATE_FILE ?? ".alchemy/state.sqlite"}`;
+    `file:${options?.filename ?? process.env.ALCHEMY_STATE_FILE ?? path.join(options?.dotAlchemy ?? ".alchemy", "state.sqlite")}`;
+
   const filename = url.startsWith("file:") ? url.slice(5) : undefined;
   if (filename) {
-    ensureDirectory(filename);
+    await ensureDirectory(filename);
   }
   const { drizzle } = await importPeer(
     import("drizzle-orm/libsql"),
@@ -173,9 +200,9 @@ async function createLibSQLDatabase(
   return db;
 }
 
-const ensureDirectory = (filename: string) => {
+const ensureDirectory = async (filename: string) => {
   const dir = path.dirname(filename);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
+  if (!(await exists(dir))) {
+    await fs.mkdir(dir, { recursive: true });
   }
 };

package/src/stripe/customer.ts

@@ -92,10 +92,6 @@ export interface CustomerProps {
    * An integer amount in cents that represents the customer's current balance
    */
   balance?: number;
-  /**
-   * If you provide a coupon code, the customer will have a discount applied on all recurring charges
-   */
-  coupon?: string;
   /**
    * An arbitrary string attached to the object
    */
@@ -136,10 +132,6 @@ export interface CustomerProps {
    * Customer's preferred languages, ordered by preference
    */
   preferredLocales?: string[];
-  /**
-   * The ID of a promotion code to apply to the customer
-   */
-  promotionCode?: string;
   /**
    * The customer's shipping information
    */
@@ -311,7 +303,6 @@ export const Customer = Resource(
               }
             : undefined,
           balance: props.balance,
-          coupon: props.coupon,
           description: props.description,
           email: props.email,
           invoice_prefix: props.invoicePrefix,
@@ -320,7 +311,6 @@ export const Customer = Resource(
           next_invoice_sequence: props.nextInvoiceSequence,
           phone: props.phone,
           preferred_locales: props.preferredLocales,
-          promotion_code: props.promotionCode,
           shipping: props.shipping as any,
           source: props.source,
           tax_exempt: props.taxExempt,
@@ -354,7 +344,6 @@ export const Customer = Resource(
               }
             : undefined,
           balance: props.balance,
-          coupon: props.coupon,
           description: props.description,
           email: props.email,
           invoice_prefix: props.invoicePrefix,
@@ -364,7 +353,6 @@ export const Customer = Resource(
           payment_method: props.paymentMethod,
           phone: props.phone,
           preferred_locales: props.preferredLocales,
-          promotion_code: props.promotionCode,
           shipping: props.shipping as any,
           source: props.source,
           tax_exempt: props.taxExempt,
@@ -404,7 +392,6 @@ export const Customer = Resource(
                   }
                 : undefined,
               balance: props.balance,
-              coupon: props.coupon,
               description: props.description,
               email: props.email,
               invoice_prefix: props.invoicePrefix,
@@ -413,7 +400,6 @@ export const Customer = Resource(
               next_invoice_sequence: props.nextInvoiceSequence,
               phone: props.phone,
               preferred_locales: props.preferredLocales,
-              promotion_code: props.promotionCode,
               shipping: props.shipping as any,
               source: props.source,
               tax_exempt: props.taxExempt,