libnpmexec 8.1.1 → 8.1.2

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 = []
 
@@ -73,6 +73,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 +94,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 +118,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) {

package/package.json

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