tweak

Author: Andarist

get-changed-packages.ts

@@ -15,6 +15,15 @@ import micromatch from "micromatch";
 import fetch from "node-fetch";
 import type { ProbotOctokit } from "probot";
 
+interface PackageJSON extends ChangesetPackageJSON {
+  workspaces?: Array<string> | { packages: Array<string> };
+  bolt?: { workspaces: Array<string> };
+}
+
+interface PnpmWorkspace {
+  packages: Array<string>;
+}
+
 export const getChangedPackages = async ({
   owner,
   repo,
@@ -63,11 +72,6 @@ export const getChangedPackages = async ({
     }
   }
 
-  interface PackageJSON extends ChangesetPackageJSON {
-    workspaces?: Array<string> | { packages: Array<string> };
-    bolt?: { workspaces: Array<string> };
-  }
-
   async function getPackage(pkgPath: string): Promise<{ dir: string; packageJson: PackageJSON }> {
     const jsonContent = await fetchJsonFile(pkgPath + "/package.json");
     return {
@@ -128,10 +132,6 @@ export const getChangedPackages = async ({
     | undefined;
 
   if (isPnpm) {
-    interface PnpmWorkspace {
-      packages: Array<string>;
-    }
-
     const pnpmWorkspaceContent = await fetchTextFile("pnpm-workspace.yaml");
     const pnpmWorkspace = safeLoad(pnpmWorkspaceContent) as PnpmWorkspace;
 

index.ts

@@ -151,13 +151,13 @@ export default (app: Probot) => {
         // deploying this doesn't cost money
         context.payload.action === "synchronize"
           ? getCommentId(context, { ...repo, issue_number: number })
-          : Promise.resolve(null),
+          : undefined,
         hasChangesetBeenAdded(changedFilesPromise),
         getChangedPackages({
           repo: context.payload.pull_request.head.repo.name,
           owner: context.payload.pull_request.head.repo.owner.login,
           ref: context.payload.pull_request.head.ref,
-          changedFiles: changedFilesPromise.then((x) => x.data.map(({ filename }) => filename)),
+          changedFiles: changedFilesPromise.then((files) => files.data.map(({ filename }) => filename)),
           octokit: context.octokit,
           installationToken: (
             await (await app.auth()).apps.createInstallationAccessToken({
@@ -176,7 +176,7 @@ export default (app: Probot) => {
             releasePlan: null,
           };
         }),
-      ] as const);
+      ]);
 
       let addChangesetUrl = `${context.payload.pull_request.head.repo.html_url}/new/${
         context.payload.pull_request.head.ref
@@ -195,7 +195,7 @@ export default (app: Probot) => {
           errFromFetchingChangedFiles,
       };
 
-      if (commentId !== null) {
+      if (typeof commentId === "number") {
         return context.octokit.issues.updateComment({
           ...prComment,
           comment_id: commentId,

test/index.test.ts

@@ -140,10 +140,10 @@ function usePrState(apiServer: ReturnType<typeof setupServer>, state: PrState) {
         >
       > = [];
       for (const [filename, file] of Object.entries(state.files)) {
-        if (typeof file !== "string") {
+        if (file && typeof file !== "string") {
           changedFiles.push({
             filename,
-            status: file![0].status,
+            status: file[0].status,
           });
         }
       }