@pnpm/bins.linker 1000.2.6 → 1100.0.0

package/lib/index.js

@@ -1,15 +1,14 @@
 import { existsSync, promises as fs } from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
-import { getBinsFromPackageManifest } from '@pnpm/bins.resolver';
-import { getBunBinLocationForCurrentOS, getDenoBinLocationForCurrentOS, getNodeBinLocationForCurrentOS } from '@pnpm/constants';
+import { getBinsFromPackageManifest, pkgOwnsBin } from '@pnpm/bins.resolver';
 import { PnpmError } from '@pnpm/error';
 import { readModulesDir } from '@pnpm/fs.read-modules-dir';
 import { globalWarn, logger } from '@pnpm/logger';
 import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils';
 import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader';
-import cmdShim from '@zkochan/cmd-shim';
+import { cmdShim, isShimPointingAt } from '@zkochan/cmd-shim';
 import { rimraf } from '@zkochan/rimraf';
 import fixBin from 'bin-links/lib/fix-bin.js';
 import { isSubdir } from 'is-subdir';
@@ -17,12 +16,14 @@ import isWindows from 'is-windows';
 import normalizePath from 'normalize-path';
 import { groupBy, isEmpty, partition, unnest } from 'ramda';
 import semver from 'semver';
-import symlinkDir from 'symlink-dir';
+import { symlinkDir } from 'symlink-dir';
 import { getBinNodePaths } from './getBinNodePaths.js';
 const binsConflictLogger = logger('bins-conflict');
 const IS_WINDOWS = isWindows();
 const EXECUTABLE_SHEBANG_SUPPORTED = !IS_WINDOWS;
 const POWER_SHELL_IS_SUPPORTED = IS_WINDOWS;
