CHANGELOG.md

@@ -1,5 +1,13 @@
 # changes log
 
+## 6.0
+
+* Fix `intersects` logic.
+
+    This is technically a bug fix, but since it is also a change to behavior
+    that may require users updating their code, it is marked as a major
+    version increment.
+
 ## 5.7
 
 * Add `minVersion` method

package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "5.7.0",
+  "version": "6.0.0",
   "description": "The semantic version parser used by npm.",
   "main": "semver.js",
   "scripts": {

semver.js

@@ -934,16 +934,40 @@ Range.prototype.intersects = function (range, options) {
   }
 
   return this.set.some(function (thisComparators) {
-    return thisComparators.every(function (thisComparator) {
-      return range.set.some(function (rangeComparators) {
-        return rangeComparators.every(function (rangeComparator) {
-          return thisComparator.intersects(rangeComparator, options)
-        })
+    return (
+      isSatisfiable(thisComparators, options) &&
+      range.set.some(function (rangeComparators) {
+        return (
+          isSatisfiable(rangeComparators, options) &&
+          thisComparators.every(function (thisComparator) {
+            return rangeComparators.every(function (rangeComparator) {
+              return thisComparator.intersects(rangeComparator, options)
+            })
+          })
+        )
       })
-    })
+    )
   })
 }
 
+// take a set of comparators and determine whether there
+// exists a version which can satisfy it
+function isSatisfiable (comparators, options) {
+  var result = true
+  var remainingComparators = comparators.slice()
+  var testComparator = remainingComparators.pop()
+
+  while (result && remainingComparators.length) {
+    result = remainingComparators.every(function (otherComparator) {
+      return testComparator.intersects(otherComparator, options)
+    })
+
+    testComparator = remainingComparators.pop()
+  }
+
+  return result
+}
+
 // Mostly just for testing and legacy API reasons
 exports.toComparators = toComparators
 function toComparators (range, options) {

test/index.js

@@ -875,12 +875,19 @@ test('missing comparator parameter in intersect comparators', function (t) {
 test('ranges intersect', function (t) {
   [
     ['1.3.0 || <1.0.0 >2.0.0', '1.3.0 || <1.0.0 >2.0.0', true],
-    ['<1.0.0 >2.0.0', '>0.0.0', true],
+    ['<1.0.0 >2.0.0', '>0.0.0', false],
+    ['>0.0.0', '<1.0.0 >2.0.0', false],
     ['<1.0.0 >2.0.0', '>1.4.0 <1.6.0', false],
     ['<1.0.0 >2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
     ['>1.0.0 <=2.0.0', '2.0.0', true],
     ['<1.0.0 >=2.0.0', '2.1.0', false],
-    ['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false]
+    ['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
+    ['1.5.x', '<1.5.0 || >=1.6.0', false],
+    ['<1.5.0 || >=1.6.0', '1.5.x', false],
+    ['<1.6.16 || >=1.7.0 <1.7.11 || >=1.8.0 <1.8.2', '>=1.6.16 <1.7.0 || >=1.7.11 <1.8.0 || >=1.8.2', false],
+    ['<=1.6.16 || >=1.7.0 <1.7.11 || >=1.8.0 <1.8.2', '>=1.6.16 <1.7.0 || >=1.7.11 <1.8.0 || >=1.8.2', true],
+    ['>=1.0.0', '<=1.0.0', true],
+    ['>1.0.0 <1.0.0', '<=0.0.0', false]
   ].forEach(function (v) {
     var range1 = new Range(v[0])
     var range2 = new Range(v[1])