@pnpm/cli.parse-cli-args 1100.1.1 → 1100.1.3

package/lib/index.js

@@ -30,7 +30,7 @@ export async function parseCliArgs(opts, inputArgv) {
         if (noptExploratoryResults['help']) {
             return {
                 ...getParsedArgsForHelp(),
-                workspaceDir: await getWorkspaceDir(noptExploratoryResults),
+                workspaceDir: await getWorkspaceDir(noptExploratoryResults, opts.renamedOptions),
             };
         }
         if (noptExploratoryResults['version'] || noptExploratoryResults['v']) {
@@ -38,12 +38,13 @@ export async function parseCliArgs(opts, inputArgv) {
                 argv: noptExploratoryResults.argv,
                 cmd: null,
                 options: {
+                    ...pickUniversalOptions(),
                     version: true,
                 },
                 params: noptExploratoryResults.argv.remain,
                 unknownOptions: new Map(),
                 fallbackCommandUsed: false,
-                workspaceDir: await getWorkspaceDir(noptExploratoryResults),
+                workspaceDir: await getWorkspaceDir(noptExploratoryResults, opts.renamedOptions),
             };
         }
     }
@@ -51,12 +52,32 @@ export async function parseCliArgs(opts, inputArgv) {
         return {
             argv: noptExploratoryResults.argv,
             cmd: 'help',
-            options: {},
+            options: pickUniversalOptions(),
             params: noptExploratoryResults.argv.remain,
             unknownOptions: new Map(),
             fallbackCommandUsed: false,
         };
     }
+    // The --help and --version short-circuits skip the per-command nopt
+    // parse, so we still need to surface universal options the user typed
+    // alongside them — most importantly --pm-on-fail, which gates the
+    // packageManager / devEngines.packageManager check (#11487). Universal
+    // options were already typed and parsed by the exploratory nopt call,
+    // so we just pluck them back out and apply the same renamedOptions
+    // mapping the regular parse path uses (e.g. --prefix → dir), so
+    // consumers see consistent option names regardless of which path
+    // produced the result. Command-specific options are intentionally
+    // dropped; they belong to a command we are not running.
+    function pickUniversalOptions() {
+        const result = {};
+        for (const key of Object.keys(opts.universalOptionsTypes)) {
+            if (!(key in noptExploratoryResults))
+                continue;
+            const renamed = opts.renamedOptions?.[key] ?? key;
+            result[renamed] = noptExploratoryResults[key];
+        }
+        return result;
+    }
     const types = {
         ...opts.universalOptionsTypes,
         ...opts.getTypesByCommandName(commandName),
@@ -116,6 +137,23 @@ export async function parseCliArgs(opts, inputArgv) {
         const { argv: _, ...configOptions } = nopt({}, {}, configDotArgs, 0);
         Object.assign(options, configOptions);
     }
+    // Apply renamedOptions before workspace detection so `--prefix=foo`
+    // (renamed to `dir`) participates in finding the workspace root.
+    // Otherwise getWorkspaceDir falls back to process.cwd() and the
+    // workspace manifest at the prefix dir is missed (#11535).
+    // The canonical option wins if both are supplied (e.g. `--prefix=foo
+    // --dir=bar` keeps `dir=bar`); the alias is always dropped.
+    if (opts.renamedOptions != null) {
+        for (const [cliOption, optionValue] of Object.entries(options)) {
+            const target = opts.renamedOptions[cliOption];
+            if (target) {
+                if (!(target in options)) {
+                    options[target] = optionValue;
+                }
+                delete options[cliOption];
+            }
+        }
+    }
     const workspaceDir = await getWorkspaceDir(options);
     // For the run command, it's not clear whether --help should be passed to the
     // underlying script or invoke pnpm's help text until an additional nopt call.
@@ -125,14 +163,6 @@ export async function parseCliArgs(opts, inputArgv) {
             workspaceDir,
         };
     }
-    if (opts.renamedOptions != null) {
-        for (const [cliOption, optionValue] of Object.entries(options)) {
-            if (opts.renamedOptions[cliOption]) {
-                options[opts.renamedOptions[cliOption]] = optionValue;
-                delete options[cliOption];
-            }
-        }
-    }
     const params = argv.remain.slice(1);
     if (options['recursive'] !== true && (options['filter'] || options['filter-prod'] || recursiveCommandUsed)) {
         options['recursive'] = true;
@@ -201,10 +231,21 @@ function getClosestOptionMatches(knownOptions, option) {
         returnType: ReturnTypeEnums.ALL_CLOSEST_MATCHES,
     });
 }
-async function getWorkspaceDir(parsedOpts) {
+async function getWorkspaceDir(parsedOpts, renamedOptions) {
     if (parsedOpts['global'] || parsedOpts['ignore-workspace'])
         return undefined;
-    const dir = parsedOpts['dir'] ?? process.cwd();
-    return findWorkspaceDir(dir);
+    // Look up dir, also honoring renamed options like `prefix → dir` so that
+    // `--prefix` works even on code paths that read parsedOpts before the
+    // rename loop has run (e.g. the --help/--version short-circuits).
+    let dir = parsedOpts['dir'];
+    if (dir == null && renamedOptions != null) {
+        for (const [from, to] of Object.entries(renamedOptions)) {
+            if (to === 'dir' && parsedOpts[from] != null) {
+                dir = parsedOpts[from];
+                break;
+            }
+        }
+    }
+    return findWorkspaceDir((dir ?? process.cwd()));
 }
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/cli.parse-cli-args",
-  "version": "1100.1.1",
+  "version": "1100.1.3",
   "description": "Parses the CLI args passed to pnpm",
   "keywords": [
     "pnpm",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "tempy": "3.0.0",
-    "@pnpm/cli.parse-cli-args": "1100.1.1"
+    "@pnpm/cli.parse-cli-args": "1100.1.3"
   },
   "engines": {
     "node": ">=22.13"