libnpmexec 4.0.9 → 4.0.12

package/lib/index.js

@@ -28,7 +28,7 @@ const binPaths = []
 const manifests = new Map()
 
 const getManifest = async (spec, flatOptions) => {
-  if (!manifests.get(spec.raw)) {
+  if (!manifests.has(spec.raw)) {
     const manifest = await pacote.manifest(spec, { ...flatOptions, preferOnline: true })
     manifests.set(spec.raw, manifest)
   }
@@ -36,6 +36,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 }) => {
   if (spec.registry && (spec.rawSpec === '' || spec.type !== 'tag')) {
     // registry spec that is not a specific tag.
@@ -43,32 +44,36 @@ const missingFromTree = async ({ spec, tree, flatOptions }) => {
     for (const node of nodesBySpec) {
       if (spec.type === 'tag') {
         // package requested by name only
-        return
+        return { node }
       } else if (spec.type === 'version') {
         // package requested by specific version
         if (node.pkgid === spec.raw) {
-          return
+          return { node }
         }
       } else {
         // package requested by version range, only remaining registry type
         if (semver.satisfies(node.package.version, spec.rawSpec)) {
-          return
+          return { node }
         }
       }
     }
-    return await getManifest(spec, flatOptions)
+    const manifest = await getManifest(spec, flatOptions)
+    return { manifest }
   } else {
     // non-registry spec, or a specific tag.  Look up manifest and check
     // resolved to see if it's in the tree.
     const manifest = await getManifest(spec, flatOptions)
+    if (spec.type === 'directory') {
+      return { manifest }
+    }
     const nodesByManifest = tree.inventory.query('packageName', manifest.name)
     for (const node of nodesByManifest) {
       if (node.package.resolved === manifest._resolved) {
         // we have a package by the same name and the same resolved destination, nothing to add.
-        return
+        return { node }
       }
     }
-    return manifest
+    return { manifest }
   }
 }
 
@@ -80,17 +85,17 @@ const exec = async (opts) => {
     localBin = resolve('./node_modules/.bin'),
     locationMsg = undefined,
     globalBin = '',
-    globalPath = '',
+    globalPath,
     output,
     // dereference values because we manipulate it later
     packages: [...packages] = [],
     path = '.',
     runPath = '.',
     scriptShell = isWindows ? process.env.ComSpec || 'cmd' : 'sh',
-    yes = undefined,
     ...flatOptions
   } = opts
 
+  let yes = opts.yes
   const run = () => runScript({
     args,
     call,
@@ -118,7 +123,7 @@ const exec = async (opts) => {
     if (localBinPath) {
       binPaths.push(localBinPath)
       return await run()
-    } else if (await fileExists(`${globalBin}/${args[0]}`)) {
+    } else if (globalPath && await fileExists(`${globalBin}/${args[0]}`)) {
       binPaths.push(globalBin)
       return await run()
     }
@@ -127,40 +132,56 @@ const exec = async (opts) => {
     packages.push(args[0])
   }
 
+  // Resolve any directory specs so that the npx directory is unique to the
+  // resolved directory, not the potentially relative one (i.e. "npx .")
+  for (const i in packages) {
+    const pkg = packages[i]
+    const spec = npa(pkg)
+    if (spec.type === 'directory') {
+      packages[i] = spec.fetchSpec
+    }
+  }
+
   const localArb = new Arborist({ ...flatOptions, path })
   const localTree = await localArb.loadActual()
 
   // Find anything that isn't installed locally
   const needInstall = []
-  await Promise.all(packages.map(async pkg => {
+  let commandManifest
+  await Promise.all(packages.map(async (pkg, i) => {
     const spec = npa(pkg, path)
-    const manifest = await missingFromTree({ spec, tree: localTree, flatOptions })
+    const { manifest, node } = await missingFromTree({ spec, tree: localTree, flatOptions })
     if (manifest) {
       // Package does not exist in the local tree
       needInstall.push({ spec, manifest })
+      if (i === 0) {
+        commandManifest = manifest
+      }
+    } else if (i === 0) {
+      // The node.package has enough to look up the bin
+      commandManifest = node.package
     }
   }))
 
   if (needPackageCommandSwap) {
-    // Either we have a scoped package or the bin of our package we inferred
-    // from arg[0] might not be identical to the package name
     const spec = npa(args[0])
-    let commandManifest
-    if (needInstall.length === 0) {
-      commandManifest = await getManifest(spec, flatOptions)
-    } else {
-      commandManifest = needInstall[0].manifest
+
+    if (spec.type === 'directory') {
+      yes = true
     }
 
     args[0] = getBinFromManifest(commandManifest)
 
-    // See if the package is installed globally, and run the translated bin
-    const globalArb = new Arborist({ ...flatOptions, path: globalPath, global: true })
-    const globalTree = await globalArb.loadActual()
-    const globalManifest = await missingFromTree({ spec, tree: globalTree, flatOptions })
-    if (!globalManifest) {
-      binPaths.push(globalBin)
-      return await run()
+    if (needInstall.length > 0 && globalPath) {
+      // See if the package is installed globally, and run the translated bin
+      const globalArb = new Arborist({ ...flatOptions, path: globalPath, global: true })
+      const globalTree = await globalArb.loadActual()
+      const { manifest: globalManifest } =
+        await missingFromTree({ spec, tree: globalTree, flatOptions })
+      if (!globalManifest && await fileExists(`${globalBin}/${args[0]}`)) {
+        binPaths.push(globalBin)
+        return await run()
+      }
     }
   }
 
@@ -172,7 +193,15 @@ const exec = async (opts) => {
       throw new Error('Must provide a valid npxCache path')
     }
     const hash = crypto.createHash('sha512')
-      .update(packages.sort((a, b) => a.localeCompare(b, 'en')).join('\n'))
+      .update(packages.map(p => {
+        // Keeps the npx directory unique to the resolved directory, not the
+        // potentially relative one (i.e. "npx .")
+        const spec = npa(p)
+        if (spec.type === 'directory') {
+          return spec.fetchSpec
+        }
+        return p
+      }).sort((a, b) => a.localeCompare(b, 'en')).join('\n'))
       .digest('hex')
       .slice(0, 16)
     const installDir = resolve(npxCache, hash)
@@ -183,7 +212,7 @@ const exec = async (opts) => {
     })
     const npxTree = await npxArb.loadActual()
     await Promise.all(needInstall.map(async ({ spec }) => {
-      const manifest = await missingFromTree({ spec, tree: npxTree, flatOptions })
+      const { manifest } = await missingFromTree({ spec, tree: npxTree, flatOptions })
       if (manifest) {
         // Manifest is not in npxCache, we need to install it there
         if (!spec.registry) {

package/lib/run-script.js

@@ -73,6 +73,7 @@ const run = async ({
       event: 'npx',
       args,
       stdio: 'inherit',
+      scriptShell,
     })
   } finally {
     npmlog.enableProgress()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libnpmexec",
-  "version": "4.0.9",
+  "version": "4.0.12",
   "files": [
     "bin/",
     "lib/"
@@ -49,13 +49,15 @@
     "files": "test/*.js"
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "3.5.0",
-    "bin-links": "^3.0.0",
+    "@npmcli/eslint-config": "^3.1.0",
+    "@npmcli/template-oss": "3.8.0",
+    "bin-links": "^3.0.3",
+    "minify-registry-metadata": "^2.2.0",
+    "mkdirp": "^1.0.4",
     "tap": "^16.0.1"
   },
   "dependencies": {
-    "@npmcli/arborist": "^5.0.0",
+    "@npmcli/arborist": "^5.6.1",
     "@npmcli/ci-detect": "^2.0.0",
     "@npmcli/fs": "^2.1.1",
     "@npmcli/run-script": "^4.2.0",
@@ -72,6 +74,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.5.0"
+    "version": "3.8.0"
   }
 }