alchemy 0.16.9 → 0.17.0

package/src/cloudflare/d1-database.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
+import { Resource, ResourceKind } from "../resource.js";
+import { bind, type Bound } from "../runtime/bind.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import {
   createCloudflareApi,
@@ -93,10 +94,16 @@ export interface D1DatabaseProps extends CloudflareApiOptions {
   migrationsDir?: string;
 }
 
+export function isD1Database(
+  resource: Resource,
+): resource is D1DatabaseResource {
+  return resource[ResourceKind] === "cloudflare::D1Database";
+}
+
 /**
  * Output returned after D1 Database creation/update
  */
-export type D1Database = Resource<"cloudflare::D1Database"> &
+export type D1DatabaseResource = Resource<"cloudflare::D1Database"> &
   D1DatabaseProps & {
     type: "d1";
     /**
@@ -135,6 +142,34 @@ export type D1Database = Resource<"cloudflare::D1Database"> &
     };
   };
 
+export type D1Database = D1DatabaseResource & Bound<D1DatabaseResource>;
+
+export async function D1Database(
+  id: string,
+  props: Omit<D1DatabaseProps, "migrationsFiles">,
+): Promise<D1Database> {
+  const migrationsFiles = props.migrationsDir
+    ? await listMigrationsFiles(props.migrationsDir)
+    : [];
+
+  const db = await D1DatabaseResource(id, {
+    ...props,
+    migrationsFiles,
+  });
+  const binding = await bind(db);
+  return {
+    ...db,
+    batch: binding.batch,
+    exec: binding.exec,
+    prepare: binding.prepare,
+    withSession: binding.withSession,
+    /**
+     * @deprecated
+     */
+    dump: binding.dump,
+  };
+}
+
 /**
  * Creates and manages Cloudflare D1 Databases.
  *
@@ -194,27 +229,13 @@ export type D1Database = Resource<"cloudflare::D1Database"> &
  *
  * @see https://developers.cloudflare.com/d1/
  */
