@eui/tools 5.2.0 → 5.2.1

package/.version.properties

@@ -1 +1 @@
-5.2.0
+5.2.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.2.1 (2022-05-02)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong initial version set for envTarget remote delivery - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([cc894439](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cc8944393d48bb9b7ae2ee5afb3ab5052983f4a5))
+
+* * *
+* * *
 ## 5.2.0 (2022-04-29)
 
 ##### New Features

package/package.json

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

package/sandbox.js

@@ -790,7 +790,7 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 // METADATA API TESTING
 // --------------------
 // const metadataModule = require('./scripts/csdr/metadata/v2');
-// const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+// const pkg = configUtils.packages.getPackage('cc-task-details-eui10-remote-el-ui');
 
 // Promise.resolve()
 //   .then(() => {
@@ -840,12 +840,33 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 // })
 
 
-const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
+// METADATA ESTING
+// --------------------
+const pkg = configUtils.packages.getPackage('cc-task-details-eui10-remote-el-ui');
+const envTarget = 'DEV';
+
+let versionsMetadata, envsMetadata;
 
 Promise.resolve()
+  // generating new version based on the env target and the envs cycle type
   .then(() => {
-    return metadataUtils.package.getPackageVersionsByMajor(pkg, '10', false)
+    return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
   })
-  .then((versions) => {
-    console.log(versions);
+  .then((version) => {
+    console.log(version);
   })
+
+
+
+
+
+
+// const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.package.getPackageVersionsByMajor(pkg, '10', false)
+//   })
+//   .then((versions) => {
+//     console.log(versions);
+//   })

package/scripts/csdr/release/package/common.js

@@ -260,7 +260,8 @@ module.exports.updateVersion = (pkg, pkgMetadata, envTarget) => {
       (branches.isSnapshot || branches.isSupportSnapshot),
       branches.isNext,
       branches.isSupport,
-      branches.isHotfix
+      branches.isHotfix,
+      envTarget
     );
   })
 

package/scripts/csdr/version/common.js

@@ -7,7 +7,7 @@ const semver = require('semver');
 const tools = require('../../utils/tools');
 
 
-const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv) => {
+const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv, currentVersion) => {
   let version;
   const lastIntMetadata = envsMetadata[rootEnv];
 
@@ -19,7 +19,11 @@ const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv) => {
 
   } else {
     tools.logInfo('No INT metadata found : initializing version');
-    version = '1.0.0-SNAPSHOT';
+    if (currentVersion) {
+      version = semver.coerce(currentVersion).raw + '-SNAPSHOT';
+    } else {
+      version = '1.0.0-SNAPSHOT';
+    }
     tools.logInfo(`version intialized : ${version}`);
   }
 
@@ -48,6 +52,7 @@ const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv) => {
 
       // if it's a branch new DEV stream release, the snapshot is itialized
     } else {
+      tools.logInfo(`prevVersions matching: ${version} not found initializing first release of raw version`);
       version += '.0';
     }
   }
@@ -132,7 +137,7 @@ const getNewVersionForEnv = (versionsMetadata, envsMetadata, rootEnv, envTarget)
 
 
 
