alchemy 0.67.0 → 0.69.0

package/src/cloudflare/worker.ts

@@ -432,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";
 }
 
 /**
@@ -442,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.
@@ -614,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"
  * });
  *
@@ -901,7 +900,7 @@ const _Worker = Resource(
           containers: options.containers,
         },
       );
-      return this({
+      return {
         ...props,
         type: "service",
         id,
@@ -920,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) {
@@ -1045,7 +1044,7 @@ const _Worker = Resource(
     );
 
     const now = new Date();
-    return this({
+    return {
       ...props,
       type: "service",
       id,
@@ -1074,7 +1073,7 @@ const _Worker = Resource(
       dev: {
         hasRemote: true,
       },
-    } as unknown as Worker<B>);
+    } as unknown as Worker<B>;
   },
 );
 
@@ -1190,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

@@ -350,14 +350,7 @@ export interface WranglerJsonSpec {
    */
   queues?: {
     producers?: { queue: string; binding: string }[];
-    consumers?: {
-      queue: string;
-      max_batch_size?: number;
-      max_concurrency?: number;
-      max_retries?: number;
-      max_wait_time_ms?: number;
-      retry_delay?: number;
-    }[];
+    consumers?: QueueConsumerWranglerJson[];
   };
 
   /**
@@ -500,6 +493,33 @@ export interface WranglerJsonSpec {
   };
 }
 
+/**
+ * Queue consumer bindings for wrangler.json
+ */
+interface QueueConsumerWranglerJson {
+  queue: string;
+  /**
+   * The maximum number of messages allowed in each batch.
+   */
+  max_batch_size?: number;
+  /**
+   * The maximum number of concurrent consumers allowed to run at once. Leaving this unset will mean that the number of invocations will scale to the currently supported maximum.
+   */
+  max_concurrency?: number;
+  /**
+   * The maximum number of retries for a message, if it fails or `retryAll()` is invoked.
+   */
+  max_retries?: number;
+  /**
+   * The maximum number of seconds to wait for messages to fill a batch before the batch is sent to the consumer Worker.
+   */
+  max_batch_timeout?: number;
+  /**
+   * The number of seconds to delay retried messages for by default, before they are re-delivered to the consumer. This can be overridden on a per-message or per-batch basis when retrying messages.
+   */
+  retry_delay?: number;
+}
+
 /**
  * Process worker bindings into wrangler.json format
  */
@@ -554,14 +574,7 @@ function processBindings(
   }[] = [];
   const queues: {
     producers: { queue: string; binding: string }[];
-    consumers: {
-      queue: string;
-      max_batch_size?: number;
-      max_concurrency?: number;
-      max_retries?: number;
-      max_wait_time_ms?: number;
-      retry_delay?: number;
-    }[];
+    consumers: QueueConsumerWranglerJson[];
   } = {
     producers: [],
     consumers: [],
@@ -604,7 +617,9 @@ function processBindings(
         max_batch_size: eventSource.settings?.batchSize,
         max_concurrency: eventSource.settings?.maxConcurrency,
         max_retries: eventSource.settings?.maxRetries,
-        max_wait_time_ms: eventSource.settings?.maxWaitTimeMs,
+        max_batch_timeout: eventSource.settings?.maxWaitTimeMs
+          ? eventSource.settings?.maxWaitTimeMs / 1000
+          : undefined,
         retry_delay: eventSource.settings?.retryDelay,
       });
     } else if (isQueue(eventSource)) {

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(),
-      });
+      };
     }
   },
 );

package/src/docker/volume.ts

@@ -48,7 +48,7 @@ export interface VolumeProps {
 /**
  * Docker Volume resource
  */
-export interface Volume extends Resource<"docker::Volume">, VolumeProps {
+export interface Volume extends VolumeProps {
   /**
    * Volume ID (same as name for Docker volumes)
    */
@@ -150,8 +150,7 @@ export const Volume = Resource(
       const volumeInfos = await api.inspectVolume(volumeId);
       const mountpoint = volumeInfos[0].Mountpoint;
 
-      // Return the resource using this() to construct output
-      return this({
+      return {
         ...props,
         id: volumeId,
         name: volumeName,
@@ -159,7 +158,7 @@ export const Volume = Resource(
         createdAt: Date.now(),
         labels: Array.isArray(props.labels) ? props.labels : undefined,
         driverOpts: props.driverOpts,
-      });
+      };
     }
   },
 );

package/src/esbuild/bundle.ts

@@ -74,8 +74,7 @@ export interface BundleProps extends Partial<esbuild.BuildOptions> {
  * Output returned after bundle creation/update
  */
 export interface Bundle<P extends BundleProps = BundleProps>
-  extends Resource<"esbuild::Bundle">,
-    BundleProps {
+  extends BundleProps {
   /**
    * Path to the bundled file
    * Absolute or relative path to the generated bundle
@@ -161,21 +160,24 @@ export const Bundle = Resource(
     if (outputFile === undefined && bundlePath === undefined) {
       throw new Error("Failed to create bundle");
     }
+    type Path = Props extends { outdir: string } | { outfile: string }
+      ? string
+      : undefined;
     if (outputFile) {
-      return this({
+      return {
         ...props,
-        path: bundlePath,
+        path: bundlePath as Path,
         hash: outputFile.hash,
         content: outputFile.text,
-      });
+      };
     }
     const content = await fs.readFile(bundlePath!, "utf-8");
-    return this({
+    return {
       ...props,
-      path: bundlePath,
+      path: bundlePath as Path,
       hash: crypto.createHash("sha256").update(content).digest("hex"),
       content,
-    });
+    };
   },
 );