improve parseRange, add test cases
- parse "NaN" as string part - allow more whitespaces in hyphen
This commit is contained in:
parent
1ab1d0104c
commit
3b55455b26
|
@ -89,7 +89,9 @@ exports.versionLt = versionLt;
|
|||
*/
|
||||
exports.parseRange = str => {
|
||||
const splitAndConvert = str => {
|
||||
return str.split(".").map(item => (`${+item}` === item ? +item : item));
|
||||
return str
|
||||
.split(".")
|
||||
.map(item => (item !== "NaN" && `${+item}` === item ? +item : item));
|
||||
};
|
||||
// see https://docs.npmjs.com/misc/semver#range-grammar for grammar
|
||||
const parsePartial = str => {
|
||||
|
@ -131,13 +133,15 @@ exports.parseRange = str => {
|
|||
return [-range[0] - 1, ...range.slice(1)];
|
||||
};
|
||||
const parseSimple = str => {
|
||||
// simple ::= primitive | partial | tilde | caret
|
||||
// primitive ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
|
||||
// tilde ::= '~' partial
|
||||
// caret ::= '^' partial
|
||||
// simple ::= primitive | partial | tilde | caret
|
||||
// primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | '!' ) ( ' ' ) * partial
|
||||
// tilde ::= '~' ( ' ' ) * partial
|
||||
// caret ::= '^' ( ' ' ) * partial
|
||||
const match = /^(\^|~|<=|<|>=|>|=|v|!)/.exec(str);
|
||||
const start = match ? match[0] : "";
|
||||
const remainder = parsePartial(str.slice(start.length));
|
||||
const remainder = parsePartial(
|
||||
start.length ? str.slice(start.length).trim() : str.trim()
|
||||
);
|
||||
switch (start) {
|
||||
case "^":
|
||||
if (remainder.length > 1 && remainder[1] === 0) {
|
||||
|
@ -190,18 +194,14 @@ exports.parseRange = str => {
|
|||
// eslint-disable-next-line no-sparse-arrays
|
||||
return [, ...arr, ...items.slice(1).map(() => fn)];
|
||||
};
|
||||
// remove whitespace characters after ^, ~, <=, <, >=, >, =
|
||||
const trimRangeOperators = str => {
|
||||
return str.replace(/(\^|~|<=|<|>=|>|=)\s*/g, "$1");
|
||||
};
|
||||
const parseRange = str => {
|
||||
// range ::= hyphen | simple ( ' ' simple ) * | ''
|
||||
// hyphen ::= partial ' - ' partial
|
||||
const items = str.split(" - ");
|
||||
// range ::= hyphen | simple ( ' ' ( ' ' ) * simple ) * | ''
|
||||
// hyphen ::= partial ( ' ' ) * ' - ' ( ' ' ) * partial
|
||||
const items = str.split(/\s+-\s+/);
|
||||
if (items.length === 1) {
|
||||
const items = trimRangeOperators(str)
|
||||
const items = str
|
||||
.trim()
|
||||
.split(/\s+/g)
|
||||
.split(/(?<=[-0-9A-Za-z])\s+/g)
|
||||
.map(parseSimple);
|
||||
return combine(items, 2);
|
||||
}
|
||||
|
|
|
@ -129,6 +129,8 @@ describe("SemVer", () => {
|
|||
|
||||
describe("parseRange", () => {
|
||||
const cases = {
|
||||
"5 || 6 || 7.x.x": ["5.x.x || 6.x || 7"],
|
||||
"1 - 2": ["1 - 2"],
|
||||
"=3": [
|
||||
"3",
|
||||
"v3",
|
||||
|
@ -145,7 +147,9 @@ describe("SemVer", () => {
|
|||
"^3.4": ["^3.4.*", "^ 3.4"],
|
||||
"3.4 - 6.5": [">=3.4 <=6.5", ">= 3.4 <= 6.5"],
|
||||
"<=3.4": ["<3.4 || =3.4", "<= 3.4"],
|
||||
">3.4": [">=3.4 !3.4", "> 3.4"]
|
||||
">3.4": [">=3.4 !3.4", "> 3.4"],
|
||||
"1.2.3-alpha.x.x": ["1.2.3-alpha", "1.2.3-alpha+build.25"],
|
||||
"1.2.3-NaN": ["1.2.3-NaN"]
|
||||
};
|
||||
for (const key of Object.keys(cases)) {
|
||||
describe(key, () => {
|
||||
|
|
Loading…
Reference in New Issue