Reduce unnecessary Comparators in Range set

classes/range.js

@@ -46,6 +46,24 @@ class Range {
       throw new TypeError(`Invalid SemVer Range: ${range}`)
     }
 
+    // if we have any that are not the null set, throw out null sets.
+    if (this.set.length > 1) {
+      // keep the first one, in case they're all null sets
+      const first = this.set[0]
+      this.set = this.set.filter(c => !isNullSet(c[0]))
+      if (this.set.length === 0)
+        this.set = [first]
+      else if (this.set.length > 1) {
+        // if we have any that are *, then the range is just *
+        for (const c of this.set) {
+          if (c.length === 1 && isAny(c[0])) {
+            this.set = [c]
+            break
+          }
+        }
+      }
+    }
+
     this.format()
   }
 
@@ -87,15 +105,31 @@ class Range {
     // ready to be split into comparators.
 
     const compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
-    return range
+    const rangeList = range
       .split(' ')
       .map(comp => parseComparator(comp, this.options))
       .join(' ')
       .split(/\s+/)
+      // >=0.0.0 is equivalent to *
       .map(comp => replaceGTE0(comp, this.options))
       // in loose mode, throw out any that are not valid comparators
       .filter(this.options.loose ? comp => !!comp.match(compRe) : () => true)
       .map(comp => new Comparator(comp, this.options))
+
+    // if any comparators are the null set, then replace with JUST null set
+    // if more than one comparator, remove any * comparators
+    // also, don't include the same comparator more than once
+    const l = rangeList.length
+    const rangeMap = new Map()
+    for (const comp of rangeList) {
+      if (isNullSet(comp))
+        return [comp]
+      rangeMap.set(comp.value, comp)
+    }
+    if (rangeMap.size > 1 && rangeMap.has(''))
+      rangeMap.delete('')
+
+    return [...rangeMap.values()]
   }
 
   intersects (range, options) {
@@ -155,6 +189,9 @@ const {
   caretTrimReplace
 } = require('../internal/re')
 
+const isNullSet = c => c.value === '<0.0.0-0'
+const isAny = c => c.value === ''
+
 // take a set of comparators and determine whether there
 // exists a version which can satisfy it
 const isSatisfiable = (comparators, options) => {

test/fixtures/range-parse.js

@@ -38,7 +38,7 @@ module.exports = [
   ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
   ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
   ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
-  ['||', '||'],
+  ['||', '*'],
   ['2.x.x', '>=2.0.0 <3.0.0-0'],
   ['1.2.x', '>=1.2.0 <1.3.0-0'],
   ['1.2.x || 2.x', '>=1.2.0 <1.3.0-0||>=2.0.0 <3.0.0-0'],
@@ -79,12 +79,14 @@ module.exports = [
   ['>01.02.03', null],
   ['~1.2.3beta', '>=1.2.3-beta <1.3.0-0', { loose: true }],
   ['~1.2.3beta', null],
-  ['^ 1.2 ^ 1', '>=1.2.0 <2.0.0-0 >=1.0.0 <2.0.0-0'],
+  ['^ 1.2 ^ 1', '>=1.2.0 <2.0.0-0 >=1.0.0'],
   ['1.2 - 3.4.5', '>=1.2.0 <=3.4.5'],
   ['1.2.3 - 3.4', '>=1.2.3 <3.5.0-0'],
   ['1.2 - 3.4', '>=1.2.0 <3.5.0-0'],
   ['>1', '>=2.0.0'],
   ['>1.2', '>=1.3.0'],
   ['>X', '<0.0.0-0'],
   ['<X', '<0.0.0-0'],
+  ['<x <* || >* 2.x', '<0.0.0-0'],
+  ['>x 2.x || * || <x', '*'],
 ]

test/ranges/to-comparators.js

@@ -37,7 +37,7 @@ test('comparators test', (t) => {
     ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
     ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
     ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
-    ['||', [[''], ['']]],
+    ['||', [['']]],
     ['2.x.x', [['>=2.0.0', '<3.0.0-0']]],
     ['1.2.x', [['>=1.2.0', '<1.3.0-0']]],
     ['1.2.x || 2.x', [['>=1.2.0', '<1.3.0-0'], ['>=2.0.0', '<3.0.0-0']]],
@@ -72,7 +72,11 @@ test('comparators test', (t) => {
     ['1.2.3 - 3.4', [['>=1.2.3', '<3.5.0-0']]],
     ['1.2.3 - 3', [['>=1.2.3', '<4.0.0-0']]],
     ['>*', [['<0.0.0-0']]],
-    ['<*', [['<0.0.0-0']]]
+    ['<*', [['<0.0.0-0']]],
+    ['>X', [['<0.0.0-0']]],
+    ['<X', [['<0.0.0-0']]],
+    ['<x <* || >* 2.x', [['<0.0.0-0']]],
+    ['>x 2.x || * || <x', [['']]],
   ].forEach(([pre, wanted]) => {
     const found = toComparators(pre)
     const jw = JSON.stringify(wanted)