Fixing version reset if greater version incremented

HardNorth · Jul 2, 2020 · 1d3f06d · 1d3f06d
1 parent 03b0319
commit 1d3f06d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.0.1]
+## Fixed
+- Version reset if a version of a greater value incremented
+
 ## [1.0.0]
 ### Added
 - Initial release, see README.md for the list of features
diff --git a/action.yml b/action.yml
@@ -65,15 +65,15 @@ inputs:
 
   # Next version
   next-version-increment-major:
-    description: 'Increment major version in result NEXT_VERSION'
+    description: 'Increment major version in result NEXT_VERSION, resets all other versions to "0" and prerelease to "1" if found'
     required: false
     default: 'false'
   next-version-increment-minor:
-    description: 'Increment minor version in result NEXT_VERSION'
+    description: 'Increment minor version in result NEXT_VERSION, resets patch to "0" and prerelease to "1" if found'
     required: false
     default: 'false'
   next-version-increment-patch:
-    description: 'Increment patch version in result NEXT_VERSION'
+    description: 'Increment patch version in result NEXT_VERSION, resets prerelease to "1" if found'
     required: false
     default: 'false'
   next-version-increment-prerelease:

diff --git a/build/index.js b/build/index.js
@@ -20694,11 +20694,15 @@ function generateReleaseVersion(currentVersion, properties) {
     return releaseVersion;
 }
 
