@pnpm/global.commands 1100.0.13 → 1100.0.15

package/lib/globalAdd.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { linkBinsOfPackages } from '@pnpm/bins.linker';
 import { removeBin } from '@pnpm/bins.remover';
+import { summaryLogger } from '@pnpm/core-loggers';
 import { cleanOrphanedInstallDirs, createGlobalCacheKey, createInstallDir, findGlobalPackage, getHashLink, getInstalledBinNames, } from '@pnpm/global.packages';
 import { readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.reader';
 import { isSubdir } from 'is-subdir';
@@ -11,17 +12,9 @@ import { installGlobalPackages } from './installGlobalPackages.js';
 import { promptApproveGlobalBuilds } from './promptApproveGlobalBuilds.js';
 import { readInstalledPackages } from './readInstalledPackages.js';
 export async function handleGlobalAdd(opts, params, commands) {
-    // Resolve relative path selectors to absolute paths before the working
-    // directory is changed to the global install dir, otherwise "." or
-    // "./foo" would resolve against the temp install directory.
-    params = params.map((param) => resolveLocalParam(param, opts.dir));
     const globalDir = opts.globalPkgDir;
     const globalBinDir = opts.bin;
     cleanOrphanedInstallDirs(globalDir);
-    // Install into a new directory first, then read the resolved aliases
-    // from the resulting package.json. This is more reliable than parsing
-    // aliases from CLI params (which may be tarballs, git URLs, etc.).
-    const installDir = createInstallDir(globalDir);
     // Convert allowBuild array to allowBuilds Record (same conversion as add.handler)
     let allowBuilds = opts.allowBuilds ?? {};
     if (opts.allowBuild?.length) {
@@ -30,19 +23,45 @@ export async function handleGlobalAdd(opts, params, commands) {
             allowBuilds[pkg] = true;
         }
     }
+    // Each space-separated CLI param becomes its own isolated install group.
+    // A param containing commas is split into multiple selectors that share a
+    // single group, so `pnpm add -g foo,bar qar` installs foo+bar together
+    // and qar separately. Local paths and URLs that legitimately contain
+    // commas are detected and kept whole.
+    const groups = params
+        .map((param) => splitCommaSeparated(param, opts.dir).map((token) => resolveLocalParam(token, opts.dir)))
+        .filter((group) => group.length > 0);
+    for (const group of groups) {
+        // eslint-disable-next-line no-await-in-loop
+        await installGroup({ opts, globalDir, globalBinDir, allowBuilds, params: group }, commands);
+    }
+    // The per-group `mutateModulesInSingleProject` calls run with
+    // `omitSummaryLog: true` so the default-reporter's summary block only
+    // appears once at the end, with every installed package listed under a
+    // single "global:" heading. Without this, the reporter would print
+    // group 1's summary and then ignore later groups, because its summary
+    // pipeline takes only the first `summary` log event.
+    summaryLogger.debug({ prefix: globalDir });
+}
+async function installGroup(ctx, commands) {
+    const { opts, globalDir, globalBinDir, allowBuilds, params } = ctx;
+    // Install into a new directory first, then read the resolved aliases
+    // from the resulting package.json. This is more reliable than parsing
+    // aliases from CLI params (which may be tarballs, git URLs, etc.).
+    const installDir = createInstallDir(globalDir);
     const include = {
         dependencies: true,
         devDependencies: false,
         optionalDependencies: true,
     };
     const fetchFullMetadata = opts.supportedArchitectures?.libc != null && true;
-    const makeInstallOpts = (dir, builds) => ({
+    const installOpts = {
         ...opts,
         global: false,
-        bin: path.join(dir, 'node_modules/.bin'),
-        dir,
-        lockfileDir: dir,
-        rootProjectManifestDir: dir,
+        bin: path.join(installDir, 'node_modules/.bin'),
+        dir: installDir,
+        lockfileDir: installDir,
+        rootProjectManifestDir: installDir,
         rootProjectManifest: undefined,
         saveProd: true,
         saveDev: false,
@@ -54,9 +73,10 @@ export async function handleGlobalAdd(opts, params, commands) {
         fetchFullMetadata,
         include,
         includeDirect: include,
-        allowBuilds: builds,
-    });
-    const ignoredBuilds = await installGlobalPackages(makeInstallOpts(installDir, allowBuilds), params);
+        allowBuilds,
+        omitSummaryLog: true,
+    };
+    const ignoredBuilds = await installGlobalPackages(installOpts, params);
     await promptApproveGlobalBuilds({
         globalPkgDir: globalDir,
         installDir,
@@ -95,6 +115,47 @@ export async function handleGlobalAdd(opts, params, commands) {
     // Link bins from installed packages into global bin dir
     await linkBinsOfPackages(pkgs, globalBinDir, { excludeBins: binsToSkip });
 }
+function splitCommaSeparated(param, baseDir) {
+    if (!param.includes(','))
+        return [param];
+    // URLs may contain commas and are never a group of selectors.
+    if (param.includes('://'))
+        return [param];
+    // For path-like specs (relative/absolute paths, file:, link:), the
+    // commas could either be part of a single path that legitimately
+    // contains commas, or be separators between multiple distinct paths.
+    // Resolve the ambiguity by checking whether the whole param actually
+    // refers to an existing local path on disk.
+    if (refersToExistingLocalPath(param, baseDir))
+        return [param];
+    return param.split(',').map((token) => token.trim()).filter(Boolean);
+}
+function refersToExistingLocalPath(param, baseDir) {
+    let pathPart;
+    if (param.startsWith('file:')) {
+        pathPart = param.slice('file:'.length);
+    }
+    else if (param.startsWith('link:')) {
+        pathPart = param.slice('link:'.length);
+    }
+    else if (param[0] === '.' || param[0] === '/' || param[0] === '~') {
+        pathPart = param;
+    }
+    else if (/^[a-z]:[/\\]/i.test(param)) {
+        pathPart = param;
+    }
+    else {
+        return false;
+    }
+    const resolved = path.isAbsolute(pathPart) ? pathPart : path.resolve(baseDir, pathPart);
+    try {
+        fs.statSync(resolved);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function resolveLocalParam(param, baseDir) {
     for (const prefix of ['file:', 'link:']) {
         if (param.startsWith(prefix)) {

package/lib/installGlobalPackages.d.ts

@@ -10,6 +10,7 @@ export interface InstallGlobalPackagesOptions extends CreateStoreControllerOptio
     include: IncludedDependencies;
     includeDirect?: IncludedDependencies;
     fetchFullMetadata?: boolean;
+    omitSummaryLog?: boolean;
     rootProjectManifest?: unknown;
     rootProjectManifestDir?: string;
     saveDev?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/global.commands",
-  "version": "1100.0.13",
+  "version": "1100.0.15",
   "description": "Global package command handlers for pnpm",
   "keywords": [
     "pnpm",
@@ -28,24 +28,25 @@
     "@pnpm/util.lex-comparator": "^3.0.2",
     "is-subdir": "^2.0.0",
     "symlink-dir": "^10.0.1",
-    "@pnpm/cli.command": "1100.0.1",
-    "@pnpm/bins.remover": "1100.0.2",
-    "@pnpm/bins.linker": "1100.0.3",
-    "@pnpm/cli.utils": "1101.0.2",
-    "@pnpm/bins.resolver": "1100.0.2",
-    "@pnpm/deps.inspection.list": "1100.0.7",
+    "@pnpm/bins.remover": "1100.0.3",
+    "@pnpm/bins.resolver": "1100.0.3",
+    "@pnpm/cli.utils": "1101.0.3",
+    "@pnpm/bins.linker": "1100.0.4",
+    "@pnpm/config.matcher": "1100.0.1",
+    "@pnpm/config.reader": "1101.3.0",
+    "@pnpm/core-loggers": "1100.0.2",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/config.reader": "1101.2.1",
-    "@pnpm/installing.deps-installer": "1101.0.8",
-    "@pnpm/store.connection-manager": "1100.0.12",
-    "@pnpm/global.packages": "1100.0.2",
-    "@pnpm/types": "1101.0.0",
-    "@pnpm/pkg-manifest.reader": "1100.0.2",
-    "@pnpm/config.matcher": "1100.0.1"
+    "@pnpm/global.packages": "1100.0.3",
+    "@pnpm/installing.deps-installer": "1101.1.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.3",
+    "@pnpm/store.connection-manager": "1100.1.0",
+    "@pnpm/types": "1101.1.0",
+    "@pnpm/cli.command": "1100.0.1",
+    "@pnpm/deps.inspection.list": "1100.0.9"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/global.commands": "1100.0.13"
+    "@pnpm/global.commands": "1100.0.15"
   },
   "engines": {
     "node": ">=22.13"