@pnpm/exec.commands 1100.2.5 → 1100.3.1

package/lib/dlx.js

@@ -8,10 +8,11 @@ import { OUTPUT_OPTIONS } from '@pnpm/cli.common-cli-options-help';
 import { docsUrl, readProjectManifestOnly } from '@pnpm/cli.utils';
 import { types } from '@pnpm/config.reader';
 import { getPublishedByPolicy } from '@pnpm/config.version-policy';
-import { createHexHash } from '@pnpm/crypto.hash';
+import { createShortHash } from '@pnpm/crypto.hash';
 import { PnpmError } from '@pnpm/error';
 import { createResolver, makeResolutionStrict } from '@pnpm/installing.client';
 import { add } from '@pnpm/installing.commands';
+import { logger } from '@pnpm/logger';
 import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
 import { lexCompare } from '@pnpm/util.lex-comparator';
@@ -186,8 +187,23 @@ export async function handler(opts, [command, ...args], commands) {
             }
             else {
                 // Drop the partially-populated cache so a subsequent dlx run starts
-                // clean instead of reusing a broken install.
-                await fs.promises.rm(cachedDir, { recursive: true, force: true });
+                // clean instead of reusing a broken install. This is best-effort: on
+                // Windows the just-run install scripts (or antivirus) can briefly hold
+                // handles on freshly written files, so retry with backoff. A cleanup
+                // failure must never mask the original install error, which is the one
+                // worth surfacing — log it and rethrow err. A leftover prepare dir is
+                // harmless: it has a unique name and findCache only trusts the `pkg`
+                // symlink.
+                try {
+                    await fs.promises.rm(cachedDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+                }
+                catch (cleanupErr) {
+                    logger.warn({
+                        error: cleanupErr,
+                        message: `Failed to clean up the dlx cache directory at "${cachedDir}"`,
+                        prefix: cachedDir,
+                    });
+                }
                 throw err;
             }
         }
@@ -353,7 +369,12 @@ export function createCacheKey(opts) {
         }
     }
     const hashStr = JSON.stringify(args);
-    return createHexHash(hashStr);
+    // A short (truncated) hash keeps the dlx cache path short. The full
+    // virtual-store path below it (`<key>/<prepare>/node_modules/.pnpm/<pkgId>/
+    // node_modules/<pkg>`) can otherwise blow past Windows' MAX_PATH (260) and
+    // make lifecycle scripts fail with a `spawn cmd.exe ENOENT` (the cwd no
+    // longer resolves). 128 bits is ample collision resistance for a cache key.
+    return createShortHash(hashStr);
 }
 function getValidCacheDir(cacheLink, dlxCacheMaxAge) {
     let stats;
@@ -379,7 +400,10 @@ function getValidCacheDir(cacheLink, dlxCacheMaxAge) {
     return isValid ? target : undefined;
 }
 function getPrepareDir(cachePath) {
-    const name = `${new Date().getTime().toString(16)}-${process.pid.toString(16)}`;
+    // base36 (vs hex) keeps this segment short — see createCacheKey for why dlx
+    // path length matters on Windows. time+pid stays unique across concurrent
+    // dlx processes and across a process's own retries of a failed install.
+    const name = `${Date.now().toString(36)}-${process.pid.toString(36)}`;
     return path.join(cachePath, name);
 }
 function resolveCatalogProtocol(catalogResolver, alias, bareSpecifier) {

package/lib/exec.d.ts

@@ -28,7 +28,7 @@ export type ExecOpts = Required<Pick<ConfigContext, 'selectedProjectsGraph'>> &
     resumeFrom?: string;
     reportSummary?: boolean;
     implicitlyFellbackFromRun?: boolean;
-} & Pick<Config, 'bin' | 'dir' | 'extraBinPaths' | 'extraEnv' | 'lockfileDir' | 'modulesDir' | 'nodeOptions' | 'pnpmHomeDir' | 'recursive' | 'reporter' | 'reporterHidePrefix' | 'userAgent' | 'verifyDepsBeforeRun' | 'workspaceDir'> & Pick<ConfigContext, 'cliOptions'> & CheckDepsStatusOptions;
+} & Pick<Config, 'bin' | 'dir' | 'extraBinPaths' | 'extraEnv' | 'lockfileDir' | 'modulesDir' | 'nodeOptions' | 'nodeExperimentalPackageMap' | 'pnpmHomeDir' | 'recursive' | 'reporter' | 'reporterHidePrefix' | 'userAgent' | 'verifyDepsBeforeRun' | 'workspaceDir'> & Pick<ConfigContext, 'cliOptions'> & CheckDepsStatusOptions;
 export declare function handler(opts: ExecOpts, params: string[]): Promise<{
     exitCode: number;
 }>;

package/lib/exec.js

@@ -4,7 +4,7 @@ import { docsUrl, readProjectManifestOnly, throwOnCommandFail } from '@pnpm/cli.
 import { getWorkspaceConcurrency, types } from '@pnpm/config.reader';
 import { lifecycleLogger } from '@pnpm/core-loggers';
 import { PnpmError } from '@pnpm/error';
-import { makeNodeRequireOption } from '@pnpm/exec.lifecycle';
+import { makeNodePackageMapOption, makeNodeRequireOption } from '@pnpm/exec.lifecycle';
 import { logger } from '@pnpm/logger';
 import { prependDirsToPath } from '@pnpm/shell.path';
 import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader';
@@ -33,6 +33,8 @@ export function rcOptionsTypes() {
             'unsafe-perm',
             'workspace-concurrency',
             'reporter-hide-prefix',
+            'node-experimental-package-map',
+            'node-package-map-type',
         ], types),
         'shell-mode': Boolean,
         'resume-from': String,
@@ -156,6 +158,8 @@ export async function handler(opts, params) {
     const result = createEmptyRecursiveSummary(chunks);
     const existsPnp = existsInDir.bind(null, '.pnp.cjs');
     const workspacePnpPath = opts.workspaceDir && existsPnp(opts.workspaceDir);
+    const existsPackageMap = existsInDir.bind(null, path.join(opts.modulesDir ?? 'node_modules', '.package-map.json'));
+    const workspacePackageMapPath = opts.nodeExperimentalPackageMap && opts.workspaceDir && existsPackageMap(opts.workspaceDir);
     let exitCode = 0;
     const prependPaths = [
         './node_modules/.bin',
@@ -169,15 +173,21 @@ export async function handler(opts, params) {
             const startTime = process.hrtime();
             try {
                 const pnpPath = workspacePnpPath ?? existsPnp(prefix);
+                const packageMapPath = workspacePackageMapPath || (opts.nodeExperimentalPackageMap && existsPackageMap(prefix));
                 const extraEnv = {
                     ...opts.extraEnv,
-                    ...(pnpPath ? makeNodeRequireOption(pnpPath) : {}),
+                    ...(opts.nodeOptions ? { NODE_OPTIONS: opts.nodeOptions } : {}),
                 };
+                if (pnpPath) {
+                    Object.assign(extraEnv, makeNodeRequireOption(pnpPath, extraEnv));
+                }
+                if (packageMapPath) {
+                    Object.assign(extraEnv, makeNodePackageMapOption(packageMapPath, extraEnv));
+                }
                 const env = makeEnv({
                     extraEnv: {
                         ...extraEnv,
                         PNPM_PACKAGE_NAME: opts.selectedProjectsGraph[prefix]?.package.manifest.name,
-                        ...(opts.nodeOptions ? { NODE_OPTIONS: opts.nodeOptions } : {}),
                     },
                     prependPaths,
                     userAgent: opts.userAgent,

package/lib/run.d.ts

@@ -24,7 +24,7 @@ export declare const commandNames: string[];
 export declare function help(): string;
 export type RunOpts = Omit<RecursiveRunOpts, 'allProjects' | 'selectedProjectsGraph' | 'workspaceDir'> & {
     recursive?: boolean;
-} & Pick<Config, 'bin' | 'verifyDepsBeforeRun' | 'dir' | 'enablePrePostScripts' | 'engineStrict' | 'extraBinPaths' | 'extraEnv' | 'nodeOptions' | 'pnpmHomeDir' | 'reporter' | 'scriptShell' | 'scriptsPrependNodePath' | 'shellEmulator' | 'syncInjectedDepsAfterScripts' | 'userAgent'> & Pick<ConfigContext, 'cliOptions'> & (({
+} & Pick<Config, 'bin' | 'verifyDepsBeforeRun' | 'dir' | 'enablePrePostScripts' | 'engineStrict' | 'extraBinPaths' | 'extraEnv' | 'nodeOptions' | 'nodeExperimentalPackageMap' | 'pnpmHomeDir' | 'reporter' | 'scriptShell' | 'scriptsPrependNodePath' | 'shellEmulator' | 'syncInjectedDepsAfterScripts' | 'userAgent'> & Pick<ConfigContext, 'cliOptions'> & (({
     recursive?: false;
 } & Partial<Pick<ConfigContext, 'allProjects' | 'selectedProjectsGraph'> & Pick<Config, 'workspaceDir'>>) | ({
     recursive: true;

package/lib/run.js

@@ -3,7 +3,7 @@ import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help'
 import { docsUrl, readProjectManifestOnly, tryReadProjectManifest, } from '@pnpm/cli.utils';
 import { getWorkspaceConcurrency, types as allTypes } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
-import { makeNodeRequireOption, runLifecycleHook, } from '@pnpm/exec.lifecycle';
+import { makeNodePackageMapOption, makeNodeRequireOption, runLifecycleHook, } from '@pnpm/exec.lifecycle';
 import { syncInjectedDeps } from '@pnpm/workspace.injected-deps-syncer';
 import pLimit from 'p-limit';
 import { pick } from 'ramda';
@@ -60,6 +60,8 @@ export function rcOptionsTypes() {
     return {
         ...pick([
             'npm-path',
+            'node-experimental-package-map',
+            'node-package-map-type',
         ], allTypes),
     };
 }
@@ -104,7 +106,7 @@ For options that may be used with `-r`, see "pnpm help recursive"',
                         shortAlias: '-r',
                     },
                     {
-                        description: 'The command will exit with a 0 exit code even if the script fails',
+                        description: 'Continue running the remaining scripts even if one of them fails, instead of aborting on the first failure. The command still exits with a non-zero exit code if any script failed',
                         name: '--no-bail',
                     },
                     IF_PRESENT_OPTION_HELP,
@@ -214,22 +216,40 @@ so you may run "pnpm -w run ${scriptName}"`,
     if (pnpPath) {
         lifecycleOpts.extraEnv = {
             ...lifecycleOpts.extraEnv,
-            ...makeNodeRequireOption(pnpPath),
+            ...makeNodeRequireOption(pnpPath, lifecycleOpts.extraEnv),
         };
     }
-    try {
-        const limitRun = pLimit(concurrency);
-        const runScriptOptions = {
-            enablePrePostScripts: opts.enablePrePostScripts ?? false,
-            syncInjectedDepsAfterScripts: opts.syncInjectedDepsAfterScripts,
-            workspaceDir: opts.workspaceDir,
+    const existsPackageMap = existsInDir.bind(null, path.join(opts.modulesDir ?? 'node_modules', '.package-map.json'));
+    const packageMapPath = opts.nodeExperimentalPackageMap
+        ? (opts.workspaceDir && existsPackageMap(opts.workspaceDir)) ?? existsPackageMap(dir)
+        : undefined;
+    if (packageMapPath) {
+        lifecycleOpts.extraEnv = {
+            ...lifecycleOpts.extraEnv,
+            ...makeNodePackageMapOption(packageMapPath, lifecycleOpts.extraEnv),
         };
-        const _runScript = runScript.bind(null, { manifest, lifecycleOpts, runScriptOptions, passedThruArgs });
+    }
+    const limitRun = pLimit(concurrency);
+    const runScriptOptions = {
+        enablePrePostScripts: opts.enablePrePostScripts ?? false,
+        syncInjectedDepsAfterScripts: opts.syncInjectedDepsAfterScripts,
+        workspaceDir: opts.workspaceDir,
+    };
+    const _runScript = runScript.bind(null, { manifest, lifecycleOpts, runScriptOptions, passedThruArgs });
+    if (opts.bail !== false) {
         await Promise.all(specifiedScripts.map(script => limitRun(() => _runScript(script))));
     }
-    catch (err) {
-        if (opts.bail !== false) {
-            throw err;
+    else {
+        const results = await Promise.allSettled(specifiedScripts.map(script => limitRun(() => _runScript(script))));
+        const failures = results
+            .map((result, index) => ({ result, script: specifiedScripts[index] }))
+            .filter((entry) => entry.result.status === 'rejected');
+        if (failures.length > 0) {
+            throw new PnpmError('RUN_FAILED', `Some scripts failed: ${failures.length} of ${specifiedScripts.length}`, {
+                hint: failures
+                    .map(({ script, result }) => `${script}: ${result.reason?.message ?? String(result.reason)}`)
+                    .join('\n'),
+            });
         }
     }
     return undefined;

package/lib/runRecursive.d.ts

@@ -1,6 +1,6 @@
 import { type Config, type ConfigContext } from '@pnpm/config.reader';
 import type { PackageScripts } from '@pnpm/types';
-export type RecursiveRunOpts = Pick<Config, 'bin' | 'enablePrePostScripts' | 'unsafePerm' | 'pnpmHomeDir' | 'requiredScripts' | 'userAgent' | 'scriptsPrependNodePath' | 'scriptShell' | 'shellEmulator' | 'stream' | 'syncInjectedDepsAfterScripts' | 'workspaceDir'> & Pick<ConfigContext, 'rootProjectManifest'> & Required<Pick<ConfigContext, 'allProjects' | 'selectedProjectsGraph'> & Pick<Config, 'workspaceDir' | 'dir'>> & Partial<Pick<Config, 'extraBinPaths' | 'extraEnv' | 'bail' | 'reporter' | 'reverse' | 'sort' | 'workspaceConcurrency'>> & {
+export type RecursiveRunOpts = Pick<Config, 'bin' | 'enablePrePostScripts' | 'unsafePerm' | 'pnpmHomeDir' | 'requiredScripts' | 'userAgent' | 'scriptsPrependNodePath' | 'scriptShell' | 'shellEmulator' | 'stream' | 'syncInjectedDepsAfterScripts' | 'workspaceDir' | 'nodeExperimentalPackageMap' | 'modulesDir'> & Pick<ConfigContext, 'rootProjectManifest'> & Required<Pick<ConfigContext, 'allProjects' | 'selectedProjectsGraph'> & Pick<Config, 'workspaceDir' | 'dir'>> & Partial<Pick<Config, 'extraBinPaths' | 'extraEnv' | 'bail' | 'reporter' | 'reverse' | 'sort' | 'workspaceConcurrency'>> & {
     ifPresent?: boolean;
     resumeFrom?: string;
     reportSummary?: boolean;

package/lib/runRecursive.js

@@ -4,7 +4,7 @@ import util from 'node:util';
 import { throwOnCommandFail } from '@pnpm/cli.utils';
 import { getWorkspaceConcurrency } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
-import { makeNodeRequireOption, } from '@pnpm/exec.lifecycle';
+import { makeNodePackageMapOption, makeNodeRequireOption, } from '@pnpm/exec.lifecycle';
 import { groupStart } from '@pnpm/log.group';
 import { sortProjects } from '@pnpm/workspace.projects-sorter';
 import pLimit from 'p-limit';
@@ -39,6 +39,8 @@ export async function runRecursive(params, opts) {
         : 'pipe';
     const existsPnp = existsInDir.bind(null, '.pnp.cjs');
     const workspacePnpPath = opts.workspaceDir && existsPnp(opts.workspaceDir);
+    const existsPackageMap = existsInDir.bind(null, path.join(opts.modulesDir ?? 'node_modules', '.package-map.json'));
+    const workspacePackageMapPath = opts.nodeExperimentalPackageMap && opts.workspaceDir && existsPackageMap(opts.workspaceDir);
     const requiredScripts = opts.requiredScripts ?? [];
     if (requiredScripts.includes(scriptName)) {
         const missingScriptPackages = packageChunks
@@ -93,7 +95,14 @@ export async function runRecursive(params, opts) {
                 if (pnpPath) {
                     lifecycleOpts.extraEnv = {
                         ...lifecycleOpts.extraEnv,
-                        ...makeNodeRequireOption(pnpPath),
+                        ...makeNodeRequireOption(pnpPath, lifecycleOpts.extraEnv),
+                    };
+                }
+                const packageMapPath = workspacePackageMapPath || (opts.nodeExperimentalPackageMap && existsPackageMap(prefix));
+                if (packageMapPath) {
+                    lifecycleOpts.extraEnv = {
+                        ...lifecycleOpts.extraEnv,
+                        ...makeNodePackageMapOption(packageMapPath, lifecycleOpts.extraEnv),
                     };
                 }
                 const runScriptOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.commands",
-  "version": "1100.2.5",
+  "version": "1100.3.1",
   "description": "Commands for running scripts",
   "keywords": [
     "pnpm",
@@ -11,9 +11,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/exec/commands"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/exec/commands"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/exec/commands#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/exec/commands#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -41,31 +41,31 @@
     "symlink-dir": "^10.0.1",
     "which": "npm:@pnpm/which@^3.0.1",
     "write-json-file": "^7.0.0",
+    "@pnpm/building.commands": "1100.1.7",
     "@pnpm/bins.resolver": "1100.0.8",
     "@pnpm/cli.command": "1100.0.1",
-    "@pnpm/cli.utils": "1101.0.12",
-    "@pnpm/config.reader": "1101.9.0",
-    "@pnpm/config.version-policy": "1100.1.5",
-    "@pnpm/building.commands": "1100.1.5",
+    "@pnpm/cli.common-cli-options-help": "1100.0.2",
+    "@pnpm/cli.utils": "1101.0.13",
+    "@pnpm/config.reader": "1101.10.1",
     "@pnpm/catalogs.resolver": "1100.0.0",
-    "@pnpm/deps.status": "1100.1.1",
-    "@pnpm/engine.runtime.commands": "1100.1.5",
-    "@pnpm/error": "1100.0.0",
+    "@pnpm/config.version-policy": "1100.1.6",
     "@pnpm/core-loggers": "1100.2.1",
     "@pnpm/crypto.hash": "1100.0.1",
-    "@pnpm/exec.lifecycle": "1100.0.18",
-    "@pnpm/installing.commands": "1100.9.0",
-    "@pnpm/installing.client": "1100.2.8",
+    "@pnpm/deps.status": "1100.1.3",
+    "@pnpm/engine.runtime.commands": "1100.1.7",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/exec.lifecycle": "1100.1.1",
+    "@pnpm/installing.commands": "1100.10.1",
     "@pnpm/exec.pnpm-cli-runner": "1100.0.1",
-    "@pnpm/pkg-manifest.reader": "1100.0.8",
-    "@pnpm/shell.path": "1100.0.1",
-    "@pnpm/store.path": "1100.0.1",
+    "@pnpm/installing.client": "1100.2.10",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
+    "@pnpm/shell.path": "1100.0.1",
     "@pnpm/types": "1101.3.2",
-    "@pnpm/workspace.projects-sorter": "1100.0.7",
-    "@pnpm/cli.common-cli-options-help": "1100.0.2",
-    "@pnpm/workspace.injected-deps-syncer": "1100.0.19",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.13"
+    "@pnpm/workspace.injected-deps-syncer": "1100.0.21",
+    "@pnpm/store.path": "1100.0.2",
+    "@pnpm/pkg-manifest.reader": "1100.0.9",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.14",
+    "@pnpm/workspace.projects-sorter": "1100.0.7"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -77,13 +77,13 @@
     "@types/which": "^3.0.4",
     "is-windows": "^1.0.2",
     "write-yaml-file": "^6.0.0",
+    "@pnpm/exec.commands": "1100.3.1",
     "@pnpm/engine.runtime.system-version": "1100.0.3",
-    "@pnpm/exec.commands": "1100.2.5",
-    "@pnpm/prepare": "1100.0.16",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/prepare": "1100.0.17",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.6",
-    "@pnpm/workspace.projects-filter": "1100.0.21",
-    "@pnpm/logger": "1100.0.0"
+    "@pnpm/workspace.projects-filter": "1100.0.23",
+    "@pnpm/testing.command-defaults": "1100.0.7"
   },
   "engines": {
     "node": ">=22.13"