alchemy 0.64.0 → 0.65.1

package/lib/planetscale/role.d.ts

@@ -0,0 +1,126 @@
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import type { Secret } from "../secret.ts";
+import { type PlanetScaleProps } from "./api/client.gen.ts";
+import type { Branch } from "./branch.ts";
+import type { Database } from "./database.ts";
+/**
+ * Properties for creating or updating a PlanetScale PostgreSQL Role
+ */
+export interface RoleProps extends PlanetScaleProps {
+    /**
+     * The organization ID where the role will be created
+     * Required when using string database name, optional when using Database resource
+     */
+    organizationId?: string;
+    /**
+     * The database where the role will be created
+     * Can be either a database name (string) or Database resource
+     */
+    database: string | Database;
+    /**
+     * The branch where the role will be created
+     * Can be either a branch name (string) or Branch resource
+     * @default "main"
+     */
+    branch?: string | Branch;
+    /**
+     * Time to live in seconds
+     */
+    ttl?: number;
+    /**
+     * Roles to inherit from.
+     * The `"postgres"` role provides full administrator access to the database.
+     * You can also inherit from another Role resource.
+     */
+    inheritedRoles: InheritedRole[] | Role;
+}
+/**
+ * Roles that can be inherited from.
+ */
+export type InheritedRole = "postgres" | "pg_checkpoint" | "pg_create_subscription" | "pg_maintain" | "pg_monitor" | "pg_read_all_data" | "pg_read_all_settings" | "pg_read_all_stats" | "pg_signal_backend" | "pg_stat_scan_tables" | "pg_use_reserved_connections" | "pg_write_all_data" | (string & {});
+export interface Role extends Resource<"planetscale::Role">, Omit<RoleProps, "inheritedRoles"> {
+    /**
+     * The unique identifier for the role
+     */
+    id: string;
+    /**
+     * The name of the role
+     */
+    name: string;
+    /**
+     * The timestamp when the role expires (ISO 8601 format)
+     */
+    expiresAt: string;
+    /**
+     * The host URL for database connection
+     */
+    host: string;
+    /**
+     * The username for database authentication
+     */
+    username: string;
+    /**
+     * The encrypted password for database authentication
+     */
+    password: Secret<string>;
+    /**
+     * The database name
+     */
+    databaseName: string;
+    /**
+     * The direct connection URL for the database.
+     */
+    connectionUrl: Secret<string>;
+    /**
+     * The pooled connection URL for the database.
+     * Uses PSBouncer on port 6432. Recommended for production.
+     * @see https://planetscale.com/docs/postgres/connecting/psbouncer
+     */
+    connectionUrlPooled: Secret<string>;
+    /**
+     * The roles that this role inherits from.
+     */
+    inheritedRoles: InheritedRole[];
+}
+/**
+ * Create and manage database roles for PlanetScale PostgreSQL branches. Database roles provide secure access to your database with specific roles and permissions.
+ *
+ * For MySQL, use [Passwords](./password.ts) instead.
+ *
+ * @example
+ * ## Basic Role
+ *
+ * Create a default role with all permissions:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   inheritedRoles: ["postgres"],
+ * });
+ * ```
+ *
+ * ## Role with TTL
+ *
+ * Create a role with a TTL of 1 hour:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   ttl: 3600,
+ * });
+ * ```
+ *
+ * ## Role with Inherited Permissions
+ *
+ * Create a role with read-only access to all data and settings:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   inheritedRoles: ["pg_read_all_data", "pg_read_all_settings"],
+ * });
+ * ```
+ */
+export declare const Role: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Role, RoleProps>, id: string, props: RoleProps) => Promise<Role>);
+//# sourceMappingURL=role.d.ts.map

package/lib/planetscale/role.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../src/planetscale/role.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAG9C;;GAEG;AACH,MAAM,WAAW,SAAU,SAAQ,gBAAgB;IACjD;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IAE5B;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,cAAc,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB,UAAU,GACV,eAAe,GACf,wBAAwB,GACxB,aAAa,GACb,YAAY,GACZ,kBAAkB,GAClB,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,qBAAqB,GACrB,6BAA6B,GAC7B,mBAAmB,GACnB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB,MAAM,WAAW,IACf,SAAQ,QAAQ,CAAC,mBAAmB,CAAC,EACnC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACnC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAE9B;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAEpC;;OAEG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,IAAI,yFAGP,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,MAC1B,MAAM,SACH,SAAS,KACf,OAAO,CAAC,IAAI,CAAC,CA+GjB,CAAC"}

package/lib/planetscale/role.js

