alchemy 0.12.20 → 0.13.0

package/src/github/client.ts

@@ -48,7 +48,7 @@ export async function getGitHubToken(token?: string): Promise<string | null> {
  * @returns An authenticated Octokit client
  */
 export async function createGitHubClient(
-  options: { token?: string } = {}
+  options: { token?: string } = {},
 ): Promise<Octokit> {
   const token = await getGitHubToken(options.token);
 
@@ -67,7 +67,7 @@ export async function createGitHubClient(
 export async function verifyGitHubAuth(
   octokit: Octokit,
   owner: string,
-  repo: string
+  repo: string,
 ): Promise<void> {
   try {
     // Make a test request to check authentication
@@ -78,38 +78,39 @@ export async function verifyGitHubAuth(
   } catch (error: any) {
     if (error.status === 401) {
       console.error(
-        "\n⚠️ GitHub authentication failed. Please try one of the following:"
+        "\n⚠️ GitHub authentication failed. Please try one of the following:",
       );
       console.error(
-        "1. Run 'gh auth login' to authenticate with the GitHub CLI"
+        "1. Run 'gh auth login' to authenticate with the GitHub CLI",
       );
       console.error(
-        "2. Set the GITHUB_TOKEN environment variable with a personal access token"
+        "2. Set the GITHUB_TOKEN environment variable with a personal access token",
       );
       console.error("3. Pass a token directly to the constructor");
       console.error(
-        "\nTo create a token, visit: https://github.com/settings/tokens"
+        "\nTo create a token, visit: https://github.com/settings/tokens",
       );
       console.error(
-        "Required scopes: 'repo' for private repos or 'public_repo' for public repos\n"
+        "Required scopes: 'repo' for private repos or 'public_repo' for public repos\n",
       );
       throw new Error("GitHub authentication failed");
-    } else if (error.status === 403) {
+    }
+    if (error.status === 403) {
       console.error(
-        "\n⚠️ Insufficient permissions. You need admin access to the repository."
+        "\n⚠️ Insufficient permissions. You need admin access to the repository.",
       );
       console.error(
-        "Make sure your token has the 'repo' scope for private repos or 'public_repo' for public repos\n"
+        "Make sure your token has the 'repo' scope for private repos or 'public_repo' for public repos\n",
       );
       throw new Error("Insufficient GitHub permissions");
-    } else if (error.status === 404) {
+    }
+    if (error.status === 404) {
       console.error(`\n⚠️ Repository not found: ${owner}/${repo}`);
       console.error(
-        "Make sure the repository exists and you have access to it\n"
+        "Make sure the repository exists and you have access to it\n",
       );
       throw new Error("GitHub repository not found");
-    } else {
-      throw error;
     }
+    throw error;
   }
 }

package/src/github/repository-environment.ts

@@ -174,7 +174,7 @@ export const RepositoryEnvironment = Resource(
   async function (
     this: Context<RepositoryEnvironment>,
     id: string,
-    props: RepositoryEnvironmentProps
+    props: RepositoryEnvironmentProps,
   ): Promise<RepositoryEnvironment> {
     // Create authenticated Octokit client
     const octokit = await createGitHubClient({
@@ -207,138 +207,98 @@ export const RepositoryEnvironment = Resource(
 
       // Return void (a deleted resource has no content)
       return this.destroy();
-    } else {
+    }
+    try {
+      // Check if the environment already exists
+      let environmentId: number | undefined = undefined; // Use undefined instead of 0
       try {
-        // Check if the environment already exists
-        let environmentId: number | undefined = undefined; // Use undefined instead of 0
-        try {
-          const { data: environments } =
-            await octokit.rest.repos.getAllEnvironments({
-              owner: props.owner,
-              repo: props.repository,
-            });
+        const { data: environments } =
+          await octokit.rest.repos.getAllEnvironments({
+            owner: props.owner,
+            repo: props.repository,
+          });
 
-          const existingEnv = environments.environments?.find(
-            (env) => env.name.toLowerCase() === props.name.toLowerCase()
-          );
+        const existingEnv = environments.environments?.find(
+          (env) => env.name.toLowerCase() === props.name.toLowerCase(),
+        );
 
-          if (existingEnv?.id) {
-            environmentId = existingEnv.id;
-          }
-        } catch (error: any) {
-          // If it's a 404, the environment doesn't exist, which is fine
-          if (error.status !== 404) {
-            throw error;
-          }
+        if (existingEnv?.id) {
+          environmentId = existingEnv.id;
         }
+      } catch (error: any) {
+        // If it's a 404, the environment doesn't exist, which is fine
+        if (error.status !== 404) {
+          throw error;
+        }
+      }
 
-        // Convert reviewers to API format
-        const reviewers: { type: "User" | "Team"; id: number }[] = [];
-
-        // Process user reviewers
-        if (props.reviewers?.users && props.reviewers.users.length > 0) {
-          for (const user of props.reviewers.users) {
-            if (typeof user === "number") {
-              // If a numeric ID is provided, use it directly
-              reviewers.push({
-                type: "User" as const,
-                id: user,
-              });
-            } else {
-              // If a username string is provided, look up the ID
-              const { data: userData } = await octokit.rest.users.getByUsername(
-                {
-                  username: user,
-                }
-              );
+      // Convert reviewers to API format
+      const reviewers: { type: "User" | "Team"; id: number }[] = [];
+
+      // Process user reviewers
+      if (props.reviewers?.users && props.reviewers.users.length > 0) {
+        for (const user of props.reviewers.users) {
+          if (typeof user === "number") {
+            // If a numeric ID is provided, use it directly
+            reviewers.push({
+              type: "User" as const,
+              id: user,
+            });
+          } else {
+            // If a username string is provided, look up the ID
+            const { data: userData } = await octokit.rest.users.getByUsername({
+              username: user,
+            });
 
-              reviewers.push({
-                type: "User" as const,
-                id: userData.id,
-              });
-            }
+            reviewers.push({
+              type: "User" as const,
+              id: userData.id,
+            });
           }
         }
+      }
 
-        // Process team reviewers
-        if (props.reviewers?.teams && props.reviewers.teams.length > 0) {
-          for (const team of props.reviewers.teams) {
-            if (typeof team === "number") {
-              // If a numeric ID is provided, use it directly
-              reviewers.push({
-                type: "Team" as const,
-                id: team,
-              });
-            } else {
-              // If a team name string is provided, look up the ID
-              // Check if team name is in the format 'org/team-name'
-              const teamParts = team.includes("/")
-                ? team.split("/")
-                : [props.owner, team];
-
-              if (teamParts.length !== 2) {
-                throw new Error(
-                  `Invalid team format: ${team}. Expected format: "org/team-slug" or just "team-slug"`
-                );
-              }
+      // Process team reviewers
+      if (props.reviewers?.teams && props.reviewers.teams.length > 0) {
+        for (const team of props.reviewers.teams) {
+          if (typeof team === "number") {
+            // If a numeric ID is provided, use it directly
+            reviewers.push({
+              type: "Team" as const,
+              id: team,
+            });
+          } else {
+            // If a team name string is provided, look up the ID
+            // Check if team name is in the format 'org/team-name'
+            const teamParts = team.includes("/")
+              ? team.split("/")
+              : [props.owner, team];
+
+            if (teamParts.length !== 2) {
+              throw new Error(
+                `Invalid team format: ${team}. Expected format: "org/team-slug" or just "team-slug"`,
+              );
+            }
 
-              const [org, teamSlug] = teamParts;
+            const [org, teamSlug] = teamParts;
 
-              const { data: teamData } = await octokit.rest.teams.getByName({
-                org,
-                team_slug: teamSlug,
-              });
+            const { data: teamData } = await octokit.rest.teams.getByName({
+              org,
+              team_slug: teamSlug,
+            });
 
-              reviewers.push({
-                type: "Team" as const,
-                id: teamData.id,
-              });
-            }
+            reviewers.push({
+              type: "Team" as const,
+              id: teamData.id,
+            });
           }
         }
+      }
 
-        // Create or update the environment
-        if (environmentId === undefined) {
-          // Create the environment
-          const { data: createdEnv } =
-            await octokit.rest.repos.createOrUpdateEnvironment({
-              owner: props.owner,
-              repo: props.repository,
-              environment_name: props.name,
-              wait_timer: props.waitTimer,
-              prevent_self_review: props.preventSelfReview,
-              reviewers: reviewers.length > 0 ? reviewers : undefined,
-              deployment_branch_policy: props.deploymentBranchPolicy
-                ? {
-                    protected_branches:
-                      props.deploymentBranchPolicy.protectedBranches ?? false,
-                    custom_branch_policies:
-                      props.deploymentBranchPolicy.customBranchPolicies ??
-                      false,
-                  }
-                : undefined,
-            });
-
-          environmentId = createdEnv.id;
-
-          // If there are specific branch patterns, set them
-          if (
-            props.deploymentBranchPolicy?.customBranchPolicies === true &&
-            props.branchPatterns &&
-            props.branchPatterns.length > 0
-          ) {
-            // Add branch patterns one by one
-            for (const pattern of props.branchPatterns) {
-              await octokit.rest.repos.createDeploymentBranchPolicy({
-                owner: props.owner,
-                repo: props.repository,
-                environment_name: props.name,
-                name: pattern,
-              });
-            }
-          }
-        } else {
-          // Update the environment
+      // Create or update the environment
+      if (environmentId === undefined) {
+        // Create the environment
+        const { data: createdEnv } =
           await octokit.rest.repos.createOrUpdateEnvironment({
             owner: props.owner,
             repo: props.repository,
@@ -356,114 +316,150 @@ export const RepositoryEnvironment = Resource(
               : undefined,
           });
 
-          // If there are specific branch patterns, update them
-          if (props.deploymentBranchPolicy?.customBranchPolicies === true) {
-            // Get existing branch policies to understand what's currently configured
-            const { data: existingPolicies } =
-              await octokit.rest.repos.listDeploymentBranchPolicies({
-                owner: props.owner,
-                repo: props.repository,
-                environment_name: props.name,
-              });
+        environmentId = createdEnv.id;
 
-            const existingPatterns = existingPolicies.branch_policies.map(
-              (policy) => policy.name!
-            );
+        // If there are specific branch patterns, set them
+        if (
+          props.deploymentBranchPolicy?.customBranchPolicies === true &&
+          props.branchPatterns &&
+          props.branchPatterns.length > 0
+        ) {
+          // Add branch patterns one by one
+          for (const pattern of props.branchPatterns) {
+            await octokit.rest.repos.createDeploymentBranchPolicy({
+              owner: props.owner,
+              repo: props.repository,
+              environment_name: props.name,
+              name: pattern,
+            });
+          }
+        }
+      } else {
+        // Update the environment
+        await octokit.rest.repos.createOrUpdateEnvironment({
+          owner: props.owner,
+          repo: props.repository,
+          environment_name: props.name,
+          wait_timer: props.waitTimer,
+          prevent_self_review: props.preventSelfReview,
+          reviewers: reviewers.length > 0 ? reviewers : undefined,
+          deployment_branch_policy: props.deploymentBranchPolicy
+            ? {
+                protected_branches:
+                  props.deploymentBranchPolicy.protectedBranches ?? false,
+                custom_branch_policies:
+                  props.deploymentBranchPolicy.customBranchPolicies ?? false,
+              }
+            : undefined,
+        });
 
-            const newPatterns: string[] = props.branchPatterns || [];
+        // If there are specific branch patterns, update them
+        if (props.deploymentBranchPolicy?.customBranchPolicies === true) {
+          // Get existing branch policies to understand what's currently configured
+          const { data: existingPolicies } =
+            await octokit.rest.repos.listDeploymentBranchPolicies({
+              owner: props.owner,
+              repo: props.repository,
+              environment_name: props.name,
+            });
 
-            // For updates, keep track of which branch policies we should manage
-            // This set identifies patterns that were previously managed by this resource
-            // If we don't have previous props, use an empty set
-            const previouslyManagedPatterns: Set<string> = new Set(
-              this.phase === "update" &&
-              this.props?.deploymentBranchPolicy?.customBranchPolicies === true
-                ? this.props.branchPatterns || []
-                : []
-            );
+          const existingPatterns = existingPolicies.branch_policies.map(
+            (policy) => policy.name!,
+          );
 
-            // Patterns to add (in new config but not in existing)
-            const patternsToAdd = newPatterns.filter(
-              (pattern) => !existingPatterns.includes(pattern)
-            );
+          const newPatterns: string[] = props.branchPatterns || [];
 
-            // Patterns to delete (were managed by us previously but not in new config)
-            const patternsToDelete = existingPatterns.filter(
-              (pattern) =>
-                previouslyManagedPatterns.has(pattern) &&
-                !newPatterns.includes(pattern)
-            );
+          // For updates, keep track of which branch policies we should manage
+          // This set identifies patterns that were previously managed by this resource
+          // If we don't have previous props, use an empty set
+          const previouslyManagedPatterns: Set<string> = new Set(
+            this.phase === "update" &&
+              this.props?.deploymentBranchPolicy?.customBranchPolicies === true
+              ? this.props.branchPatterns || []
+              : [],
+          );
 
-            // Delete policies that are no longer needed
-            for (const patternToDelete of patternsToDelete) {
-              const policy = existingPolicies.branch_policies.find(
-                (p) => p.name === patternToDelete
-              );
+          // Patterns to add (in new config but not in existing)
+          const patternsToAdd = newPatterns.filter(
+            (pattern) => !existingPatterns.includes(pattern),
+          );
 
-              if (policy?.id) {
-                await octokit.rest.repos.deleteDeploymentBranchPolicy({
-                  owner: props.owner,
-                  repo: props.repository,
-                  environment_name: props.name,
-                  branch_policy_id: policy.id,
-                });
-              }
-            }
+          // Patterns to delete (were managed by us previously but not in new config)
+          const patternsToDelete = existingPatterns.filter(
+            (pattern) =>
+              previouslyManagedPatterns.has(pattern) &&
+              !newPatterns.includes(pattern),
+          );
 
-            // Add new branch patterns
-            for (const pattern of patternsToAdd) {
-              await octokit.rest.repos.createDeploymentBranchPolicy({
+          // Delete policies that are no longer needed
+          for (const patternToDelete of patternsToDelete) {
+            const policy = existingPolicies.branch_policies.find(
+              (p) => p.name === patternToDelete,
+            );
+
+            if (policy?.id) {
+              await octokit.rest.repos.deleteDeploymentBranchPolicy({
                 owner: props.owner,
                 repo: props.repository,
                 environment_name: props.name,
-                name: pattern,
+                branch_policy_id: policy.id,
               });
             }
           }
-        }
 
-        // Get the updated environment details
-        const { data: env } = await octokit.rest.repos.getEnvironment({
-          owner: props.owner,
-          repo: props.repository,
-          environment_name: props.name,
-        });
-
-        // Return environment details
-        return this({
-          id: `${props.owner}/${props.repository}/${props.name}`,
-          environmentId: environmentId || env.id,
-          owner: props.owner,
-          repository: props.repository,
-          name: props.name,
-          waitTimer: props.waitTimer,
-          preventSelfReview: props.preventSelfReview,
-          adminBypass: props.adminBypass,
-          reviewers: props.reviewers,
-          deploymentBranchPolicy: props.deploymentBranchPolicy,
-          branchPatterns: props.branchPatterns,
-          token: props.token,
-          updatedAt: new Date().toISOString(),
-        });
-      } catch (error: any) {
-        if (
-          error.status === 403 &&
-          error.message?.includes("Must have admin rights")
-        ) {
-          console.error(
-            "\n⚠️ Error creating/updating GitHub environment: You must have admin rights to the repository."
-          );
-          console.error(
-            "Make sure your GitHub token has the required permissions (repo scope for private repos).\n"
-          );
-        } else {
-          console.error(
-            "Error creating/updating GitHub environment:",
-            error.message
-          );
+          // Add new branch patterns
+          for (const pattern of patternsToAdd) {
+            await octokit.rest.repos.createDeploymentBranchPolicy({
+              owner: props.owner,
+              repo: props.repository,
+              environment_name: props.name,
+              name: pattern,
+            });
+          }
         }
-        throw error;
       }
+
+      // Get the updated environment details
+      const { data: env } = await octokit.rest.repos.getEnvironment({
+        owner: props.owner,
+        repo: props.repository,
+        environment_name: props.name,
+      });
+
+      // Return environment details
+      return this({
+        id: `${props.owner}/${props.repository}/${props.name}`,
+        environmentId: environmentId || env.id,
+        owner: props.owner,
+        repository: props.repository,
+        name: props.name,
+        waitTimer: props.waitTimer,
+        preventSelfReview: props.preventSelfReview,
+        adminBypass: props.adminBypass,
+        reviewers: props.reviewers,
+        deploymentBranchPolicy: props.deploymentBranchPolicy,
+        branchPatterns: props.branchPatterns,
+        token: props.token,
+        updatedAt: new Date().toISOString(),
+      });
+    } catch (error: any) {
+      if (
+        error.status === 403 &&
+        error.message?.includes("Must have admin rights")
+      ) {
+        console.error(
+          "\n⚠️ Error creating/updating GitHub environment: You must have admin rights to the repository.",
+        );
+        console.error(
+          "Make sure your GitHub token has the required permissions (repo scope for private repos).\n",
+        );
+      } else {
+        console.error(
+          "Error creating/updating GitHub environment:",
+          error.message,
+        );
+      }
+      throw error;
     }
-  }
+  },
 );