Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export * from './first-past'
export * from './min-version'
export * from './next-version'
export * from './prerelease'
export * from './upper-bound'
export * from './valid-version-or-range'
export * from './version-compare'
export * from './x-sort'
3 changes: 2 additions & 1 deletion src/test/min-version.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ describe('minVersion', () => {
['1.0.x', '1.0.0'],
['1.0.0-alpha.x', '1.0.0-alpha.0'],
['1.0.0-beta.x', '1.0.0-beta.0'],
['1.0.0-rc.x', '1.0.0-rc.0']
['1.0.0-rc.x', '1.0.0-rc.0'],
['1.0.0 - 2', '1.0.0']
])('%s => %s', (input, expected) => expect(minVersion(input)).toBe(expected))
})
1 change: 1 addition & 0 deletions src/test/next-version.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as ver from '../next-version'
describe('nextVersion', () => {
describe('handles semver style', () => {
test.each([
// currVer, increment, expected
['1.0.0', undefined, '1.0.1'],
['1.0.0-alpha.94', undefined, '1.0.0-alpha.95'],
['1.0.0-alpha.94', 'prerelease', '1.0.0-alpha.95'],
Expand Down
14 changes: 14 additions & 0 deletions src/test/upper-bound.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* global describe expect test */
import { upperBound } from '../upper-bound'

describe('upperBound', () => {
test.each([
['*', '*'],
['1.0.0', '1.0.0'],
['2', '<3.0.0-0'],
['1.0.0 - 2', '<3.0.0-0'],
['1.0.x', '<1.1.0-0'],
['1.0.0-alpha.1', '1.0.0-alpha.1'],
['1.0 - 1.2.3', '1.2.3']
])('%s => %s', (input, expected) => expect(upperBound(input)).toBe(expected))
})
13 changes: 13 additions & 0 deletions src/test/valid-version-or-range.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* global describe expect test */
import { validVersionOrRange } from '../valid-version-or-range'

describe('validVersionOrRange', () => {
test.each([
[{ input : '1.0.0' }, true],
[{ input : '1.0.0-alpha.0' }, true],
[{ input : '1.0.0-alpha.1' }, true],
[{ input : '1.0.0 - 2' }, true],
[{ input : '1.0.x', onlyXRange : true }, true],
[{ input : '1.0.0-alpha.1' }, true]
])('%s => %s', (input, expected) => expect(validVersionOrRange(input)).toBe(expected))
})
22 changes: 22 additions & 0 deletions src/upper-bound.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import semver from 'semver'

/**
* Finds the ceiling of a range. For '*', the ceiling is '*'. For specific versions or any range capped by a specific
* version, the ceiling is that version. For any open-ended range, the ceiling is defined by a '<version>-0' range
* function where 'verision-0' least range above the given range.
* @param {string} range - The range to find the ceiling for.
* @returns {string} - Either '*', a specific version, or a '<version>-0'.
*/
const upperBound = (range) => {
const normalizedRange = semver.validRange(range)
if (normalizedRange === null) {
return null
}

const ranges = normalizedRange.split(' ')
const upperRange = ranges[ranges.length - 1]

return upperRange.startsWith('<=') ? upperRange.slice(2) : upperRange
}

export { upperBound }
4 changes: 2 additions & 2 deletions src/valid-version-or-range.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const validVersionOrRange = ({
input = throw new Error("'input' is required."),
onlyXRange = false
}) =>
(dissallowVersions !== true && semver.valid(input))
!!((dissallowVersions !== true && semver.valid(input))
|| (onlyXRange !== true && dissallowRanges !== true && semver.validRange(input))
|| (onlyXRange === true && input.match(xRangeRE))
|| (onlyXRange === true && input.match(xRangeRE)))

export { validVersionOrRange }