Skip to content

fix: reject intersections between adjacent prereleases #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FanWu-ai wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −0
Open

fix: reject intersections between adjacent prereleases #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions classes/comparator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ class Comparator {

options = parseOptions(options)

// Appending .0 to a prerelease gives its immediate successor, so two
// exclusive bounds around that pair cannot contain any version.
if ((this.operator === '>' && comp.operator === '<' &&
comp.semver.version === `${this.semver.version}.0`) ||
(this.operator === '<' && comp.operator === '>' &&
this.semver.version === `${comp.semver.version}.0`)) {
return false
}

// Special cases where nothing can possibly be lower
if (options.includePrerelease &&
(this.value === '<0.0.0-0' || comp.value === '<0.0.0-0')) {
Expand Down
15 changes: 15 additions & 0 deletions test/classes/comparator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ test('intersect demands another comparator', t => {
t.end()
})

test('adjacent prereleases with loose numeric identifiers', t => {
const options = { loose: true, includePrerelease: true }
for (const [lower, upper] of [
['1.0.0-01', '1.0.0-1.00'],
['1.0.0-0009007199254740992', '1.0.0-9007199254740992.0'],
['1.0.0-9007199254740992', '1.0.0-0009007199254740992.0'],
]) {
const a = new Comparator(`>${lower}`, options)
const b = new Comparator(`<${upper}`, options)
t.notOk(a.intersects(b, options))
t.notOk(b.intersects(a, options))
}
t.end()
})

test('ANY matches anything', t => {
const c = new Comparator('')
t.ok(c.test('1.2.3'), 'ANY matches anything')
Expand Down
12 changes: 12 additions & 0 deletions test/fixtures/comparator-intersection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,16 @@ module.exports = [
['<0.1.0', '<0.0.0-0', false],
['<0.0.0-0', '<0.1.0', false, true],
['<0.1.0', '<0.0.0-0', false, true],
// No version lies strictly between a prerelease and its extension by .0.
['>1.0.0-alpha', '<1.0.0-alpha.0', false],
['>1.0.0-alpha', '<1.0.0-alpha.0', false, true],
['>1.0.0-0', '<1.0.0-0.0', false],
['>1.0.0-alpha.1', '<1.0.0-alpha.1.0', false],
['>1.0.0-alpha+left', '<1.0.0-alpha.0+right', false],
['>1.0.0-9007199254740992', '<1.0.0-9007199254740992.0', false],
['>=1.0.0-alpha', '<1.0.0-alpha.0', true],
['>1.0.0-alpha', '<=1.0.0-alpha.0', true],
['>1.0.0-alpha', '<1.0.0-alpha.1', true],
['>1.0.0-alpha', '<1.0.0-alpha.0.0', true],
['>1.0.0-alpha', '<1.0.0-beta.0', true],
]
4 changes: 4 additions & 0 deletions test/fixtures/range-intersection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,8 @@ module.exports = [
['1.x', '1.3.0 || <1.0.0 >2.0.0', true],
['*', '*', true],
['x', '', true],
['>1.0.0-alpha <1.0.0-alpha.0', '>=1.0.0-alpha', false],
['>1.0.0-alpha <1.0.0-alpha.0', '>1.0.0-alpha <1.0.0-alpha.0', false],
['>1.0.0-alpha <1.0.0-alpha.0 || 2.0.0', '*', true],
['>1.0.0-alpha <1.0.0-alpha.0 || 2.0.0', '3.0.0', false],
]