+// A cmd-shim is a small shell script. Anything larger is a binary and should not be read.
+const CMD_SHIM_MAX_SIZE = 4 * 1024;
 export async function linkBins(modulesDir, binsDir, opts) {
     const allDeps = await readModulesDir(modulesDir);
     // If the modules dir does not exist, do nothing
@@ -105,9 +106,12 @@ function resolveCommandConflicts(group, binsDir) {
     });
 }
 function compareCommandsInConflict(a, b) {
-    if (a.ownName && !b.ownName)
+    // Check ownership: a package that owns the bin name gets priority
+    const aOwns = pkgOwnsBin(a.name, a.pkgName);
+    const bOwns = pkgOwnsBin(b.name, b.pkgName);
+    if (aOwns && !bOwns)
         return 1;
-    if (!a.ownName && b.ownName)
+    if (!aOwns && bOwns)
         return -1;
     if (a.pkgName !== b.pkgName)
         return a.pkgName.localeCompare(b.pkgName); // it's pointless to compare versions of 2 different package
@@ -132,37 +136,6 @@ async function getPackageBins(opts, target) {
         ? await safeReadProjectManifestOnly(target)
         : await safeReadPkgJson(target);
     if (manifest == null) {
-        // There is a probably a better way to do this.
-        // It isn't good to have these hardcoded here.
-        switch (path.basename(target)) {
-            case 'node':
-                return [{
-                        name: 'node',
-                        path: path.join(target, getNodeBinLocationForCurrentOS()),
-                        ownName: true,
-                        pkgName: '',
-                        pkgVersion: '',
-                        makePowerShellShim: false,
-                    }];
-            case 'deno':
-                return [{
-                        name: 'deno',
-                        path: path.join(target, getDenoBinLocationForCurrentOS()),
-                        ownName: true,
-                        pkgName: '',
-                        pkgVersion: '',
-                        makePowerShellShim: false,
-                    }];
-            case 'bun':
-                return [{
-                        name: 'bun',
-                        path: path.join(target, getBunBinLocationForCurrentOS()),
-                        ownName: true,
-                        pkgName: '',
-                        pkgVersion: '',
-                        makePowerShellShim: false,
-                    }];
-        }
         // There's a directory in node_modules without package.json: ${target}.
         // This used to be a warning but it didn't really cause any issues.
         return [];
@@ -191,7 +164,6 @@ async function getPackageBinsFromManifest(manifest, pkgDir) {
     }
     return cmds.map((cmd) => ({
         ...cmd,
-        ownName: cmd.name === manifest.name,
         pkgName: manifest.name,
         pkgVersion: manifest.version,
         makePowerShellShim: POWER_SHELL_IS_SUPPORTED && manifest.name !== 'pnpm',
@@ -206,6 +178,26 @@ function runtimeHasNodeDownloaded(runtime) {
 }
 async function linkBin(cmd, binsDir, opts) {
     const externalBinPath = path.join(binsDir, cmd.name);
+    // Skip if the existing bin already references the correct target.
+    // This avoids redundant I/O on warm installs and EACCES on read-only stores.
+    // We verify the target path — not just existence — so that conflict resolution
+    // changes or provider swaps still get the bin rewritten.
+    try {
+        const stat = await fs.lstat(externalBinPath);
+        if (stat.isSymbolicLink()) {
+            const target = await fs.readlink(externalBinPath);
+            if (target === cmd.path || path.resolve(binsDir, target) === path.resolve(cmd.path)) {
+                return;
+            }
+        }
+        else if (stat.isFile() && stat.size < CMD_SHIM_MAX_SIZE) {
+            const content = await fs.readFile(externalBinPath, 'utf8');
+            if (isShimPointingAt(content, cmd.path)) {
+                return;
+            }
+        }
+    }
+    catch { }
     if (IS_WINDOWS) {
         const exePath = path.join(binsDir, `${cmd.name}${getExeExtension()}`);
         if (existsSync(exePath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/bins.linker",
-  "version": "1000.2.6",
+  "version": "1100.0.0",
   "description": "Link bins to node_modules/.bin",
   "keywords": [
     "pnpm",
@@ -25,39 +25,38 @@
     "!*.map"
   ],
   "dependencies": {
-    "@zkochan/cmd-shim": "^8.0.1",
+    "@zkochan/cmd-shim": "^9.0.0",
     "@zkochan/rimraf": "^4.0.0",
-    "bin-links": "^5.0.0",
+    "bin-links": "^6.0.0",
     "is-subdir": "^2.0.0",
     "is-windows": "^1.0.2",
     "normalize-path": "^3.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "semver": "^7.7.2",
-    "symlink-dir": "^7.0.0",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/bins.resolver": "1000.0.11",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/fs.read-modules-dir": "1000.0.0",
-    "@pnpm/pkg-manifest.utils": "1001.0.6",
-    "@pnpm/pkg-manifest.reader": "1000.1.2",
-    "@pnpm/workspace.project-manifest-reader": "1001.1.4",
-    "@pnpm/types": "1000.9.0"
+    "symlink-dir": "^10.0.1",
+    "@pnpm/bins.resolver": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/fs.read-modules-dir": "1100.0.0",
+    "@pnpm/types": "1100.0.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.0",
+    "@pnpm/pkg-manifest.utils": "1100.0.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.0.5",
+    "@jest/globals": "30.3.0",
     "@types/is-windows": "^1.0.2",
-    "@types/node": "^22.19.11",
+    "@types/node": "^22.19.15",
     "@types/normalize-path": "^3.0.2",
-    "@types/ramda": "0.29.12",
+    "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "cmd-extension": "^2.0.0",
     "tempy": "3.0.0",
-    "@pnpm/bins.linker": "1000.2.6",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/test-fixtures": "1000.0.0"
+    "@pnpm/bins.linker": "1100.0.0",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/test-fixtures": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -67,9 +66,9 @@
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest",
-    "test": "pnpm run compile && pnpm run _test",
+    "test": "pn compile && pn .test",
     "fix": "tslint -c tslint.json --project . --fix",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }