alchemy 0.16.10 → 0.17.0

package/src/aws/queue.ts

@@ -3,6 +3,8 @@ import {
   DeleteQueueCommand,
   GetQueueAttributesCommand,
   GetQueueUrlCommand,
+  QueueDeletedRecently,
+  QueueDoesNotExist,
   SQSClient,
 } from "@aws-sdk/client-sqs";
 import type { Context } from "../context.js";
@@ -136,7 +138,7 @@ export const Queue = Resource(
   "sqs::Queue",
   async function (
     this: Context<Queue>,
-    id: string,
+    _id: string,
     props: QueueProps,
   ): Promise<Queue> {
     const client = new SQSClient({});
@@ -176,7 +178,7 @@ export const Queue = Resource(
             // If we get here, queue still exists
             await new Promise((resolve) => setTimeout(resolve, 1000));
           } catch (error: any) {
-            if (error.name === "QueueDoesNotExist") {
+            if (isQueueDoesNotExist(error)) {
               queueDeleted = true;
             } else {
               throw error;
@@ -184,7 +186,7 @@ export const Queue = Resource(
           }
         }
       } catch (error: any) {
-        if (error.name !== "QueueDoesNotExist") {
+        if (!isQueueDoesNotExist(error)) {
           throw error;
         }
       }
@@ -258,37 +260,18 @@ export const Queue = Resource(
         url: createResponse.QueueUrl!,
       });
     } catch (error: any) {
-      if (error.name === "QueueAlreadyExists") {
-        // Get existing queue URL
-        const urlResponse = await client.send(
-          new GetQueueUrlCommand({
-            QueueName: queueName,
-          }),
-        );
-
-        // Get queue attributes
-        const attributesResponse = await client.send(
-          new GetQueueAttributesCommand({
-            QueueUrl: urlResponse.QueueUrl,
-            AttributeNames: ["QueueArn"],
-          }),
+      if (isQueueDeletedRecently(error)) {
+        console.log(
+          `Queue "${queueName}" was recently deleted and can't be re-created. Waiting and retrying...`,
         );
-
-        return this({
-          ...props,
-          arn: attributesResponse.Attributes!.QueueArn!,
-          url: urlResponse.QueueUrl!,
-        });
-      }
-      if (error.name === "QueueDeletedRecently") {
         // Queue was recently deleted, wait and retry
-        const maxRetries = 3;
+        const maxRetries = 61;
         let retryCount = 0;
 
         while (retryCount < maxRetries) {
           try {
-            // Wait for 60 seconds before retrying
-            await new Promise((resolve) => setTimeout(resolve, 61000));
+            // Wait for 1 second before retrying
+            await new Promise((resolve) => setTimeout(resolve, 1000));
 
             // Retry creating the queue
             const createResponse = await client.send(
@@ -314,7 +297,7 @@ export const Queue = Resource(
             });
           } catch (retryError: any) {
             if (
-              retryError.name !== "QueueDeletedRecently" ||
+              !isQueueDeletedRecently(retryError) ||
               retryCount === maxRetries - 1
             ) {
               throw retryError;
@@ -327,3 +310,19 @@ export const Queue = Resource(
     }
   },
 );
+
+function isQueueDoesNotExist(error: any): error is QueueDoesNotExist {
+  return (
+    error.name === "QueueDoesNotExist" ||
+    error.Code === "AWS.SimpleQueueService.NonExistentQueue" ||
+    error instanceof QueueDoesNotExist
+  );
+}
+
+function isQueueDeletedRecently(error: any): error is QueueDeletedRecently {
+  return (
+    error instanceof QueueDeletedRecently ||
+    error.Code === "AWS.SimpleQueueService.QueueDeletedRecently" ||
+    error.name === "QueueDeletedRecently"
+  );
+}

package/src/aws/role.ts

@@ -218,7 +218,7 @@ export const Role = Resource(
   "iam::Role",
   async function (
     this: Context<Role>,
-    id: string,
+    _id: string,
     props: RoleProps,
   ): Promise<Role> {
     const client = new IAMClient({});

package/src/aws/ses.ts

@@ -160,7 +160,7 @@ export const SES = Resource(
   "aws::SES",
   async function (
     this: Context<SES>,
-    id: string,
+    _id: string,
     props: SESProps,
   ): Promise<SES> {
     // Create SES client

package/src/aws/table.ts

@@ -142,7 +142,7 @@ export const Table = Resource(
   "dynamo::Table",
   async function (
     this: Context<Table>,
-    id: string,
+    _id: string,
     props: TableProps,
   ): Promise<Table> {
     const client = new DynamoDBClient({});

package/src/cloudflare/account-api-token.ts

@@ -251,7 +251,7 @@ export const AccountApiToken = Resource(
   "cloudflare::AccountApiToken",
   async function (
     this: Context<AccountApiToken>,
-    id: string,
+    _id: string,
     props: AccountApiTokenProps,
   ): Promise<AccountApiToken> {
     // Create Cloudflare API client with automatic account discovery

package/src/cloudflare/ai-gateway.ts

@@ -1,7 +1,9 @@
 import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
+import { bind } from "../runtime/bind.js";
 import { handleApiError } from "./api-error.js";
 import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import type { Bound } from "./bound.js";
 
 /**
  * Properties for creating or updating a Cloudflare AI Gateway.
@@ -85,7 +87,7 @@ export interface AiGatewayProps extends CloudflareApiOptions {
  * Output returned after Cloudflare AI Gateway creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export interface AiGateway
+export interface AiGatewayResource
   extends Resource<"cloudflare::AiGateway">,
     AiGatewayProps {
   /**
@@ -125,6 +127,8 @@ export interface AiGateway
   type: "ai_gateway";
 }
 
+export type AiGateway = AiGatewayResource & Bound<AiGatewayResource>;
+
 /**
  * Represents a Cloudflare AI Gateway.
  *
@@ -149,13 +153,28 @@ export interface AiGateway
  *   logpushPublicKey: "mypublickey..." // Replace with actual public key
  * });
  */
-export const AiGateway = Resource(
+export async function AiGateway(
+  name: string,
+  props: AiGatewayProps = {},
+): Promise<AiGateway> {
+  const gateway = await AiGatewayResource(name, props);
+  const binding = await bind(gateway);
+  return {
+    ...gateway,
+    getLog: binding.getLog,
+    getUrl: binding.getUrl,
+    patchLog: binding.patchLog,
+    run: binding.run,
+  } as AiGateway;
+}
+
+const AiGatewayResource = Resource(
   "cloudflare::AiGateway",
   async function (
-    this: Context<AiGateway>,
+    this: Context<AiGatewayResource>,
     id: string,
     props: AiGatewayProps = {},
-  ): Promise<AiGateway> {
+  ): Promise<AiGatewayResource> {
     const api = await createCloudflareApi(props);
     const gatewayPath = `/accounts/${api.accountId}/ai-gateway/gateways/${id}`;
     const gatewaysPath = `/accounts/${api.accountId}/ai-gateway/gateways`;

package/src/cloudflare/api-error.ts

@@ -52,7 +52,7 @@ export async function handleApiError(
   let json: any;
   try {
     json = JSON.parse(text);
-  } catch (error) {
+  } catch {
     json = { errors: [{ message: text }] };
   }
   const errors: { message: string }[] = json?.errors || [

package/src/cloudflare/assets.ts

@@ -104,7 +104,7 @@ export const Assets = Resource(
       if (!stats.isDirectory()) {
         throw new Error(`Assets path ${props.path} is not a directory`);
       }
-    } catch (error) {
+    } catch (_error) {
       throw new Error(
         `Assets directory ${props.path} does not exist or is not accessible`,
       );
@@ -121,7 +121,7 @@ export const Assets = Resource(
       return {
         path: normalizedPath,
         filePath,
-        contentType: getContentType(filePath),
+        contentType: getContentType(filePath) ?? "application/null",
       };
     });
 

package/src/cloudflare/auth.ts

@@ -226,7 +226,7 @@ async function parseTOML(input: string): Promise<any> {
 async function isDirectory(dir: string) {
   try {
     return (await fs.stat(dir)).isDirectory();
-  } catch (err) {
+  } catch (_err) {
     return false;
   }
 }

package/src/cloudflare/bindings.ts

@@ -4,20 +4,21 @@
  * https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
  */
 import type { Secret } from "../secret.js";
-import type { AiGateway } from "./ai-gateway.js";
+import type { AiGatewayResource } from "./ai-gateway.js";
 import type { Ai } from "./ai.js";
 import type { AnalyticsEngineDataset } from "./analytics-engine.js";
 import type { Assets } from "./assets.js";
 import type { Bound } from "./bound.js";
 import type { BrowserRendering } from "./browser-rendering.js";
-import type { R2Bucket } from "./bucket.js";
-import type { D1Database } from "./d1-database.js";
+import type { R2BucketResource } from "./bucket.js";
+import type { D1DatabaseResource } from "./d1-database.js";
 import type { DurableObjectNamespace } from "./durable-object-namespace.js";
-import type { Hyperdrive } from "./hyperdrive.js";
-import type { KVNamespace } from "./kv-namespace.js";
-import type { Pipeline } from "./pipeline.js";
-import type { Queue } from "./queue.js";
-import type { VectorizeIndex } from "./vectorize-index.js";
+import type { HyperdriveResource } from "./hyperdrive.js";
+import type { KVNamespaceResource } from "./kv-namespace.js";
+import type { PipelineResource } from "./pipeline.js";
+import type { QueueResource } from "./queue.js";
+import type { VectorizeIndexResource } from "./vectorize-index.js";
+import type { WorkerStub } from "./worker-stub.js";
 import type { Worker } from "./worker.js";
 import type { Workflow } from "./workflow.js";
 
@@ -36,31 +37,45 @@ export declare namespace Bindings {
  */
 export type Binding =
   | Ai
-  | AiGateway
+  | AiGatewayResource
   | Assets
+  | D1DatabaseResource
   | AnalyticsEngineDataset
-  | D1Database
   | DurableObjectNamespace
-  | Hyperdrive
-  | KVNamespace
+  | HyperdriveResource
+  | KVNamespaceResource
+  | PipelineResource
+  | QueueResource
+  | R2BucketResource
   | {
       type: "kv_namespace";
       id: string;
     }
-  | Pipeline
-  | Queue
-  | R2Bucket
   | Secret
   | string
-  | VectorizeIndex
+  | VectorizeIndexResource
   | Worker
+  | WorkerStub
   | Workflow
   | BrowserRendering
-  | Self;
+  | Self
+  | Json;
 
 export type Self = typeof Self;
 export const Self = Symbol.for("Self");
 
+export type Json<T = any> = {
+  type: "json";
+  json: T;
+};
+
+export function Json<const T>(value: T): Json<T> {
+  return {
+    type: "json",
+    json: value,
+  };
+}
+
 /**
  * Union type for all Worker binding types (API spec)
  */
@@ -201,7 +216,7 @@ export interface WorkerBindingJson {
   /** Type identifier for JSON binding */
   type: "json";
   /** JSON value */
-  json: any;
+  json: string;
 }
 
 /**

package/src/cloudflare/bound.ts

@@ -1,27 +1,26 @@
 import type { Pipeline } from "cloudflare:pipelines";
 import type { Secret } from "../secret.js";
-import type { AiGateway as _AiGateway } from "./ai-gateway.js";
+import type { AiGatewayResource as _AiGateway } from "./ai-gateway.js";
 import type { Ai as _Ai } from "./ai.js";
 import type { AnalyticsEngineDataset as _AnalyticsEngineDataset } from "./analytics-engine.js";
 import type { Assets } from "./assets.js";
-import type { Binding, Self } from "./bindings.js";
+import type { Binding, Json, Self } from "./bindings.js";
 import type { BrowserRendering } from "./browser-rendering.js";
-import type { R2Bucket as _R2Bucket } from "./bucket.js";
-import type { D1Database as _D1Database } from "./d1-database.js";
+import type { R2BucketResource as _R2Bucket } from "./bucket.js";
+import type { D1DatabaseResource } from "./d1-database.js";
 import type { DurableObjectNamespace as _DurableObjectNamespace } from "./durable-object-namespace.js";
-import type { Hyperdrive as _Hyperdrive } from "./hyperdrive.js";
-import type { Pipeline as _Pipeline } from "./pipeline.js";
-import type { Queue as _Queue } from "./queue.js";
-import type { VectorizeIndex as _VectorizeIndex } from "./vectorize-index.js";
-import type { Worker as _Worker } from "./worker.js";
+import type { HyperdriveResource as _Hyperdrive } from "./hyperdrive.js";
+import type { PipelineResource as _Pipeline } from "./pipeline.js";
+import type { QueueResource as _Queue } from "./queue.js";
+import type { VectorizeIndexResource as _VectorizeIndex } from "./vectorize-index.js";
 import type { Workflow as _Workflow } from "./workflow.js";
 
 export type Bound<T extends Binding> = T extends _DurableObjectNamespace
   ? DurableObjectNamespace
   : T extends { type: "kv_namespace" }
     ? KVNamespace
-    : T extends _Worker
-      ? Worker
+    : T extends { type: "service" }
+      ? Service
       : T extends _R2Bucket
         ? R2Bucket
         : T extends _AiGateway
@@ -34,16 +33,16 @@ export type Bound<T extends Binding> = T extends _DurableObjectNamespace
                 ? Service
                 : T extends _Workflow<infer P>
                   ? Workflow<P>
-                  : T extends _D1Database
+                  : T extends D1DatabaseResource
                     ? D1Database
                     : T extends _VectorizeIndex
                       ? VectorizeIndex
                       : T extends _Queue<infer Body>
                         ? Queue<Body>
-                        : T extends _Pipeline<infer R>
-                          ? Pipeline<R>
-                          : T extends _AnalyticsEngineDataset
-                            ? AnalyticsEngineDataset
+                        : T extends _AnalyticsEngineDataset
+                          ? AnalyticsEngineDataset
+                          : T extends _Pipeline<infer R>
+                            ? Pipeline<R>
                             : T extends string
                               ? string
                               : T extends BrowserRendering
@@ -52,4 +51,6 @@ export type Bound<T extends Binding> = T extends _DurableObjectNamespace
                                   ? Ai<M>
                                   : T extends Self
                                     ? Service
-                                    : Service;
+                                    : T extends Json<infer T>
+                                      ? T
+                                      : Service;

package/src/cloudflare/bucket.ts

@@ -1,9 +1,11 @@
 import { AwsClient } from "aws4fetch";
 import type { Context } from "../context.js";
-import { Resource } from "../resource.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 CloudflareApi, createCloudflareApi } from "./api.js";
+import type { Bound } from "./bound.js";
 
 /**
  * Properties for creating or updating an R2 Bucket
@@ -89,30 +91,35 @@ export interface BucketProps {
 /**
  * Output returned after R2 Bucket creation/update
  */
-export interface R2Bucket
-  extends Resource<"cloudflare::R2Bucket">,
-    BucketProps {
-  /**
-   * Resource type identifier
-   */
-  type: "r2_bucket";
+export type R2BucketResource = Resource<"cloudflare::R2Bucket"> &
+  Omit<BucketProps, "delete"> & {
+    /**
+     * Resource type identifier
+     */
+    type: "r2_bucket";
+
+    /**
+     * The name of the bucket
+     */
+    name: string;
 
-  /**
-   * The name of the bucket
-   */
-  name: string;
+    /**
+     * Location of the bucket
+     */
+    location: string;
 
-  /**
-   * Location of the bucket
-   */
-  location: string;
+    /**
+     * Time at which the bucket was created
+     */
+    creationDate: Date;
+  };
 
-  /**
-   * Time at which the bucket was created
-   */
-  creationDate: Date;
+export function isBucket(resource: Resource): resource is R2BucketResource {
+  return resource[ResourceKind] === "cloudflare::R2Bucket";
 }
 
+export type R2Bucket = R2BucketResource & Bound<R2BucketResource>;
+
 /**
  * Creates and manages Cloudflare R2 Buckets for object storage.
  *
@@ -157,13 +164,31 @@ export interface R2Bucket
  *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
-export const R2Bucket = Resource(
+export async function R2Bucket(
+  name: string,
+  props: BucketProps = {},
+): Promise<R2Bucket> {
+  const bucket = await R2BucketResource(name, props);
+  const binding = await bind(bucket);
+  return {
+    ...bucket,
+    createMultipartUpload: binding.createMultipartUpload,
+    delete: binding.delete,
+    get: binding.get,
+    list: binding.list,
+    put: binding.put,
+    head: binding.head,
+    resumeMultipartUpload: binding.resumeMultipartUpload,
+  };
+}
+
+const R2BucketResource = Resource(
   "cloudflare::R2Bucket",
   async function (
-    this: Context<R2Bucket>,
-    id: string,
+    this: Context<R2BucketResource>,
+    _id: string,
     props: BucketProps = {},
-  ): Promise<R2Bucket> {
+  ): Promise<R2BucketResource> {
     const api = await createCloudflareApi(props);
     const bucketName = props.name || this.id;
 
@@ -174,6 +199,9 @@ export const R2Bucket = Resource(
           const r2Client = await createR2Client({
             ...props,
             accountId: api.accountId,
+            accessKeyId: props.accessKey ?? this.output.accessKey,
+            secretAccessKey:
+              props.secretAccessKey ?? this.output.secretAccessKey,
           });
           // Empty the bucket first by deleting all objects
           await emptyBucket(r2Client, bucketName, props.jurisdiction);

package/src/cloudflare/bundle/bundle-worker.ts

@@ -13,13 +13,14 @@ import { nodeJsCompatPlugin } from "./nodejs-compat.js";
 
 export async function bundleWorkerScript<B extends Bindings>(
   props: WorkerProps<B> & {
+    entrypoint: string;
     compatibilityDate: string;
     compatibilityFlags: string[];
   },
 ) {
   const projectRoot = props.projectRoot ?? process.cwd();
 
-  const nodeJsCompatMode = getNodeJSCompatMode(
+  const nodeJsCompatMode = await getNodeJSCompatMode(
     props.compatibilityDate,
     props.compatibilityFlags,
   );
@@ -29,10 +30,11 @@ export async function bundleWorkerScript<B extends Bindings>(
       "You must set your compatibilty date >= 2024-09-23 when using 'nodejs_compat' compatibility flag",
     );
   }
+  const main = props.entrypoint;
 
   try {
     const bundle = await Bundle("bundle", {
-      entryPoint: props.entrypoint!,
+      entryPoint: main,
       format: props.format === "cjs" ? "cjs" : "esm", // Use the specified format or default to ESM
       target: "esnext",
       platform: "node",
@@ -48,6 +50,7 @@ export async function bundleWorkerScript<B extends Bindings>(
           ".json": "json",
         },
         plugins: [
+          ...(props.bundle?.plugins ?? []),
           ...(nodeJsCompatMode === "v2" ? [await nodeJsCompatPlugin()] : []),
           ...(props.bundle?.alias
             ? [

package/src/cloudflare/bundle/nodejs-compat-mode.ts

@@ -1,5 +1,4 @@
 import type { NodeJSCompatMode } from "miniflare";
-import { getNodeCompat } from "miniflare";
 
 /**
  * Computes and validates the Node.js compatibility mode we are running.
@@ -13,13 +12,14 @@ import { getNodeCompat } from "miniflare";
  * @param noBundle Whether to skip internal build steps and directly deploy script
  *
  */
-export function getNodeJSCompatMode(
+export async function getNodeJSCompatMode(
   compatibilityDateStr: string,
   compatibilityFlags: string[],
   props?: {
     noBundle?: boolean;
   },
-): NodeJSCompatMode {
+): Promise<NodeJSCompatMode> {
+  const { getNodeCompat } = await import("miniflare");
   const {
     mode,
     hasNodejsCompatFlag,

package/src/cloudflare/bundle/nodejs-compat.ts

@@ -122,7 +122,7 @@ function handleUnenvAliasedPackages(
   for (const [module, unresolvedAlias] of Object.entries(alias)) {
     try {
       aliasAbsolute[module] = _require.resolve(unresolvedAlias);
-    } catch (e) {
+    } catch (_e) {
       // this is an alias for package that is not installed in the current app => ignore
     }
   }

package/src/cloudflare/custom-domain.ts

@@ -165,7 +165,7 @@ async function deleteCustomDomain(
 async function ensureCustomDomain(
   context: Context<CustomDomain>,
   api: CloudflareApi,
-  logicalId: string,
+  _logicalId: string,
   props: CustomDomainProps,
 ): Promise<CustomDomain> {
   const environment = props.environment || "production";