@npmcli/arborist 6.1.5 → 6.1.6

package/lib/arborist/build-ideal-tree.js

@@ -12,6 +12,7 @@ const { readdirScoped } = require('@npmcli/fs')
 const { lstat, readlink } = require('fs/promises')
 const { depth } = require('treeverse')
 const log = require('proc-log')
+const { cleanUrl } = require('npm-registry-fetch')
 
 const {
   OK,
@@ -1210,7 +1211,8 @@ This is a one-time fix-up, please be patient...
     if (this[_manifests].has(spec.raw)) {
       return this[_manifests].get(spec.raw)
     } else {
-      log.silly('fetch manifest', spec.raw)
+      const cleanRawSpec = cleanUrl(spec.rawSpec)
+      log.silly('fetch manifest', spec.raw.replace(spec.rawSpec, cleanRawSpec))
       const p = pacote.manifest(spec, options)
         .then(mani => {
           this[_manifests].set(spec.raw, mani)

package/lib/arborist/load-virtual.js

@@ -1,5 +1,6 @@
 // mixin providing the loadVirtual method
 const localeCompare = require('@isaacs/string-locale-compare')('en')
+const mapWorkspaces = require('@npmcli/map-workspaces')
 
 const { resolve } = require('path')
 
@@ -21,7 +22,6 @@ const loadRoot = Symbol('loadRoot')
 const loadNode = Symbol('loadVirtualNode')
 const loadLink = Symbol('loadVirtualLink')
 const loadWorkspaces = Symbol.for('loadWorkspaces')
-const loadWorkspacesVirtual = Symbol.for('loadWorkspacesVirtual')
 const flagsSuspect = Symbol.for('flagsSuspect')
 const reCalcDepFlags = Symbol('reCalcDepFlags')
 const checkRootEdges = Symbol('checkRootEdges')
@@ -157,7 +157,7 @@ module.exports = cls => class VirtualLoader extends cls {
     }
 
     const lockWS = []
-    const workspaces = this[loadWorkspacesVirtual]({
+    const workspaces = mapWorkspaces.virtual({
       cwd: this.path,
       lockfile: s.data,
     })

package/lib/arborist/load-workspaces.js

@@ -1,33 +1,19 @@
 const mapWorkspaces = require('@npmcli/map-workspaces')
 
-const _appendWorkspaces = Symbol('appendWorkspaces')
 // shared ref used by other mixins/Arborist
 const _loadWorkspaces = Symbol.for('loadWorkspaces')
-const _loadWorkspacesVirtual = Symbol.for('loadWorkspacesVirtual')
 
 module.exports = cls => class MapWorkspaces extends cls {
-  [_appendWorkspaces] (node, workspaces) {
-    if (node && workspaces.size) {
-      node.workspaces = workspaces
-    }
-
-    return node
-  }
-
   async [_loadWorkspaces] (node) {
-    if (node.workspaces) {
-      return node
-    }
-
     const workspaces = await mapWorkspaces({
       cwd: node.path,
       pkg: node.package,
     })
 
-    return this[_appendWorkspaces](node, workspaces)
-  }
+    if (node && workspaces.size) {
+      node.workspaces = workspaces
+    }
 
-  [_loadWorkspacesVirtual] (opts) {
-    return mapWorkspaces.virtual(opts)
+    return node
   }
 }

package/lib/override-resolves.js

@@ -1,4 +1,4 @@
-function overrideResolves (resolved, opts = {}) {
+function overrideResolves (resolved, opts) {
   const { omitLockfileRegistryResolved = false } = opts
 
   if (omitLockfileRegistryResolved) {

package/lib/override-set.js

@@ -50,9 +50,36 @@ class OverrideSet {
         continue
       }
 
-      if (semver.intersects(edge.spec, rule.keySpec)) {
+      // if keySpec is * we found our override
+      if (rule.keySpec === '*') {
         return rule
       }
+
+      let spec = npa(`${edge.name}@${edge.spec}`)
+      if (spec.type === 'alias') {
+        spec = spec.subSpec
+      }
+
+      if (spec.type === 'git') {
+        if (spec.gitRange && semver.intersects(spec.gitRange, rule.keySpec)) {
+          return rule
+        }
+
+        continue
+      }
+
+      if (spec.type === 'range' || spec.type === 'version') {
+        if (semver.intersects(spec.fetchSpec, rule.keySpec)) {
+          return rule
+        }
+
+        continue
+      }
+
+      // if we got this far, the spec type is one of tag, directory or file
+      // which means we have no real way to make version comparisons, so we
+      // just accept the override
+      return rule
     }
 
     return this

package/lib/place-dep.js

@@ -9,6 +9,7 @@
 
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const log = require('proc-log')
+const { cleanUrl } = require('npm-registry-fetch')
 const deepestNestingTarget = require('./deepest-nesting-target.js')
 const CanPlaceDep = require('./can-place-dep.js')
 const {
@@ -187,7 +188,7 @@ class PlaceDep {
       `${this.dep.name}@${this.dep.version}`,
       this.canPlace.description,
       `for: ${this.edge.from.package._id || this.edge.from.location}`,
-      `want: ${this.edge.spec || '*'}`
+      `want: ${cleanUrl(this.edge.spec || '*')}`
     )
 
     const placementType = this.canPlace.canPlace === CONFLICT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "6.1.5",
+  "version": "6.1.6",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
@@ -42,9 +42,9 @@
     "@npmcli/template-oss": "4.11.0",
     "benchmark": "^2.1.4",
     "chalk": "^4.1.0",
-    "minify-registry-metadata": "^2.1.0",
+    "minify-registry-metadata": "^3.0.0",
     "nock": "^13.2.0",
-    "tap": "^16.0.1",
+    "tap": "^16.3.2",
     "tcompare": "^5.0.6"
   },
   "scripts": {
@@ -81,7 +81,6 @@
   "tap": {
     "color": true,
     "after": "test/fixtures/cleanup.js",
-    "coverage-map": "map.js",
     "test-env": [
       "NODE_OPTIONS=--no-warnings",
       "LC_ALL=sk"