feat(env use): sync global pkg node exec path

env/plugin-commands-env/package.json

@@ -34,16 +34,22 @@
     "@pnpm/config": "workspace:*",
     "@pnpm/error": "workspace:*",
     "@pnpm/fetch": "workspace:*",
+    "@pnpm/get-context": "workspace:*",
+    "@pnpm/link-bins": "workspace:*",
     "@pnpm/logger": "^5.0.0",
     "@pnpm/node.fetcher": "workspace:*",
     "@pnpm/node.resolver": "workspace:*",
+    "@pnpm/package-bins": "workspace:*",
+    "@pnpm/read-modules-dir": "workspace:*",
     "@pnpm/remove-bins": "workspace:*",
     "@pnpm/store-path": "workspace:*",
     "@zkochan/cmd-shim": "^6.0.0",
     "@zkochan/rimraf": "^2.1.3",
     "graceful-fs": "^4.2.11",
+    "ramda": "npm:@pnpm/ramda@0.28.1",
     "is-windows": "^1.0.2",
     "load-json-file": "^6.2.0",
+    "normalize-path": "^3.0.0",
     "render-help": "^1.0.3",
     "semver": "^7.6.0",
     "symlink-dir": "^5.2.1",
@@ -56,6 +62,8 @@
     "@types/adm-zip": "^0.5.5",
     "@types/graceful-fs": "^4.1.9",
     "@types/is-windows": "^1.0.2",
+    "@types/normalize-path": "^3.0.2",
+    "@types/ramda": "0.28.20",
     "@types/semver": "7.5.3",
     "adm-zip": "^0.5.12",
     "execa": "npm:safe-execa@0.1.2",

env/plugin-commands-env/src/envUse.ts

@@ -2,10 +2,17 @@ import { promises as fs } from 'fs'
 import util from 'util'
 import gfs from 'graceful-fs'
 import path from 'path'
+import normalizePath from 'normalize-path'
 import { PnpmError } from '@pnpm/error'
+import { getBinNodePaths, getPackageBins, preferDirectCmds } from '@pnpm/link-bins'
+import { readModulesDir } from '@pnpm/read-modules-dir'
+import { getExtraNodePaths } from '@pnpm/get-context'
+import { logger } from '@pnpm/logger'
+import type { Command } from '@pnpm/package-bins'
 import cmdShim from '@zkochan/cmd-shim'
 import isWindows from 'is-windows'
 import symlinkDir from 'symlink-dir'
+import unnest from 'ramda/src/unnest'
 import { type NvmNodeCommandOptions } from './node'
 import { CURRENT_NODE_DIRNAME, getNodeExecPathInBinDir, getNodeExecPathInNodeDir } from './utils'
 import { downloadNodeVersion } from './downloadNodeVersion'
@@ -41,6 +48,53 @@ export async function envUse (opts: NvmNodeCommandOptions, params: string[]) {
     }
     const npmBinDir = path.join(npmDir, 'bin')
     const cmdShimOpts = { createPwshFile: false }
