Skip to content

Commit 3fa9542

Browse files
wraithgarwraithgar
committed
1 parent e49844e commit 3fa9542

15 files changed

Lines changed: 218 additions & 119 deletions

File tree

‎node_modules/semver/bin/semver.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ let rtl = false
2323

2424
let identifier
2525

26+
let identifierBase
27+
2628
const semver = require('../')
29+
const parseOptions = require('../internal/parse-options')
2730

2831
let reverse = false
2932

@@ -71,6 +74,12 @@ const main = () => {
7174
case '-r': case '--range':
7275
range.push(argv.shift())
7376
break
77+
case '-n':
78+
identifierBase = argv.shift()
79+
if (identifierBase === 'false') {
80+
identifierBase = false
81+
}
82+
break
7483
case '-c': case '--coerce':
7584
coerce = true
7685
break
@@ -88,7 +97,7 @@ const main = () => {
8897
}
8998
}
9099

91-
options = { loose: loose, includePrerelease: includePrerelease, rtl: rtl }
100+
options = parseOptions({ loose, includePrerelease, rtl })
92101

93102
versions = versions.map((v) => {
94103
return coerce ? (semver.coerce(v, options) || { version: v }).version : v
@@ -127,7 +136,7 @@ const success = () => {
127136
}).map((v) => {
128137
return semver.clean(v, options)
129138
}).map((v) => {
130-
return inc ? semver.inc(v, inc, options, identifier) : v
139+
return inc ? semver.inc(v, inc, options, identifier, identifierBase) : v
131140
}).forEach((v, i, _) => {
132141
console.log(v)
133142
})
@@ -172,6 +181,11 @@ Options:
172181
--ltr
173182
Coerce version strings left to right (default)
174183
184+
-n <base>
185+
Base number to be used for the prerelease identifier.
186+
Can be either 0 or 1, or false to omit the number altogether.
187+
Defaults to 0.
188+
175189
Program exits successfully if any valid version satisfies
176190
all supplied ranges, and prints all satisfying versions.
177191

‎node_modules/semver/classes/comparator.js‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ class Comparator {
7878
throw new TypeError('a Comparator is required')
7979
}
8080

81-
if (!options || typeof options !== 'object') {
82-
options = {
83-
loose: !!options,
84-
includePrerelease: false,
85-
}
86-
}
87-
8881
if (this.operator === '') {
8982
if (this.value === '') {
9083
return true
@@ -97,32 +90,43 @@ class Comparator {
9790
return new Range(this.value, options).test(comp.semver)
9891
}
9992

100-
const sameDirectionIncreasing =
101-
(this.operator === '>=' || this.operator === '>') &&
102-
(comp.operator === '>=' || comp.operator === '>')
103-
const sameDirectionDecreasing =
104-
(this.operator === '<=' || this.operator === '<') &&
105-
(comp.operator === '<=' || comp.operator === '<')
106-
const sameSemVer = this.semver.version === comp.semver.version
107-
const differentDirectionsInclusive =
108-
(this.operator === '>=' || this.operator === '<=') &&
109-
(comp.operator === '>=' || comp.operator === '<=')
110-
const oppositeDirectionsLessThan =
111-
cmp(this.semver, '<', comp.semver, options) &&
112-
(this.operator === '>=' || this.operator === '>') &&
113-
(comp.operator === '<=' || comp.operator === '<')
114-
const oppositeDirectionsGreaterThan =
115-
cmp(this.semver, '>', comp.semver, options) &&
116-
(this.operator === '<=' || this.operator === '<') &&
117-
(comp.operator === '>=' || comp.operator === '>')
118-
119-
return (
120-
sameDirectionIncreasing ||
121-
sameDirectionDecreasing ||
122-
(sameSemVer && differentDirectionsInclusive) ||
123-
oppositeDirectionsLessThan ||
124-
oppositeDirectionsGreaterThan
125-
)
93+
options = parseOptions(options)
94+
95+
// Special cases where nothing can possibly be lower
96+
if (options.includePrerelease &&
97+
(this.value === '<0.0.0-0' || comp.value === '<0.0.0-0')) {
98+
return false
99+
}
100+
if (!options.includePrerelease &&
101+
(this.value.startsWith('<0.0.0') || comp.value.startsWith('<0.0.0'))) {
102+
return false
103+
}
104+
105+
// Same direction increasing (> or >=)
106+
if (this.operator.startsWith('>') && comp.operator.startsWith('>')) {
107+
return true
108+
}
109+
// Same direction decreasing (< or <=)
110+
if (this.operator.startsWith('<') && comp.operator.startsWith('<')) {
111+
return true
112+
}
113+
// same SemVer and both sides are inclusive (<= or >=)
114+
if (
115+
(this.semver.version === comp.semver.version) &&
116+
this.operator.includes('=') && comp.operator.includes('=')) {
117+
return true
118+
}
119+
// opposite directions less than
120+
if (cmp(this.semver, '<', comp.semver, options) &&
121+
this.operator.startsWith('>') && comp.operator.startsWith('<')) {
122+
return true
123+
}
124+
// opposite directions greater than
125+
if (cmp(this.semver, '>', comp.semver, options) &&
126+
this.operator.startsWith('<') && comp.operator.startsWith('>')) {
127+
return true
128+
}
129+
return false
126130
}
127131
}
128132

‎node_modules/semver/classes/range.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ class Range {
8181

8282
// memoize range parsing for performance.
8383
// this is a very hot path, and fully deterministic.
84-
const memoOpts = Object.keys(this.options).join(',')
85-
const memoKey = `parseRange:${memoOpts}:${range}`
84+
const memoOpts =
85+
(this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) |
86+
(this.options.loose && FLAG_LOOSE)
87+
const memoKey = memoOpts + ':' + range
8688
const cached = cache.get(memoKey)
8789
if (cached) {
8890
return cached
@@ -190,6 +192,7 @@ class Range {
190192
return false
191193
}
192194
}
195+
193196
module.exports = Range
194197

195198
const LRU = require('lru-cache')
@@ -206,6 +209,7 @@ const {
206209
tildeTrimReplace,
207210
caretTrimReplace,
208211
} = require('../internal/re')
212+
const { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require('../internal/constants')
209213

210214
const isNullSet = c => c.value === '<0.0.0-0'
211215
const isAny = c => c.value === ''

‎node_modules/semver/classes/semver.js‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class SemVer {
1616
version = version.version
1717
}
1818
} else if (typeof version !== 'string') {
19-
throw new TypeError(`Invalid Version: ${version}`)
19+
throw new TypeError(`Invalid Version: ${require('util').inspect(version)}`)
2020
}
2121

2222
if (version.length > MAX_LENGTH) {
@@ -175,36 +175,36 @@ class SemVer {
175175

176176
// preminor will bump the version up to the next minor release, and immediately
177177
// down to pre-release. premajor and prepatch work the same way.
178-
inc (release, identifier) {
178+
inc (release, identifier, identifierBase) {
179179
switch (release) {
180180
case 'premajor':
181181
this.prerelease.length = 0
182182
this.patch = 0
183183
this.minor = 0
184184
this.major++
185-
this.inc('pre', identifier)
185+
this.inc('pre', identifier, identifierBase)
186186
break
187187
case 'preminor':
188188
this.prerelease.length = 0
189189
this.patch = 0
190190
this.minor++
191-
this.inc('pre', identifier)
191+
this.inc('pre', identifier, identifierBase)
192192
break
193193
case 'prepatch':
194194
// If this is already a prerelease, it will bump to the next version
195195
// drop any prereleases that might already exist, since they are not
196196
// relevant at this point.
197197
this.prerelease.length = 0
198-
this.inc('patch', identifier)
199-
this.inc('pre', identifier)
198+
this.inc('patch', identifier, identifierBase)
199+
this.inc('pre', identifier, identifierBase)
200200
break
201201
// If the input is a non-prerelease version, this acts the same as
202202
// prepatch.
203203
case 'prerelease':
204204
if (this.prerelease.length === 0) {
205-
this.inc('patch', identifier)
205+
this.inc('patch', identifier, identifierBase)
206206
}
207-
this.inc('pre', identifier)
207+
this.inc('pre', identifier, identifierBase)
208208
break
209209

210210
case 'major':
@@ -246,9 +246,15 @@ class SemVer {
246246
break
247247
// This probably shouldn't be used publicly.
248248
// 1.0.0 'pre' would become 1.0.0-0 which is the wrong direction.
249-
case 'pre':
249+
case 'pre': {
250+
const base = Number(identifierBase) ? 1 : 0
251+
252+
if (!identifier && identifierBase === false) {
253+
throw new Error('invalid increment argument: identifier is empty')
254+
}
255+
250256
if (this.prerelease.length === 0) {
251-
this.prerelease = [0]
257+
this.prerelease = [base]
252258
} else {
253259
let i = this.prerelease.length
254260
while (--i >= 0) {
@@ -259,22 +265,29 @@ class SemVer {
259265
}
260266
if (i === -1) {
261267
// didn't increment anything
262-
this.prerelease.push(0)
268+
if (identifier === this.prerelease.join('.') && identifierBase === false) {
269+
throw new Error('invalid increment argument: identifier already exists')
270+
}
271+
this.prerelease.push(base)
263272
}
264273
}
265274
if (identifier) {
266275
// 1.2.0-beta.1 bumps to 1.2.0-beta.2,
267276
// 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
277+
let prerelease = [identifier, base]
278+
if (identifierBase === false) {
279+
prerelease = [identifier]
280+
}
268281
if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
269282
if (isNaN(this.prerelease[1])) {
270-
this.prerelease = [identifier, 0]
283+
this.prerelease = prerelease
271284
}
272285
} else {
273-
this.prerelease = [identifier, 0]
286+
this.prerelease = prerelease
274287
}
275288
}
276289
break
277-
290+
}
278291
default:
279292
throw new Error(`invalid increment argument: ${release}`)
280293
}

‎node_modules/semver/functions/diff.js‎

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,54 @@
1-
const parse = require('./parse')
2-
const eq = require('./eq')
1+
const parse = require('./parse.js')
32

43
const diff = (version1, version2) => {
5-
if (eq(version1, version2)) {
4+
const v1 = parse(version1, null, true)
5+
const v2 = parse(version2, null, true)
6+
const comparison = v1.compare(v2)
7+
8+
if (comparison === 0) {
69
return null
7-
} else {
8-
const v1 = parse(version1)
9-
const v2 = parse(version2)
10-
const hasPre = v1.prerelease.length || v2.prerelease.length
11-
const prefix = hasPre ? 'pre' : ''
12-
const defaultResult = hasPre ? 'prerelease' : ''
13-
for (const key in v1) {
14-
if (key === 'major' || key === 'minor' || key === 'patch') {
15-
if (v1[key] !== v2[key]) {
16-
return prefix + key
17-
}
18-
}
19-
}
20-
return defaultResult // may be undefined
2110
}
11+
12+
const v1Higher = comparison > 0
13+
const highVersion = v1Higher ? v1 : v2
14+
const lowVersion = v1Higher ? v2 : v1
15+
const highHasPre = !!highVersion.prerelease.length
16+
17+
// add the `pre` prefix if we are going to a prerelease version
18+
const prefix = highHasPre ? 'pre' : ''
19+
20+
if (v1.major !== v2.major) {
21+
return prefix + 'major'
22+
}
23+
24+
if (v1.minor !== v2.minor) {
25+
return prefix + 'minor'
26+
}
27+
28+
if (v1.patch !== v2.patch) {
29+
return prefix + 'patch'
30+
}
31+
32+
// at this point we know stable versions match but overall versions are not equal,
33+
// so either they are both prereleases, or the lower version is a prerelease
34+
35+
if (highHasPre) {
36+
// high and low are preleases
37+
return 'prerelease'
38+
}
39+
40+
if (lowVersion.patch) {
41+
// anything higher than a patch bump would result in the wrong version
42+
return 'patch'
43+
}
44+
45+
if (lowVersion.minor) {
46+
// anything higher than a minor bump would result in the wrong version
47+
return 'minor'
48+
}
49+
50+
// bumping major/minor/patch all have same result
51+
return 'major'
2252
}
53+
2354
module.exports = diff

‎node_modules/semver/functions/inc.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const SemVer = require('../classes/semver')
22

3-
const inc = (version, release, options, identifier) => {
3+
const inc = (version, release, options, identifier, identifierBase) => {
44
if (typeof (options) === 'string') {
5+
identifierBase = identifier
56
identifier = options
67
options = undefined
78
}
@@ -10,7 +11,7 @@ const inc = (version, release, options, identifier) => {
1011
return new SemVer(
1112
version instanceof SemVer ? version.version : version,
1213
options
13-
).inc(release, identifier).version
14+
).inc(release, identifier, identifierBase).version
1415
} catch (er) {
1516
return null
1617
}

0 commit comments

Comments
 (0)