@node-core/utils 5.12.1 → 5.13.0

package/lib/cherry_pick.js

@@ -1,23 +1,13 @@
-import os from 'node:os';
 import path from 'node:path';
 import { getMetadata } from '../components/metadata.js';
 
 import {
-  runAsync, runSync, forceRunAsync
+  runAsync, runSync
 } from './run.js';
-import { writeFile } from './file.js';
-import {
-  shortSha, getEditor
-} from './utils.js';
 import { getNcuDir } from './config.js';
+import LandingSession, { LINT_RESULTS } from './landing_session.js';
 
-const LINT_RESULTS = {
-  SKIPPED: 'skipped',
-  FAILED: 'failed',
-  SUCCESS: 'success'
-};
-
-export default class CheckPick {
+export default class CherryPick {
   constructor(prid, dir, cli, {
     owner,
     repo,
@@ -46,11 +36,6 @@ export default class CheckPick {
     return this.options.lint;
   }
 
-  getUpstreamHead() {
-    const { upstream, branch } = this;
-    return runSync('git', ['rev-parse', `${upstream}/${branch}`]).trim();
-  }
-
   getCurrentRev() {
     return runSync('git', ['rev-parse', 'HEAD']).trim();
   }
@@ -73,16 +58,6 @@ export default class CheckPick {
     return path.resolve(this.ncuDir, `${this.prid}`);
   }
 
-  getMessagePath(rev) {
-    return path.resolve(this.pullDir, `${shortSha(rev)}.COMMIT_EDITMSG`);
-  }
-
-  saveMessage(rev, message) {
-    const file = this.getMessagePath(rev);
-    writeFile(file, message);
-    return file;
-  }
-
   async start() {
     const { cli } = this;
 
@@ -91,7 +66,7 @@ export default class CheckPick {
       owner: this.owner,
       repo: this.repo
     }, false, cli);
-    const expectedCommitShas =
+    this.expectedCommitShas =
       metadata.data.commits.map(({ commit }) => commit.oid);
 
     const amend = await cli.prompt(
@@ -104,7 +79,7 @@ export default class CheckPick {
     }
 
     try {
-      const commitInfo = await this.downloadAndPatch(expectedCommitShas);
+      const commitInfo = await this.downloadAndPatch();
       const cleanLint = await this.validateLint();
       if (cleanLint === LINT_RESULTS.FAILED) {
         cli.error('Patch still contains lint errors. ' +
@@ -120,68 +95,6 @@ export default class CheckPick {
     }
   }
 
-  async downloadAndPatch(expectedCommitShas) {
-    const { cli, repo, owner, prid } = this;
-
-    cli.startSpinner(`Downloading patch for ${prid}`);
-    // fetch via ssh to handle private repo
-    await runAsync('git', [
-      'fetch', `git@github.com:${owner}/${repo}.git`,
-      `refs/pull/${prid}/merge`]);
-    // We fetched the commit that would result if we used `git merge`.
-    // ^1 and ^2 refer to the PR base and the PR head, respectively.
-    const [base, head] = await runAsync('git',
-      ['rev-parse', 'FETCH_HEAD^1', 'FETCH_HEAD^2'],
-      { captureStdout: 'lines' });
-    const commitShas = await runAsync('git',
-      ['rev-list', `${base}..${head}`],
-      { captureStdout: 'lines' });
-    cli.stopSpinner(`Fetched commits as ${shortSha(base)}..${shortSha(head)}`);
-    cli.separator();
-
-    const mismatchedCommits = [
-      ...commitShas.filter((sha) => !expectedCommitShas.includes(sha))
-        .map((sha) => `Unexpected commit ${sha}`),
-      ...expectedCommitShas.filter((sha) => !commitShas.includes(sha))
-        .map((sha) => `Missing commit ${sha}`)
-    ].join('\n');
-    if (mismatchedCommits.length > 0) {
-      throw new Error(`Mismatched commits:\n${mismatchedCommits}`);
-    }
-
-    const commitInfo = { base, head, shas: commitShas };
-
-    try {
-      await forceRunAsync('git', ['cherry-pick', `${base}..${head}`], {
-        ignoreFailure: false
-      });
-    } catch (ex) {
-      await forceRunAsync('git', ['cherry-pick', '--abort']);
-      throw new Error('Failed to apply patches');
-    }
-
-    cli.ok('Patches applied');
-    return commitInfo;
-  }
-
-  async validateLint() {
-    // The linter is currently only run on non-Windows platforms.
-    if (os.platform() === 'win32') {
-      return LINT_RESULTS.SKIPPED;
-    }
-
-    if (!this.lint) {
-      return LINT_RESULTS.SKIPPED;
-    }
-
-    try {
-      await runAsync('make', ['lint']);
-      return LINT_RESULTS.SUCCESS;
-    } catch {
-      return LINT_RESULTS.FAILED;
-    }
-  }
-
   async amend(metadata, commitInfo) {
     const { cli } = this;
     const subjects = await runAsync('git',
@@ -203,102 +116,23 @@ export default class CheckPick {
       await runAsync('git', ['commit', '--amend', '--no-edit']);
     }
 
-    return this._amend(metadata);
+    return LandingSession.prototype.amend.call(this, metadata);
   }
 
-  async _amend(metadataStr) {
-    const { cli } = this;
-
-    const rev = this.getCurrentRev();
-    const original = runSync('git', [
-      'show', 'HEAD', '-s', '--format=%B'
-    ]).trim();
-    // git has very specific rules about what is a trailer and what is not.
-    // Instead of trying to implement those ourselves, let git parse the
-    // original commit message and see if it outputs any trailers.
-    const originalHasTrailers = runSync('git', [
-      'interpret-trailers', '--parse', '--no-divider'
-    ], {
-      input: `${original}\n`
-    }).trim().length !== 0;
-    const metadata = metadataStr.trim().split('\n');
-    const amended = original.split('\n');
-
-    // If the original commit message already contains trailers (such as
-    // "Co-authored-by"), we simply add our own metadata after those. Otherwise,
-    // we have to add an empty line so that git recognizes our own metadata as
-    // trailers in the amended commit message.
-    if (!originalHasTrailers) {
-      amended.push('');
-    }
-
-    const BACKPORT_RE = /BACKPORT-PR-URL\s*:\s*(\S+)/i;
-    const PR_RE = /PR-URL\s*:\s*(\S+)/i;
-    const REVIEW_RE = /Reviewed-By\s*:\s*(\S+)/i;
-    const CVE_RE = /CVE-ID\s*:\s*(\S+)/i;
-
-    let containCVETrailer = false;
-    for (const line of metadata) {
-      if (line.length !== 0 && original.includes(line)) {
-        if (line.match(CVE_RE)) {
-          containCVETrailer = true;
-        }
-        if (originalHasTrailers) {
-          cli.warn(`Found ${line}, skipping..`);
-        } else {
-          throw new Error(
-            'Git found no trailers in the original commit message, ' +
-            `but '${line}' is present and should be a trailer.`);
-        }
-      } else {
-        if (line.match(BACKPORT_RE)) {
-          let prIndex = amended.findIndex(datum => datum.match(PR_RE));
-          if (prIndex === -1) {
-            prIndex = amended.findIndex(datum => datum.match(REVIEW_RE)) - 1;
-          }
-          amended.splice(prIndex + 1, 0, line);
-        } else {
-          amended.push(line);
-        }
-      }
-    }
-
-    if (!containCVETrailer && this.includeCVE) {
-      const cveID = await cli.prompt(
-        'Git found no CVE-ID trailer in the original commit message. ' +
-        'Please, provide the CVE-ID',
-        { questionType: 'input', defaultAnswer: 'CVE-2023-XXXXX' }
-      );
-      amended.push('CVE-ID: ' + cveID);
-    }
+  readyToAmend() {
+    return true;
+  }
 
-    const message = amended.join('\n');
-    const messageFile = this.saveMessage(rev, message);
-    cli.separator('New Message');
-    cli.log(message.trim());
-    const takeMessage = await cli.prompt('Use this message?');
-    if (takeMessage) {
-      await runAsync('git', ['commit', '--amend', '-F', messageFile]);
-      return true;
-    }
+  startAmending() {
+    // No-op
+  }
 
-    const editor = await getEditor({ git: true });
-    if (editor) {
-      try {
-        await forceRunAsync(
-          editor,
-          [`"${messageFile}"`],
-          { ignoreFailure: false, spawnArgs: { shell: true } }
-        );
-        await runAsync('git', ['commit', '--amend', '-F', messageFile]);
-        return true;
-      } catch {
-        cli.warn(`Please manually edit ${messageFile}, then run\n` +
-          `\`git commit --amend -F ${messageFile}\` ` +
-          'to finish amending the message');
-        throw new Error(
-          'Failed to edit the message using the configured editor');
-      }
-    }
+  saveCommitInfo() {
+    // No-op
   }
 }
+
+CherryPick.prototype.downloadAndPatch = LandingSession.prototype.downloadAndPatch;
+CherryPick.prototype.validateLint = LandingSession.prototype.validateLint;
+CherryPick.prototype.getMessagePath = LandingSession.prototype.getMessagePath;
+CherryPick.prototype.saveMessage = LandingSession.prototype.saveMessage;

package/lib/ci/run_ci.js

@@ -26,7 +26,7 @@ export class RunPRJob {
     this.prData = new PRData({ prid, owner, repo }, cli, request);
     this.certifySafe =
       certifySafe ||
-      Promise.all([this.prData.getReviews(), this.prData.getPR()]).then(() =>
+      Promise.all([this.prData.getReviews(), this.prData.getCommits()]).then(() =>
         (this.certifySafe = new PRChecker(cli, this.prData, request, {}).getApprovedTipOfHead())
       );
   }

package/lib/landing_session.js

@@ -10,7 +10,7 @@ import {
 
 const isWindows = process.platform === 'win32';
 
-const LINT_RESULTS = {
+export const LINT_RESULTS = {
   SKIPPED: 'skipped',
   FAILED: 'failed',
   SUCCESS: 'success'
@@ -84,11 +84,11 @@ export default class LandingSession extends Session {
   }
 
   async downloadAndPatch() {
-    const { cli, repo, owner, prid, expectedCommitShas } = this;
+    const { cli, upstream, prid, expectedCommitShas } = this;
 
     cli.startSpinner(`Downloading patch for ${prid}`);
     await runAsync('git', [
-      'fetch', `https://github.com/${owner}/${repo}.git`,
+      'fetch', upstream,
       `refs/pull/${prid}/merge`]);
     // We fetched the commit that would result if we used `git merge`.
     // ^1 and ^2 refer to the PR base and the PR head, respectively.
@@ -315,9 +315,14 @@ export default class LandingSession extends Session {
     const BACKPORT_RE = /BACKPORT-PR-URL\s*:\s*(\S+)/i;
     const PR_RE = /PR-URL\s*:\s*(\S+)/i;
     const REVIEW_RE = /Reviewed-By\s*:\s*(\S+)/i;
+    const CVE_RE = /CVE-ID\s*:\s*(\S+)/i;
 
+    let containCVETrailer = false;
     for (const line of metadata) {
       if (line.length !== 0 && original.includes(line)) {
+        if (line.match(CVE_RE)) {
+          containCVETrailer = true;
+        }
         if (originalHasTrailers) {
           cli.warn(`Found ${line}, skipping..`);
         } else {
@@ -338,6 +343,15 @@ export default class LandingSession extends Session {
       }
     }
 
+    if (!containCVETrailer && this.includeCVE) {
+      const cveID = await cli.prompt(
+        'Git found no CVE-ID trailer in the original commit message. ' +
+        'Please, provide the CVE-ID',
+        { questionType: 'input', defaultAnswer: 'CVE-2023-XXXXX' }
+      );
+      amended.push('CVE-ID: ' + cveID);
+    }
+
     const message = amended.join('\n');
     const messageFile = this.saveMessage(rev, message);
     cli.separator('New Message');

package/lib/pr_checker.js

@@ -30,15 +30,6 @@ const FAST_TRACK_RE = /^Fast-track has been requested by @(.+?)\. Please 👍 to
 const FAST_TRACK_MIN_APPROVALS = 2;
 const GIT_CONFIG_GUIDE_URL = 'https://github.com/nodejs/node/blob/99b1ada/doc/guides/contributing/pull-requests.md#step-1-fork';
 
-// eslint-disable-next-line no-extend-native
-Array.prototype.findLastIndex ??= function findLastIndex(fn) {
-  const reversedIndex = Reflect.apply(
-    Array.prototype.findIndex,
-    this.slice().reverse(),
-    arguments);
-  return reversedIndex === -1 ? -1 : this.length - reversedIndex - 1;
-};
-
 export default class PRChecker {
   /**
    * @param {{}} cli
@@ -49,7 +40,7 @@ export default class PRChecker {
     this.request = request;
     this.data = data;
     const {
-      pr, reviewers, comments, reviews, commits, collaborators
+      pr, reviewers, comments, reviews, commits
     } = data;
     this.reviewers = reviewers;
     this.pr = pr;
@@ -61,9 +52,6 @@ export default class PRChecker {
     this.reviews = reviews;
     this.commits = commits;
     this.argv = argv;
-    this.collaboratorEmails = new Set(
-      Array.from(collaborators).map((c) => c[1].email)
-    );
   }
 
   get waitTimeSingleApproval() {
@@ -531,7 +519,7 @@ export default class PRChecker {
     const { maxCommits } = argv;
 
     if (commits.length === 0) {
-      cli.warn('No commits found');
+      cli.warn('No commits detected');
       return false;
     }
 

package/lib/session.js

@@ -347,7 +347,8 @@ export default class Session {
     const { cli, upstream, branch } = this;
     const branchName = `${upstream}/${branch}`;
     cli.startSpinner(`Bringing ${branchName} up to date...`);
-    await runAsync('git', ['fetch', upstream, branch]);
+    const maybeUnshallow = fs.existsSync('.git/shallow') ? ['--unshallow'] : [];
+    await runAsync('git', ['fetch', ...maybeUnshallow, upstream, branch]);
     cli.stopSpinner(`${branchName} is now up-to-date`);
     const stray = this.getStrayCommits(true);
     if (!stray.length) {

package/lib/update-v8/constants.js

@@ -44,6 +44,9 @@ const fastFloatReplace = `/third_party/fast_float/src/*
 const highwayIgnore = `/third_party/highway/src/*
 !/third_party/highway/src/hwy`;
 
+const dragonboxIgnore = `/third_party/dragonbox/src/*
+!/third_party/dragonbox/src/include`;
+
 export const v8Deps = [
   {
     name: 'trace_event',
@@ -133,5 +136,14 @@ export const v8Deps = [
     repo: 'third_party/simdutf',
     gitignore: '!/third_party/simdutf',
     since: 134
-  }
+  },
+  {
+    name: 'dragonbox',
+    repo: 'third_party/dragonbox/src',
+    gitignore: {
+      match: '/third_party/dragonbox/src',
+      replace: dragonboxIgnore
+    },
+    since: 138
+  },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {
@@ -34,40 +34,40 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@inquirer/prompts": "^7.2.3",
+    "@inquirer/prompts": "^7.4.1",
     "@listr2/prompt-adapter-enquirer": "^2.0.12",
     "@node-core/caritat": "^1.6.0",
     "@pkgjs/nv": "^0.2.2",
     "branch-diff": "^3.1.1",
     "chalk": "^5.4.1",
-    "changelog-maker": "^4.3.2",
+    "changelog-maker": "^4.4.1",
     "cheerio": "^1.0.0",
     "clipboardy": "^4.0.0",
     "core-validate-commit": "^4.1.0",
     "figures": "^6.1.0",
-    "ghauth": "^6.0.10",
+    "ghauth": "^6.0.12",
     "git-secure-tag": "^2.3.1",
     "js-yaml": "^4.1.0",
     "listr2": "^8.2.5",
     "lodash": "^4.17.21",
     "log-symbols": "^7.0.0",
-    "ora": "^8.1.1",
+    "ora": "^8.2.0",
     "replace-in-file": "^8.3.0",
-    "semver": "^7.6.3",
-    "undici": "^7.3.0",
+    "semver": "^7.7.1",
+    "undici": "^7.7.0",
     "which": "^5.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.19.0",
+    "@eslint/js": "^9.24.0",
     "@reporters/github": "^1.7.2",
     "c8": "^10.1.3",
-    "eslint": "^9.19.0",
+    "eslint": "^9.24.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-n": "^17.17.0",
     "eslint-plugin-promise": "^7.2.1",
-    "globals": "^15.14.0",
-    "neostandard": "^0.12.0",
-    "sinon": "^19.0.2"
+    "globals": "^16.0.0",
+    "neostandard": "^0.12.1",
+    "sinon": "^20.0.0"
   }
 }