Skip to content

Commit 8473d65

Browse files
Max Bittmanisaacs
Max Bittman
authored andcommitted
fix: Fix Range intersects algorithm
1 parent 8055dda commit 8473d65

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

semver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ Range.prototype.intersects = function (range, options) {
934934
}
935935

936936
return this.set.some(function (thisComparators) {
937-
return thisComparators.every(function (thisComparator) {
938-
return range.set.some(function (rangeComparators) {
937+
return range.set.some(function (rangeComparators) {
938+
return thisComparators.every(function (thisComparator) {
939939
return rangeComparators.every(function (rangeComparator) {
940940
return thisComparator.intersects(rangeComparator, options)
941941
})

test/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,10 @@ test('ranges intersect', function (t) {
880880
['<1.0.0 >2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
881881
['>1.0.0 <=2.0.0', '2.0.0', true],
882882
['<1.0.0 >=2.0.0', '2.1.0', false],
883-
['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false]
883+
['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
884+
['1.5.x', '<1.5.0 || >=1.6.0', false],
885+
['<1.5.0 || >=1.6.0', '1.5.x', false],
886+
['<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]
884887
].forEach(function (v) {
885888
var range1 = new Range(v[0])
886889
var range2 = new Range(v[1])

0 commit comments

Comments
 (0)