Skip to content

Remove tolerant option from Semver #573

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

Merged
mxcl merged 2 commits into from
May 9, 2023
Merged

Remove tolerant option from Semver #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86334f5
Remove tolerant option from Semver
uesyn May 7, 2023
74b550d
add tests for \d[a-z] and \d.\d[a-z]
jhheider May 7, 2023
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
25 changes: 12 additions & 13 deletions src/utils/semver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ export default class SemVer {
readonly raw: string
readonly pretty?: string

constructor(input: string | number[] | Range | SemVer, {tolerant}: {tolerant: boolean} = {tolerant: false}) {
constructor(input: string | number[] | Range | SemVer) {
if (typeof input == 'string') {
const vprefix = input.startsWith('v')
const raw = vprefix ? input.slice(1) : input
const parts = raw.split('.')
if (parts.length < 3 && !vprefix && !tolerant) throw new Error(`too short to parse without a \`v\` prefix: ${input}`)
let pretty_is_raw = false
this.components = parts.flatMap((x, index) => {
const match = x.match(/^(\d+)([a-z])$/)
Expand Down Expand Up @@ -102,7 +101,7 @@ export default class SemVer {
/// also slightly more tolerant parsing
export function parse(input: string) {
try {
return new SemVer(input, {tolerant: true})
return new SemVer(input)
} catch {
return undefined
}
Expand All @@ -126,15 +125,15 @@ export class Range {
this.set = input.split(/(?:,|\s*\|\|\s*)/).map(input => {
let match = input.match(/^>=((\d+\.)*\d+)\s*(<((\d+\.)*\d+))?$/)
if (match) {
const v1 = new SemVer(match[1], {tolerant: true})
const v2 = match[3] ? new SemVer(match[4], {tolerant: true})! : new SemVer([Infinity, Infinity, Infinity])
const v1 = new SemVer(match[1])
const v2 = match[3] ? new SemVer(match[4])! : new SemVer([Infinity, Infinity, Infinity])
return [v1, v2]
} else if ((match = input.match(/^([~=<^])(.+)$/))) {
let v1: SemVer | undefined, v2: SemVer | undefined
switch (match[1]) {
// deno-lint-ignore no-case-declarations
case "^":
v1 = new SemVer(match[2], {tolerant: true})
v1 = new SemVer(match[2])
const parts = []
for (let i = 0; i < v1.components.length; i++) {
if (v1.components[i] === 0 && i < v1.components.length - 1) {
Expand All @@ -144,23 +143,23 @@ export class Range {
break
}
}
v2 = new SemVer(parts, {tolerant: true})
v2 = new SemVer(parts)
return [v1, v2]
case "~": {
v1 = new SemVer(match[2], {tolerant: true})
v1 = new SemVer(match[2])
if (v1.components.length == 1) {
// yep this is the official policy
v2 = new SemVer([v1.major + 1], {tolerant: true})
v2 = new SemVer([v1.major + 1])
} else {
v2 = new SemVer([v1.major, v1.minor + 1], {tolerant: true})
v2 = new SemVer([v1.major, v1.minor + 1])
}
} return [v1, v2]
case "<":
v1 = new SemVer([0], {tolerant: true})
v2 = new SemVer(match[2], {tolerant: true})
v1 = new SemVer([0])
v2 = new SemVer(match[2])
return [v1, v2]
case "=":
return new SemVer(match[2], {tolerant: true})
return new SemVer(match[2])
}
}
throw err()
Expand Down
8 changes: 6 additions & 2 deletions tests/unit/semver.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ Deno.test("semver", async test => {
assertEquals(new SemVer("1.2.3.4").toString(), "1.2.3.4")
assertEquals(new SemVer("1.2.3").toString(), "1.2.3")
assertEquals(new SemVer("v1.2.3").toString(), "1.2.3")
assertThrows(() => new SemVer("1.2"))
assertEquals(new SemVer("1.2").toString(), "1.2.0")
assertEquals(new SemVer("v1.2").toString(), "1.2.0")
assertThrows(() => new SemVer("1"))
assertEquals(new SemVer("1").toString(), "1.0.0")
assertEquals(new SemVer("v1").toString(), "1.0.0")

assertEquals(new SemVer("9e").toString(), "9e")
assertEquals(new SemVer("9e").components, [9,5])
assertEquals(new SemVer("3.3a").toString(), "3.3a")
assertEquals(new SemVer("3.3a").components, [3,3,1])
assertEquals(new SemVer("1.1.1q").toString(), "1.1.1q")
assertEquals(new SemVer("1.1.1q").components, [1,1,1,17])
})
Expand Down