@@ -0,0 +1,144 @@
+import { alchemy } from "../alchemy.js";
+import { Resource } from "../resource.js";
+import { logger } from "../util/logger.js";
+import { PlanetScaleClient } from "./api/client.gen.js";
+import { waitForBranchReady } from "./utils.js";
+/**
+ * Create and manage database roles for PlanetScale PostgreSQL branches. Database roles provide secure access to your database with specific roles and permissions.
+ *
+ * For MySQL, use [Passwords](./password.ts) instead.
+ *
+ * @example
+ * ## Basic Role
+ *
+ * Create a default role with all permissions:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   inheritedRoles: ["postgres"],
+ * });
+ * ```
+ *
+ * ## Role with TTL
+ *
+ * Create a role with a TTL of 1 hour:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   ttl: 3600,
+ * });
+ * ```
+ *
+ * ## Role with Inherited Permissions
+ *
+ * Create a role with read-only access to all data and settings:
+ *
+ * ```ts
+ * const role = await Role("my-role", {
+ *   database: "my-database",
+ *   inheritedRoles: ["pg_read_all_data", "pg_read_all_settings"],
+ * });
+ * ```
+ */
+export const Role = Resource("planetscale::Role", async function (id, props) {
+    const api = new PlanetScaleClient(props);
+    const organization = typeof props.branch === "object"
+        ? props.branch.organizationId
+        : typeof props.database === "object"
+            ? props.database.organizationId
+            : props.organizationId;
+    const database = typeof props.database === "string" ? props.database : props.database.name;
+    const branch = typeof props.branch === "string"
+        ? props.branch
+        : (props.branch?.name ?? "main");
+    const inheritedRoles = Array.isArray(props.inheritedRoles)
+        ? props.inheritedRoles
+        : props.inheritedRoles.inheritedRoles;
+    if (!organization) {
+        throw new Error("Organization ID is required");
+    }
+    switch (this.phase) {
+        case "delete": {
+            if (this.output?.id) {
+                const res = await api.organizations.databases.branches.roles.delete({
+                    path: {
+                        organization,
+                        database,
+                        branch,
+                        id: this.output.id,
+                    },
+                    result: "full",
+                });
+                if (res.error) {
+                    switch (res.error.status) {
+                        case 404:
+                            break;
+                        case 422:
+                            // This is a workaround for 422 unprocessable: Role is still referenced and cannot be dropped.
+                            // Essentially, the role is still linked to a branch, so we can't delete it here, but it'll be deleted when the branch is deleted.
+                            logger.warn([
+                                `Failed to delete role "${id}" (name: "${this.output.name}").`,
+                                `Error: ${res.error.message}`,
+                                `If you are deleting database "${database}" or branch "${branch}", the role will be deleted automatically.`,
+                                `Otherwise, consider manually deleting the role at: https://app.planetscale.com/${organization}/${database}/settings/roles`,
+                            ].join("\n"));
+                            break;
+                        default:
+                            throw new Error(`Failed to delete role "${id}"`, {
+                                cause: res.error,
+                            });
+                    }
+                }
+            }
+            return this.destroy();
+        }
+        case "create": {
+            const { kind, ready } = await api.organizations.databases.branches.get({
+                path: {
+                    organization,
+                    database,
+                    name: branch,
+                },
+            });
+            if (kind !== "postgresql") {
+                throw new Error(`Cannot create a role on MySQL database "${database}". Roles are only supported on PostgreSQL databases. For MySQL databases, please use the Password resource instead.`);
+            }
+            // Cannot create role until branch is ready
+            if (!ready) {
+                await waitForBranchReady(api, organization, database, branch);
+            }
+            const role = await api.organizations.databases.branches.roles.post({
+                path: {
+                    organization,
+                    database,
+                    branch,
+                },
+                body: {
+                    ttl: props.ttl,
+                    inherited_roles: inheritedRoles,
+                },
+            });
+            return this({
+                ...props,
+                id: role.id,
+                name: role.name,
+                host: role.access_host_url,
+                username: role.username,
+                password: alchemy.secret(role.password),
+                expiresAt: role.expires_at,
+                databaseName: role.database_name,
+                inheritedRoles,
+                connectionUrl: alchemy.secret(`postgresql://${role.username}:${role.password}@${role.access_host_url}:5432/${role.database_name}?sslmode=verify-full`),
+                connectionUrlPooled: alchemy.secret(`postgresql://${role.username}:${role.password}@${role.access_host_url}:6432/${role.database_name}?sslmode=verify-full`),
+            });
+        }
+        case "update": {
+            // According to the types, the only property that can be updated is the name.
+            // However, I was getting 500 errors when trying to update the name, so we'll just replace.
+            return this.replace();
+        }
+    }
+});
+//# sourceMappingURL=role.js.map

package/lib/planetscale/role.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/planetscale/role.ts"],"names":[],"mappings":"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"}

package/lib/planetscale/utils.d.ts

@@ -1,9 +1,23 @@
 import type { PlanetScaleClient } from "./api/client.gen.ts";