-module.exports.getNewVersionDefault = (envTarget, versionsMetadata, envsMetadata) => {
+module.exports.getNewVersionDefault = (envTarget, versionsMetadata, envsMetadata, currentVersion) => {
   tools.logInfo(`Retrieve version for ${envTarget}`);
 
   return Promise.resolve()
@@ -145,7 +150,7 @@ module.exports.getNewVersionDefault = (envTarget, versionsMetadata, envsMetadata
       // =====================================================================
 
       if (envTarget === 'DEV') {
-        version = getNewVersionForDev(versionsMetadata, envsMetadata, 'INT');
+        version = getNewVersionForDev(versionsMetadata, envsMetadata, 'INT', currentVersion);
       }
 
 

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

@@ -16,7 +16,7 @@ const configUtils = require('../config/config-utils');
 const { dryRun, nexusUser, nexusPassword } = tools.getArgs();
 
 
-const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
+const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget) => {
   return Promise.resolve()
     .then(() => {
       const pkgJsonFile = path.resolve(folder, 'package.json');
@@ -24,14 +24,18 @@ const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSu
 
       let tag;
 
-      if (isSnapshot) {
+      if (envTarget && envTarget === 'DEV') {
         tag = 'snapshot';
-      } else if (isNextBranch) {
-        tag = 'next';
-      } else if (isSupportBranch) {
-        tag = 'prev';
       } else {
-        tag = 'latest';
+        if (isSnapshot) {
+          tag = 'snapshot';
+        } else if (isNextBranch) {
+          tag = 'next';
+        } else if (isSupportBranch) {
+          tag = 'prev';
+        } else {
+          tag = 'latest';
+        }
       }
 
       pkgJson.version = newVersion;
@@ -48,7 +52,7 @@ const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSu
     })
 }
 
-const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
+const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget) => {
   return Promise.resolve()
     .then(() => {
       tools.logTitle('updating package version');
@@ -56,11 +60,11 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
       if (!pkg.parent) {
         return Promise.resolve()
           .then(() => {
-            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
+            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
           })
           .then(() => {
             if (!pkg.element && !pkg.config) {
-              return writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
+              return writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
             }
           })
           .catch((e) => {
@@ -70,7 +74,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
       } else {
         return Promise.resolve()
           .then(() => {
-            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
+            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
           })
           .then(() => {
             let linkedPackages = Object.keys(pkg.packages)
@@ -85,7 +89,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
           .then((linkedPackages) => Promise.resolve().then(() => {
             return linkedPackages.reduce((promise, pkg) => {
               return promise.then(() => (
-                writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch)
+                writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget)
               ));
             }, Promise.resolve());
           }))
@@ -113,7 +117,7 @@ const writePomXml = (pkg, newVersion, isSnapshot, isForceTimestamp = true) => {
   if (dryRun) {
       return;
   }
-  
+
   return Promise.resolve()
     .then(() => {
       return templateUtils.generateMavenSettings(nexusUser, nexusPassword);
@@ -146,13 +150,56 @@ const writePomXml = (pkg, newVersion, isSnapshot, isForceTimestamp = true) => {
 
 
 
-module.exports.updateVersion = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
+module.exports.updateVersion = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget) => {
   if (pkg.backend) {
     return writePomXml(pkg, newVersion, isSnapshot);
   }
   else {
-    return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
+    return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
   }
 }
 
 
+module.exports.getCurrentVersion = (pkg) => {
+  return Promise.resolve()
+    .then(() => {
+      let currentVersion;
+
+      tools.logTitle('Extracting current version');
+
+      if (pkg.backend) {
+        // if nodejs backend, explicitely declared
+        if (pkg.build && pkg.build.nodejs) {
+          tools.logInfo('UI package => extracting from package.json');
+
+          const pathPkgJson = path.resolve(pkg.paths.pkgDirectory, 'package.json');
+          const pkgJson = require(pathPkgJson);
+          currentVersion = pkgJson.version;
+
+          // by default maven java backend is taken into account
+        } else {
+          tools.logInfo('Backend => extracting pom.xml');
+          const xmlContent = tools.getXMLJsContent(path.join(pkg.paths.pkgDirectory, 'pom.xml'));
+
+          tools.logInfo('Content found:');
+          console.log(xmlContent);
+
+          currentVersion = xmlContent.project.version.toString();
+        }
+
+      } else {
+        tools.logInfo('UI package => extracting from package.json');
+
+        const pathPkgJson = path.resolve(pkg.paths.pkgDirectory, 'package.json');
+        const pkgJson = require(pathPkgJson);
+        currentVersion = pkgJson.version;
+      }
+
+      tools.logSuccess('Current version found : ' + currentVersion);
+      return currentVersion;
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+

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

@@ -2,57 +2,13 @@
 
 // externals
 const semver = require('semver');
-const path = require('path');
 
 // local
 const tools = require('../../utils/tools');
 
-const RELEASE_TYPES = ['major', 'minor', 'patch'];
+// inner
+const innerPackageCommon = require('./package-common');
 
-const getCurrentVersion = (pkg) => {
-  return Promise.resolve()
-    .then(() => {
-      let currentVersion;
-
-      tools.logTitle('Extracting current version');
-
-      if (pkg.backend) {
-        // if nodejs backend, explicitely declared
-        if (pkg.build && pkg.build.nodejs) {
-          tools.logInfo('UI package => extracting from package.json');
-
-          const pathPkgJson = path.resolve(pkg.paths.pkgDirectory, 'package.json');
-          const pkgJson = require(pathPkgJson);
-          currentVersion = pkgJson.version;
-
-          // by default maven java backend is taken into account
-        } else {
-          tools.logInfo('Backend => extracting pom.xml');
-          const xmlContent = tools.getXMLJsContent(path.join(pkg.paths.pkgDirectory, 'pom.xml'));
-
-          tools.logInfo('Content found:');
-          console.log(xmlContent);
-
-          currentVersion = xmlContent.project.version.toString();
-        }
-
-      } else {
-        tools.logInfo('UI package => extracting from package.json');
-
-        const pathPkgJson = path.resolve(pkg.paths.pkgDirectory, 'package.json');
-        const pkgJson = require(pathPkgJson);
-        currentVersion = pkgJson.version;
-      }
-
-      tools.logSuccess('Current version found : ' + currentVersion);
-      return currentVersion;
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-// PUBLIC METHODS
 
 module.exports.getNewVersion = (
     pkg,
@@ -61,7 +17,7 @@ module.exports.getNewVersion = (
   ) => {
   return Promise.resolve()
     .then(() => {
-      return getCurrentVersion(pkg);
+      return innerPackageCommon.getCurrentVersion(pkg);
     })
 
     .then((currentVersion) => {
@@ -69,6 +25,8 @@ module.exports.getNewVersion = (
 
       tools.logInfo(`Current version found : ${currentVersion}`);
 
+      const RELEASE_TYPES = ['major', 'minor', 'patch'];
+
       let newVersion = '1.0.0';
 
       if (commits) {

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

@@ -12,6 +12,7 @@ const metadataUtils = require('../metadata/metadata-utils');
 
 // inner modules
 const innerCommon = require('./common');
+const innerPackageCommon = require('./package-common');
 
 // constants
 const { dryRun } = tools.getArgs();
@@ -21,8 +22,17 @@ const { dryRun } = tools.getArgs();
 module.exports.getNewVersion = (pkg, envTarget) => {
   let versionsMetadata;
   let envsMetadata;
+  let currentVersion;
 
   return Promise.resolve()
+    // get current version
+    .then(() => {
+      return innerPackageCommon.getCurrentVersion(pkg);
+    })
+    .then((version) => {
+      currentVersion = version;
+    })
+
     // fetch versions history and store
     .then(() => {
       return metadataUtils.packageVersions.getMetadata(pkg);
@@ -42,7 +52,7 @@ module.exports.getNewVersion = (pkg, envTarget) => {
 
     // generating new version based on the env target and the envs cycle type
     .then(() => {
-      return innerCommon.getNewVersionDefault(envTarget, versionsMetadata, envsMetadata);
+      return innerCommon.getNewVersionDefault(envTarget, versionsMetadata, envsMetadata, currentVersion);
     })
 
     .catch((e) => {

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

@@ -9,6 +9,7 @@ const innerPackage = require('./package');
 const innerPackageCommon = require('./package-common');
 const innerPackageRemote = require('./package-remote');
 const innerPackageDefault = require('./package-default');
+const innerCommon = require('./common');
 
 // re-exports inner modules
 module.exports.app = innerApp;
@@ -19,3 +20,4 @@ module.exports.package = innerPackage;
 module.exports.packageCommon = innerPackageCommon;
 module.exports.packageRemote = innerPackageRemote;
 module.exports.packageDefault = innerPackageDefault;
+module.exports.common = innerCommon;