+
+    type CommandInfo = Command & {
+      ownName: boolean
+      pkgName: string
+      makePowerShellShim: boolean
+      nodeExecPath?: string
+    }
+    const globalDepDir = path.join(opts.rootProjectManifestDir, 'node_modules')
+    const allDeps = await readModulesDir(globalDepDir) ?? []
+    const directDependencies = new Set(Object.keys((opts.rootProjectManifest?.dependencies ?? {})))
+    const binWarn = (prefix: string, message: string) => {
+      logger.info({ message, prefix })
+    }
+    const allCmds: CommandInfo[] = unnest(
+      (await Promise.all(
+        allDeps.map((alias) => ({
+          depDir: path.resolve(globalDepDir, alias),
+          isDirectDependency: directDependencies?.has(alias),
+          nodeExecPath: src,
+        }))
+          .map(async ({ depDir, isDirectDependency, nodeExecPath }) => {
+            const target = normalizePath(depDir)
+            const cmds = await getPackageBins({ allowExoticManifests: false, warn: binWarn.bind(null, opts.rootProjectManifestDir) }, target, nodeExecPath)
+            return cmds.map((cmd) => ({ ...cmd, isDirectDependency }))
+          })
+      ))
+        .filter((cmds: Command[]) => cmds.length)
+    )
+    const cmdsToLink = preferDirectCmds(allCmds)
+
+    await Promise.all(cmdsToLink.map(async (cmd) => {
+      const nodePath: string[] = []
+      const virtualStoreDir = path.join(opts.rootProjectManifestDir, opts.virtualStoreDir ?? '')
+      const extraNodePaths = getExtraNodePaths({ extendNodePath: opts.extendNodePath, nodeLinker: opts.nodeLinker ?? 'isolated', hoistPattern: opts.hoistPattern, virtualStoreDir })
+      for (const modulesPath of await getBinNodePaths(cmd.path)) {
+        if (extraNodePaths.includes(modulesPath)) break
+        nodePath.push(modulesPath)
+      }
+      nodePath.push(...extraNodePaths)
+      const externalBinPath = path.join(opts.bin, cmd.name)
+      await cmdShim(cmd.path, externalBinPath, {
+        createPwshFile: cmd.makePowerShellShim,
+        nodePath,
+        nodeExecPath: cmd.nodeExecPath,
+      })
+    }))
+
     await cmdShim(path.join(npmBinDir, 'npm-cli.js'), path.join(opts.bin, 'npm'), cmdShimOpts)
     await cmdShim(path.join(npmBinDir, 'npx-cli.js'), path.join(opts.bin, 'npx'), cmdShimOpts)
   } catch {

env/plugin-commands-env/src/node.ts

@@ -32,6 +32,12 @@ export type NvmNodeCommandOptions = Pick<Config,
 | 'storeDir'
 | 'useNodeVersion'
 | 'pnpmHomeDir'
+| 'rootProjectManifest'
+| 'rootProjectManifestDir'
+| 'extendNodePath'
+| 'nodeLinker'
+| 'hoistPattern'
+| 'virtualStoreDir'
 > & Partial<Pick<Config, 'configDir' | 'cliOptions' | 'sslConfigs'>> & {
   remote?: boolean
 }

env/plugin-commands-env/tsconfig.json

@@ -18,12 +18,24 @@
     {
       "path": "../../config/config"
     },
+    {
+      "path": "../../fs/read-modules-dir"
+    },
     {
       "path": "../../network/fetch"
     },
     {
       "path": "../../packages/error"
     },
+    {
+      "path": "../../pkg-manager/get-context"
+    },
+    {
+      "path": "../../pkg-manager/link-bins"
+    },
+    {
+      "path": "../../pkg-manager/package-bins"
+    },
     {
       "path": "../../pkg-manager/remove-bins"
     },

pkg-manager/get-context/src/index.ts

@@ -544,7 +544,7 @@ export async function getContextForSingleImporter (
   return ctx
 }
 
-function getExtraNodePaths (
+export function getExtraNodePaths (
   { extendNodePath = true, hoistPattern, nodeLinker, virtualStoreDir }: {
     extendNodePath?: boolean
     hoistPattern?: string[]

pkg-manager/link-bins/src/index.ts

@@ -90,7 +90,7 @@ export async function linkBinsOfPkgsByAliases (
   return _linkBins(cmdsToLink, binsDir, opts)
 }
 
-function preferDirectCmds (allCmds: Array<CommandInfo & { isDirectDependency?: boolean }>) {
+export function preferDirectCmds (allCmds: Array<CommandInfo & { isDirectDependency?: boolean }>) {
   const [directCmds, hoistedCmds] = partition((cmd) => cmd.isDirectDependency === true, allCmds)
   const usedDirectCmds = new Set(directCmds.map((directCmd) => directCmd.name))
   return [
@@ -171,7 +171,7 @@ async function isFromModules (filename: string) {
   return normalizePath(real).includes('/node_modules/')
 }
 
-async function getPackageBins (
+export async function getPackageBins (
   opts: {
     allowExoticManifests: boolean
     warn: WarnFunction
@@ -280,7 +280,7 @@ function getExeExtension (): string {
   return cmdExtension ?? '.exe'
 }
 
-async function getBinNodePaths (target: string): Promise<string[]> {
+export async function getBinNodePaths (target: string): Promise<string[]> {
   const targetDir = path.dirname(target)
   try {
     const targetRealPath = await fs.realpath(targetDir)

pkg-manifest/read-project-manifest/fixtures/invalid-package-json/package.json

@@ -1,4 +1,4 @@
 {
-  "name": "foo"
+  "name": "foo",
   "version": "1.0.0"
 }