diff --git a/classes/semver.js b/classes/semver.js index 20eb0897..96fceb79 100644 --- a/classes/semver.js +++ b/classes/semver.js @@ -176,6 +176,7 @@ class SemVer { // preminor will bump the version up to the next minor release, and immediately // down to pre-release. premajor and prepatch work the same way. inc (release, identifier, identifierBase) { + const base = Number(identifierBase) ? 1 : 0 switch (release) { case 'premajor': this.prerelease.length = 0 @@ -248,7 +249,7 @@ class SemVer { // 1.0.0 'pre' would become 1.0.0-0 which is the wrong direction. case 'pre': if (this.prerelease.length === 0) { - this.prerelease = [0] + this.prerelease = [base] } else { let i = this.prerelease.length while (--i >= 0) { @@ -259,11 +260,10 @@ class SemVer { } if (i === -1) { // didn't increment anything - this.prerelease.push(0) + this.prerelease.push(base) } } if (identifier) { - const base = Number(identifierBase) ? 1 : 0 // 1.2.0-beta.1 bumps to 1.2.0-beta.2, // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0 if (compareIdentifiers(this.prerelease[0], identifier) === 0) { diff --git a/test/fixtures/increments.js b/test/fixtures/increments.js index dedd02e6..b1f1f2fd 100644 --- a/test/fixtures/increments.js +++ b/test/fixtures/increments.js @@ -79,6 +79,7 @@ module.exports = [ ['1.2.3-1', 'preminor', '1.3.0-dev.0', false, 'dev'], ['1.2.0', 'premajor', '2.0.0-dev.0', false, 'dev'], ['1.2.3-1', 'premajor', '2.0.0-dev.0', false, 'dev'], + ['1.2.3-1', 'premajor', '2.0.0-dev.1', false, 'dev', 1], ['1.2.0-1', 'minor', '1.2.0', false, 'dev'], ['1.0.0-1', 'major', '1.0.0', 'dev'], ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.0', false, 'dev'], @@ -99,6 +100,10 @@ module.exports = [ ['1.2.0', 'premajor', '2.0.0-dev.0', false, 'dev', '0'], ['1.2.3-1', 'premajor', '2.0.0-dev.0', false, 'dev', '0'], ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.0', false, 'dev', '0'], + ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.1', false, 'dev', '1'], + ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.bar.0', false, '', '0'], + ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.bar.1', false, '', '1'], ['1.2.0', 'preminor', '1.3.0-dev.1', false, 'dev', '1'], ['1.2.3-1', 'preminor', '1.3.0-dev.0', false, 'dev'], + ['1.2.0', 'prerelease', '1.2.1-1', false, '', '1'], ]