[Fix] pr inference

ljharb · Jan 5, 2022 · 792bd5d · 792bd5d
1 parent 0966e95
commit 792bd5d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 67 deletions.
diff --git a/bin/can-merge b/bin/can-merge
@@ -115,7 +115,7 @@ function outputStatus(response) {
 	if (NODE_ENV === 'DEBUG') {
 		console.log(JSON.stringify(response, null, 2));
 	}
-	const prs = parsePullRequest(response.repository);
+	const prs = parsePullRequest(response);
 	if (prs.length === 0) {
 		console.info(chalk.redBright(`⚠ This remote repository does not contain any pull requests matching sha: ${args.sha}`));
 		process.exitCode = 1;

diff --git a/utils/buildQuery.js b/utils/buildQuery.js
@@ -1,45 +1,45 @@
 'use strict';
 
 const pullRequestQuery = () => `
+state
+url
+title
+number
+merged
+mergeable
+reviewDecision
+potentialMergeCommit {
+  commitUrl
+}
+commits(last: 1) {
+  nodes {
+    commit {
+      statusCheckRollup {
         state
-        url
-        title
-        number
-        merged
-        mergeable
-        reviewDecision
-        potentialMergeCommit {
-          commitUrl
-        }
-        commits(last: 1) {
+        contexts(last: 100) {
+          totalCount
+          pageInfo {
+            endCursor
+            hasNextPage
+          }
           nodes {
-            commit {
-              statusCheckRollup {
-                state
-                contexts(last: 100) {
-                  totalCount
-                  pageInfo {
-                    endCursor
-                    hasNextPage
-                  }
-                  nodes {
-                    __typename
-                    ... on CheckRun {
-                      status
-                      name
-                      conclusion
-                    }
-                    ... on StatusContext {
-                      state
-                      context
-                      description
-                    }
-                  }
-                }
-              }
+            __typename
+            ... on CheckRun {
+              status
+              name
+              conclusion
+            }
+            ... on StatusContext {
+              state
+              context
+              description
             }
           }
         }
+      }
+    }
+  }
+}
 `;
 
 module.exports = function buildQuery({
@@ -49,37 +49,17 @@ module.exports = function buildQuery({
 	sha,
 }) {
 	return `
-      {
-        repository(owner: "${owner}", name: "${name}") {
-          branchProtectionRules(first: 10) {
-            nodes {
-              requiresStatusChecks
-              requiredApprovingReviewCount
-              requiredStatusCheckContexts
-            }
+  {
+    search(query: "is:open is:pr repo:${owner}/${name} ${sha ? `sha:${sha}` : ''} ${pr ? `pr: ${pr}` : ''}", type:ISSUE, first: 100) {
+      issueCount
+      edges {
+        node {
+          ... on PullRequest {
+          ${pullRequestQuery()}
           }
-          ${pr ? `pullRequest(number: ${pr}) {
-            ${pullRequestQuery()}
-          }` : sha ? `commit: object(expression: "${sha}") {
-            ... on Commit {
-                associatedPullRequests(first:50){
-                  edges{
-                    node{
-                      ${pullRequestQuery()}
-                    }
-                  }
-                }
-            }
-          }` : `pullRequests(first: 100) {
-            nodes {
-              ${pullRequestQuery()}
-            }
-          }`}
-        }
-        rateLimit {
-          cost
-          remaining
         }
       }
+    }
+  }
     `;
 };
diff --git a/utils/parsePullRequest.js b/utils/parsePullRequest.js
@@ -1,9 +1,7 @@
 'use strict';
 
 module.exports = function parsePullRequest(response) {
-	return response.pullRequest
-		? [response.pullRequest]
-		: response.commit?.associatedPullRequests.edges.flatMap(({ node }) => node)
+	return response.search.edges.flatMap(({ node }) => node)
 			|| response.pullRequests?.nodes
 			|| [];
 };