libnpmexec 5.0.15 → 5.0.17

package/lib/file-exists.js

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

package/lib/index.js

@@ -35,12 +35,15 @@ 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.type !== 'tag') {
+const missingFromTree = async ({ spec, tree, flatOptions, isNpxTree }) => {
+  // 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
+  const npxByNameOnly = isNpxTree && spec.name === spec.raw
+  if (spec.registry && spec.type !== 'tag' && !npxByNameOnly) {
     // registry spec that is not a specific tag.
     const nodesBySpec = tree.inventory.query('packageName', spec.name)
     for (const node of nodesBySpec) {
-      // package requested by name only (or name@*)
       if (spec.rawSpec === '*') {
         return { node }
       }
@@ -56,8 +59,8 @@ const missingFromTree = async ({ spec, tree, 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.
+    // non-registry spec, or a specific tag, or name only in npx tree.  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 }
@@ -224,7 +227,12 @@ 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,
+        isNpxTree: true,
+      })
       if (manifest) {
         // Manifest is not in npxCache, we need to install it there
         if (!spec.registry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libnpmexec",
-  "version": "5.0.15",
+  "version": "5.0.17",
   "files": [
     "bin/",
     "lib/"
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-registry": "^1.0.0",
-    "@npmcli/template-oss": "4.12.1",
+    "@npmcli/template-oss": "4.14.1",
     "bin-links": "^4.0.1",
     "just-extend": "^6.2.0",
     "just-safe-set": "^4.2.1",
@@ -60,7 +60,7 @@
     "tap": "^16.3.4"
   },
   "dependencies": {
-    "@npmcli/arborist": "^6.2.7",
+    "@npmcli/arborist": "^6.2.9",
     "@npmcli/run-script": "^6.0.0",
     "chalk": "^4.1.0",
     "ci-info": "^3.7.1",
@@ -71,11 +71,11 @@
     "read": "^2.0.0",
     "read-package-json-fast": "^3.0.2",
     "semver": "^7.3.7",
-    "walk-up-path": "^1.0.0"
+    "walk-up-path": "^3.0.1"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.12.1",
+    "version": "4.14.1",
     "content": "../../scripts/template-oss/index.js"
   }
 }