@node-core/utils 7.0.1 → 7.0.3

package/lib/auth.js

@@ -7,7 +7,7 @@ import { clearCachedConfig, encryptValue, getMergedConfig, getNcurcPath } from '
 
 export default lazy(auth);
 
-function check(username, token, format = /^[A-Za-z0-9_]+$/) {
+function check(username, token, format = /^[A-Za-z0-9\-_.]+$/) {
   if (typeof username !== 'string') {
     throw new Error(`username must be a string, received ${typeof username}`);
   }

package/lib/pr_data.js

@@ -60,11 +60,30 @@ export default class PRData {
       this.getThreadData(),
       this.getCommits()
     ]).then(() => {
+      this.mergeHeadCommitChecks();
       this.cli.stopSpinner(`Done loading data for ${prStr}`);
     });
     this.analyzeReviewers();
   }
 
+  mergeHeadCommitChecks() {
+    const headCommit = this.pr.headCommit?.nodes?.[0]?.commit;
+    delete this.pr.headCommit;
+
+    const lastCommit = this.commits.at(-1)?.commit;
+    if (headCommit === undefined && lastCommit === undefined) {
+      return;
+    }
+
+    if (headCommit?.oid !== lastCommit?.oid) {
+      throw new Error(
+        'Unable to match pull request head commit while loading data');
+    }
+
+    lastCommit.checkSuites = headCommit.checkSuites;
+    lastCommit.status = headCommit.status;
+  }
+
   analyzeReviewers() {
     this.reviewers = new ReviewAnalyzer(this).getReviewers();
   }

package/lib/queries/PR.gql

@@ -23,6 +23,35 @@ query PR($prid: Int!, $owner: String!, $repo: String!) {
           path
         }
       },
+      # CI data is only consumed for the pull request's head commit. Querying
+      # it for every commit multiplies the GraphQL rate-limit cost.
+      headCommit: commits(last: 1) {
+        nodes {
+          commit {
+            oid
+            checkSuites(first: 100) {
+              nodes {
+                app {
+                  slug
+                }
+                conclusion,
+                status,
+                checkRuns(first: 40) {
+                  nodes {
+                    name
+                    status
+                    conclusion
+                    detailsUrl
+                  }
+                }
+              }
+            }
+            status {
+              state
+            }
+          }
+        }
+      },
       title,
       baseRefName,
       headRefName,

package/lib/queries/PRCommits.gql

@@ -25,26 +25,6 @@ query Commits($prid: Int!, $owner: String!, $repo: String!, $after: String) {
             message
             messageHeadline
             authoredByCommitter
-            checkSuites(first: 100) {
-              nodes {
-                app {
-                  slug
-                }
-                conclusion,
-                status,
-                checkRuns(first: 40) {
-                  nodes {
-                    name
-                    status
-                    conclusion
-                    detailsUrl
-                  }
-                }
-              }
-            }
-            status {
-              state
-            }
           }
         }
       }

package/lib/reviews.js

@@ -83,7 +83,7 @@ export class ReviewAnalyzer {
       switch (r.state) {
         case APPROVED:
         case CHANGES_REQUESTED:
-          // Overwrite previous reviews, whether initalized or not
+          // Overwrite previous reviews, whether initialized or not
           map.set(
             login,
             new Review(r.state, r.publishedAt, r.url, FROM_REVIEW)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {