From e18d844842d6cc0557c6a402e5f925b210f5c5d7 Mon Sep 17 00:00:00 2001
From: gmaggiodev <gmaggio@talentia-software.com>
Date: Tue, 6 Oct 2020 18:10:02 +0200
Subject: [PATCH] support for preId

---
 README.md |  2 +-
 index.js  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c91aa19..23f58e2 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Make sure you use the `actions/checkout@v2` action!
     version will be incremented.
   * If a commit message begins with the string "feat" or includes "minor" then the minor version will be increased. This works
     for most common commit metadata for feature additions: `"feat: new API"` and `"feature: new API"`.
-  * If a commit message contains the word "prerelease" then the pre-release version will be increased (for example 1.6.0-alpha.1 -> 1.6.0-alpha.2)
+  * If a commit message contains the word "pre-alpha" or "pre-beta" or "pre-rc" then the pre-release version will be increased (for example specifying pre-alpha: 1.6.0-alpha.1 -> 1.6.0-alpha.2 or, specifying pre-beta: 1.6.0-alpha.1 -> 1.6.0-beta.0)
   * All other changes will increment the patch version.
 * Push the bumped npm version in package.json back into the repo.
 * Push a tag for the new version back into the repo.
diff --git a/index.js b/index.js
index b369c37..abc2a2b 100644
--- a/index.js
+++ b/index.js
@@ -28,28 +28,27 @@ Toolkit.run(async tools => {
 
   const majorWords = process.env['INPUT_MAJOR-WORDING'].split(',')
   const minorWords = process.env['INPUT_MINOR-WORDING'].split(',')
-  const prereleaseWords = ['preprelease', 'alpha', 'beta', 'rc']
+  const preReleaseWords = ['pre-alpha', 'pre-beta', 'pre-rc']
 
   let version = 'patch'
-  let preid = null;
-  let foundWords = [];
-
+  let foundWord = null;
+  
   if (messages.some(
     message => /^([a-zA-Z]+)(\(.+\))?(\!)\:/.test(message) || majorWords.some(word => message.includes(word)))) {
     version = 'major'
   } else if (messages.some(message => minorWords.some(word => message.includes(word)))) {
     version = 'minor'
-  } else if (messages.some(message => prereleaseWords.some(word => {
+  } else if (messages.some(message => preReleaseWords.some(word => {
         if (message.includes(word)) {
-          foundWords.push(word);
+          foundWord = word;
           return true;
         } else {
           return false;
         }
       }
     ))) {
-    version = 'prerelease';
-    console.log(foundWords);
+      let preid = foundWord.split("-")[1];
+      version = `prerelease --preid=${preid}`;
   }
 
   try {