alchemy 0.71.1 → 0.73.0

package/src/cloudflare/container.ts

@@ -780,6 +780,15 @@ export interface ContainerApplicationData {
   [key: string]: any;
 }
 
+export async function getContainerApplicationByName(
+  api: CloudflareApi,
+  name: string,
+) {
+  return (await listContainerApplications(api)).find(
+    (app) => app.name === name,
+  );
+}
+
 export async function getContainerApplication(
   api: CloudflareApi,
   applicationId: string,

package/src/cloudflare/index.ts

@@ -1,3 +1,5 @@
+/// <reference types="@cloudflare/workers-types" />
+
 export * from "./account-api-token.ts";
 export * from "./account-id.ts";
 export * from "./ai-gateway.ts";
@@ -66,11 +68,11 @@ export * from "./vectorize-metadata-index.ts";
 export * from "./version-metadata.ts";
 export * from "./vite/vite.ts";
 export * from "./website.ts";
+export { WorkerLoader } from "./worker-loader.ts";
 export * from "./worker-ref.ts";
 export * from "./worker-stub.ts";
 export * from "./worker-subdomain.ts";
 export * from "./worker.ts";
 export { Workflow } from "./workflow.ts";
-export { WorkerLoader } from "./worker-loader.ts";
 export * from "./wrangler.json.ts";
 export * from "./zone.ts";

package/src/cloudflare/queue-consumer.ts

@@ -229,6 +229,12 @@ export const QueueConsumer = Resource(
       );
     }
 
+    const deadLetterQueue = props.settings?.deadLetterQueue
+      ? typeof props.settings.deadLetterQueue === "string"
+        ? props.settings.deadLetterQueue
+        : props.settings.deadLetterQueue.name
+      : undefined;
+
     return {
       id: consumerData.result.consumer_id,
       queueId,
@@ -242,9 +248,14 @@ export const QueueConsumer = Resource(
             maxRetries: consumerData.result.settings.max_retries,
             maxWaitTimeMs: consumerData.result.settings.max_wait_time_ms,
             retryDelay: consumerData.result.settings.retry_delay,
-            deadLetterQueue: consumerData.result.settings.dead_letter_queue,
+            deadLetterQueue,
           }
-        : undefined,
+        : props.settings
+          ? {
+              ...props.settings,
+              deadLetterQueue,
+            }
+          : undefined,
       createdOn: consumerData.result.created_on,
       accountId: api.accountId,
     };
@@ -258,13 +269,13 @@ interface CloudflareQueueConsumerResponse {
   result: {
     consumer_id: string;
     script_name: string;
+    dead_letter_queue?: string;
     settings?: {
       batch_size?: number;
       max_concurrency?: number;
       max_retries?: number;
       max_wait_time_ms?: number;
       retry_delay?: number;
-      dead_letter_queue?: string;
     };
     type: "worker";
     queue_id?: string;
@@ -462,13 +473,13 @@ export async function listQueueConsumers(
       queue_id: string;
       queue_name: string;
       created_on: string;
+      dead_letter_queue?: string;
       settings?: {
         batch_size?: number;
         max_concurrency?: number;
         max_retries?: number;
         max_wait_time_ms?: number;
         retry_delay?: number;
-        dead_letter_queue?: string;
       };
     }>;
   };
@@ -492,7 +503,10 @@ export async function listQueueConsumers(
           maxRetries: consumer.settings.max_retries,
           maxWaitTimeMs: consumer.settings.max_wait_time_ms,
           retryDelay: consumer.settings.retry_delay,
-          deadLetterQueue: consumer.settings.dead_letter_queue,
+          deadLetterQueue:
+            consumer.dead_letter_queue && consumer.dead_letter_queue !== ""
+              ? consumer.dead_letter_queue
+              : undefined,
         }
       : undefined,
   }));