+import type { DatabaseBranch } from "./api/types.gen.ts";
 export type PlanetScaleClusterSize = "PS_DEV" | "PS_10" | "PS_20" | "PS_40" | "PS_80" | "PS_160" | "PS_320" | "PS_400" | "PS_640" | "PS_700" | "PS_900" | "PS_1280" | "PS_1400" | "PS_1800" | "PS_2100" | "PS_2560" | "PS_2700" | "PS_2800" | (string & {});
 /**
- * Wait for a database to be ready with exponential backoff
+ * Ensures that the given cluster size is in the correct format.
  */
-export declare function waitForDatabaseReady(api: PlanetScaleClient, organization: string, database: string, branch?: string): Promise<void>;
+export declare function sanitizeClusterSize(input: {
+    size: PlanetScaleClusterSize;
+    kind?: "mysql" | "postgresql";
+    arch?: "x86" | "arm";
+    region?: string;
+}): string;
+/**
+ * Polls a branch until it is ready.
+ */
+export declare function waitForBranchReady(api: PlanetScaleClient, organization: string, database: string, branch: string): Promise<DatabaseBranch>;
+/**
+ * Polls a database until it is ready.
+ */
+export declare function waitForDatabaseReady(api: PlanetScaleClient, organization: string, database: string): Promise<void>;
 /**
  * Polls a keyspace until it is finished resizing.
  */
@@ -13,5 +27,5 @@ export declare function waitForKeyspaceReady(api: PlanetScaleClient, organizatio
  * If a branch is not production, it will be promoted to production because
  * cluster sizes can only be configured for production branches.
  */
-export declare function ensureProductionBranchClusterSize(api: PlanetScaleClient, organization: string, database: string, branch: string, expectedClusterSize: PlanetScaleClusterSize, isDBReady: boolean): Promise<void>;
+export declare function ensureProductionBranchClusterSize(api: PlanetScaleClient, organization: string, database: string, branch: string, kind: "mysql" | "postgresql", expectedClusterSize: PlanetScaleClusterSize): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/planetscale/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/planetscale/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,sBAAsB,GAC9B,QAAQ,GACR,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAYf;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,sBAAsB,EAC3C,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,IAAI,CAAC,CAoEf"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/planetscale/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,MAAM,sBAAsB,GAC9B,QAAQ,GACR,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACzC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IAC9B,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAaT;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,CAAC,CASzB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAYf;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,GAAG,YAAY,EAC5B,mBAAmB,EAAE,sBAAsB,GAC1C,OAAO,CAAC,IAAI,CAAC,CA2Bf"}

package/lib/planetscale/utils.js

@@ -1,20 +1,42 @@
 /**
- * Wait for a database to be ready with exponential backoff
+ * Ensures that the given cluster size is in the correct format.
  */
