alchemy 0.71.1 → 0.73.0

package/src/planetscale/password.ts

@@ -22,8 +22,9 @@ export interface PasswordProps extends PlanetScaleProps {
   /**
    * The organization ID where the password will be created
    * Required when using string database name, optional when using Database or Branch resource
+   * @default process.env.PLANETSCALE_ORGANIZATION
    */
-  organizationId?: string;
+  organization?: string;
 
   /**
    * The database where the password will be created
@@ -114,7 +115,7 @@ export interface Password extends PasswordProps {
  *
  * const readerPassword = await Password("app-reader", {
  *   name: "app-reader",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   database: "my-app-db",
  *   branch: "main",
  *   role: "reader"
@@ -136,7 +137,7 @@ export interface Password extends PasswordProps {
  *
  * const writerPassword = await Password("app-writer", {
  *   name: "app-writer",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   database: "my-app-db",
  *   branch: "development",
  *   role: "writer",
@@ -157,7 +158,7 @@ export interface Password extends PasswordProps {
  *
  * const adminPassword = await Password("admin-access", {
  *   name: "admin-access",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   database: "my-app-db",
  *   branch: "main",
  *   role: "admin",
@@ -176,7 +177,7 @@ export interface Password extends PasswordProps {
  *
  * const password = await Password("custom-auth", {
  *   name: "custom-auth",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   database: "my-app-db",
  *   branch: "main",
  *   role: "readwriter",
@@ -194,7 +195,7 @@ export interface Password extends PasswordProps {
  *
  * const replicaPassword = await Password("replica-reader", {
  *   name: "replica-reader",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   database: "my-app-db",
  *   branch: "main",
  *   role: "reader",
@@ -211,7 +212,7 @@ export interface Password extends PasswordProps {
  *
  * const database = await Database("my-db", {
  *   name: "my-app-db",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   clusterSize: "PS_10"
  * });
  *
@@ -232,13 +233,13 @@ export interface Password extends PasswordProps {
  *
  * const database = await Database("my-db", {
  *   name: "my-app-db",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   clusterSize: "PS_10"
  * });
  *
  * const branch = await Branch("feature-branch", {
  *   name: "feature-branch",
- *   organizationId: "my-org",
+ *   organization: "my-org",
  *   databaseName: "my-app-db",
  *   parentBranch: "main",
  *   isProduction: false
@@ -266,19 +267,36 @@ export const Password = Resource(
     const name = `${(props.name ?? this.output?.name ?? this.scope.createPhysicalName(id)).toLowerCase()}-${nameSlug}`;
 
     const api = createPlanetScaleClient(props);
+    if (!props.organization && typeof props.database === "string") {
+      throw new Error(
+        "Organization ID is required when using string database 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
+        : typeof props.branch !== "string" && props.branch
+          ? props.branch.organization
+          : (process.env.PLANETSCALE_ORGANIZATION ??
+            process.env.PLANETSCALE_ORG_ID));
     const database =
-      typeof props.database === "string" ? props.database : props.database.name;
+      // @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);
     const branch =
       typeof props.branch === "string"
         ? props.branch
         : (props.branch?.name ?? "main");
-    const organization =
-      props.organizationId ??
-      ((typeof props.branch !== "string" && props.branch?.organizationId) ||
-        (typeof props.database !== "string" && props.database.organizationId));
-
     if (!organization) {
-      throw new Error("Organization ID is required");
+      throw new Error(
+        "PlanetScale organization is required. Please set the `organization` property or the `PLANETSCALE_ORGANIZATION` environment variable.",
+      );
     }
 
     if (this.phase === "delete") {

package/src/planetscale/role.ts

@@ -16,8 +16,9 @@ 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
+   * @default process.env.PLANETSCALE_ORGANIZATION
    */
-  organizationId?: string;
+  organization?: string;
 
   /**
    * The database where the role will be created
@@ -164,12 +165,21 @@ export const Role = Resource(
     props: RoleProps,
   ): Promise<Role> {
     const api = createPlanetScaleClient(props);
+
     const organization =
-      typeof props.branch === "object"
-        ? props.branch.organizationId
-        : typeof props.database === "object"
-          ? props.database.organizationId
-          : props.organizationId;
+      // @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));
+    if (!organization) {
+      throw new Error(
+        "PlanetScale organization is required. Please set the `organization` property or the `PLANETSCALE_ORGANIZATION` environment variable.",
+      );
+    }
+
     const database =
       typeof props.database === "string" ? props.database : props.database.name;
     const branch =
@@ -179,9 +189,6 @@ export const Role = Resource(
     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": {

package/workers/tunnel-proxy.js

@@ -34,7 +34,7 @@ var h={async fetch(e,r){let n=new URL(e.url);n.host=r.TUNNEL_HOST;let l=new Head
             Alchemy</a>.</p>
       </div>
       <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
-        <p class="text-sm text-slate-500">Alchemy 0.71.1</p>
+        <p class="text-sm text-slate-500">Alchemy 0.73.0</p>
       </div>
     </div>
   </body>