alchemy 0.12.21 → 0.14.0

package/src/cloudflare/pipeline.ts

@@ -3,7 +3,7 @@ import { Resource } from "../resource.js";
 import type { Secret } from "../secret.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import {
-  CloudflareApi,
+  type CloudflareApi,
   createCloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
@@ -332,50 +332,49 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
 
     // Return void (a deleted pipeline has no content)
     return this.destroy();
-  } else {
-    let pipelineData: CloudflarePipelineResponse;
+  }
+  let pipelineData: CloudflarePipelineResponse;
 
-    if (this.phase === "create") {
-      pipelineData = await createPipeline(api, pipelineName, props);
-    } else {
-      // Update operation
-      if (this.output?.id) {
-        // Check if name is being changed, which is not allowed
-        if (props.name !== this.output.name) {
-          throw new Error(
-            "Cannot update Pipeline name after creation. Pipeline name is immutable."
-          );
-        }
-
-        // Update the pipeline with new settings
-        pipelineData = await updatePipeline(api, pipelineName, props);
-      } else {
-        // If no ID exists, fall back to creating a new pipeline
-        console.log(
-          "No existing Pipeline ID found, creating new Cloudflare Pipeline:",
-          pipelineName
+  if (this.phase === "create") {
+    pipelineData = await createPipeline(api, pipelineName, props);
+  } else {
+    // Update operation
+    if (this.output?.id) {
+      // Check if name is being changed, which is not allowed
+      if (props.name !== this.output.name) {
+        throw new Error(
+          "Cannot update Pipeline name after creation. Pipeline name is immutable.",
         );
-        pipelineData = await createPipeline(api, pipelineName, props);
       }
-    }
 
-    return this({
-      type: "pipeline",
-      id: pipelineData.result.id,
-      name: pipelineName,
-      endpoint: pipelineData.result.endpoint,
-      version: pipelineData.result.version,
-      source: pipelineData.result.source!.map((s) => ({
-        type: s.type as "http" | "binding",
-        format: s.format as "json",
-        authentication: s.authentication,
-        cors: s.cors,
-      })),
-      destination: props.destination, // Use the input destination, not the API response
-      compression: props.compression,
-      accountId: api.accountId,
-    });
+      // Update the pipeline with new settings
+      pipelineData = await updatePipeline(api, pipelineName, props);
+    } else {
+      // If no ID exists, fall back to creating a new pipeline
+      console.log(
+        "No existing Pipeline ID found, creating new Cloudflare Pipeline:",
+        pipelineName,
+      );
+      pipelineData = await createPipeline(api, pipelineName, props);
+    }
   }
+
+  return this({
+    type: "pipeline",
+    id: pipelineData.result.id,
+    name: pipelineName,
+    endpoint: pipelineData.result.endpoint,
+    version: pipelineData.result.version,
+    source: pipelineData.result.source!.map((s) => ({
+      type: s.type as "http" | "binding",
+      format: s.format as "json",
+      authentication: s.authentication,
+      cors: s.cors,
+    })),
+    destination: props.destination, // Use the input destination, not the API response
+    compression: props.compression,
+    accountId: api.accountId,
+  });
 });
 
 interface CloudflarePipelineResponse {
@@ -421,10 +420,10 @@ interface CloudflarePipelineResponse {
  */
 export async function getPipeline(
   api: CloudflareApi,
-  pipelineName: string
+  pipelineName: string,
 ): Promise<CloudflarePipelineResponse> {
   const response = await api.get(
-    `/accounts/${api.accountId}/pipelines/${pipelineName}`
+    `/accounts/${api.accountId}/pipelines/${pipelineName}`,
   );
 
   if (!response.ok) {
@@ -439,11 +438,11 @@ export async function getPipeline(
  */
 export async function deletePipeline(
   api: CloudflareApi,
-  pipelineName: string
+  pipelineName: string,
 ): Promise<void> {
   // Delete Pipeline
   const deleteResponse = await api.delete(
-    `/accounts/${api.accountId}/pipelines/${pipelineName}`
+    `/accounts/${api.accountId}/pipelines/${pipelineName}`,
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -452,7 +451,7 @@ export async function deletePipeline(
     }));
     throw new CloudflareApiError(
       `Error deleting Cloudflare Pipeline '${pipelineName}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`,
-      deleteResponse
+      deleteResponse,
     );
   }
 }
@@ -463,14 +462,14 @@ export async function deletePipeline(
 export async function createPipeline(
   api: CloudflareApi,
   pipelineName: string,
-  props: PipelineProps
+  props: PipelineProps,
 ): Promise<CloudflarePipelineResponse> {
   // Prepare the create payload
   const createPayload = preparePipelinePayload(api, pipelineName, props);
 
   const createResponse = await api.post(
     `/accounts/${api.accountId}/pipelines`,
-    createPayload
+    createPayload,
   );
 
   if (!createResponse.ok) {
@@ -478,7 +477,7 @@ export async function createPipeline(
       createResponse,
       "creating",
       "Pipeline",
-      pipelineName
+      pipelineName,
     );
   }
 
@@ -491,7 +490,7 @@ export async function createPipeline(
 export async function updatePipeline(
   api: CloudflareApi,
   pipelineName: string,
-  props: PipelineProps
+  props: PipelineProps,
 ): Promise<CloudflarePipelineResponse> {
   // Get current pipeline to build update payload
   const currentPipeline = await getPipeline(api, pipelineName);
@@ -501,12 +500,12 @@ export async function updatePipeline(
     api,
     pipelineName,
     props,
-    currentPipeline
+    currentPipeline,
   );
 
   const updateResponse = await api.put(
     `/accounts/${api.accountId}/pipelines/${pipelineName}`,
-    updatePayload
+    updatePayload,
   );
 
   if (!updateResponse.ok) {
@@ -514,7 +513,7 @@ export async function updatePipeline(
       updateResponse,
       "updating",
       "Pipeline",
-      pipelineName
+      pipelineName,
     );
   }
 
@@ -528,7 +527,7 @@ function preparePipelinePayload(
   api: CloudflareApi,
   pipelineName: string,
   props: PipelineProps,
-  currentPipeline?: CloudflarePipelineResponse
+  currentPipeline?: CloudflarePipelineResponse,
 ): any {
   // Prepare the payload with name and source
   const payload: any = {
@@ -568,7 +567,7 @@ function preparePipelinePayload(
     payload.destination = currentPipeline.result.destination;
   } else if (!props.destination && !currentPipeline) {
     throw new Error(
-      "An R2 destination is required for creating/updating a pipeline"
+      "An R2 destination is required for creating/updating a pipeline",
     );
   }
 
@@ -584,14 +583,14 @@ function preparePipelinePayload(
  * List all pipelines in an account
  */
 export async function listPipelines(
-  api: CloudflareApi
+  api: CloudflareApi,
 ): Promise<{ name: string; id: string }[]> {
   const response = await api.get(`/accounts/${api.accountId}/pipelines`);
 
   if (!response.ok) {
     throw new CloudflareApiError(
       `Failed to list pipelines: ${response.statusText}`,
-      response
+      response,
     );
   }
 

package/src/cloudflare/queue-consumer.ts

@@ -2,8 +2,8 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import {
-  CloudflareApi,
   createCloudflareApi,
+  type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
 import type { Queue } from "./queue.js";
@@ -139,7 +139,7 @@ export const QueueConsumer = Resource(
   async function (
     this: Context<QueueConsumer>,
     id: string,
-    props: QueueConsumerProps
+    props: QueueConsumerProps,
   ): Promise<QueueConsumer> {
     const api = await createCloudflareApi(props);
 
@@ -159,48 +159,41 @@ export const QueueConsumer = Resource(
 
       // Return void (a deleted consumer has no content)
       return this.destroy();
-    } else {
-      let consumerData: CloudflareQueueConsumerResponse;
-
-      if (this.phase === "create") {
-        console.log(`Creating Queue Consumer for queue ${queueId}`);
-        consumerData = await createQueueConsumer(api, queueId, props);
-      } else if (this.output?.id) {
-        console.log(`Updating Queue Consumer ${this.output.id}`);
-        consumerData = await updateQueueConsumer(
-          api,
-          queueId,
-          this.output.id,
-          props
-        );
-      } else {
-        // If no ID exists, fall back to creating a new consumer
-        console.log(
-          `No existing Consumer ID found, creating new Queue Consumer for queue ${queueId}`
-        );
-        consumerData = await createQueueConsumer(api, queueId, props);
-      }
+    }
+    let consumerData: CloudflareQueueConsumerResponse;
 
-      return this({
-        id: consumerData.result.consumer_id,
+    if (this.phase === "create") {
+      consumerData = await createQueueConsumer(api, queueId, props);
+    } else if (this.output?.id) {
+      consumerData = await updateQueueConsumer(
+        api,
         queueId,
-        queue: props.queue,
-        type: "worker",
-        scriptName: props.scriptName,
-        settings: consumerData.result.settings
-          ? {
-              batchSize: consumerData.result.settings.batch_size,
-              maxConcurrency: consumerData.result.settings.max_concurrency,
-              maxRetries: consumerData.result.settings.max_retries,
-              maxWaitTimeMs: consumerData.result.settings.max_wait_time_ms,
-              retryDelay: consumerData.result.settings.retry_delay,
-            }
-          : undefined,
-        createdOn: consumerData.result.created_on,
-        accountId: api.accountId,
-      });
+        this.output.id,
+        props,
+      );
+    } else {
+      consumerData = await createQueueConsumer(api, queueId, props);
     }
-  }
+
+    return this({
+      id: consumerData.result.consumer_id,
+      queueId,
+      queue: props.queue,
+      type: "worker",
+      scriptName: props.scriptName,
+      settings: consumerData.result.settings
+        ? {
+            batchSize: consumerData.result.settings.batch_size,
+            maxConcurrency: consumerData.result.settings.max_concurrency,
+            maxRetries: consumerData.result.settings.max_retries,
+            maxWaitTimeMs: consumerData.result.settings.max_wait_time_ms,
+            retryDelay: consumerData.result.settings.retry_delay,
+          }
+        : undefined,
+      createdOn: consumerData.result.created_on,
+      accountId: api.accountId,
+    });
+  },
 );
 
 /**
@@ -232,7 +225,7 @@ interface CloudflareQueueConsumerResponse {
 export async function createQueueConsumer(
   api: CloudflareApi,
   queueId: string,
-  props: QueueConsumerProps
+  props: QueueConsumerProps,
 ): Promise<CloudflareQueueConsumerResponse> {
   // Prepare the create payload
   const createPayload: any = {
@@ -267,7 +260,7 @@ export async function createQueueConsumer(
 
   const createResponse = await api.post(
     `/accounts/${api.accountId}/queues/${queueId}/consumers`,
-    createPayload
+    createPayload,
   );
 
   if (!createResponse.ok) {
@@ -275,7 +268,7 @@ export async function createQueueConsumer(
       createResponse,
       "creating",
       "Queue Consumer",
-      `for queue ${queueId}`
+      `for queue ${queueId}`,
     );
   }
 
@@ -288,10 +281,10 @@ export async function createQueueConsumer(
 export async function deleteQueueConsumer(
   api: CloudflareApi,
   queueId: string,
-  consumerId: string
+  consumerId: string,
 ): Promise<void> {
   const deleteResponse = await api.delete(
-    `/accounts/${api.accountId}/queues/${queueId}/consumers/${consumerId}`
+    `/accounts/${api.accountId}/queues/${queueId}/consumers/${consumerId}`,
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -300,7 +293,7 @@ export async function deleteQueueConsumer(
     }));
     throw new CloudflareApiError(
       `Error deleting Queue Consumer '${consumerId}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`,
-      deleteResponse
+      deleteResponse,
     );
   }
 }
@@ -312,7 +305,7 @@ async function updateQueueConsumer(
   api: CloudflareApi,
   queueId: string,
   consumerId: string,
-  props: QueueConsumerProps
+  props: QueueConsumerProps,
 ): Promise<CloudflareQueueConsumerResponse> {
   // Prepare the update payload
   const updatePayload: any = {
@@ -348,7 +341,7 @@ async function updateQueueConsumer(
   // Use PUT to update the consumer
   const updateResponse = await api.put(
     `/accounts/${api.accountId}/queues/${queueId}/consumers/${consumerId}`,
-    updatePayload
+    updatePayload,
   );
 
   if (!updateResponse.ok) {
@@ -356,7 +349,7 @@ async function updateQueueConsumer(
       updateResponse,
       "updating",
       "Queue Consumer",
-      consumerId
+      consumerId,
     );
   }
 
@@ -376,16 +369,16 @@ export interface ListQueueConsumersResponse {
  */
 export async function listQueueConsumers(
   api: CloudflareApi,
-  queueId: string
+  queueId: string,
 ): Promise<ListQueueConsumersResponse[]> {
   const response = await api.get(
-    `/accounts/${api.accountId}/queues/${queueId}/consumers`
+    `/accounts/${api.accountId}/queues/${queueId}/consumers`,
   );
 
   if (!response.ok) {
     throw new CloudflareApiError(
       `Failed to list queue consumers: ${response.statusText}`,
-      response
+      response,
     );
   }
 

package/src/cloudflare/queue.ts

@@ -2,7 +2,7 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import {
-  CloudflareApi,
+  type CloudflareApi,
   createCloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
@@ -168,56 +168,55 @@ export const Queue = Resource("cloudflare::Queue", async function <
 
     // Return void (a deleted queue has no content)
     return this.destroy();
-  } else {
-    let queueData: CloudflareQueueResponse;
-
-    if (this.phase === "create") {
-      console.log("Creating Cloudflare Queue:", queueName);
-      queueData = await createQueue(api, queueName, props);
-    } 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) {
-          throw new Error(
-            "Cannot update Queue name after creation. Queue name is immutable."
-          );
-        }
+  }
+  let queueData: CloudflareQueueResponse;
 
-        // Update the queue with new settings
-        queueData = await updateQueue(api, this.output.id, props);
-      } else {
-        // If no ID exists, fall back to creating a new queue
-        console.log(
-          "No existing Queue ID found, creating new Cloudflare Queue:",
-          queueName
+  if (this.phase === "create") {
+    console.log("Creating Cloudflare Queue:", queueName);
+    queueData = await createQueue(api, queueName, props);
+  } 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) {
+        throw new Error(
+          "Cannot update Queue name after creation. Queue name is immutable.",
         );
-        queueData = await createQueue(api, queueName, props);
       }
-    }
 
-    return this({
-      type: "queue",
-      id: queueData.result.queue_id || "",
-      name: queueName,
-      settings: queueData.result.settings
-        ? {
-            deliveryDelay: queueData.result.settings.delivery_delay,
-            deliveryPaused: queueData.result.settings.delivery_paused,
-            messageRetentionPeriod:
-              queueData.result.settings.message_retention_period,
-          }
-        : undefined,
-      createdOn: queueData.result.created_on || new Date().toISOString(),
-      modifiedOn: queueData.result.modified_on || new Date().toISOString(),
-      accountId: api.accountId,
-      // phantom properties
-      Body: undefined as T,
-      Batch: undefined! as MessageBatch<T>,
-    });
+      // Update the queue with new settings
+      queueData = await updateQueue(api, this.output.id, props);
+    } else {
+      // If no ID exists, fall back to creating a new queue
+      console.log(
+        "No existing Queue ID found, creating new Cloudflare Queue:",
+        queueName,
+      );
+      queueData = await createQueue(api, queueName, props);
+    }
   }
+
+  return this({
+    type: "queue",
+    id: queueData.result.queue_id || "",
+    name: queueName,
+    settings: queueData.result.settings
+      ? {
+          deliveryDelay: queueData.result.settings.delivery_delay,
+          deliveryPaused: queueData.result.settings.delivery_paused,
+          messageRetentionPeriod:
+            queueData.result.settings.message_retention_period,
+        }
+      : undefined,
+    createdOn: queueData.result.created_on || new Date().toISOString(),
+    modifiedOn: queueData.result.modified_on || new Date().toISOString(),
+    accountId: api.accountId,
+    // phantom properties
+    Body: undefined as T,
+    Batch: undefined! as MessageBatch<T>,
+  });
 });
 
 /**
@@ -226,7 +225,7 @@ export const Queue = Resource("cloudflare::Queue", async function <
 export async function createQueue(
   api: CloudflareApi,
   queueName: string,
-  props: QueueProps
+  props: QueueProps,
 ): Promise<CloudflareQueueResponse> {
   // Prepare the create payload
   const createPayload: any = {
@@ -253,7 +252,7 @@ export async function createQueue(
 
   const createResponse = await api.post(
     `/accounts/${api.accountId}/queues`,
-    createPayload
+    createPayload,
   );
 
   if (!createResponse.ok) {
@@ -268,10 +267,10 @@ export async function createQueue(
  */
 export async function getQueue(
   api: CloudflareApi,
-  queueId: string
+  queueId: string,
 ): Promise<CloudflareQueueResponse> {
   const response = await api.get(
-    `/accounts/${api.accountId}/queues/${queueId}`
+    `/accounts/${api.accountId}/queues/${queueId}`,
   );
 
   if (!response.ok) {
@@ -286,7 +285,7 @@ export async function getQueue(
  */
 export async function deleteQueue(
   api: CloudflareApi,
-  queueId?: string
+  queueId?: string,
 ): Promise<void> {
   if (!queueId) {
     console.log("No Queue ID provided, skipping delete");
@@ -295,7 +294,7 @@ export async function deleteQueue(
 
   // Delete Queue
   const deleteResponse = await api.delete(
-    `/accounts/${api.accountId}/queues/${queueId}`
+    `/accounts/${api.accountId}/queues/${queueId}`,
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -304,7 +303,7 @@ export async function deleteQueue(
     }));
     throw new CloudflareApiError(
       `Error deleting Cloudflare Queue '${queueId}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`,
-      deleteResponse
+      deleteResponse,
     );
   }
 }
@@ -318,7 +317,7 @@ export async function deleteQueue(
 export async function updateQueue(
   api: CloudflareApi,
   queueId: string,
-  props: QueueProps
+  props: QueueProps,
 ): Promise<CloudflareQueueResponse> {
   // Prepare the update payload - only include settings
   const updatePayload: any = {};
@@ -344,7 +343,7 @@ export async function updateQueue(
   // Use PATCH for partial updates (only settings can be updated)
   const updateResponse = await api.patch(
     `/accounts/${api.accountId}/queues/${queueId}`,
-    updatePayload
+    updatePayload,
   );
 
   if (!updateResponse.ok) {
@@ -358,14 +357,14 @@ export async function updateQueue(
  * List all Cloudflare Queues in an account
  */
 export async function listQueues(
-  api: CloudflareApi
+  api: CloudflareApi,
 ): Promise<{ name: string; id: string }[]> {
   const response = await api.get(`/accounts/${api.accountId}/queues`);
 
   if (!response.ok) {
     throw new CloudflareApiError(
       `Failed to list queues: ${response.statusText}`,
-      response
+      response,
     );
   }