@@ -532,12 +546,12 @@ export async function listQueueConsumersForWorker(
   const data = (await response.json()) as {
     result: Array<{
       script: string;
+      dead_letter_queue?: string;
       settings?: {
         batch_size?: number;
         max_retries?: number;
         max_wait_time_ms?: number;
         retry_delay?: number;
-        dead_letter_queue?: string;
       };
       type: string;
       queue_name: string;
@@ -562,6 +576,13 @@ export async function listQueueConsumersForWorker(
     queueId: consumer.queue_id,
     consumerId: consumer.consumer_id,
     createdOn: consumer.created_on,
-    settings: consumer.settings,
+    settings: consumer.settings
+      ? {
+          ...consumer.settings,
+          deadLetterQueue: consumer.dead_letter_queue,
+        }
+      : consumer.dead_letter_queue
+        ? { deadLetterQueue: consumer.dead_letter_queue }
+        : undefined,
   }));
 }

package/src/cloudflare/redwood/redwood.ts

@@ -50,9 +50,9 @@ export async function Redwood<B extends Bindings>(
       },
     },
     noBundle: props?.noBundle ?? true,
-    entrypoint: props?.entrypoint ?? path.join("dist", "worker", "worker.js"),
+    entrypoint: props?.entrypoint ?? path.join("dist", "worker", "index.js"),
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
-    compatibilityDate: props?.compatibilityDate ?? "2025-04-02",
+    compatibilityDate: props?.compatibilityDate ?? "2025-08-21",
     wrangler: {
       main: props?.wrangler?.main ?? "src/worker.tsx",
       transform: props?.wrangler?.transform,

package/src/cloudflare/worker.ts

@@ -1313,15 +1313,10 @@ async function provisionResources<B extends Bindings>(
         ? Promise.all(
             input.containers.map(async (container) => {
               return await ContainerApplication(container.id, {
-                image: container.image,
-                name: container.name,
-                instanceType: container.instanceType,
-                observability: container.observability,
+                ...container,
                 durableObjects: {
                   namespaceId: await getContainerNamespaceId(container),
                 },
-                schedulingPolicy: container.schedulingPolicy,
-                adopt: container.adopt,
                 dev: options.local,
                 ...input.api,
               });

package/src/planetscale/api.ts

@@ -28,10 +28,6 @@ export interface PlanetScaleProps {
    * @deprecated Use serviceTokenId and serviceToken instead.
    */
   apiKey?: Secret;
-  /**
-   * The organization to use for authentication. Defaults to the value of the PLANETSCALE_ORGANIZATION or PLANETSCALE_ORG_ID environment variable.
-   */
-  organizationId?: string;
 }
 
 export class PlanetScaleError extends Error {

package/src/planetscale/branch.ts

@@ -1,6 +1,7 @@
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { createPlanetScaleClient, type PlanetScaleProps } from "./api.ts";
+import type { Database } from "./database.ts";
 import {
   ensureProductionBranchClusterSize,
   sanitizeClusterSize,
@@ -20,14 +21,14 @@ export interface BranchProps extends PlanetScaleProps {
   name?: string;
 
   /**
-   * The organization ID
+   * The organization name. Automatically inferred from the database if the database is provided as an object.
    */
-  organizationId: string;
+  organization?: string;
 
   /**
    * The database name
    */
-  databaseName: string;
+  database: string | Database;
 
   /**
    * Whether or not the branch should be set to a production branch or not.
@@ -114,8 +115,8 @@ export interface Branch extends BranchProps {
  * // Create a branch from 'main'
  * const branch = await Branch("feature-123", {
  *   name: "feature-123",
- *   organizationId: "my-org",
- *   databaseName: "my-database",
+ *   organization: "my-org",
+ *   database: "my-database",
  *   parentBranch: "main"
  * });
  *
@@ -123,15 +124,15 @@ export interface Branch extends BranchProps {
  * // Create a branch from another branch object
  * const parentBranch = await Branch("staging", {
  *   name: "staging",
- *   organizationId: "my-org",
- *   databaseName: "my-database",
+ *   organization: "my-org",
+ *   database: "my-database",
  *   parentBranch: "main"
  * });
  *
  * const featureBranch = await Branch("feature-456", {
  *   name: "feature-456",
- *   organizationId: "my-org",
- *   databaseName: "my-database",
+ *   organization: "my-org",
+ *   database: "my-database",
  *   parentBranch: parentBranch // Using Branch object instead of string
  * });
  *
@@ -139,8 +140,8 @@ export interface Branch extends BranchProps {
  * // Create a branch from a backup
  * const branch = await Branch("restored-branch", {
  *   name: "restored-branch",
- *   organizationId: "my-org",
- *   databaseName: "my-database",
+ *   organization: "my-org",
+ *   database: "my-database",
  *   parentBranch: "main",
  *   backupId: "backup-123",
  *   clusterSize: "PS_10"
@@ -164,6 +165,26 @@ export const Branch = Resource(
       : typeof props.parentBranch === "string"
         ? props.parentBranch
         : props.parentBranch.name;
+    const organization =
+      // @ts-expect-error - organizationId is a legacy thing, we keep this so we can destroy
+      this.output?.organizationId ??
+      props.organization ??
+      (typeof props.database !== "string"
+        ? props.database.organization
+        : (process.env.PLANETSCALE_ORGANIZATION ??
+          process.env.PLANETSCALE_ORG_ID));
+    const database =
+      // @ts-expect-error - databaseName is a legacy thing, we keep this so we can destroy
+      this.output?.databaseName ??
+      (typeof props.database === "string"
+        ? props.database
+        : props.database.name);
+
+    if (!organization) {
+      throw new Error(
+        "PlanetScale organization is required. Please set the `organization` property or the `PLANETSCALE_ORGANIZATION` environment variable.",
+      );
+    }
 
     if (this.phase === "update" && this.output.name !== branchName) {
       // TODO(sam): maybe we don't need to replace? just branch again? or rename?
@@ -174,8 +195,8 @@ export const Branch = Resource(
       if (this.output?.name) {
         const response = await api.deleteBranch({
           path: {
-            organization: props.organizationId,
-            database: props.databaseName,
+            organization,
+            database,
             name: this.output.name,
           },
           throwOnError: false,
@@ -196,8 +217,8 @@ export const Branch = Resource(
     if (typeof props.parentBranch !== "string" && props.parentBranch) {
       await waitForBranchReady(
         api,
-        props.organizationId,
-        props.databaseName,
+        organization,
+        database,
         props.parentBranch.name,
       );
     }
@@ -205,8 +226,8 @@ export const Branch = Resource(
     // Check if branch exists
     const getResponse = await api.getBranch({
       path: {
-        organization: props.organizationId,
-        database: props.databaseName,
+        organization,
+        database,
         name: branchName,
       },
       throwOnError: false,
@@ -256,8 +277,8 @@ export const Branch = Resource(
             : "disableSafeMigrations"
         ]({
           path: {
-            organization: props.organizationId,
-            database: props.databaseName,
+            organization,
+            database,
             name: branchName,
           },
         });
@@ -279,8 +300,8 @@ export const Branch = Resource(
         }
         await ensureProductionBranchClusterSize(
           api,
-          props.organizationId,
-          props.databaseName,
+          organization,
+          database,
           branchName,
           data.kind,
           clusterSize,
@@ -299,8 +320,8 @@ export const Branch = Resource(
     let clusterSize: string | undefined;
     const parent = await waitForBranchReady(
       api,
-      props.organizationId,
-      props.databaseName,
+      organization,
+      database,
       parentBranchName,
     );
     if (props.clusterSize) {
@@ -315,8 +336,8 @@ export const Branch = Resource(
     // Branch doesn't exist, create it
     const { data } = await api.createBranch({
       path: {
-        organization: props.organizationId,
-        database: props.databaseName,
+        organization,
+        database,
       },
       body: {
         name: branchName,
@@ -331,18 +352,13 @@ export const Branch = Resource(
     // Handle safe migrations if specified
     if (props.safeMigrations !== undefined) {
       // We can't change the migrations mode if the branch is not ready
-      await waitForBranchReady(
-        api,
-        props.organizationId,
-        props.databaseName,
-        branchName,
-      );
+      await waitForBranchReady(api, organization, database, branchName);
       await api[
         props.safeMigrations ? "enableSafeMigrations" : "disableSafeMigrations"
       ]({
         path: {
-          organization: props.organizationId,
-          database: props.databaseName,
+          organization,
+          database,
           name: branchName,
         },
       });
@@ -352,8 +368,8 @@ export const Branch = Resource(
     if (clusterSize) {
       await ensureProductionBranchClusterSize(
         api,
-        props.organizationId,
-        props.databaseName,
+        organization,
+        database,
         branchName,
         data.kind,
         clusterSize,

package/src/planetscale/database.ts

@@ -18,9 +18,10 @@ interface BaseDatabaseProps extends PlanetScaleProps {
   name?: string;
 
   /**
-   * The organization ID where the database will be created
+   * The organization name where the database will be created
+   * @default process.env.PLANETSCALE_ORGANIZATION
    */
-  organizationId: string;
+  organization?: string;
 
   /**
    * Whether to adopt the database if it already exists in Planetscale
@@ -157,6 +158,11 @@ export type Database = DatabaseProps & {
    * HTML URL to access the database
    */
   htmlUrl: string;
+
+  /**
+   * The organization of the database
+   */
+  organization: string;
 };
 
 /**
@@ -166,7 +172,7 @@ export type Database = DatabaseProps & {
  * // Create a basic database in a specific organization
  * const db = await Database("my-app-db", {
  *   name: "my-app-db",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   clusterSize: "PS_10"
  * });
  *
@@ -174,7 +180,7 @@ export type Database = DatabaseProps & {
  * // Create a database with specific region and settings
  * const db = await Database("my-app-db", {
  *   name: "my-app-db",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   region: {
  *     slug: "us-east"
  *   },
@@ -188,7 +194,7 @@ export type Database = DatabaseProps & {
  * // Create a database with custom API key
  * const db = await Database("my-app-db", {
  *   name: "my-app-db",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   apiKey: alchemy.secret(process.env.CUSTOM_PLANETSCALE_TOKEN),
  *   clusterSize: "PS_10"
  * });
@@ -210,11 +216,22 @@ export const Database = Resource(
       arch: props.arch,
       region: props.region?.slug,
     });
+    const organization =
+      // @ts-expect-error - organizationId is a legacy thing, we keep this so we can destroy
+      this.output?.organizationId ??
+      props.organization ??
+      process.env.PLANETSCALE_ORGANIZATION ??
+      process.env.PLANETSCALE_ORG_ID;
+    if (!organization) {
+      throw new Error(
+        "PlanetScale organization is required. Please set the `organization` property or the `PLANETSCALE_ORGANIZATION` environment variable.",
+      );
+    }
 
     if (this.phase === "update" && this.output.name !== databaseName) {
       await api.updateDatabaseSettings({
         path: {
-          organization: props.organizationId,
+          organization,
           name: this.output.name,
         },
         body: { new_name: databaseName },
@@ -225,7 +242,7 @@ export const Database = Resource(
       if (this.output?.name) {
         const response = await api.deleteDatabase({
           path: {
-            organization: props.organizationId,
+            organization,
             name: this.output.name,
           },
           throwOnError: false,
@@ -243,7 +260,7 @@ export const Database = Resource(
     // Check if database exists
     const getResponse = await api.getDatabase({
       path: {
-        organization: props.organizationId,
+        organization,
         name: databaseName,
       },
       throwOnError: false,
@@ -259,20 +276,20 @@ export const Database = Resource(
       if (props.defaultBranch && props.defaultBranch !== "main") {
         const branchResponse = await api.getBranch({
           path: {
-            organization: props.organizationId,
+            organization,
             database: databaseName,
             name: props.defaultBranch,
           },
           throwOnError: false,
         });
         if (!branchResponse.data) {
-          await waitForDatabaseReady(api, props.organizationId, databaseName);
+          await waitForDatabaseReady(api, organization, databaseName);
         }
         if (branchResponse.error && branchResponse.response.status === 404) {
           // Create the branch
           await api.createBranch({
             path: {
-              organization: props.organizationId,
+              organization,
               database: databaseName,
             },
             body: {
@@ -285,7 +302,7 @@ export const Database = Resource(
 
       const { data } = await api.updateDatabaseSettings({
         path: {
-          organization: props.organizationId,
+          organization,
           name: databaseName,
         },
         body: {
@@ -303,7 +320,7 @@ export const Database = Resource(
 
       await ensureProductionBranchClusterSize(
         api,
-        props.organizationId,
+        organization,
         databaseName,
         props.defaultBranch || "main",
         data.kind,
@@ -320,6 +337,7 @@ export const Database = Resource(
         createdAt: data.created_at,
         updatedAt: data.updated_at,
         htmlUrl: data.html_url,
+        organization,
       };
     }
 
@@ -330,7 +348,7 @@ export const Database = Resource(
     // Create new database
     await api.createDatabase({
       path: {
-        organization: props.organizationId,
+        organization,
       },
       body: {
         name: databaseName,
@@ -343,7 +361,7 @@ export const Database = Resource(
     // These settings can't be set on creation, so we need to patch them after creation.
     const { data } = await api.updateDatabaseSettings({
       path: {
-        organization: props.organizationId,
+        organization,
         name: databaseName,
       },
       body: {
@@ -360,12 +378,12 @@ export const Database = Resource(
 
     // If a non-'main' default branch is specified, create it
     if (props.defaultBranch && props.defaultBranch !== "main") {
-      await waitForDatabaseReady(api, props.organizationId, databaseName);
+      await waitForDatabaseReady(api, organization, databaseName);
 
       // Check if branch exists
       const branchResponse = await api.getBranch({
         path: {
-          organization: props.organizationId,
+          organization,
           database: databaseName,
           name: props.defaultBranch,
         },
@@ -376,7 +394,7 @@ export const Database = Resource(
         // Create the branch
         await api.createBranch({
           path: {
-            organization: props.organizationId,
+            organization,
             database: databaseName,
           },
           body: {
@@ -387,7 +405,7 @@ export const Database = Resource(
 
         await ensureProductionBranchClusterSize(
           api,
-          props.organizationId,
+          organization,
           databaseName,
           props.defaultBranch || "main",
           data.kind,
@@ -397,7 +415,7 @@ export const Database = Resource(
         // Update database to use new branch as default
         const { data: updatedData } = await api.updateDatabaseSettings({
           path: {
-            organization: props.organizationId,
+            organization,
             name: databaseName,
           },
           body: {
@@ -415,6 +433,7 @@ export const Database = Resource(
           createdAt: updatedData.created_at,
           updatedAt: updatedData.updated_at,
           htmlUrl: updatedData.html_url,
+          organization,
         };
       }
     }
@@ -429,6 +448,7 @@ export const Database = Resource(
       createdAt: data.created_at,
       updatedAt: data.updated_at,
       htmlUrl: data.html_url,
+      organization,
     };
   },
 );

package/src/planetscale/index.ts

@@ -1,6 +1,7 @@
 export * from "./api.ts";
 export * from "./branch.ts";
 export * from "./database.ts";
+export * from "./organization.ts";
 export * from "./password.ts";
 export * from "./role.ts";
 export * from "./utils.ts";

package/src/planetscale/organization.ts

@@ -0,0 +1,17 @@
+import { createPlanetScaleClient, type PlanetScaleProps } from "./api.ts";
+import type { Organization } from "./api/types.gen.ts";
+
+export type OrganizationRef = Organization;
+
+export async function OrganizationRef(
+  name: string | Organization,
+  options: PlanetScaleProps = {},
+) {
+  const api = createPlanetScaleClient(options);
+  const organization = await api.getOrganization({
+    path: {
+      name: typeof name === "string" ? name : name.id,
+    },
+  });
+  return organization.data;
+}