alchemy 0.66.0 → 0.68.0

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;
       };
 
   /**
@@ -421,8 +432,8 @@ export type WorkerProps<
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
 > = InlineWorkerProps<B, RPC> | EntrypointWorkerProps<B, RPC>;
 
-export function isWorker(resource: Resource): resource is Worker<any> {
-  return resource[ResourceKind] === "cloudflare::Worker";
+export function isWorker(resource: any): resource is Worker<any> {
+  return resource?.[ResourceKind] === "cloudflare::Worker";
 }
 
 /**
@@ -431,109 +442,108 @@ export function isWorker(resource: Resource): resource is Worker<any> {
 export type Worker<
   B extends Bindings | undefined = Bindings | undefined,
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
-> = Resource<"cloudflare::Worker"> &
-  Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & {
-    /** @internal phantom property */
-    __rpc__?: RPC;
+> = Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & {
+  /** @internal phantom property */
+  __rpc__?: RPC;
 
-    type: "service";
+  type: "service";
 
-    /**
-     * The ID of the worker
-     */
-    id: string;
+  /**
+   * The ID of the worker
+   */
+  id: string;
 
-    /**
-     * The name of the worker
-     */
-    name: string;
+  /**
+   * The name of the worker
+   */
+  name: string;
 
-    /**
-     * The root directory of the project
-     * @default process.cwd()
-     */
-    cwd: string;
+  /**
+   * The root directory of the project
+   * @default process.cwd()
+   */
+  cwd: string;
 
-    /**
-     * Time at which the worker was created
-     */
-    createdAt: number;
+  /**
+   * Time at which the worker was created
+   */
+  createdAt: number;
 
-    /**
-     * Time at which the worker was last updated
-     */
-    updatedAt: number;
+  /**
+   * Time at which the worker was last updated
+   */
+  updatedAt: number;
 
-    /**
-     * The worker's URL if enabled
-     * Format: {name}.{subdomain}.workers.dev
-     *
-     * @default true
-     */
-    url?: string;
+  /**
+   * The worker's URL if enabled
+   * Format: {name}.{subdomain}.workers.dev
+   *
+   * @default true
+   */
+  url?: string;
 
-    /**
-     * The bindings that were created
-     */
-    bindings: B;
+  /**
+   * The bindings that were created
+   */
+  bindings: B;
 
-    /**
-     * Configuration for static assets
-     */
-    assets?: AssetsConfig;
+  /**
+   * Configuration for static assets
+   */
+  assets?: AssetsConfig;
 
-    /**
-     * The routes that were created for this worker
-     */
-    routes?: Route[];
+  /**
+   * The routes that were created for this worker
+   */
+  routes?: Route[];
 
-    /**
-     * The custom domains that were created for this worker
-     */
-    domains?: CustomDomain[];
+  /**
+   * The custom domains that were created for this worker
+   */
+  domains?: CustomDomain[];
 
-    // phantom property (for typeof myWorker.Env)
-    Env: B extends Bindings
-      ? {
-          [bindingName in keyof B]: Bound<B[bindingName]>;
-        }
-      : undefined;
+  // phantom property (for typeof myWorker.Env)
+  Env: B extends Bindings
+    ? {
+        [bindingName in keyof B]: Bound<B[bindingName]>;
+      }
+    : undefined;
 
-    /**
-     * The compatibility date for the worker
-     */
-    compatibilityDate: string;
+  /**
+   * The compatibility date for the worker
+   */
+  compatibilityDate: string;
 
-    /**
-     * The compatibility flags for the worker
-     */
-    compatibilityFlags: string[];
+  /**
+   * The compatibility flags for the worker
+   */
+  compatibilityFlags: string[];
 
-    /**
-     * The dispatch namespace this worker is deployed to
-     */
-    namespace?: string | DispatchNamespace;
+  /**
+   * The dispatch namespace this worker is deployed to
+   */
+  namespace?: string | DispatchNamespace;
 
-    /**
-     * Version label for this worker deployment
-     */
-    version?: string;
+  /**
+   * Version label for this worker deployment
+   */
+  version?: string;
 
-    /**
-     * Smart placement configuration for the worker
-     */
-    placement?: {
-      mode: "smart";
-    };
+  /**
+   * Smart placement configuration for the worker
+   */
+  placement?: {
+    mode: "smart";
+  };
 
-    /**
-     * Whether the worker has a remote deployment
-     * @internal
-     */
-    dev?: {
-      hasRemote: boolean;
-    };
+  /**
+   * Whether the worker has a remote deployment
+   * @internal
+   */
+  dev?: {
+    hasRemote: boolean;
   };
+};
 
 /**
  * A Cloudflare Worker is a serverless function that can be deployed to the Cloudflare network.
@@ -603,7 +613,7 @@ export type Worker<
  *
  * @example
  * // Create a worker with static assets:
- * const staticAssets = await Assets("static", {
+ * const staticAssets = await Assets({
  *   path: "./src/assets"
  * });
  *
@@ -699,6 +709,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",
   {
@@ -854,7 +883,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());
       }
@@ -870,7 +900,7 @@ const _Worker = Resource(
           containers: options.containers,
         },
       );
-      return this({
+      return {
         ...props,
         type: "service",
         id,
@@ -889,7 +919,7 @@ const _Worker = Resource(
           hasRemote: this.output?.dev?.hasRemote ?? false,
         },
         Env: undefined!,
-      } as unknown as Worker<B>);
+      } as unknown as Worker<B>;
     }
 
     if (this.phase === "create" || this.output.dev?.hasRemote === false) {
@@ -1014,7 +1044,7 @@ const _Worker = Resource(
     );
 
     const now = new Date();
-    return this({
+    return {
       ...props,
       type: "service",
       id,
@@ -1043,7 +1073,7 @@ const _Worker = Resource(
       dev: {
         hasRemote: true,
       },
-    } as unknown as Worker<B>);
+    } as unknown as Worker<B>;
   },
 );
 
@@ -1159,6 +1189,7 @@ async function provisionResources<B extends Bindings>(
       apiToken: props.apiToken,
       email: props.email,
       baseUrl: props.baseUrl,
+      profile: props.profile,
     } satisfies CloudflareApiOptions,
   };
 

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") {

package/src/cloudflare/zone.ts

@@ -263,7 +263,7 @@ export interface ZoneData {
 /**
  * Output returned after Zone creation/update
  */
