@pnpm/pkg-manifest.commands 1100.1.30 → 1100.1.32

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @pnpm/pkg-manifest.commands
 
+## 1100.1.32
+
+### Patch Changes
+
+- `pnpm -r pkg get` now reports every selected project when several share a package name. Projects with the same name are keyed by their directory relative to the workspace root. Before, only one of them appeared in the output.
+
+- Updated dependencies:
+  - @pnpm/cli.utils@1101.0.31
+  - @pnpm/config.reader@1102.3.3
+
+## 1100.1.31
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/config.reader@1102.3.2
+
 ## 1100.1.30
 
 ### Patch Changes

package/lib/pkg.js

@@ -4,6 +4,7 @@ import { types as allTypes } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import { deleteObjectValueByPropertyPathString, getObjectValueByPropertyPathString, setObjectValueByPropertyPathString, } from '@pnpm/object.property-path';
 import { renderHelp } from 'render-help';
+import { assignReportKeys } from './reportKeys.js';
 export const rcOptionsTypes = cliOptionsTypes;
 export function cliOptionsTypes() {
     const types = allTypes;
@@ -57,12 +58,18 @@ async function handleRecursiveCommand(opts, subcmd, args) {
         throw new PnpmError('PKG_RECURSIVE_NO_PACKAGES', 'No workspace packages were selected');
     }
     if (subcmd === 'get') {
-        const entries = await Promise.all(selectedProjects.map(async ({ package: pkg }) => {
+        const projects = await Promise.all(selectedProjects.map(async ({ package: pkg }) => {
             const manifest = await readProjectManifestOnly(pkg.rootDir);
-            const pkgName = String(manifest.name ?? path.relative(workspaceDir, pkg.rootDir));
-            return [pkgName, selectFromManifest(manifest, args)];
+            return {
+                identity: {
+                    name: manifest.name == null ? undefined : String(manifest.name),
+                    dirKey: path.relative(workspaceDir, pkg.rootDir),
+                },
+                value: selectFromManifest(manifest, args),
+            };
         }));
-        return JSON.stringify(Object.fromEntries(entries), undefined, 2);
+        const keys = assignReportKeys(projects.map(({ identity }) => identity));
+        return JSON.stringify(Object.fromEntries(projects.map(({ value }, index) => [keys[index], value])), undefined, 2);
     }
     await Promise.all(selectedProjects.map(({ package: pkg }) => runSubcommand({ ...opts, dir: pkg.rootDir }, subcmd, args)));
 }
@@ -129,77 +136,80 @@ async function pkgDelete(opts, args) {
 }
 async function pkgFix(opts) {
     const { manifest, writeProjectManifest } = await readProjectManifest(opts.dir);
-    const m = manifest;
-    if ('name' in m && typeof m.name !== 'string') {
-        delete m.name;
+    const untypedManifest = manifest;
+    if ('name' in untypedManifest && typeof untypedManifest.name !== 'string') {
+        delete untypedManifest.name;
     }
-    if ('version' in m && typeof m.version !== 'string') {
-        delete m.version;
+    if ('version' in untypedManifest && typeof untypedManifest.version !== 'string') {
+        delete untypedManifest.version;
     }
     for (const field of ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies', 'scripts']) {
-        if (field in m && !isPlainObject(m[field])) {
-            delete m[field];
+        if (field in untypedManifest && !isPlainObject(untypedManifest[field])) {
+            delete untypedManifest[field];
         }
     }
-    if ('bin' in m && typeof m.bin !== 'string' && !isPlainObject(m.bin)) {
-        delete m.bin;
+    if ('bin' in untypedManifest && typeof untypedManifest.bin !== 'string' && !isPlainObject(untypedManifest.bin)) {
+        delete untypedManifest.bin;
     }
     await writeProjectManifest(manifest);
 }
 function isPlainObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+const COMMANDS = {
+    title: 'Commands',
+    list: [
+        {
+            description: 'Retrieves a value from package.json',
+            name: 'get [<key> [<key> ...]]',
+        },
+        {
+            description: 'Sets a value in package.json',
+            name: 'set <key>=<value> [<key>=<value> ...]',
+        },
+        {
+            description: 'Deletes a key from package.json',
+            name: 'delete <key> [<key> ...]',
+        },
+        {
+            description: 'Auto corrects common errors in package.json',
+            name: 'fix',
+        },
+    ],
+};
+const OPTIONS = {
+    title: 'Options',
+    list: [
+        {
+            description: 'When setting, parse the value as JSON. When getting a single key, return its JSON-encoded form instead of the raw value',
+            name: '--json',
+        },
+        {
+            description: 'Run on every workspace project or every project selected by a filter',
+            name: '--recursive',
+            shortAlias: '-r',
+        },
+    ],
+};
+const USAGES = [
+    'pnpm pkg get [<key> [<key> ...]]',
+    'pnpm pkg set <key>=<value> [<key>=<value> ...]',
+    'pnpm pkg delete <key> [<key> ...]',
+    'pnpm pkg fix',
+    'pnpm pkg set <key>=<value> --json',
+    'pnpm -r pkg get name',
+    'pnpm --filter <selector> pkg get name',
+    'pnpm -r pkg set version=1.0.0',
+];
 export function help() {
     return renderHelp({
         description: 'Manages your package.json',
         descriptionLists: [
-            {
-                title: 'Commands',
-                list: [
-                    {
-                        description: 'Retrieves a value from package.json',
-                        name: 'get [<key> [<key> ...]]',
-                    },
-                    {
-                        description: 'Sets a value in package.json',
-                        name: 'set <key>=<value> [<key>=<value> ...]',
-                    },
-                    {
-                        description: 'Deletes a key from package.json',
-                        name: 'delete <key> [<key> ...]',
-                    },
-                    {
-                        description: 'Auto corrects common errors in package.json',
-                        name: 'fix',
-                    },
-                ],
-            },
-            {
-                title: 'Options',
-                list: [
-                    {
-                        description: 'When setting, parse the value as JSON. When getting a single key, return its JSON-encoded form instead of the raw value',
-                        name: '--json',
-                    },
-                    {
-                        description: 'Run on every workspace project or every project selected by a filter',
-                        name: '--recursive',
-                        shortAlias: '-r',
-                    },
-                ],
-            },
+            COMMANDS,
+            OPTIONS,
         ],
         url: docsUrl('pkg'),
-        usages: [
-            'pnpm pkg get [<key> [<key> ...]]',
-            'pnpm pkg set <key>=<value> [<key>=<value> ...]',
-            'pnpm pkg delete <key> [<key> ...]',
-            'pnpm pkg fix',
-            'pnpm pkg set <key>=<value> --json',
-            'pnpm -r pkg get name',
-            'pnpm --filter <selector> pkg get name',
-            'pnpm -r pkg set version=1.0.0',
-        ],
+        usages: USAGES,
     });
 }
 //# sourceMappingURL=pkg.js.map

package/lib/reportKeys.d.ts

@@ -0,0 +1,17 @@
+export interface ReportIdentity {
+    /** The manifest's `name`, when it declares one. */
+    name?: string;
+    /** The project's directory, relative to the workspace root. */
+    dirKey: string;
+}
+/**
+ * Chooses a distinct `pnpm -r pkg get` report key for every project, in input order.
+ *
+ * A project is keyed by its name unless that would hide another project:
+ * a project without a name, every project that shares its name with
+ * another selected project, and a project whose name equals the directory
+ * key another project is reported under are keyed by their directory instead. Directories
+ * are distinct, so the keys are too, and a workspace whose names are unique
+ * keeps its name keys.
+ */
+export declare function assignReportKeys(identities: ReportIdentity[]): string[];

package/lib/reportKeys.js

@@ -0,0 +1,44 @@
+/**
+ * Chooses a distinct `pnpm -r pkg get` report key for every project, in input order.
+ *
+ * A project is keyed by its name unless that would hide another project:
+ * a project without a name, every project that shares its name with
+ * another selected project, and a project whose name equals the directory
+ * key another project is reported under are keyed by their directory instead. Directories
+ * are distinct, so the keys are too, and a workspace whose names are unique
+ * keeps its name keys.
+ */
+export function assignReportKeys(identities) {
+    const keyedByDir = initiallyKeyedByDir(identities);
+    moveNamesShadowedByDirs(identities, keyedByDir);
+    return identities.map((identity, index) => identity.name == null || keyedByDir[index] ? identity.dirKey : identity.name);
+}
+function initiallyKeyedByDir(identities) {
+    const nameCounts = new Map();
+    for (const { name } of identities) {
+        if (name != null)
+            nameCounts.set(name, (nameCounts.get(name) ?? 0) + 1);
+    }
+    return identities.map(({ name }) => name == null || nameCounts.get(name) > 1);
+}
+/**
+ * Moves every name-keyed project whose name equals a directory key in use
+ * to its own directory key. A moved project's directory key can in turn
+ * shadow another name, so each move is followed up the same way.
+ */
+function moveNamesShadowedByDirs(identities, keyedByDir) {
+    const nameKeyed = new Map();
+    for (const [index, { name }] of identities.entries()) {
+        if (name != null && !keyedByDir[index])
+            nameKeyed.set(name, index);
+    }
+    const pending = identities.flatMap((_, index) => keyedByDir[index] ? [index] : []);
+    for (let index = pending.pop(); index !== undefined; index = pending.pop()) {
+        const shadowed = nameKeyed.get(identities[index].dirKey);
+        if (shadowed !== undefined && !keyedByDir[shadowed]) {
+            keyedByDir[shadowed] = true;
+            pending.push(shadowed);
+        }
+    }
+}
+//# sourceMappingURL=reportKeys.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/pkg-manifest.commands",
-  "version": "1100.1.30",
+  "version": "1100.1.32",
   "description": "Commands for managing package.json",
   "keywords": [
     "pnpm",
@@ -28,8 +28,8 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/cli.utils": "1101.0.30",
-    "@pnpm/config.reader": "1102.3.1",
+    "@pnpm/cli.utils": "1101.0.31",
+    "@pnpm/config.reader": "1102.3.3",
     "@pnpm/error": "1100.2.1",
     "@pnpm/object.property-path": "1100.1.8",
     "@pnpm/types": "1102.1.1",
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/pkg-manifest.commands": "1100.1.30",
-    "@pnpm/prepare": "1100.0.33"
+    "@pnpm/pkg-manifest.commands": "1100.1.32",
+    "@pnpm/prepare": "1100.0.35"
   },
   "engines": {
     "node": ">=22.13"