@pnpm/cli.parse-cli-args 1100.1.2 → 1100.1.4

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']) {
@@ -44,7 +44,7 @@ export async function parseCliArgs(opts, inputArgv) {
                 params: noptExploratoryResults.argv.remain,
                 unknownOptions: new Map(),
                 fallbackCommandUsed: false,
-                workspaceDir: await getWorkspaceDir(noptExploratoryResults),
+                workspaceDir: await getWorkspaceDir(noptExploratoryResults, opts.renamedOptions),
             };
         }
     }
@@ -137,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.
@@ -146,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;
@@ -222,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.2",
+  "version": "1100.1.4",
   "description": "Parses the CLI args passed to pnpm",
   "keywords": [
     "pnpm",
@@ -8,7 +8,10 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/cli/parse-cli-args",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pnpm/pnpm/tree/main/cli/parse-cli-args"
+  },
   "homepage": "https://github.com/pnpm/pnpm/tree/main/cli/parse-cli-args#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
@@ -26,13 +29,13 @@
   "dependencies": {
     "@pnpm/nopt": "^0.3.1",
     "didyoumean2": "^7.0.4",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/workspace.root-finder": "1100.0.1"
+    "@pnpm/workspace.root-finder": "1100.0.2",
+    "@pnpm/error": "1100.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "tempy": "3.0.0",
-    "@pnpm/cli.parse-cli-args": "1100.1.2"
+    "@pnpm/cli.parse-cli-args": "1100.1.4"
   },
   "engines": {
     "node": ">=22.13"