-export interface Zone extends Resource<"cloudflare::Zone">, ZoneData {}
+export interface Zone extends ZoneData {}
 
 /**
  * A Cloudflare Zone represents a domain and its configuration settings on Cloudflare.
@@ -425,7 +425,7 @@ export const Zone = Resource(
       this.props?.botManagement,
     );
 
-    return this({
+    return {
       id: zoneData.id,
       name: zoneData.name,
       type: zoneData.type,
@@ -440,7 +440,7 @@ export const Zone = Resource(
         ? new Date(zoneData.activated_on).getTime()
         : null,
       settings: await getZoneSettings(api, zoneData.id),
-    });
+    };
   },
 );
 

package/src/context.ts

@@ -6,24 +6,26 @@ import {
   ResourceScope,
   ResourceSeq,
   type Resource,
+  type ResourceAttributes,
   type ResourceProps,
 } from "./resource.ts";
 import type { Scope } from "./scope.ts";
 import type { State } from "./state.ts";
 
 export type Context<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > = CreateContext<Out> | UpdateContext<Out, Props> | DeleteContext<Out, Props>;
 
-export interface CreateContext<Out extends Resource> extends BaseContext<Out> {
+export interface CreateContext<Out extends ResourceAttributes>
+  extends BaseContext<Out> {
   phase: "create";
   output?: undefined;
   props?: undefined;
 }
 
 export interface UpdateContext<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > extends BaseContext<Out> {
   phase: "update";
@@ -32,7 +34,7 @@ export interface UpdateContext<
 }
 
 export interface DeleteContext<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > extends BaseContext<Out> {
   phase: "delete";
@@ -40,7 +42,7 @@ export interface DeleteContext<
   props: Props;
 }
 
-export interface BaseContext<Out extends Resource> {
+export interface BaseContext<Out extends ResourceAttributes> {
   quiet: boolean;
   stage: string;
   id: ResourceID;
@@ -94,7 +96,7 @@ export interface BaseContext<Out extends Resource> {
 export function context<
   Kind extends string,
   Props extends ResourceProps | undefined,
-  Out extends Resource,
+  Out extends ResourceAttributes,
 >({
   scope,
   phase,
@@ -114,7 +116,7 @@ export function context<
   fqn: ResourceFQN;
   seq: number;
   props: Props;
-  state: State<Kind, Props, Out>;
+  state: State<Kind, Props, Out & Resource>;
   replace: (force?: boolean) => never;
   isReplacement?: boolean;
 }): Context<Out> {

package/src/destroy.ts

@@ -50,10 +50,10 @@ function isScopeArgs(a: any): a is [scope: Scope, options?: DestroyOptions] {
 /**
  * Prune all resources from an Output and "down", i.e. that branches from it.
  */
