Skip to content

fix: don't let a null comparator set mask the minimum of another union branch #896

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
maximilliangrand wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −6
Open

fix: don't let a null comparator set mask the minimum of another union branch #896

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
12 changes: 6 additions & 6 deletions ranges/min-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ const minVersion = (range, loose) => {
throw new Error(`Unexpected operation: ${comparator.operator}`)
}
})
if (setMin && (!minver || gt(minver, setMin))) {
// Maximum versions are ignored above, so a comparator set that is a null
// set (eg `^1 ^2`) still yields a candidate. Check the candidate against
// the range here rather than once at the end, so that such a set cannot
// mask the minimum of another set in the union.
if (setMin && (!minver || gt(minver, setMin)) && range.test(setMin)) {
minver = setMin
}
}

if (minver && range.test(minver)) {
return minver
}

return null
return minver
}
module.exports = minVersion
7 changes: 7 additions & 0 deletions test/ranges/min-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,15 @@ test('minimum version in range tests', (t) => {
['>2 || >1.0.0-0', '1.0.0-0.0'],
['>2 || >1.0.0-beta', '1.0.0-beta.0'],

// A null set in a union must not mask the minimum of the other sets
['^1 ^2 || >=3', '3.0.0'],
['>=2 <1 || >=3', '3.0.0'],
['1.x 2.x || >=3', '3.0.0'],
['>=3 || ^1 ^2', '3.0.0'],

// Impossible range
['>4 <3', null],
['^1 ^2 || >4 <3', null],
].forEach((tuple) => {
const range = tuple[0]
const version = tuple[1]
Expand Down