libnpmexec 8.1.1 → 8.1.3

package/lib/file-exists.js

@@ -1,5 +1,5 @@
-const { resolve } = require('path')
-const { stat } = require('fs/promises')
+const { resolve } = require('node:path')
+const { stat } = require('node:fs/promises')
 const { walkUp } = require('walk-up-path')
 
 const fileExists = async (file) => {

package/lib/index.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const { mkdir } = require('fs/promises')
+const { mkdir } = require('node:fs/promises')
 const Arborist = require('@npmcli/arborist')
 const ciInfo = require('ci-info')
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 const { log, input } = require('proc-log')
 const npa = require('npm-package-arg')
 const pacote = require('pacote')
@@ -14,7 +14,7 @@ const getBinFromManifest = require('./get-bin-from-manifest.js')
 const noTTY = require('./no-tty.js')
 const runScript = require('./run-script.js')
 const isWindows = require('./is-windows.js')
-const { dirname, resolve } = require('path')
+const { dirname, resolve } = require('node:path')
 
 const binPaths = []
 
@@ -32,7 +32,7 @@ const getManifest = async (spec, flatOptions) => {
 
 // Returns the required manifest if the spec is missing from the tree
 // Returns the found node if it is in the tree
-const missingFromTree = async ({ spec, tree, flatOptions, isNpxTree }) => {
+const missingFromTree = async ({ spec, tree, flatOptions, isNpxTree, shallow }) => {
   // If asking for a spec by name only (spec.raw === spec.name):
   //  - In local or global mode go with anything in the tree that matches
   //  - If looking in the npx cache check if a newer version is available
@@ -41,6 +41,10 @@ const missingFromTree = async ({ spec, tree, flatOptions, isNpxTree }) => {
     // registry spec that is not a specific tag.
     const nodesBySpec = tree.inventory.query('packageName', spec.name)
     for (const node of nodesBySpec) {
+      // continue if node is not a top level node
+      if (shallow && node.depth) {
+        continue
+      }
       if (spec.rawSpec === '*') {
         return { node }
       }
@@ -73,6 +77,11 @@ const missingFromTree = async ({ spec, tree, flatOptions, isNpxTree }) => {
   }
 }
 
+// see if the package.json at `path` has an entry that matches `cmd`
+const hasPkgBin = (path, cmd, flatOptions) =>
+  pacote.manifest(path, flatOptions)
+    .then(manifest => manifest?.bin?.[cmd]).catch(() => null)
+
 const exec = async (opts) => {
   const {
     args = [],
@@ -89,6 +98,13 @@ const exec = async (opts) => {
     ...flatOptions
   } = opts
 
+  let pkgPaths = opts.pkgPath
+  if (typeof pkgPaths === 'string') {
+    pkgPaths = [pkgPaths]
+  }
+  if (!pkgPaths) {
+    pkgPaths = ['.']
+  }
   let yes = opts.yes
   const run = () => runScript({
     args,
@@ -106,28 +122,31 @@ const exec = async (opts) => {
     return run()
   }
 
+  // Look in the local tree too
+  pkgPaths.push(path)
+
   let needPackageCommandSwap = (args.length > 0) && (packages.length === 0)
   // If they asked for a command w/o specifying a package, see if there is a
   // bin that directly matches that name:
-  // - in the local package itself
-  // - in the local tree
+  // - in any local packages (pkgPaths can have workspaces in them or just the root)
+  // - in the local tree (path)
   // - globally
   if (needPackageCommandSwap) {
-    let localManifest
-    try {
-      localManifest = await pacote.manifest(path, flatOptions)
-    } catch {
-      // no local package.json? no problem, move one.
+    // Local packages and local tree
+    for (const p of pkgPaths) {
+      if (await hasPkgBin(p, args[0], flatOptions)) {
+        // we have to install the local package into the npx cache so that its
+        // bin links get set up
+        flatOptions.installLinks = false
+        // args[0] will exist when the package is installed
+        packages.push(p)
+        yes = true
+        needPackageCommandSwap = false
+        break
+      }
     }
-    if (localManifest?.bin?.[args[0]]) {
-      // we have to install the local package into the npx cache so that its
-      // bin links get set up
-      flatOptions.installLinks = false
-      // args[0] will exist when the package is installed
-      packages.push(path)
-      yes = true
-      needPackageCommandSwap = false
-    } else {
+    if (needPackageCommandSwap) {
+      // no bin entry in local packages or in tree, now we look for binPaths
       const dir = dirname(dirname(localBin))
       const localBinPath = await localFileExists(dir, args[0], '/')
       if (localBinPath) {
@@ -187,7 +206,7 @@ const exec = async (opts) => {
       const globalArb = new Arborist({ ...flatOptions, path: globalPath, global: true })
       const globalTree = await globalArb.loadActual()
       const { manifest: globalManifest } =
-        await missingFromTree({ spec, tree: globalTree, flatOptions })
+        await missingFromTree({ spec, tree: globalTree, flatOptions, shallow: true })
       if (!globalManifest && await fileExists(`${globalBin}/${args[0]}`)) {
         binPaths.push(globalBin)
         return await run()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libnpmexec",
-  "version": "8.1.1",
+  "version": "8.1.3",
   "files": [
     "bin/",
     "lib/"
@@ -59,7 +59,7 @@
     "tap": "^16.3.8"
   },
   "dependencies": {
-    "@npmcli/arborist": "^7.5.2",
+    "@npmcli/arborist": "^7.5.4",
     "@npmcli/run-script": "^8.1.0",
     "ci-info": "^4.0.0",
     "npm-package-arg": "^11.0.2",