-export async function destroy<Type extends string>(
+export async function destroy(
   ...args:
     | [scope: Scope, options?: DestroyOptions]
-    | [resource: Resource<Type> | undefined | null, options?: DestroyOptions]
+    | [resource: any | undefined | null, options?: DestroyOptions]
 ): Promise<void> {
   if (isScopeArgs(args)) {
     const [scope] = args;

package/src/dns/import-dns.ts

@@ -62,9 +62,7 @@ export interface ImportDnsRecordsProps {
 /**
  * Output returned after DNS records import
  */
-export interface ImportDnsRecords
-  extends Resource<"dns::ImportDnsRecords">,
-    ImportDnsRecordsProps {
+export interface ImportDnsRecords extends ImportDnsRecordsProps {
   /**
    * The DNS records as a flat array, directly compatible with DnsRecords function
    */
@@ -204,11 +202,11 @@ export const ImportDnsRecords = Resource(
     }
 
     // Return the resource with fetched records as a flat array
-    return this({
+    return {
       domain: props.domain,
       recordTypes: [...recordTypes],
       records: allRecords,
       importedAt: Date.now(),
-    });
+    };
   },
 );

package/src/docker/container.ts

@@ -120,9 +120,7 @@ export interface ContainerProps {
 /**
  * Docker Container resource
  */
-export interface Container
-  extends Resource<"docker::Container">,
-    ContainerProps {
+export interface Container extends ContainerProps {
   /**
    * Container ID
    */
@@ -266,14 +264,13 @@ export const Container = Resource(
         containerState = "running";
       }
 
-      // Return the resource using this() to construct output
-      return this({
+      return {
         ...props,
         id: containerId,
         name: containerName,
         state: containerState,
         createdAt: Date.now(),
-      });
+      };
     }
   },
 );

package/src/docker/image.ts

@@ -84,7 +84,7 @@ export interface ImageProps {
 /**
  * Docker Image resource
  */
-export interface Image extends Resource<"docker::Image">, ImageProps {
+export interface Image extends ImageProps {
   /**
    * Image name
    */
@@ -135,16 +135,8 @@ export const Image = Resource(
     id: string,
     props: ImageProps,
   ): Promise<Image> {
-    // Create a temporary directory that will act as an isolated Docker config
-    // (credentials) directory. This prevents race-conditions when multiple
-    // concurrent tests perform `docker login` / `logout` by ensuring each
-    // Image operation has its own credential store.
-    const tempConfigDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), "docker-config-"),
-    );
-
     // Initialize Docker API client with the isolated config directory
-    const api = new DockerApi({ configDir: tempConfigDir });
+    const api = new DockerApi();
 
     if (this.phase === "delete") {
       // No action needed for delete as Docker images aren't automatically removed
@@ -232,6 +224,15 @@ export const Image = Resource(
           : `${registryHost}/${imageRef}`;
 
         try {
+          // Create a temporary directory that will act as an isolated Docker config
+          // (credentials) directory. This prevents race-conditions when multiple
+          // concurrent tests perform `docker login` / `logout` by ensuring each
+          // Image operation has its own credential store.
+          const tempConfigDir = await fs.mkdtemp(
+            path.join(os.tmpdir(), "docker-config-"),
+          );
+          const api = new DockerApi({ configDir: tempConfigDir });
+
           // Authenticate to registry using the isolated config directory
           await api.login(registryHost, username, password.unencrypted);
 
@@ -265,15 +266,14 @@ export const Image = Resource(
         }
       }
 
-      // Return the resource using this() to construct output
-      return this({
+      return {
         ...props,
         name,
         imageRef: finalImageRef,
         imageId,
         repoDigest,
         builtAt: Date.now(),
-      });
+      };
     }
   },
 );

package/src/docker/network.ts

@@ -34,7 +34,7 @@ export interface NetworkProps {
 /**
  * Docker Network resource
  */
-export interface Network extends Resource<"docker::Network">, NetworkProps {
+export interface Network extends NetworkProps {
   /**
    * Network ID
    */
@@ -104,13 +104,12 @@ export const Network = Resource(
       props.driver = props.driver || "bridge";
       const networkId = await api.createNetwork(networkName, props.driver);
 
-      // Return the resource using this() to construct output
-      return this({
+      return {
         ...props,
         id: networkId,
         name: networkName,
         createdAt: Date.now(),
-      });
+      };
     }
   },
 );

package/src/docker/remote-image.ts

@@ -25,9 +25,7 @@ export interface RemoteImageProps {
 /**
  * Docker Remote Image resource
  */
-export interface RemoteImage
-  extends Resource<"docker::RemoteImage">,
-    RemoteImageProps {
+export interface RemoteImage extends RemoteImageProps {
   /**
    * Full image reference (name:tag)
    */
@@ -72,12 +70,11 @@ export const RemoteImage = Resource(
       // Pull image
       await api.pullImage(imageRef);
 
-      // Return the resource using this() to construct output
-      return this({
+      return {
         ...props,
         imageRef,
         createdAt: Date.now(),
-      });
+      };
     }
   },
 );