@node-core/utils 7.2.0 → 7.2.2

package/lib/ci/build-types/normal_build.js

@@ -76,7 +76,7 @@ export class NormalBuild extends Job {
       if (!upstream) {
         return true;
       } else {
-        return this.jobUrl.includes(upstream + '');
+        return this.jobUrl.endsWith(`/${upstream}/`);
       }
     });
 

package/lib/ci/build-types/pr_build.js

@@ -1,4 +1,5 @@
 import { PR_TREE } from '../jenkins_constants.js';
+import { statusType } from '../ci_utils.js';
 import CIFailureParser from '../ci_failure_parser.js';
 import { TestBuild } from './test_build.js';
 import { CommitBuild } from './commit_build.js';
@@ -69,7 +70,7 @@ export class PRBuild extends TestBuild {
 
     // Get result from the sub build
     // assert.strictEqual(commitBuild.jobName, 'node-test-commit');
-    const allBuilds = commitBuild.build.subBuilds;
+    const allBuilds = commitBuild.build?.subBuilds;
     // TODO: fetch result, builtOn, timestamp in the commit build's own data
     // ..or maybe they do not worth an additional API call?
     // Note that we have to pass the actions down to detect resume builds.
@@ -78,6 +79,15 @@ export class PRBuild extends TestBuild {
     };
     const commitBuildId = commitBuild.buildNumber;
     this.commitBuild = new CommitBuild(cli, request, commitBuildId, this.skipMoreThan);
+    // Jenkins can retain the result after the nested build is no longer available.
+    if (!commitBuild.build) {
+      this.commitBuild.setBuildData(buildData);
+      this.failures = result === statusType.SUCCESS
+        ? []
+        : [new NCUFailure({ url: this.commitBuild.jobUrl }, 'Build data is unavailable')];
+      this.commitBuild.failures = this.failures;
+      return { result, builds: this.builds, failures: this.failures };
+    }
     const { builds, failures } = await this.commitBuild.getResults(buildData);
 
     // Set up aliases for display

package/lib/ci/build-types/test_build.js

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 
 import { shortSha } from '../../utils.js';
 import {
@@ -119,11 +119,11 @@ export class TestBuild extends Job {
       cli.table('Built On', failure.builtOn);
     }
     if (!reason.includes('\n') && reason.length < 40) {
-      cli.table('Reason', chalk.red(reason));
+      cli.table('Reason', styleText('red', reason));
     } else {
       cli.table('Reason', '');
       const lines = reason.split('\n');
-      cli.log(`  ${chalk.red(lines[0])}`);
+      cli.log(`  ${styleText('red', lines[0])}`);
       for (let i = 1; i < lines.length; ++i) {
         cli.log(`  ${lines[i]}`);
       }

package/lib/ci/build-types/test_run.js

@@ -31,7 +31,7 @@ export class TestRun extends Job {
       ];
       return this.failures;
     }
-    this.causes = this.getCause(data.actions) || {};
+    this.cause = this.getCause(data.actions) || {};
     this.builtOn = data.builtOn;
   }
 

package/lib/ci/failure_aggregator.js

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 
 import { getMachineUrl, parsePRFromURL } from '../links.js';
 import CIFailureParser from './ci_failure_parser.js';
@@ -140,7 +140,7 @@ export class FailureAggregator {
           cli.table('First CI', `${prs[0].upstream}`);
         }
         cli.table('Last CI', `${prs[prs.length - 1].upstream}`);
-        cli.log('\n' + chalk.bold('Example: ') + `${failures[0].url}\n`);
+        cli.log('\n' + styleText('bold', 'Example: ') + `${failures[0].url}\n`);
         const example = failures[0].reason;
         cli.log(example.length > 512 ? example.slice(0, 512) + '...' : example);
         cli.separator();

package/lib/ci/run_ci.js

@@ -73,9 +73,10 @@ export class RunPRJob {
   }
 
   async start() {
-    const { cli, request, certifySafe, checkForDuplicates } = this;
+    const { cli, request, checkForDuplicates } = this;
+    const certifySafe = await this.certifySafe;
 
-    if (!(await certifySafe)) {
+    if (!certifySafe) {
       cli.error('Refusing to run CI on potentially unsafe PR');
       return false;
     }

package/lib/cli.js

@@ -1,5 +1,5 @@
-import ora from 'ora';
-import chalk from 'chalk';
+import { styleText } from 'node:util';
+import yoctoSpinner from 'yocto-spinner';
 import * as inquirer from '@inquirer/prompts';
 
 import { warning, error, info, success } from './figures.js';
@@ -22,14 +22,14 @@ const QUESTION_TYPE = {
 const formatter = new Intl.ListFormat('en', { type: 'disjunction' });
 
 function head(text, length = 11) {
-  return chalk.bold(text.padEnd(length));
+  return styleText('bold', text.padEnd(length));
 }
 
 export default class CLI {
   constructor(stream, options = {}) {
     const spinnerOptions = options.spinner ?? {};
     this.stream = stream || process.stderr;
-    this.spinner = ora({ stream: this.stream, ...spinnerOptions });
+    this.spinner = yoctoSpinner({ stream: this.stream, ...spinnerOptions });
     this.SPINNER_STATUS = SPINNER_STATUS;
     this.QUESTION_TYPE = QUESTION_TYPE;
     this.figureIndent = '   ';
@@ -154,10 +154,7 @@ export default class CLI {
       case INFO:
         symbol = info;
     }
-    const text = ' ' + rawText;
-    this.spinner.stopAndPersist({
-      symbol, text
-    });
+    this.spinner.stop(`${symbol}  ${rawText}`);
   }
 
   write(text) {
@@ -180,9 +177,9 @@ export default class CLI {
     const rest = (length - text.length - 2);
     const half = sep.repeat(Math.abs(Math.floor(rest / 2)));
     if (rest % 2 === 0) {
-      this.log(`${half} ${chalk.bold(text)} ${half}`);
+      this.log(`${half} ${styleText('bold', text)} ${half}`);
     } else {
-      this.log(`${half} ${chalk.bold(text)} ${sep}${half}`);
+      this.log(`${half} ${styleText('bold', text)} ${sep}${half}`);
     }
   }
 
@@ -193,7 +190,7 @@ export default class CLI {
 
   warn(text, options = {}) {
     const prefix = options.newline ? this.eolIndent : this.figureIndent;
-    this.log(prefix + chalk.bold(`${warning}  ${text}`));
+    this.log(prefix + styleText('bold', `${warning}  ${text}`));
   }
 
   info(text, options = {}) {
@@ -210,7 +207,7 @@ export default class CLI {
         this.log(JSON.stringify(obj.data, null, 2));
       }
     } else {
-      this.log(prefix + chalk.bold(`${error}  ${obj}`));
+      this.log(prefix + styleText('bold', `${error}  ${obj}`));
     }
   }
 

package/lib/figures.js

@@ -1,7 +1,7 @@
-import chalk from 'chalk';
-import figures from 'figures';
+import { figures } from 'listr2';
+import { styleText } from 'node:util';
 
-export const warning = chalk.yellow(figures.warning);
-export const error = chalk.red(figures.cross);
-export const info = chalk.blue(figures.info);
-export const success = chalk.green(figures.tick);
+export const warning = styleText('yellow', figures.warning);
+export const error = styleText('red', figures.cross);
+export const info = styleText('blue', figures.info);
+export const success = styleText('green', figures.tick);

package/lib/links.js

@@ -1,4 +1,4 @@
-import * as cheerio from 'cheerio';
+import { Parser } from 'htmlparser2';
 
 const FIXES_RE = /(Close[ds]?|Fix(e[ds])?|Resolve[sd]?)\s*:\s*(\S+)/mgi;
 const FIX_RE = /(Close[ds]?|Fix(e[ds])?|Resolve[sd]?)\s*:\s*(\S+)/i;
@@ -13,7 +13,26 @@ export class LinkParser {
   constructor(owner, repo, html) {
     this.owner = owner;
     this.repo = repo;
-    this.$ = cheerio.load(html);
+    this.text = '';
+    this.links = [];
+
+    let currentLink;
+    const parser = new Parser({
+      onopentag: (name, attributes) => {
+        if (name === 'a') {
+          currentLink = { href: attributes.href, text: '' };
+          this.links.push(currentLink);
+        }
+      },
+      ontext: (text) => {
+        this.text += text;
+        if (currentLink) currentLink.text += text;
+      },
+      onclosetag: (name) => {
+        if (name === 'a') currentLink = undefined;
+      }
+    });
+    parser.end(html);
   }
 
   getFixesUrlsFromArray(arr) {
@@ -55,32 +74,25 @@ export class LinkParser {
   // Do this so we can reliably get the correct url.
   // Otherwise, the number could reference a PR or an issue.
   getUrlFromOP(ref) {
-    const as = this.$('a');
-    const links = as.map((i, el) => this.$(el)).get();
-    for (const link of links) {
-      const text = link.text();
-      if (text === ref) {
-        const href = link.attr('href');
-        if (href) return href;
+    for (const link of this.links) {
+      if (link.text === ref) {
+        if (link.href) return link.href;
       }
     }
   }
 
   getFixes() {
-    const text = this.$.text();
-    const fixes = text.match(FIXES_RE) || [];
+    const fixes = this.text.match(FIXES_RE) || [];
     return this.getFixesUrlsFromArray(fixes);
   }
 
   getRefs() {
-    const text = this.$.text();
-    const refs = text.match(REFS_RE) || [];
+    const refs = this.text.match(REFS_RE) || [];
     return this.getRefsUrlsFromArray(refs);
   }
 
   getAltPrUrl() {
-    const text = this.$.text();
-    const refs = text.match(PR_RE) || [];
+    const refs = this.text.match(PR_RE) || [];
     return this.getPRUrlsFromArray(refs);
   }
 }

package/lib/pr_checker.js

@@ -467,43 +467,54 @@ export default class PRChecker {
       }
 
       if (!GITHUB_SUCCESS_CONCLUSIONS.includes(conclusion)) {
-        hasFailures = true;
+        const runs = checkRuns?.nodes ?? [];
+        const allRunsSkipped = runs.length > 0 &&
+          runs.length === checkRuns.totalCount &&
+          runs.every((checkRun) => checkRun.status === 'COMPLETED' &&
+            checkRun.conclusion === 'SKIPPED');
+
+        // GitHub can report a STARTUP_FAILURE for a workflow even though all
+        // of its conditional jobs were skipped. There is no failed check in
+        // that case, so the suite should not make the commit unlandable.
+        if (conclusion === 'STARTUP_FAILURE' && allRunsSkipped) {
+          continue;
+        }
 
-        // If we have detailed checkRuns, show specific failing jobs
-        if (checkRuns && checkRuns.nodes && checkRuns.nodes.length > 0) {
-          for (const checkRun of checkRuns.nodes) {
-            if (checkRun.status === 'COMPLETED' &&
-                !GITHUB_SUCCESS_CONCLUSIONS.includes(checkRun.conclusion)) {
-              if (checkRun.conclusion === 'CANCELLED') {
-                cancelledJobs.push({
-                  name: checkRun.name,
-                  conclusion: checkRun.conclusion,
-                  url: checkRun.detailsUrl
-                });
-              } else {
-                failedJobs.push({
-                  name: checkRun.name,
-                  conclusion: checkRun.conclusion,
-                  url: checkRun.detailsUrl
-                });
-              }
+        hasFailures = true;
+        let reportedFailure = false;
+
+        // If we have detailed checkRuns, show specific failing jobs.
+        for (const checkRun of runs) {
+          if (checkRun.status === 'COMPLETED' &&
+              !GITHUB_SUCCESS_CONCLUSIONS.includes(checkRun.conclusion)) {
+            reportedFailure = true;
+            if (checkRun.conclusion === 'CANCELLED') {
+              cancelledJobs.push({
+                name: checkRun.name,
+                conclusion: checkRun.conclusion,
+                url: checkRun.detailsUrl
+              });
+            } else {
+              failedJobs.push({
+                name: checkRun.name,
+                conclusion: checkRun.conclusion,
+                url: checkRun.detailsUrl
+              });
             }
           }
-        } else {
-          // Fallback to check suite level information if no checkRuns
-          if (conclusion === 'CANCELLED') {
-            cancelledJobs.push({
-              name: GITHUB_ACTIONS_APP,
-              conclusion,
-              url: null
-            });
-          } else {
-            failedJobs.push({
-              name: GITHUB_ACTIONS_APP,
-              conclusion,
-              url: null
-            });
-          }
+        }
+
+        // Fall back to the suite when its failed conclusion is not reflected
+        // by an individual check run.
+        if (!reportedFailure) {
+          const failures = conclusion === 'CANCELLED'
+            ? cancelledJobs
+            : failedJobs;
+          failures.push({
+            name: GITHUB_ACTIONS_APP,
+            conclusion,
+            url: null
+          });
         }
       }
     }

package/lib/queries/PR.gql

@@ -38,6 +38,7 @@ query PR($prid: Int!, $owner: String!, $repo: String!) {
                 conclusion,
                 status,
                 checkRuns(first: 40) {
+                  totalCount
                   nodes {
                     name
                     status

package/lib/update-v8/backport.js

@@ -3,8 +3,8 @@ import {
   promises as fs
 } from 'node:fs';
 
-import { confirm } from '@inquirer/prompts';
-import { ListrEnquirerPromptAdapter } from '@listr2/prompt-adapter-enquirer';
+import { confirm, input } from '@inquirer/prompts';
+import { ListrInquirerPromptAdapter } from '@listr2/prompt-adapter-inquirer';
 
 import { shortSha } from '../utils.js';
 
@@ -263,8 +263,7 @@ async function applyPatch(ctx, task, patch, method = 'apply') {
     );
   } catch {
     patch.hadConflicts = true;
-    return task.prompt(ListrEnquirerPromptAdapter).run({
-      type: 'input',
+    return task.prompt(ListrInquirerPromptAdapter).run(input, {
       message: "Resolve merge conflicts and enter 'RESOLVED'",
       validate: value => value.toUpperCase() === 'RESOLVED'
     });

package/lib/verbosity.js

@@ -1,6 +1,4 @@
-import util from 'node:util';
-
-import chalk from 'chalk';
+import { format, styleText } from 'node:util';
 
 const VERBOSITY = {
   NONE: 0,
@@ -25,5 +23,5 @@ export function setVerbosityFromEnv() {
 
 export function debuglog(...args) {
   // Prepend a line break in case it's logged while the spinner is running
-  console.error(chalk.green(util.format('\n[DEBUG]', ...args)));
+  console.error('\n' + styleText('green', format('[DEBUG]', ...args)));
 }

package/node_modules/@listr2/prompt-adapter-inquirer/README.md

@@ -0,0 +1,15 @@
+# @listr2/prompt-adapter-inquirer
+
+[![Pipeline](https://gitlab.kilic.dev/libraries/listr2/badges/master/pipeline.svg?style=flat-square&ignore_skipped=true)](https://gitlab.kilic.dev/libraries/listr2/-/commits/master) [![Version](https://img.shields.io/npm/v/%40listr2/prompt-adapter-inquirer.svg?style=flat-square&logo=npm)](https://www.npmjs.com/package/%40listr2/prompt-adapter-inquirer?activeTab=versions) [![Downloads](https://img.shields.io/npm/dm/%40listr2/prompt-adapter-inquirer.svg?style=flat-square&logo=npm)](https://www.npmjs.com/package/%40listr2/prompt-adapter-inquirer) [![Size](https://img.shields.io/bundlephobia/min/%40listr2/prompt-adapter-inquirer?style=flat-square&logo=npm)](https://www.npmjs.com/package/%40listr2/prompt-adapter-inquirer) [![Dependencies](https://img.shields.io/librariesio/release/npm/%40listr2/prompt-adapter-inquirer?style=flat-square&logo=npm)](https://www.npmjs.com/package/%40listr2/prompt-adapter-inquirer?activeTab=dependencies)
+
+[![github sponsors](https://img.shields.io/github/sponsors/cenk1cenk2?style=flat-square&logo=github)](https://github.com/sponsors/cenk1cenk2) [![opencollective](https://img.shields.io/opencollective/sponsors/listr2?label=open%20collective&logo=opencollective)](https://opencollective.com/listr2)
+
+**Create beautiful CLI interfaces via easy and logical to-implement task lists that feel alive and interactive.**
+
+---
+
+## Documentation
+
+This is an extension to [`listr2`](https://listr2.kilic.dev/) to create prompts with [`@inquirer/prompts`](https://github.com/SBoudrias/Inquirer.js/blob/master/packages/prompts/README.md).
+
+**[Read the documentation...](https://listr2.kilic.dev/task/prompts.html#inquirer)**

package/node_modules/@listr2/prompt-adapter-inquirer/dist/index.d.mts

@@ -0,0 +1,21 @@
+import { ListrPromptAdapter } from "listr2";
+import { Prompt } from "@inquirer/type";
+//#region src/prompt.d.ts
+declare class ListrInquirerPromptAdapter extends ListrPromptAdapter {
+  private prompt;
+  private signal;
+  /**
+   * Get the current running instance of `inquirer`.
+   */
+  get instance(): Promise<any>;
+  /**
+   * Create a new prompt with `inquirer`.
+   */
+  run<T extends Prompt<any, any> = Prompt<any, any>>(prompt: T, ...[config, context]: Parameters<T>): Promise<ReturnType<T>>;
+  /**
+   * Cancel the ongoing prompt.
+   */
+  cancel(): void;
+}
+//#endregion
+export { ListrInquirerPromptAdapter };

package/node_modules/@listr2/prompt-adapter-inquirer/dist/index.mjs

@@ -0,0 +1,46 @@
+import { ListrPromptAdapter, ListrTaskEventType, ListrTaskState } from "listr2";
+
+//#region src/prompt.ts
+var ListrInquirerPromptAdapter = class extends ListrPromptAdapter {
+	prompt;
+	signal = new AbortController();
+	/**
+	* Get the current running instance of `inquirer`.
+	*/
+	get instance() {
+		return this.prompt;
+	}
+	/**
+	* Create a new prompt with `inquirer`.
+	*/
+	async run(prompt, ...[config, context]) {
+		context ??= {};
+		context.output ??= this.wrapper.stdout(ListrTaskEventType.PROMPT);
+		context.signal ??= this.signal.signal;
+		this.reportStarted();
+		this.task.on(ListrTaskEventType.STATE, (event) => {
+			if (event === ListrTaskState.SKIPPED && this.prompt) this.cancel();
+		});
+		this.prompt = prompt(config, context);
+		let result;
+		try {
+			result = await this.prompt;
+			this.reportCompleted();
+		} catch (e) {
+			this.reportFailed();
+			throw e;
+		}
+		return result;
+	}
+	/**
+	* Cancel the ongoing prompt.
+	*/
+	cancel() {
+		if (!this.prompt) return;
+		this.reportFailed();
+		this.signal.abort("Prompt was cancelled");
+	}
+};
+
+//#endregion
+export { ListrInquirerPromptAdapter };

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2025 Simon Boudrias
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/dist/index.d.ts

@@ -0,0 +1,2 @@
+export * from './inquirer.ts';
+export * from './utils.ts';

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/dist/index.js

@@ -0,0 +1,2 @@
+export * from "./inquirer.js";
+export * from "./utils.js";

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/dist/inquirer.d.ts

@@ -0,0 +1,35 @@
+import { Duplex } from 'node:stream';
+/**
+ * `InquirerReadline` is a re-implementation of `readline.Interface` from Node.js.
+ * We're reimplementing it because of 3 reasons:
+ * 1. The `readline.Interface` API is not complete; it's missing for example `clearLine`.
+ * 2. The input/output streams are not generics, meaning they're inexact.
+ * 3. Since ReadLine isn't built-in Typescript Global NodeJS type, it'd force us to ship `@types/node` as a dependency to all users.
+ */
+export type InquirerReadline = {
+    output: Duplex & {
+        mute: () => void;
+        unmute: () => void;
+    };
+    input: NodeJS.ReadableStream;
+    clearLine: (dir: 0 | 1 | -1) => void;
+    getCursorPos: () => {
+        rows: number;
+        cols: number;
+    };
+    setPrompt: (prompt: string) => void;
+    line: string;
+    write: (data: string) => void;
+    on: (event: string, listener: (...args: unknown[]) => void) => void;
+    removeListener: (event: string, listener: (...args: unknown[]) => void) => void;
+    pause: () => void;
+    resume: () => void;
+    close: () => void;
+};
+export type Context = {
+    input?: NodeJS.ReadableStream;
+    output?: NodeJS.WritableStream;
+    clearPromptOnDone?: boolean;
+    signal?: AbortSignal;
+};
+export type Prompt<Value, Config> = (config: Config, context?: Context) => Promise<Value>;

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/dist/utils.d.ts

@@ -0,0 +1,34 @@
+type Key = string | number | symbol;
+/**
+ * Recursively expand intersections and mapped types for better IDE display,
+ * while preserving functions, arrays, primitives, and types with a string
+ * index signature (e.g. `Record<string, ...>`) as-is.
+ */
+export type Prettify<T> = T extends (...args: never[]) => unknown ? T : T extends ReadonlyArray<unknown> ? T : T extends string | number | boolean | symbol | bigint | null | undefined ? T : T extends object ? string extends keyof T ? T : {
+    [K in keyof T]: Prettify<T[K]>;
+} & {} : T;
+export type PartialDeep<T> = T extends object ? {
+    [P in keyof T]?: PartialDeep<T[P]>;
+} : T;
+export type LiteralUnion<T extends F, F = string> = T | (F & {});
+export type KeyUnion<T> = LiteralUnion<Extract<keyof T, string>>;
+export type DistributiveMerge<A, B> = A extends any ? Prettify<Omit<A, keyof B> & B> : never;
+export type UnionToIntersection<T> = (T extends any ? (input: T) => void : never) extends (input: infer Intersection) => void ? Intersection : never;
+/**
+ * @hidden
+ */
+type __Pick<O extends object, K extends keyof O> = {
+    [P in K]: O[P];
+} & {};
+/**
+ * @hidden
+ */
+export type _Pick<O extends object, K extends Key> = __Pick<O, keyof O & K>;
+/**
+ * Extract out of `O` the fields of key `K`
+ * @param O to extract from
+ * @param K to chose fields
+ * @returns [[Object]]
+ */
+export type Pick<O extends object, K extends Key> = O extends unknown ? _Pick<O, K> : never;
+export {};

package/node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type/dist/utils.js

@@ -0,0 +1,2 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export {};