@node-core/utils 7.0.2 → 7.1.0

package/components/git/metadata.js

@@ -2,7 +2,7 @@ import { parsePRFromURL } from '../../lib/links.js';
 import { getMetadata } from '../metadata.js';
 import CLI from '../../lib/cli.js';
 import { getMergedConfig } from '../../lib/config.js';
-import { runPromise, IGNORE } from '../../lib/run.js';
+import { runPromise, reportError, IGNORE } from '../../lib/run.js';
 
 export const command = 'metadata <identifier>';
 export const describe =
@@ -67,7 +67,7 @@ export async function writeMetadataJsonResult(metadataPromise) {
     await writeStdout(`${JSON.stringify(json, null, 2)}\n`);
     process.exitCode = json.exitCode;
   } catch (error) {
-    console.error(error);
+    reportError(error);
     process.exitCode = 1;
   }
 }

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_checker.js

@@ -24,6 +24,7 @@ const WAIT_TIME_MULTI_APPROVAL = 24 * 2;
 const WAIT_TIME_SINGLE_APPROVAL = 24 * 7;
 
 const GITHUB_SUCCESS_CONCLUSIONS = ['SUCCESS', 'NEUTRAL', 'SKIPPED'];
+const GITHUB_ACTIONS_APP = 'github-actions';
 
 const FAST_TRACK_RE = /^Fast-track has been requested by @(.+?)\. Please 👍 to approve\.$/;
 const FAST_TRACK_MIN_APPROVALS = 2;
@@ -459,16 +460,9 @@ export default class PRChecker {
     const pendingJobs = [];
 
     // GitHub new Check API
-    for (const { status, conclusion, app, checkRuns } of checkSuites.nodes) {
-      if (app.slug !== 'github-actions') {
-        // Ignore all non-github check suites, such as Dependabot and Codecov.
-        // They are expected to show up on PRs whose head branch is not on a
-        // fork and never complete.
-        continue;
-      }
-
+    for (const { status, conclusion, checkRuns } of checkSuites.nodes) {
       if (status !== 'COMPLETED') {
-        pendingJobs.push({ app: app.slug, status, conclusion });
+        pendingJobs.push({ status, conclusion });
         continue;
       }
 
@@ -499,13 +493,13 @@ export default class PRChecker {
           // Fallback to check suite level information if no checkRuns
           if (conclusion === 'CANCELLED') {
             cancelledJobs.push({
-              name: app.slug,
+              name: GITHUB_ACTIONS_APP,
               conclusion,
               url: null
             });
           } else {
             failedJobs.push({
-              name: app.slug,
+              name: GITHUB_ACTIONS_APP,
               conclusion,
               url: null
             });

package/lib/queries/PR.gql

@@ -29,11 +29,12 @@ query PR($prid: Int!, $owner: String!, $repo: String!) {
         nodes {
           commit {
             oid
-            checkSuites(first: 100) {
+            # 15368 is the GitHub Actions App ID on GitHub.com. Filtering avoids
+            # querying App metadata that GITHUB_TOKEN cannot read for suites
+            # created by third-party Apps such as Jenkins and Codecov.
+            # https://api.github.com/apps/github-actions
+            checkSuites(first: 100, filterBy: { appId: 15368 }) {
               nodes {
-                app {
-                  slug
-                }
                 conclusion,
                 status,
                 checkRuns(first: 40) {

package/lib/request.js

@@ -335,11 +335,12 @@ export default class Request {
     };
 
     const result = await this.json(url, options);
-    if (result.errors) {
+    if (result.errors?.length > 0) {
       const { type, message } = result.errors[0];
       const err = new Error(`[${type}] GraphQL request Error: ${message}`);
       err.data = {
-        variables
+        variables,
+        errors: result.errors
       };
       throw err;
     }

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/lib/run.js

@@ -8,6 +8,13 @@ import {
 
 export const IGNORE = '__ignore__';
 
+export function reportError(error, write = console.error) {
+  write(error?.stack ?? error);
+  if (error?.data !== undefined) {
+    write(JSON.stringify(error.data, null, 2));
+  }
+}
+
 function runAsyncBase(cmd, args, {
   ignoreFailure = true,
   spawnArgs,
@@ -72,7 +79,7 @@ export function forceRunAsync(cmd, args, options) {
   return runAsyncBase(cmd, args, options).catch((error) => {
     if (error.message !== IGNORE) {
       if (!error.messageOnly) {
-        console.error(error);
+        reportError(error);
       }
       throw error;
     }
@@ -82,7 +89,7 @@ export function forceRunAsync(cmd, args, options) {
 export function runPromise(promise) {
   return promise.catch((error) => {
     if (error.message !== IGNORE) {
-      console.error(error);
+      reportError(error);
     }
     exit();
   });

package/package.json

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