-export async function D1Database(
-  id: string,
-  props: Omit<D1DatabaseProps, "migrationsFiles">,
-) {
-  const migrationsFiles = props.migrationsDir
-    ? await listMigrationsFiles(props.migrationsDir)
-    : [];
-
-  return D1DatabaseResource(id, {
-    ...props,
-    migrationsFiles,
-  });
-}
-
-export const D1DatabaseResource = Resource(
+const D1DatabaseResource = Resource(
   "cloudflare::D1Database",
   async function (
-    this: Context<D1Database>,
+    this: Context<D1DatabaseResource>,
     id: string,
     props: D1DatabaseProps = {},
-  ): Promise<D1Database> {
+  ): Promise<D1DatabaseResource> {
     const api = await createCloudflareApi(props);
     const databaseName = props.name ?? id;
 

package/src/cloudflare/dns-records.ts

@@ -127,7 +127,7 @@ export const DnsRecords = Resource(
   "cloudflare::DnsRecords",
   async function (
     this: Context<DnsRecords>,
-    id: string,
+    _id: string,
     props: DnsRecordsProps,
   ): Promise<DnsRecords> {
     // Create Cloudflare API client
@@ -307,7 +307,7 @@ async function createOrUpdateRecord(
             zoneId,
           );
         }
-      } catch (err) {
+      } catch (_err) {
         // Fall through to the original error
       }
     }

package/src/cloudflare/event-source.ts

@@ -1,10 +1,10 @@
 import type { QueueConsumerSettings } from "./queue-consumer.js";
-import type { Queue } from "./queue.js";
+import type { QueueResource } from "./queue.js";
 
 /**
  * Base interface for event sources that can be bound to a Worker
  */
-export type EventSource = QueueEventSource | Queue;
+export type EventSource = QueueEventSource | QueueResource;
 
 /**
  * Configuration for a Queue as an event source for a Worker
@@ -13,7 +13,7 @@ export interface QueueEventSource {
   /**
    * The queue to consume messages from
    */
-  readonly queue: Queue;
+  readonly queue: QueueResource;
 
   /**
    * Optional settings for configuring how the Worker consumes the queue

package/src/cloudflare/hyperdrive.ts

@@ -1,8 +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";
 
 /**
  * Origin configuration for a PostgreSQL database connection
@@ -153,7 +155,7 @@ export interface HyperdriveProps extends CloudflareApiOptions {
  * Output returned after Cloudflare Hyperdrive creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export interface Hyperdrive
+export interface HyperdriveResource
   extends Resource<"cloudflare::Hyperdrive">,
     Omit<HyperdriveProps, "origin"> {
   /**
@@ -178,6 +180,8 @@ export interface Hyperdrive
   type: "hyperdrive";
 }
 
+export type Hyperdrive = HyperdriveResource & Bound<HyperdriveResource>;
+
 /**
  * Represents a Cloudflare Hyperdrive configuration.
  *
@@ -242,13 +246,24 @@ export interface Hyperdrive
  *   }
  * });
  */
-export const Hyperdrive = Resource(
+export async function Hyperdrive(
+  name: string,
+  props: HyperdriveProps,
+): Promise<Hyperdrive> {
+  const resource = await HyperdriveResource(name, props);
+  return {
+    ...resource,
+    ...tryGetBinding(resource),
+  } as Hyperdrive;
+}
+
+const HyperdriveResource = Resource(
   "cloudflare::Hyperdrive",
   async function (
-    this: Context<Hyperdrive>,
+    this: Context<HyperdriveResource>,
     id: string,
     props: HyperdriveProps,
-  ): Promise<Hyperdrive> {
+  ): Promise<HyperdriveResource> {
     const api = await createCloudflareApi(props);
     const configsPath = `/accounts/${api.accountId}/hyperdrive/configs`;
 

package/src/cloudflare/kv-namespace.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../context.js";
-import { Resource } from "../resource.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 {
@@ -7,6 +8,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
+import type { Bound } from "./bound.js";
 
 /**
  * Properties for creating or updating a KV Namespace
@@ -15,7 +17,7 @@ export interface KVNamespaceProps extends CloudflareApiOptions {
   /**
    * Title of the namespace
    */
-  title: string;
+  title?: string;
 
   /**
    * KV pairs to store in the namespace
@@ -70,12 +72,18 @@ export interface KVPair {
   metadata?: any;
 }
 
+export function isKVNamespace(
+  resource: Resource,
+): resource is KVNamespaceResource {
+  return resource[ResourceKind] === "cloudflare::KVNamespace";
+}
+
 /**
  * Output returned after KV Namespace creation/update
  */
-export interface KVNamespace
+export interface KVNamespaceResource
   extends Resource<"cloudflare::KVNamespace">,
-    KVNamespaceProps {
+    Omit<KVNamespaceProps, "delete"> {
   type: "kv_namespace";
   /**
    * The ID of the namespace
@@ -93,6 +101,8 @@ export interface KVNamespace
   modifiedAt: number;
 }
 
+export type KVNamespace = KVNamespaceResource & Bound<KVNamespaceResource>;
+
 /**
  * A Cloudflare KV Namespace is a key-value store that can be used to store data for your application.
  *
@@ -147,16 +157,35 @@ export interface KVNamespace
  *   delete: false
  * });
  */
-export const KVNamespace = Resource(
+
+export async function KVNamespace(
+  name: string,
+  props: KVNamespaceProps = {},
+): Promise<KVNamespace> {
+  const kv = await _KVNamespace(name, props);
+  const binding = await bind(kv);
+  return {
+    ...kv,
+    delete: binding.delete,
+    get: binding.get,
+    getWithMetadata: binding.getWithMetadata,
+    list: binding.list,
+    put: binding.put,
+  };
+}
+
+const _KVNamespace = Resource(
   "cloudflare::KVNamespace",
   async function (
-    this: Context<KVNamespace>,
+    this: Context<KVNamespaceResource>,
     id: string,
     props: KVNamespaceProps,
-  ) {
+  ): Promise<KVNamespaceResource> {
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
 
+    const title = props.title ?? id;
+
     if (this.phase === "delete") {
       // For delete operations, we need to check if the namespace ID exists in the output
       const namespaceId = this.output?.namespaceId;
@@ -181,7 +210,10 @@ export const KVNamespace = Resource(
     } else {
       try {
         // Try to create the KV namespace
-        const { id } = await createKVNamespace(api, props);
+        const { id } = await createKVNamespace(api, {
+          ...props,
+          title,
+        });
         createdAt = Date.now();
         namespaceId = id;
       } catch (error) {
@@ -191,16 +223,13 @@ export const KVNamespace = Resource(
           error instanceof Error &&
           error.message.includes("already exists")
         ) {
-          console.log(`Namespace '${props.title}' already exists, adopting it`);
+          console.log(`Namespace '${title}' already exists, adopting it`);
           // Find the existing namespace by title
-          const existingNamespace = await findKVNamespaceByTitle(
-            api,
-            props.title,
-          );
+          const existingNamespace = await findKVNamespaceByTitle(api, title);
 
           if (!existingNamespace) {
             throw new Error(
-              `Failed to find existing namespace '${props.title}' for adoption`,
+              `Failed to find existing namespace '${title}' for adoption`,
             );
           }
 
@@ -229,7 +258,9 @@ export const KVNamespace = Resource(
 
 export async function createKVNamespace(
   api: CloudflareApi,
-  props: KVNamespaceProps,
+  props: KVNamespaceProps & {
+    title: string;
+  },
 ): Promise<{ id: string }> {
   const createResponse = await api.post(
     `/accounts/${api.accountId}/storage/kv/namespaces`,

package/src/cloudflare/permission-groups.ts

@@ -110,7 +110,7 @@ export const PermissionGroups = Resource(
   "cloudflare::PermissionGroups",
   async function (
     this: Context<PermissionGroups>,
-    id: string,
+    _id: string,
     options: CloudflareApiOptions = {},
   ): Promise<PermissionGroups> {
     // Only create and update phases are supported

package/src/cloudflare/pipeline.ts

@@ -1,12 +1,14 @@
 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,
+  type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
+import type { Bound } from "./bound.js";
 
 /**
  * Settings for compression of pipeline output
@@ -221,7 +223,7 @@ export interface PipelineRecord {
 /**
  * Output returned after Pipeline creation/update
  */
-export interface Pipeline<T extends PipelineRecord = PipelineRecord>
+export interface PipelineResource<_T extends PipelineRecord = PipelineRecord>
   extends Resource<"cloudflare::Pipeline">,
     PipelineProps {
   /**
@@ -250,6 +252,13 @@ export interface Pipeline<T extends PipelineRecord = PipelineRecord>
   version: number;
 }
 
+export function isPipeline(resource: Resource): resource is PipelineResource {
+  return resource[ResourceKind] === "cloudflare::Pipeline";
+}
+
+export type Pipeline<T extends PipelineRecord = PipelineRecord> =
+  PipelineResource<T> & Bound<PipelineResource<T>>;
+
 /**
  * Creates and manages Cloudflare Pipelines.
  *
@@ -316,10 +325,24 @@ export interface Pipeline<T extends PipelineRecord = PipelineRecord>
  *
  * @see https://developers.cloudflare.com/pipelines/
  */
-export const Pipeline = Resource("cloudflare::Pipeline", async function <
+export async function Pipeline<T extends PipelineRecord = PipelineRecord>(
+  name: string,
+  props: PipelineProps,
+): Promise<Pipeline<T>> {
+  const pipeline = await PipelineResource(name, props);
+  const binding = await bind(pipeline, {
+    bindThis: false,
+  });
+  return {
+    ...pipeline,
+    send: binding.send,
+  };
+}
+
+const PipelineResource = Resource("cloudflare::Pipeline", async function <
   T extends PipelineRecord = PipelineRecord,
->(this: Context<Pipeline<T>>, id: string, props: PipelineProps): Promise<
-  Pipeline<T>
+>(this: Context<PipelineResource<T>>, id: string, props: PipelineProps): Promise<
+  PipelineResource<T>
 > {
   const api = await createCloudflareApi(props);
   const pipelineName = props.name ?? id;

package/src/cloudflare/queue-consumer.ts

@@ -6,7 +6,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
-import type { Queue } from "./queue.js";
+import type { QueueResource } from "./queue.js";
 
 /**
  * Settings for configuring a Queue Consumer
@@ -51,7 +51,7 @@ export interface QueueConsumerProps extends CloudflareApiOptions {
    * The queue to consume
    * Either queue or queueId must be provided
    */
-  queue?: Queue;
+  queue?: QueueResource;
 
   /**
    * The queue ID to consume (alternative to providing a queue)
@@ -138,7 +138,7 @@ export const QueueConsumer = Resource(
   "cloudflare::QueueConsumer",
   async function (
     this: Context<QueueConsumer>,
-    id: string,
+    _id: string,
     props: QueueConsumerProps,
   ): Promise<QueueConsumer> {
     const api = await createCloudflareApi(props);

package/src/cloudflare/queue.ts

@@ -1,11 +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 {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
+import type { Bound } from "./bound.js";
 
 /**
  * Settings for a Cloudflare Queue
@@ -56,6 +58,14 @@ export interface QueueProps extends CloudflareApiOptions {
    * @default true
    */
   delete?: boolean;
+
+  /**
+   * Whether to adopt an existing queue with the same name if it exists
+   * If true, during creation, if a queue with the same name exists, it will be adopted instead of creating a new one
+   *
+   * @default false
+   */
+  adopt?: boolean;
 }
 
 export function isQueue(eventSource: any): eventSource is Queue {
@@ -68,7 +78,7 @@ export function isQueue(eventSource: any): eventSource is Queue {
 /**
  * Output returned after Cloudflare Queue creation/update
  */
-export interface Queue<Body = unknown>
+export interface QueueResource<Body = unknown>
   extends Resource<"cloudflare::Queue">,
     QueueProps {
   /**
@@ -104,22 +114,8 @@ export interface Queue<Body = unknown>
   Batch: MessageBatch<Body>;
 }
 
-interface CloudflareQueueResponse {
-  result: {
-    queue_id?: string;
-    queue_name: string;
-    created_on?: string;
-    modified_on?: string;
-    settings?: {
-      delivery_delay?: number;
-      delivery_paused?: boolean;
-      message_retention_period?: number;
-    };
-  };
-  success: boolean;
-  errors: Array<{ code: number; message: string }>;
-  messages: string[];
-}
+export type Queue<Body = unknown> = QueueResource<Body> &
+  Bound<QueueResource<Body>>;
 
 /**
  * Creates and manages Cloudflare Queues.
@@ -154,10 +150,23 @@ interface CloudflareQueueResponse {
  *
  * @see https://developers.cloudflare.com/queues/
  */
-export const Queue = Resource("cloudflare::Queue", async function <
+export async function Queue<Body = unknown>(
+  name: string,
+  props: QueueProps = {},
+): Promise<Queue<Body>> {
+  const queue = await QueueResource<Body>(name, props);
+  const binding = await bind(queue);
+  return {
+    ...queue,
+    send: binding.send,
+    sendBatch: binding.sendBatch,
+  } as Queue<Body>;
+}
+
+const QueueResource = Resource("cloudflare::Queue", async function <
   T = unknown,
->(this: Context<Queue<T>>, id: string, props: QueueProps = {}): Promise<
-  Queue<T>
+>(this: Context<QueueResource<T>>, id: string, props: QueueProps = {}): Promise<
+  QueueResource<T>
 > {
   const api = await createCloudflareApi(props);
   const queueName = props.name ?? id;
@@ -166,6 +175,9 @@ export const Queue = Resource("cloudflare::Queue", async function <
     console.log("Deleting Cloudflare Queue:", queueName);
     if (props.delete !== false) {
       // Delete Queue
+      if (!this.output?.id) {
+        console.log(this.output);
+      }
       await deleteQueue(api, this.output?.id);
     }
 
@@ -176,16 +188,35 @@ export const Queue = Resource("cloudflare::Queue", async function <
 
   if (this.phase === "create") {
     console.log("Creating Cloudflare Queue:", queueName);
-    queueData = await createQueue(api, queueName, props);
+    try {
+      queueData = await createQueue(api, queueName, props);
+    } catch (error) {
+      if (error instanceof CloudflareApiError && error.status === 409) {
+        if (!props.adopt) {
+          throw error;
+        }
+        // Queue already exists, try to find it by name
+        const existingQueue = await findQueueByName(api, queueName);
+        if (!existingQueue) {
+          throw new Error(
+            `Queue with name ${queueName} not found despite 409 conflict`,
+          );
+        }
+        queueData = existingQueue;
+        queueData = await updateQueue(api, queueData.result.queue_id!, props);
+      } else {
+        throw error;
+      }
+    }
   } else {
     // Update operation
     if (this.output?.id) {
       console.log("Updating Cloudflare Queue:", queueName);
 
       // Check if name is being changed, which is not allowed
-      if (props.name !== this.output.name) {
+      if (queueName !== this.output.name) {
         throw new Error(
-          "Cannot update Queue name after creation. Queue name is immutable.",
+          `Cannot update Queue name after creation. Queue name is immutable. Before: ${this.output.name}, After: ${queueName}`,
         );
       }
 
@@ -222,6 +253,23 @@ export const Queue = Resource("cloudflare::Queue", async function <
   });
 });
 
+interface CloudflareQueueResponse {
+  result: {
+    queue_id?: string;
+    queue_name: string;
+    created_on?: string;
+    modified_on?: string;
+    settings?: {
+      delivery_delay?: number;
+      delivery_paused?: boolean;
+      message_retention_period?: number;
+    };
+  };
+  success: boolean;
+  errors: Array<{ code: number; message: string }>;
+  messages: string[];
+}
+
 /**
  * Create a new Cloudflare Queue
  */
@@ -391,3 +439,56 @@ export async function listQueues(
     id: queue.queue_id,
   }));
 }
+
+/**
+ * Find a Cloudflare Queue by name
+ */
+export async function findQueueByName(
+  api: CloudflareApi,
+  queueName: string,
+): Promise<CloudflareQueueResponse | null> {
+  const response = await api.get(`/accounts/${api.accountId}/queues`);
+
+  if (!response.ok) {
+    return await handleApiError(response, "listing", "Queues", "");
+  }
+
+  const data = (await response.json()) as {
+    success: boolean;
+    errors?: Array<{ code: number; message: string }>;
+    result?: Array<{
+      queue_name: string;
+      queue_id: string;
+      created_on?: string;
+      modified_on?: string;
+      settings?: {
+        delivery_delay?: number;
+        delivery_paused?: boolean;
+        message_retention_period?: number;
+      };
+    }>;
+  };
+
+  if (!data.success) {
+    const errorMessage = data.errors?.[0]?.message || "Unknown error";
+    throw new Error(`Failed to list queues: ${errorMessage}`);
+  }
+
+  const queue = data.result?.find((q) => q.queue_name === queueName);
+  if (!queue) {
+    return null;
+  }
+
+  return {
+    result: {
+      queue_id: queue.queue_id,
+      queue_name: queue.queue_name,
+      created_on: queue.created_on,
+      modified_on: queue.modified_on,
+      settings: queue.settings,
+    },
+    success: true,
+    errors: [],
+    messages: [],
+  };
+}

package/src/cloudflare/route.ts

@@ -93,7 +93,7 @@ export const Route = Resource(
   "cloudflare::Route",
   async function (
     this: Context<Route>,
-    id: string,
+    _id: string,
     props: RouteProps,
   ): Promise<Route> {
     const api = await createCloudflareApi(props);

package/src/cloudflare/types.ts

@@ -64,7 +64,7 @@ export async function extractCloudflareError(
       return data.errors.map((e) => `Error ${e.code}: ${e.message}`).join(", ");
     }
     return `HTTP ${response.status}: ${response.statusText}`;
-  } catch (e) {
+  } catch {
     return `HTTP ${response.status}: ${response.statusText}`;
   }
 }