-export async function waitForDatabaseReady(api, organization, database, branch) {
+export function sanitizeClusterSize(input) {
+    // NAS-backed Postgres cluster sizes are formatted as `PS_<size>_<provider>_<arch>`,
+    // where <provider> is either "AWS" or "GCP", and <arch> is either "ARM" or "X86".
+    // Postgres clusters backed by PlanetScale Metal are more complex (e.g. "M6_160_AWS_INTEL_D_METAL_118"),
+    // so to avoid messing with those, we just check for AWS or GCP in the size.
+    if (input.kind === "postgresql" && !input.size.match(/(AWS|GCP)/)) {
+        // Infer the provider from the region.
+        // Not all AWS regions start with "aws-", but all GCP regions start with "gcp-".
+        const provider = input.region?.startsWith("gcp") ? "GCP" : "AWS";
+        const arch = (input.arch ?? "x86").toUpperCase();
+        return `${input.size}_${provider}_${arch}`;
+    }
+    return input.size;
+}
+/**
+ * Polls a branch until it is ready.
+ */
+export async function waitForBranchReady(api, organization, database, branch) {
+    return await poll({
+        description: `branch "${branch}" ready`,
+        fn: () => api.organizations.databases.branches.get({
+            path: { organization, database, name: branch },
+        }),
+        predicate: (branch) => branch.ready,
+    });
+}
+/**
+ * Polls a database until it is ready.
+ */
+export async function waitForDatabaseReady(api, organization, database) {
     await poll({
-        description: `database "${database}" ${branch ? `branch "${branch}"` : ""} ready`,
-        fn: async () => {
-            if (branch) {
-                return await api.organizations.databases.branches.get({
-                    path: { organization, database, name: branch },
-                });
-            }
-            return await api.organizations.databases.get({
-                path: { organization, name: database },
-            });
-        },
-        predicate: (item) => item.ready,
+        description: `database "${database}" ready`,
+        fn: () => api.organizations.databases.get({
+            path: { organization, name: database },
+        }),
+        predicate: (database) => database.ready,
     });
 }
 /**
@@ -36,31 +58,47 @@ export async function waitForKeyspaceReady(api, organization, database, branch,
  * If a branch is not production, it will be promoted to production because
  * cluster sizes can only be configured for production branches.
  */
-export async function ensureProductionBranchClusterSize(api, organization, database, branch, expectedClusterSize, isDBReady) {
-    if (!isDBReady) {
-        await waitForDatabaseReady(api, organization, database);
+export async function ensureProductionBranchClusterSize(api, organization, database, branch, kind, expectedClusterSize) {
+    switch (kind) {
+        case "mysql": {
+            // Vitess databases must be promoted before resizing
+            await ensureProductionBranch(api, organization, database, branch);
+            await ensureMySQLClusterSize(api, organization, database, branch, expectedClusterSize);
+            break;
+        }
+        case "postgresql": {
+            // Postgres databases must be resized first before promoting, otherwise 500 error
+            await ensurePostgresClusterSize(api, organization, database, branch, expectedClusterSize);
+            await ensureProductionBranch(api, organization, database, branch);
+            break;
+        }
     }
-    // 1. Ensure branch is production
-    const branchData = await api.organizations.databases.branches.get({
+}
+/**
+ * Checks if a branch is production and promotes it if it is not.
+ */
+async function ensureProductionBranch(api, organization, database, name) {
+    const data = await api.organizations.databases.branches.get({
         path: {
             organization,
             database,
-            name: branch,
+            name,
         },
     });
-    if (!branchData.production) {
-        if (!branchData.ready) {
-            await waitForDatabaseReady(api, organization, database, branch);
+    if (!data.production) {
+        if (!data.ready) {
+            await waitForBranchReady(api, organization, database, name);
         }
         await api.organizations.databases.branches.promote.post({
-            path: {
-                organization,
-                database,
-                name: branch,
-            },
+            path: { organization, database, name },
         });
     }
-    // 2. Load default keyspace
+}
+/**
+ * Ensures that a MySQL branch has the correct cluster size.
+ */
+async function ensureMySQLClusterSize(api, organization, database, branch, expectedClusterSize) {
+    // 1. Load default keyspace
     const keyspaces = await api.organizations.databases.branches.keyspaces.list({
         path: {
             organization,
@@ -72,9 +110,9 @@ export async function ensureProductionBranchClusterSize(api, organization, datab
     if (!defaultKeyspace) {
         throw new Error(`No default keyspace found for branch ${branch}`);
     }
-    // 3. Wait until any in-flight resize is done
+    // 2. Wait until any in-flight resize is done
     await waitForKeyspaceReady(api, organization, database, branch, defaultKeyspace.name);
-    // 4. If size mismatch, trigger resize and wait again
+    // 3. If size mismatch, trigger resize and wait again
     // Ideally this would use the undocumented Keyspaces API, but there seems to be a missing oauth scope that we cannot add via the console yet
     if (defaultKeyspace.cluster_name !== expectedClusterSize) {
         await api.organizations.databases.branches.cluster.patch({
@@ -89,6 +127,47 @@ export async function ensureProductionBranchClusterSize(api, organization, datab
         await waitForKeyspaceReady(api, organization, database, branch, defaultKeyspace.name);
     }
 }
+/**
+ * Ensures that a Postgres branch has the correct cluster size.
+ */
+async function ensurePostgresClusterSize(api, organization, database, branch, expectedClusterSize) {
+    const data = await api.organizations.databases.branches.get({
+        path: {
+            organization,
+            database,
+            name: branch,
+        },
+    });
+    if (data.cluster_name === expectedClusterSize) {
+        return;
+    }
+    await waitForPendingPostgresChanges(api, organization, database, branch);
+    const change = await api.organizations.databases.branches.changes.patch({
+        path: {
+            organization,
+            database,
+            branch,
+        },
+        body: {
+            cluster_size: expectedClusterSize,
+        },
+    });
+    await waitForPendingPostgresChanges(api, organization, database, branch, change.id);
+}
+/**
+ * Polls for a pending Postgres change to be completed.
+ */
+async function waitForPendingPostgresChanges(api, organization, database, branch, changeId) {
+    await poll({
+        description: `changes for branch "${branch}"`,
+        fn: () => api.organizations.databases.branches.changes.list({
+            path: { organization, database, branch },
+        }),
+        predicate: (response) => response.data.every((change) => change.state === "completed" ||
+            change.state === "canceled" ||
+            (changeId && change.id === changeId)),
+    });
+}
 /**
  * Polls a function until it returns a result that satisfies the predicate.
  */

package/lib/planetscale/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/planetscale/utils.ts"],"names":[],"mappings":"AAuBA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAe;IAEf,MAAM,IAAI,CAAC;QACT,WAAW,EAAE,aAAa,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ;QACjF,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACpD,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE;iBAC/C,CAAC,CAAC;YACL,CAAC;YACD,OAAO,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;gBAC3C,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;QACL,CAAC;QACD,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK;KAChC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,QAAgB;IAEhB,MAAM,IAAI,CAAC;QACT,WAAW,EAAE,aAAa,QAAQ,SAAS;QAC3C,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAC1D,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzD,CAAC;QACJ,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CACtB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC;QAC1D,YAAY,EAAE,GAAG;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,mBAA2C,EAC3C,SAAkB;IAElB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,oBAAoB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,iCAAiC;IACjC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;QAChE,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,oBAAoB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,IAAI,EAAE;gBACJ,YAAY;gBACZ,QAAQ;gBACR,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAC;IACL,CAAC;IACD,2BAA2B;IAC3B,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1E,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;SACP;KACF,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,2DAA2D;IACpI,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,6CAA6C;IAC7C,MAAM,oBAAoB,CACxB,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,CAAC,IAAI,CACrB,CAAC;IAEF,qDAAqD;IACrD,4IAA4I;IAC5I,IAAI,eAAe,CAAC,YAAY,KAAK,mBAAmB,EAAE,CAAC;QACzD,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YACvD,IAAI,EAAE;gBACJ,YAAY;gBACZ,QAAQ;gBACR,IAAI,EAAE,MAAM;aACb;YACD,IAAI,EAAE,EAAE,YAAY,EAAE,mBAAmB,EAAE;SAC5C,CAAC,CAAC;QAEH,kCAAkC;QAClC,MAAM,oBAAoB,CACxB,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,CAAC,IAAI,CACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,IAAI,CAAI,KAiCtB;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,KAAK,GAAG,KAAK,CAAC,YAAY,IAAI,GAAG,CAAC;IACtC,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CACb,yBAAyB,KAAK,CAAC,WAAW,UAAU,IAAI,CAAC,KAAK,CAC5D,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,GAAG,IAAI,CACpC,GAAG,CACL,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3D,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/planetscale/utils.ts"],"names":[],"mappings":"AAwBA;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAKnC;IACC,oFAAoF;IACpF,kFAAkF;IAClF,wGAAwG;IACxG,4EAA4E;IAC5E,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QAClE,sCAAsC;QACtC,gFAAgF;QAChF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QACjD,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;IAC7C,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc;IAEd,OAAO,MAAM,IAAI,CAAC;QAChB,WAAW,EAAE,WAAW,MAAM,SAAS;QACvC,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACvC,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE;SAC/C,CAAC;QACJ,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK;KACpC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAsB,EACtB,YAAoB,EACpB,QAAgB;IAEhB,MAAM,IAAI,CAAC;QACT,WAAW,EAAE,aAAa,QAAQ,SAAS;QAC3C,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;YAC9B,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;SACvC,CAAC;QACJ,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;KACxC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,QAAgB;IAEhB,MAAM,IAAI,CAAC;QACT,WAAW,EAAE,aAAa,QAAQ,SAAS;QAC3C,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAC1D,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzD,CAAC;QACJ,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CACtB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC;QAC1D,YAAY,EAAE,GAAG;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,IAA4B,EAC5B,mBAA2C;IAE3C,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,oDAAoD;YACpD,MAAM,sBAAsB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClE,MAAM,sBAAsB,CAC1B,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,mBAAmB,CACpB,CAAC;YACF,MAAM;QACR,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,iFAAiF;YACjF,MAAM,yBAAyB,CAC7B,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,mBAAmB,CACpB,CAAC;YACF,MAAM,sBAAsB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClE,MAAM;QACR,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACnC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,IAAY;IAEZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1D,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,IAAI;SACL;KACF,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE;SACvC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACnC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,mBAA2C;IAE3C,2BAA2B;IAC3B,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1E,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;SACP;KACF,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,2DAA2D;IACpI,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,6CAA6C;IAC7C,MAAM,oBAAoB,CACxB,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,CAAC,IAAI,CACrB,CAAC;IAEF,qDAAqD;IACrD,4IAA4I;IAC5I,IAAI,eAAe,CAAC,YAAY,KAAK,mBAAmB,EAAE,CAAC;QACzD,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YACvD,IAAI,EAAE;gBACJ,YAAY;gBACZ,QAAQ;gBACR,IAAI,EAAE,MAAM;aACb;YACD,IAAI,EAAE,EAAE,YAAY,EAAE,mBAAmB,EAAE;SAC5C,CAAC,CAAC;QAEH,kCAAkC;QAClC,MAAM,oBAAoB,CACxB,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,eAAe,CAAC,IAAI,CACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,yBAAyB,CACtC,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,mBAA2C;IAE3C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1D,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,YAAY,KAAK,mBAAmB,EAAE,CAAC;QAC9C,OAAO;IACT,CAAC;IACD,MAAM,6BAA6B,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;QACtE,IAAI,EAAE;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;SACP;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,mBAAmB;SAClC;KACF,CAAC,CAAC;IACH,MAAM,6BAA6B,CACjC,GAAG,EACH,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,CAAC,EAAE,CACV,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,6BAA6B,CAC1C,GAAsB,EACtB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,QAAiB;IAEjB,MAAM,IAAI,CAAC;QACT,WAAW,EAAE,uBAAuB,MAAM,GAAG;QAC7C,EAAE,EAAE,GAAG,EAAE,CACP,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YAChD,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE;SACzC,CAAC;QACJ,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CACtB,QAAQ,CAAC,IAAI,CAAC,KAAK,CACjB,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,KAAK,KAAK,WAAW;YAC5B,MAAM,CAAC,KAAK,KAAK,UAAU;YAC3B,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,CACvC;KACJ,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,IAAI,CAAI,KAiCtB;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,KAAK,GAAG,KAAK,CAAC,YAAY,IAAI,GAAG,CAAC;IACtC,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CACb,yBAAyB,KAAK,CAAC,WAAW,UAAU,IAAI,CAAC,KAAK,CAC5D,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,GAAG,IAAI,CACpC,GAAG,CACL,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3D,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}

package/lib/secret.d.ts

@@ -4,7 +4,6 @@ declare global {
         [name: string]: Secret;
     };
 }
-declare const SecretSymbol: unique symbol;
 /**
  * Internal wrapper for sensitive values like API keys and credentials.
  * When stored in alchemy state files, the value is automatically encrypted
@@ -43,7 +42,6 @@ declare const SecretSymbol: unique symbol;
 export declare class Secret<T = string> {
     readonly unencrypted: T;
     readonly name: string;
-    [SecretSymbol]: boolean;
     /**
      * @internal
      */
@@ -108,5 +106,4 @@ export declare namespace secret {
     }
     const env: Env;
 }
-export {};
 //# sourceMappingURL=secret.d.ts.map

package/lib/secret.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret.d.ts","sourceRoot":"","sources":["../src/secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE;QACvB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACxB,CAAC;CACH;AAYD,QAAA,MAAM,YAAY,eAAgC,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,MAAM,CAAC,CAAC,GAAG,MAAM;IAY1B,QAAQ,CAAC,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAZvB,CAAC,YAAY,CAAC,UAAQ;IAEtB;;OAEG;WACW,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;IAIlC,SAAgB,IAAI,YAAY;gBAErB,WAAW,EAAE,CAAC,EACd,IAAI,GAAE,MAAmB;IAKpC;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAI/C;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAIpD;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG3B;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAKvE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,MAAM,CAAC,CAAC,GAAG,MAAM,EAC/B,WAAW,EAAE,CAAC,GAAG,SAAS,EAC1B,IAAI,CAAC,EAAE,MAAM,GACZ,MAAM,CAAC,CAAC,CAAC,CAKX;AAED,yBAAiB,MAAM,CAAC;IACtB,UAAiB,GAAG;QAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KACxD;IAEM,MAAM,GAAG,EAGV,GAAG,CAAC;CASX"}
+{"version":3,"file":"secret.d.ts","sourceRoot":"","sources":["../src/secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE;QACvB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACxB,CAAC;CACH;AAYD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,MAAM,CAAC,CAAC,GAAG,MAAM;IAU1B,QAAQ,CAAC,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAVvB;;OAEG;WACW,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;IAIlC,SAAgB,IAAI,YAAY;gBAErB,WAAW,EAAE,CAAC,EACd,IAAI,GAAE,MAAmB;IAKpC;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAI/C;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAIpD;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG3B;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAKvE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,MAAM,CAAC,CAAC,GAAG,MAAM,EAC/B,WAAW,EAAE,CAAC,GAAG,SAAS,EAC1B,IAAI,CAAC,EAAE,MAAM,GACZ,MAAM,CAAC,CAAC,CAAC,CAKX;AAED,yBAAiB,MAAM,CAAC;IACtB,UAAiB,GAAG;QAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KACxD;IAEM,MAAM,GAAG,EAGV,GAAG,CAAC;CASX"}

package/lib/secret.js

@@ -6,7 +6,6 @@ let i = 0;
 function nextName() {
     return `alchemy:anonymous-secret-${i++}`;
 }
-const SecretSymbol = Symbol.for("alchemy::Secret");
 /**
  * Internal wrapper for sensitive values like API keys and credentials.
  * When stored in alchemy state files, the value is automatically encrypted
@@ -45,7 +44,6 @@ const SecretSymbol = Symbol.for("alchemy::Secret");
 export class Secret {
     unencrypted;
     name;
-    [SecretSymbol] = true;
     /**
      * @internal
      */

package/lib/secret.js.map

@@ -1 +1 @@
-{"version":3,"file":"secret.js","sourceRoot":"","sources":["../src/secret.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"secret.js","sourceRoot":"","sources":["../src/secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQvC,oFAAoF;AACpF,MAAM,aAAa,GAEf,CAAC,UAAU,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC;AAE5C,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,SAAS,QAAQ;IACf,OAAO,4BAA4B,CAAC,EAAE,EAAE,CAAC;AAC3C,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,OAAO,MAAM;IAUN;IACA;IAVX;;OAEG;IACI,MAAM,CAAC,GAAG;QACf,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACtC,CAAC;IAEe,IAAI,GAAG,QAAQ,CAAC;IAChC,YACW,WAAc,EACd,OAAe,QAAQ,EAAE;QADzB,gBAAW,GAAX,WAAW,CAAG;QACd,SAAI,GAAJ,IAAI,CAAqB;QAElC,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAI,KAAoB;QACjC,OAAO,QAAQ,CAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,CAAW,KAAoB;QAC1C,OAAO,QAAQ,CAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,UAAU,IAAI,CAAC,IAAI,IAAI,EAAE,GAAG,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,CAAC,OAAO,CAAC,MAAM,CAAC;QACd,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAa,OAAY;IAC/C,OAAO,CACL,OAAO,YAAY,MAAM;QACzB,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,IAAI,KAAK,QAAQ,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,UAAU,MAAM,CACpB,WAA0B,EAC1B,IAAa;IAEb,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,WAAiB,MAAM;IAMR,UAAG,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;QACjC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACpC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAC/D,CAAQ,CAAC;IAEV,SAAS,IAAI,CAAC,IAAY,EAAE,KAAc,EAAE,KAAc;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,kBAAkB,CAAC,CAAC;IACzE,CAAC;AACH,CAAC,EAlBgB,MAAM,KAAN,MAAM,QAkBtB"}

package/lib/state/cloudflare-state-store.js

@@ -19,10 +19,10 @@ export class CloudflareStateStore extends StateStoreProxy {
     options;
     constructor(scope, options = {}) {
         super(scope);
-        const stateToken = options.stateToken ?? alchemy.secret(process.env.ALCHEMY_STATE_TOKEN);
-        if (!stateToken) {
-            throw new Error("Missing token for DOStateStore. Please set ALCHEMY_STATE_TOKEN in the environment or set the `stateToken` option in the DOStateStore constructor.");
+        if (!options.stateToken && !process.env.ALCHEMY_STATE_TOKEN) {
+            throw new Error("Missing token for CloudflareStateStore. Please set ALCHEMY_STATE_TOKEN in the environment or set the `stateToken` option in the CloudflareStateStore constructor. See https://alchemy.run/guides/cloudflare-state-store/");
         }
+        const stateToken = options.stateToken ?? alchemy.secret(process.env.ALCHEMY_STATE_TOKEN);
         this.options = {
             ...options,
             stateToken: stateToken,

package/lib/state/cloudflare-state-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare-state-store.js","sourceRoot":"","sources":["../../src/state/cloudflare-state-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAsB7C;;;;GAIG;AACH,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IACvD,OAAO,CAA+D;IACtE,YAAY,KAAY,EAAE,UAAuC,EAAE;QACjE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,mJAAmJ,CACpJ,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC9B,MAAM,OAAO,GAGT;gBACF,MAAM;gBACN,MAAM;gBACN,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;aACrC,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;gBACpC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;oBAChC,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aAC9B,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,gCAAgC,QAAQ,CAAC,MAAM,qCAAqC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAC5J,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAElC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,gCAAgC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,EAAE,CAClG,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,SAAS,GAAG,OAAO,CACvB,KAAK,EACH,OAEC,EACD,EAAE;IACF,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,uBAAuB,CAAC;IACjE,MAAM,KAAK,GACT,OAAO,CAAC,UAAU;QAClB,OAAO,CAAC,MAAM,CAAC,GAAG,CAChB,qBAAqB,EACrB,SAAS,EACT,mJAAmJ,CACpJ,CAAC;IAEJ,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtD,uBAAuB,CAAC,wBAAwB,CAAC;QACjD,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC;QAClC,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC;KACpC,CAAC,CAAC;IACH,IACE,CAAC,QAAQ;QACT,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;QACnC,OAAO,CAAC,WAAW,EACnB,CAAC;QACD,MAAM,CAAC,GAAG,CACR,0BAA0B,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,KAAK,CAClE,CAAC;QACF,MAAM,SAAS,CAAC,GAAG,EAAE;YACnB,UAAU,EAAE,UAAU;YACtB,iBAAiB,EAAE,0BAA0B;YAC7C,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,MAAM,CAAC,MAAM;YAC3B,kBAAkB,EAAE,EAAE;YACtB,QAAQ,EAAE;gBACR,KAAK,EAAE,sBAAsB,CAAC,UAAU,EAAE;oBACxC,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,IAAI;iBACb,CAAC;gBACF,WAAW,EAAE,KAAK;aACnB;YACD,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,UAAU,IAAI,MAAM,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC;IAClF,MAAM,cAAc,CAAC,GAAG,EAAE,CACxB,KAAK,CAAC,GAAG,EAAE;QACT,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,WAAW,EAAE,EAAE;KAC1D,CAAC,CACH,CAAC;IACF,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;AAC3C,CAAC,CACF,CAAC;AAEF,KAAK,UAAU,cAAc,CAAC,EAA2B;IACvD,oEAAoE;IACpE,IAAI,IAA0B,CAAC;IAC/B,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,6MAA6M,CAC9M,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,GAAG,GAAG,CAAC;QACX,kCAAkC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,KAAK,CAAC;QAC3C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC;QACpE,KAAK,IAAI,GAAG,CAAC,CAAC,sCAAsC;QACpD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,oBAAoB;IACtD,CAAC;IACD,MAAM,IAAI,KAAK,CACb,uDAAuD,IAAI,EAAE,MAAM,IAAI,IAAI,EAAE,UAAU,EAAE,CAC1F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cloudflare-state-store.js","sourceRoot":"","sources":["../../src/state/cloudflare-state-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAsB7C;;;;GAIG;AACH,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IACvD,OAAO,CAA+D;IACtE,YAAY,KAAY,EAAE,UAAuC,EAAE;QACjE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CACb,0NAA0N,CAC3N,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC9B,MAAM,OAAO,GAGT;gBACF,MAAM;gBACN,MAAM;gBACN,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;aACrC,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;gBACpC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;oBAChC,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aAC9B,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,gCAAgC,QAAQ,CAAC,MAAM,qCAAqC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAC5J,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAElC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,gCAAgC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,EAAE,CAClG,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,SAAS,GAAG,OAAO,CACvB,KAAK,EACH,OAEC,EACD,EAAE;IACF,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,uBAAuB,CAAC;IACjE,MAAM,KAAK,GACT,OAAO,CAAC,UAAU;QAClB,OAAO,CAAC,MAAM,CAAC,GAAG,CAChB,qBAAqB,EACrB,SAAS,EACT,mJAAmJ,CACpJ,CAAC;IAEJ,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtD,uBAAuB,CAAC,wBAAwB,CAAC;QACjD,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC;QAClC,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC;KACpC,CAAC,CAAC;IACH,IACE,CAAC,QAAQ;QACT,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;QACnC,OAAO,CAAC,WAAW,EACnB,CAAC;QACD,MAAM,CAAC,GAAG,CACR,0BAA0B,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,KAAK,CAClE,CAAC;QACF,MAAM,SAAS,CAAC,GAAG,EAAE;YACnB,UAAU,EAAE,UAAU;YACtB,iBAAiB,EAAE,0BAA0B;YAC7C,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,MAAM,CAAC,MAAM;YAC3B,kBAAkB,EAAE,EAAE;YACtB,QAAQ,EAAE;gBACR,KAAK,EAAE,sBAAsB,CAAC,UAAU,EAAE;oBACxC,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,IAAI;iBACb,CAAC;gBACF,WAAW,EAAE,KAAK;aACnB;YACD,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,UAAU,IAAI,MAAM,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC;IAClF,MAAM,cAAc,CAAC,GAAG,EAAE,CACxB,KAAK,CAAC,GAAG,EAAE;QACT,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,WAAW,EAAE,EAAE;KAC1D,CAAC,CACH,CAAC;IACF,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;AAC3C,CAAC,CACF,CAAC;AAEF,KAAK,UAAU,cAAc,CAAC,EAA2B;IACvD,oEAAoE;IACpE,IAAI,IAA0B,CAAC;IAC/B,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,6MAA6M,CAC9M,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,GAAG,GAAG,CAAC;QACX,kCAAkC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,KAAK,CAAC;QAC3C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC;QACpE,KAAK,IAAI,GAAG,CAAC,CAAC,sCAAsC;QACpD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,oBAAoB;IACtD,CAAC;IACD,MAAM,IAAI,KAAK,CACb,uDAAuD,IAAI,EAAE,MAAM,IAAI,IAAI,EAAE,UAAU,EAAE,CAC1F,CAAC;AACJ,CAAC"}

package/lib/test/bun.d.ts

@@ -32,8 +32,8 @@ type test = {
      * @param condition If true, test will be skipped
      */
     skipIf(condition: boolean): test;
-    beforeAll(fn: (scope: Scope) => Promise<void>): void;
-    afterAll(fn: (scope: Scope) => Promise<void>): void;
+    beforeAll(fn: (scope: Scope) => Promise<void>, timeout?: number): void;
+    afterAll(fn: (scope: Scope) => Promise<void>, timeout?: number): void;
     /**
      * Current test scope
      */