@pnpm/deps.compliance.commands 1101.2.8 → 1101.3.0

package/lib/audit/audit.js

@@ -1,4 +1,5 @@
-import { docsUrl, TABLE_OPTIONS } from '@pnpm/cli.utils';
+import { checkbox, Separator } from '@inquirer/prompts';
+import { docsUrl, interactivePromptPageSize, TABLE_OPTIONS } from '@pnpm/cli.utils';
 import { types as allTypes } from '@pnpm/config.reader';
 import { audit, normalizeGhsaId } from '@pnpm/deps.compliance.audit';
 import { PnpmError } from '@pnpm/error';
@@ -7,7 +8,6 @@ import { globalInfo } from '@pnpm/logger';
 import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header';
 import { table } from '@zkochan/table';
 import chalk, {} from 'chalk';
-import enquirer from 'enquirer';
 import { pick, pickBy } from 'ramda';
 import { renderHelp } from 'render-help';
 import { createAuditNetworkOptions, loadAuditContext } from './auditContext.js';
@@ -386,65 +386,61 @@ function filterAdvisoriesForFix(advisories, opts) {
     }));
 }
 async function interactiveAuditFix(auditReport) {
-    const choices = getAuditFixChoices(Object.values(auditReport.advisories));
-    if (choices.length === 0) {
+    const choiceGroups = getAuditFixChoices(Object.values(auditReport.advisories));
+    if (choiceGroups.length === 0) {
         return auditReport;
     }
-    const { selectedVulnerabilities } = await enquirer.prompt({
-        choices,
-        footer: '\nEnter to start fixing. Ctrl-c to cancel.',
-        indicator(state, choice) {
-            return ` ${choice.enabled ? '●' : '○'}`;
-        },
-        message: 'Choose which vulnerabilities to fix ' +
-            `(Press ${chalk.cyan('<space>')} to select, ` +
-            `${chalk.cyan('<a>')} to toggle all, ` +
-            `${chalk.cyan('<i>')} to invert selection)`,
-        name: 'selectedVulnerabilities',
-        pointer: '❯',
-        result() {
-            return this.selected;
-        },
-        format() {
-            if (!this.state.submitted || this.state.cancelled)
-                return '';
-            if (Array.isArray(this.selected)) {
-                return this.selected
-                    .filter((choice) => !/^\[.+\]$/.test(choice.name))
-                    .map((choice) => this.styles.primary(choice.name)).join(', ');
+    const flatChoices = [];
+    for (const group of choiceGroups) {
+        flatChoices.push(new Separator(chalk.bold(`── ${group.message} ──`)));
+        for (const choice of group.choices) {
+            if (choice.disabled) {
+                flatChoices.push(new Separator(`  ${choice.message ?? choice.name}`));
             }
-            return this.styles.primary(this.selected.name);
-        },
-        styles: {
-            dark: chalk.reset,
-            em: chalk.bgBlack.whiteBright,
-            success: chalk.reset,
-        },
-        type: 'multiselect',
-        validate(value) {
-            if (value.length === 0) {
-                return 'You must choose at least one vulnerability.';
+            else {
+                flatChoices.push({
+                    name: choice.message,
+                    value: choice.value,
+                });
             }
-            return true;
-        },
-        j() {
-            return this.down();
-        },
-        k() {
-            return this.up();
-        },
-        cancel() {
-            // By default, canceling the prompt via Ctrl+c throws an empty string.
-            // The custom cancel function prevents that behavior.
-            // Otherwise, pnpm CLI would print an error and confuse users.
-            // See related issue: https://github.com/enquirer/enquirer/issues/225
+        }
+    }
+    const message = 'Choose which vulnerabilities to fix ' +
+        `(Press ${chalk.cyan('<space>')} to select, ` +
+        `${chalk.cyan('<a>')} to toggle all, ` +
+        `${chalk.cyan('<i>')} to invert selection)\n\nEnter to start fixing. Ctrl-c to cancel.`;
+    let selectedKeys;
+    try {
+        selectedKeys = await checkbox({
+            choices: flatChoices,
+            pageSize: interactivePromptPageSize(),
+            message,
+            required: true,
+            validate: (values) => {
+                if (values.length === 0) {
+                    return 'You must choose at least one vulnerability.';
+                }
+                return true;
+            },
+            theme: {
+                icon: { checked: '●', unchecked: '○', cursor: '❯' },
+                style: {
+                    highlight: (text) => text,
+                },
+                keybindings: ['vim'],
+            },
+        });
+    }
+    catch (err) {
+        if (err instanceof Error && err.name === 'ExitPromptError') {
             globalInfo('Audit fix canceled');
             process.exit(0);
-        },
-    }); // eslint-disable-line @typescript-eslint/no-explicit-any
-    const selectedKeys = new Set(selectedVulnerabilities.map((c) => c.value));
+        }
+        throw err;
+    }
+    const selectedKeySet = new Set(selectedKeys);
     const selectedAdvisories = Object.fromEntries(Object.entries(auditReport.advisories)
-        .filter(([, advisory]) => selectedKeys.has(`${advisory.module_name}@${advisory.vulnerable_versions}`)));
+        .filter(([, advisory]) => selectedKeySet.has(`${advisory.module_name}@${advisory.vulnerable_versions}`)));
     return { ...auditReport, advisories: selectedAdvisories };
 }
 //# sourceMappingURL=audit.js.map

package/lib/audit/getAuditFixChoices.d.ts

@@ -2,6 +2,7 @@ import type { AuditAdvisory } from '@pnpm/deps.compliance.audit';
 export interface AuditChoiceRow {
     name: string;
     value: string;
+    message: string;
     disabled?: boolean;
 }
 type AuditChoiceGroup = Array<{

package/lib/audit/getAuditFixChoices.js

@@ -56,6 +56,7 @@ export function getAuditFixChoices(advisories) {
             if (i === 0) {
                 return {
                     name: rendered[i],
+                    message: rendered[i],
                     value: '',
                     disabled: true,
                     hint: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/deps.compliance.commands",
-  "version": "1101.2.8",
+  "version": "1101.3.0",
   "description": "pnpm commands for audit, licenses, and sbom",
   "keywords": [
     "pnpm",
@@ -27,44 +27,43 @@
     "!*.map"
   ],
   "dependencies": {
+    "@inquirer/prompts": "^8.4.3",
     "@zkochan/table": "^2.0.1",
     "chalk": "^5.6.2",
-    "enquirer": "^2.4.1",
     "memoize": "^10.2.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "semver": "^7.8.1",
     "@pnpm/cli.command": "1100.0.1",
     "@pnpm/cli.common-cli-options-help": "1100.0.1",
+    "@pnpm/cli.utils": "1101.0.8",
     "@pnpm/cli.meta": "1100.0.5",
-    "@pnpm/config.reader": "1101.4.1",
+    "@pnpm/config.pick-registry-for-package": "1100.0.6",
+    "@pnpm/config.reader": "1101.5.0",
     "@pnpm/config.writer": "1100.0.10",
-    "@pnpm/deps.compliance.audit": "1101.0.10",
     "@pnpm/constants": "1100.0.0",
+    "@pnpm/deps.compliance.audit": "1101.0.11",
     "@pnpm/deps.compliance.license-resolver": "1100.0.0",
-    "@pnpm/config.pick-registry-for-package": "1100.0.6",
-    "@pnpm/deps.compliance.sbom": "1100.1.5",
     "@pnpm/deps.compliance.license-scanner": "1100.0.15",
+    "@pnpm/deps.compliance.sbom": "1100.1.5",
+    "@pnpm/deps.security.signatures": "1101.1.5",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.commands": "1100.6.0",
-    "@pnpm/deps.security.signatures": "1101.1.4",
     "@pnpm/lockfile.fs": "1100.1.2",
     "@pnpm/lockfile.types": "1100.0.8",
-    "@pnpm/cli.utils": "1101.0.8",
+    "@pnpm/installing.commands": "1100.7.0",
+    "@pnpm/lockfile.utils": "1100.0.10",
     "@pnpm/lockfile.walker": "1100.0.8",
     "@pnpm/network.auth-header": "1101.0.0",
-    "@pnpm/object.key-sorting": "1100.0.0",
     "@pnpm/store.path": "1100.0.1",
+    "@pnpm/object.key-sorting": "1100.0.0",
     "@pnpm/types": "1101.2.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.9",
-    "@pnpm/lockfile.utils": "1100.0.10"
+    "@pnpm/workspace.project-manifest-reader": "1100.0.9"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1001.0.1"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/registry-mock": "6.0.0",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "@types/zkochan__table": "npm:@types/table@6.0.0",
@@ -72,15 +71,15 @@
     "nock": "13.3.4",
     "read-yaml-file": "^3.0.0",
     "tempy": "3.0.0",
+    "@pnpm/deps.compliance.commands": "1101.3.0",
     "@pnpm/logger": "1100.0.0",
     "@pnpm/pkg-manifest.reader": "1100.0.5",
-    "@pnpm/prepare": "1100.0.11",
+    "@pnpm/prepare": "1100.0.12",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.mock-agent": "1100.0.7",
-    "@pnpm/testing.registry-mock": "1100.0.1",
-    "@pnpm/workspace.projects-filter": "1100.0.16",
-    "@pnpm/testing.command-defaults": "1100.0.1",
-    "@pnpm/deps.compliance.commands": "1101.2.8"
+    "@pnpm/testing.command-defaults": "1100.0.2",
+    "@pnpm/testing.mock-agent": "1100.0.8",
+    "@pnpm/testing.registry-mock": "1100.0.2",
+    "@pnpm/workspace.projects-filter": "1100.0.17"
   },
   "engines": {
     "node": ">=22.13"