@eui/tools 5.1.12 → 5.1.13

package/.version.properties

@@ -1 +1 @@
-5.1.12
+5.1.13

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.1.13 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * broken version generated for remote snapshot - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([21a5afd7](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/21a5afd7c07bcea1c4bed4e0ed7c417667e87673))
+
+* * *
+* * *
 ## 5.1.12 (2022-04-28)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.1.12",
+    "version": "5.1.13",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/version/package-default.js

@@ -7,6 +7,7 @@ const path = require('path');
 // local
 const tools = require('../../utils/tools');
 
+const RELEASE_TYPES = ['major', 'minor', 'patch'];
 
 const getCurrentVersion = (pkg) => {
   return Promise.resolve()
@@ -51,36 +52,6 @@ const getCurrentVersion = (pkg) => {
     })
 }
 
-
-const getReleaseType = (commitsMetadata) => {
-  tools.logInfo('Getting release type based on commits metadata parsed from last tag');
-
-  const RELEASE_TYPES = ['major', 'minor', 'patch'];
-
-  let level = 2;
-  let breakings = 0;
-  let features = 0;
-
-  commitsMetadata.forEach((commit) => {
-    if (commit.breakingChange) {
-      breakings += commit.body;
-      level = 1; // no major bump on "breaking changes"
-    } else if (commit.type === 'feat') {
-      features += 1;
-      if (level === 2) {
-        level = 1;
-      }
-    }
-  });
-
-  return {
-    level: level,
-    reason: 'There are ' + breakings + ' BREAKING CHANGES and ' + features + ' features',
-    releaseType: RELEASE_TYPES[level]
-  };
-}
-
-
 // PUBLIC METHODS
 
 module.exports.getNewVersion = (
@@ -101,7 +72,31 @@ module.exports.getNewVersion = (
       let newVersion = '1.0.0';
 
       if (commits) {
-        const release = getReleaseType(commits);
+
+        tools.logInfo('Commits found for processing version, extracting...');
+
+        let level = 2;
+        let breakings = 0;
+        let features = 0;
+
+        commits.forEach((commit) => {
+          if (commit.breakingChange) {
+            breakings += commit.body;
+            level = 1; // no major bump on "breaking changes"
+          } else if (commit.type === 'feat') {
+            features += 1;
+            if (level === 2) {
+              level = 1;
+            }
+          }
+        });
+
+        const release = {
+          level: level,
+          reason: 'There are ' + breakings + ' BREAKING CHANGES and ' + features + ' features',
+          releaseType: RELEASE_TYPES[level]
+        };
+
         tools.logInfo('release info found : ' + JSON.stringify(release));
 
         if (isNextBranch) {
@@ -110,37 +105,39 @@ module.exports.getNewVersion = (
           newVersion = semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType)
         }
 
-        tools.logInfo('probable new version : ' + newVersion);
 
-        if (isSnapshot) {
-          if (pkg.backend) {
-            if (pkg.build && pkg.build.nodejs) {
-              newVersion += '-snapshot-' + Date.now();
-            } else {
-              newVersion += '-SNAPSHOT';
-            }
-          } else {
-            newVersion += '-snapshot-' + Date.now();
-          }
+      } else {
+          tools.logInfo('No commits found for version processing...applying minor version upgrade');
 
-        } else if (isSupportBranch) {
-          if (pkg.backend) {
+          if (isNextBranch) {
             newVersion = semver.inc(currentVersion, 'prerelease');
+          } else {
+            newVersion = semver.inc(currentVersion, 'minor');
           }
-        } else if (isHotfixBranch) {
-          newVersion = semver.inc(currentVersion, 'prerelease');
-        }
+      }
 
-      } else {
-        tools.logInfo('No commits found for version processing...applying minor version upgrade');
+      tools.logInfo('probable new version : ' + newVersion);
 
-        if (isNextBranch) {
-          newVersion = semver.inc(currentVersion, 'prerelease');
+      if (isSnapshot) {
+        if (pkg.backend) {
+          if (pkg.build && pkg.build.nodejs) {
+            newVersion += '-snapshot-' + Date.now();
+          } else {
+            newVersion += '-SNAPSHOT';
+          }
         } else {
-          newVersion = semver.inc(currentVersion, 'minor');
+          newVersion += '-snapshot-' + Date.now();
         }
       }
 
+      if (isSupportBranch && pkg.backend) {
+        newVersion = semver.inc(currentVersion, 'prerelease');
+      }
+
+      if (isHotfixBranch) {
+        newVersion = semver.inc(currentVersion, 'prerelease');
+      }
+
       tools.logSuccess('new version generated : ' + newVersion);
 
       return newVersion;