-function incrementPrerelease(version) {
+function incrementPrerelease(version, reset) {
     let match = XRegExp.exec(version.prerelease, PRERELEASE_NUMBER_REGEX);
     if (match) {
         let prereleaseNumber = parseInt(match[0]);
-        prereleaseNumber += 1;
+        if(reset) {
+            prereleaseNumber = 1;
+        } else {
+            prereleaseNumber += 1;
+        }
         version.prerelease = version.prerelease.substring(0, match["index"]) + prereleaseNumber +
             version.prerelease.substring(match["index"] + match[0].length);
     }
@@ -20709,21 +20713,27 @@ function generateNextVersion(currentVersion, releaseVersion, properties) {
     if (!properties.nextIncrementPrerelease && !properties.nextIncrementPatch && !properties.nextIncrementMinor
         && !properties.nextIncrementMajor) {
         let prerelease = nextVersion.prerelease;
-        incrementPrerelease(nextVersion);
+        incrementPrerelease(nextVersion, false);
         if (prerelease === nextVersion.prerelease) {
             nextVersion.patch += 1;
         }
     } else {
         if (properties.nextIncrementPrerelease) {
-            incrementPrerelease(nextVersion);
+            incrementPrerelease(nextVersion, false);
         }
         if (properties.nextIncrementPatch) {
+            incrementPrerelease(nextVersion, true);
             nextVersion.patch += 1;
         }
         if (properties.nextIncrementMinor) {
+            incrementPrerelease(nextVersion, true);
+            nextVersion.patch = 0;
             nextVersion.minor += 1;
         }
         if (properties.nextIncrementMajor) {
+            incrementPrerelease(nextVersion, true);
+            nextVersion.minor = 0;
+            nextVersion.patch = 0;
             nextVersion.major += 1;
         }
     }

diff --git a/src/index.js b/src/index.js
@@ -176,11 +176,15 @@ function generateReleaseVersion(currentVersion, properties) {
     return releaseVersion;
 }
 
-function incrementPrerelease(version) {
+function incrementPrerelease(version, reset) {
     let match = XRegExp.exec(version.prerelease, PRERELEASE_NUMBER_REGEX);
     if (match) {
         let prereleaseNumber = parseInt(match[0]);
-        prereleaseNumber += 1;
+        if (reset) {
+            prereleaseNumber = 1;
+        } else {
+            prereleaseNumber += 1;
+        }
         version.prerelease = version.prerelease.substring(0, match["index"]) + prereleaseNumber +
             version.prerelease.substring(match["index"] + match[0].length);
     }
@@ -191,21 +195,27 @@ function generateNextVersion(currentVersion, releaseVersion, properties) {
     if (!properties.nextIncrementPrerelease && !properties.nextIncrementPatch && !properties.nextIncrementMinor
         && !properties.nextIncrementMajor) {
         let prerelease = nextVersion.prerelease;
-        incrementPrerelease(nextVersion);
+        incrementPrerelease(nextVersion, false);
         if (prerelease === nextVersion.prerelease) {
             nextVersion.patch += 1;
         }
     } else {
         if (properties.nextIncrementPrerelease) {
-            incrementPrerelease(nextVersion);
+            incrementPrerelease(nextVersion, false);
         }
         if (properties.nextIncrementPatch) {
+            incrementPrerelease(nextVersion, true);
             nextVersion.patch += 1;
         }
         if (properties.nextIncrementMinor) {
+            incrementPrerelease(nextVersion, true);
+            nextVersion.patch = 0;
             nextVersion.minor += 1;
         }
         if (properties.nextIncrementMajor) {
+            incrementPrerelease(nextVersion, true);
+            nextVersion.minor = 0;
+            nextVersion.patch = 0;
             nextVersion.major += 1;
         }
     }

diff --git a/tests/index.test.js b/tests/index.test.js
@@ -258,17 +258,17 @@ const RELEASE_VERSION = new index.Version({
 const NEXT_VERSION_TEST_CASES = [
     [{}, CURRENT_VERSION, RELEASE_VERSION, "1.2.3-BETA-8-SNAPSHOT"],
     [{"INPUT_NEXT-VERSION-PUT-BUILD-METADATA": "true"}, CURRENT_VERSION, RELEASE_VERSION, "1.2.3-BETA-8-SNAPSHOT+build.2017-02-04.5e2079"],
-    [{"INPUT_NEXT-VERSION-INCREMENT-PATCH": "true"}, CURRENT_VERSION, RELEASE_VERSION, "1.2.4-BETA-7-SNAPSHOT"],
-    [{"INPUT_NEXT-VERSION-INCREMENT-MINOR": "true"}, CURRENT_VERSION, RELEASE_VERSION, "1.3.3-BETA-7-SNAPSHOT"],
-    [{"INPUT_NEXT-VERSION-INCREMENT-MAJOR": "true"}, CURRENT_VERSION, RELEASE_VERSION, "2.2.3-BETA-7-SNAPSHOT"],
+    [{"INPUT_NEXT-VERSION-INCREMENT-PATCH": "true"}, CURRENT_VERSION, RELEASE_VERSION, "1.2.4-BETA-1-SNAPSHOT"],
+    [{"INPUT_NEXT-VERSION-INCREMENT-MINOR": "true"}, CURRENT_VERSION, RELEASE_VERSION, "1.3.0-BETA-1-SNAPSHOT"],
+    [{"INPUT_NEXT-VERSION-INCREMENT-MAJOR": "true"}, CURRENT_VERSION, RELEASE_VERSION, "2.0.0-BETA-1-SNAPSHOT"],
     [{"INPUT_NEXT-VERSION-INCREMENT-PRERELEASE": "true"}, new index.Version({
         ...CURRENT_VERSION,
         prerelease: "SNAPSHOT"
     }), RELEASE_VERSION, "1.2.3-SNAPSHOT"],
     [{
         "INPUT_NEXT-VERSION-INCREMENT-MAJOR": "true",
         "INPUT_NEXT-VERSION-INCREMENT-PRERELEASE": "true"
-    }, CURRENT_VERSION, RELEASE_VERSION, "2.2.3-BETA-8-SNAPSHOT"]
+    }, CURRENT_VERSION, RELEASE_VERSION, "2.0.0-BETA-1-SNAPSHOT"]
 ];
 describe("Test next version generation with different properties", () => {
     each(NEXT_VERSION_TEST_CASES).it("When inputs are '%s'; and current version is: '%s'; and release version is: '%s'; expected is '%s'", (inputs, currentVersion, releaseVersion, expected) => {