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
17 changes: 12 additions & 5 deletions scripts/update-changelog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,18 @@ export function incVersion (version: string, bump: 'major' | 'minor' | 'patch'):
`Cannot bump version "${version}": expected strict "X.Y.Z" semver. uppt does not currently support prerelease or build-metadata versions.`,
)
}
let [, major, minor, patch] = match.map(Number) as [number, number, number, number, number]
if (bump === 'major') { major += 1; minor = 0; patch = 0 }
else if (bump === 'minor') { minor += 1; patch = 0 }
else { patch += 1 }
return `${major}.${minor}.${patch}`

let [, x, y, z] = match.map(Number) as [number, number, number, number, number]

if (x === 0) {
if (bump === 'major') { bump = 'minor' }
else if (bump === 'minor') { bump = 'patch' }
}

if (bump === 'major') { x += 1; y = 0; z = 0 }
else if (bump === 'minor') { y += 1; z = 0 }
else { z += 1 }
return `${x}.${y}.${z}`
}

function formatChangelog (
Expand Down
15 changes: 15 additions & 0 deletions test/update-changelog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ describe('incVersion', () => {
expect(incVersion('1.2.3', 'major')).toBe('2.0.0')
})

it('maps a major bump in 0.x.y to the minor slot', () => {
expect(incVersion('0.2.3', 'major')).toBe('0.3.0')
})

it('maps minor and patch bumps in 0.x.y to the patch slot', () => {
expect(incVersion('0.2.3', 'minor')).toBe('0.2.4')
expect(incVersion('0.2.3', 'patch')).toBe('0.2.4')
})

it('supports 0.0.x versions with the same 0.x.y mapping', () => {
expect(incVersion('0.0.3', 'major')).toBe('0.1.0')
expect(incVersion('0.0.3', 'minor')).toBe('0.0.4')
expect(incVersion('0.0.3', 'patch')).toBe('0.0.4')
})

it('throws on a prerelease version', () => {
expect(() => incVersion('1.2.3-rc.1', 'patch')).toThrowError(/strict "X\.Y\.Z" semver/)
})
Expand Down