fix: global bin discovery fixed if found on any level globally

Author: milaninfy

workspaces/libnpmexec/lib/index.js

@@ -203,9 +203,13 @@ const exec = async (opts) => {
       const globalTree = await globalArb.loadActual()
       const { manifest: globalManifest, node: globalNode } =
         await missingFromTree({ spec, tree: globalTree, flatOptions })
-      if (globalNode) {
-        const newPath = globalNode.binPaths.filter(p => p.endsWith(args[0]))[0]
-        binPaths.push(newPath.replace(args[0], ''))
+        // check for the bin in the global tree at any level deep
+        // if we found a node matched with spec, we can use it to get the bin path from it
+      const matchingBinPaths = globalNode
+        ?.binPaths.filter(binPath => binPath.endsWith(args[0]))
+
+      if (matchingBinPaths?.length && await fileExists(matchingBinPaths[0])) {
+        binPaths.push(dirname(matchingBinPaths[0]))
         return await run()
       }
       if (!globalManifest && await fileExists(`${globalBin}/${args[0]}`)) {

workspaces/libnpmexec/test/fixtures/setup.js

@@ -224,7 +224,8 @@ const setup = (t, {
       }
       await binLinks({
         pkg: binPkg,
-        path: resolve(path, nodeModules, binPkg.name),
+        // include pkg.path for nested bin links support
+        path: resolve(path, nodeModules, binPkg.path || binPkg.name),
       })
     },
     readOutput: async (outputPath, { root = path } = {}) => {

workspaces/libnpmexec/test/local.js

@@ -370,3 +370,69 @@ t.test('global scoped pkg', async t => {
     created: 'global/node_modules/@npmcli/create-test/bin-file.js',
   })
 })
+t.test('global scoped pkg - new', async t => {
+  const pkgA1 = createPkg({
+    localVersion: '1.0.0',
+    name: '@npmcli/A',
+  })
+
+  const pkgA2 = createPkg({
+    localVersion: '2.0.0',
+    name: '@npmcli/A',
+  })
+
+  const pkgB = createPkg({
+    localVersion: '1.0.0',
+    name: '@npmcli/B',
+  })
+
+  const pkgBfix = merge(pkgB.fixtures, {
+    node_modules: {
+      '@npmcli': { B: {
+        node_modules: {
+          '@npmcli': {
+            A: pkgA2.fixtures.packages['@npmcli-A-2.0.0'],
+          } },
+        'package.json': { dependencies: { '@npmcli/A': '2.0.0' } },
+      },
+      },
+    } })
+
+  const { chmod, exec, readOutput, binLinks, registry, path } = setup(t, {
+    pkg: [pkgA2.pkg, pkgA1.pkg, pkgB.pkg],
+    global: true,
+    testdir: merge(pkgA1.fixtures, pkgBfix),
+  })
+
+  await chmod()
+  await chmod('global/node_modules/@npmcli/B/node_modules/@npmcli/A/bin-file.js')
+  await binLinks()
+  await binLinks({
+    name: '@npmcli/A',
+    path: '@npmcli/B/node_modules/@npmcli/A',
+    bin: { A: 'bin-file.js' },
+  })
+
+  await pkgA2.package({ registry, path, times: 1, tarballs: [] })
+  await pkgA1.package({ registry, path, times: 1, tarballs: [] })
+
+  await exec({
+    args: ['@npmcli/A@2.0.0'],
+  })
+
+  t.match(await readOutput('@npmcli-A'), {
+    value: 'packages-2.0.0',
+    args: [],
+    created: 'global/node_modules/@npmcli/B/node_modules/@npmcli/A/bin-file.js',
+  })
+
+  await exec({
+    args: ['@npmcli/A@1.0.0'],
+  })
+
+  t.match(await readOutput('@npmcli-A'), {
+    value: 'local-1.0.0',
+    args: [],
+    created: 'global/node_modules/@npmcli/A/bin-file.js',
+  })
+})