@eui/tools 5.1.11 → 5.2.0

package/.version.properties

@@ -1 +1 @@
-5.1.11
+5.2.0

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.2.0 (2022-04-29)
+
+##### New Features
+
+* **other:**
+  * added script for translating i18n files EUI-5847 [EUI-5847](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5847)  ([3e0740f4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3e0740f40386d87f2baa4045ae14fe93adf40655))
+
+* * *
+* * *
+## 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
+
+* **other:**
+  * wrong non-snapshots dependencies resolutions - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([b151196a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b151196a9cb6de530b035cf0d88d03ed80744eaa))
+
+* * *
+* * *
 ## 5.1.11 (2022-04-28)
 
 ##### Bug Fixes

package/bin/eui-scripts.js

@@ -35,6 +35,7 @@ const scriptIndex = args.findIndex(
     x === 'csdr-stats' ||
     x === 'generate-app-metadata' ||
     x === 'help' ||
+    x === 'i18n-translate' ||
     x === 'inject-config-app' ||
     x === 'version'
 );
@@ -70,6 +71,7 @@ switch (script) {
     case 'csdr-stats':
     case 'generate-app-metadata':
     case 'help':
+    case 'i18n-translate':
     case 'inject-config-app':
     case 'version': {
         const result = spawn.sync(

package/bin/scripts/i18n-translate.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const i18nTranslate = require('../../scripts/utils/translate/translate-utils');
+
+Promise.resolve()
+  .then(() => {
+    return i18nTranslate.translateI18nFile();
+  })
+  .catch((e) => {
+    console.log(e);
+    process.exit(1);
+  })

package/package.json

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

package/sandbox.js

@@ -823,20 +823,29 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(metadata);
 //   })
 
-Promise.resolve()
-// getting root composite - dependencies-composite.json content
-.then(() => {
-  const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
-  var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
-
-  if (compositeDeps.dependencies) {
-    return compositeDeps.dependencies;
-  } else {
-    return compositeDeps;
-  }
-})
-.then((deps) => {
-  console.log(deps);
-})
+// Promise.resolve()
+// // getting root composite - dependencies-composite.json content
+// .then(() => {
+//   const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
+//   var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+//   if (compositeDeps.dependencies) {
+//     return compositeDeps.dependencies;
+//   } else {
+//     return compositeDeps;
+//   }
+// })
+// .then((deps) => {
+//   console.log(deps);
+// })
+
 
+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/metadata/package.js

@@ -430,6 +430,12 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
     } else {
       versions = versions.filter(v => v.version.indexOf('snapshot') !== -1);
       tools.logInfo(`----> ${versions.length} metadata versions found including snapshots`);
+
+      if (versions.length === 0) {
+        versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
+        versions = versions.filter(v => v.version.indexOf('snapshot') === -1);
+        tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
+      }
     }
 
     return versions;

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;

package/scripts/utils/translate/translate-utils.js

@@ -0,0 +1,124 @@
+'use strict';
+
+const tools = require('../../utils/tools');
+const https = require('https');
+var fs = require('fs');
+const { filePath, sourceLang, targetLang } = require('../tools').getArgs();
+const TEXT = '<text>';
+const TEXT_END = '</text>';
+const CONTENT = '<content>';
+const CONTENT_END = '</content>';
+
+// example: node translate-utils.js --filePath c:\i18n\en.json --sourceLang en --targetLang bg
+
+const readFile = (filePath) => {
+    return JSON.parse(fs.readFileSync(filePath));
+}
+
+const translate = (text, sourceLang, targetLang) => {
+    tools.logTitle(`Translating file : ${filePath} from ${sourceLang} to ${targetLang}.`);
+    return new Promise((resolve, reject) => {
+        const data = JSON.stringify({
+            textToTranslate: text,
+            sourceLanguage: sourceLang,
+            targetLanguage: targetLang
+        });
+
+        const options = {
+            hostname: 'europa.eu',
+            path: '/webtools/rest/etrans/translate',
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': data.length
+            }
+        };
+
+        const req = https.request(options, res => {
+            let chunks_of_data = [];
+
+            res.on('data', d => {
+                chunks_of_data.push(d);
+            });
+            res.on('end', () => {
+                tools.logInfo('Received response from eTrans service.');
+                let response_body = Buffer.concat(chunks_of_data);
+                var response = JSON.parse(response_body);
+                resolve(Buffer.from(response.translation, 'base64').toString());
+            });
+        });
+
+        req.on('error', error => {
+            reject(error);
+            return;
+        });
+
+        tools.logInfo('Sending request to eTrans service.');
+        req.write(data);
+        req.end();
+    });
+}
+
+const  prepareStringToTranslate = (arrLines, result) => {
+    var keys = Object.keys(arrLines);
+    keys.forEach((key) => {
+        if (arrLines[key] instanceof Object && !(arrLines[key] instanceof Array)) {
+            result += prepareStringToTranslate(arrLines[key], '');
+        } else {
+            result += `${TEXT}${arrLines[key]}${TEXT_END}`;
+        }
+    });
+    return result;
+}
+
+const  createResultJsonFile = (arrLines, res) => {
+    const resString = res.split(`${CONTENT}${TEXT}`).pop().split(`${TEXT_END}${CONTENT_END}`)[0];
+    const resArr = resString.split(`${TEXT_END}${TEXT}`);
+    var resultJson = Object.assign({}, arrLines);
+    var finalRes = iterateResultToJson(resultJson, resArr);
+    return finalRes;
+}
+
+const iterateResultToJson = (resultJson, resArr) => {
+    var keys = Object.keys(resultJson);
+    keys.forEach((key, index) => {
+        if (resultJson[key] instanceof Object && !(resultJson[key] instanceof Array)) { // If there is nested JSON
+            resultJson[key] = iterateResultToJson(resultJson[key], resArr.slice(index));
+            var subKeys = Object.keys(resultJson[key]);
+            resArr.splice(index, subKeys.length - 1); // remove elements for nested JSON from results array
+        } else {
+            if (resultJson[key] instanceof Array) {
+                resultJson[key] = resArr[index].split(',').map(el => el.trim());
+            } else {
+                resultJson[key] = resArr[index];
+            }
+        }
+    });
+    return resultJson;
+}
+
+const translateI18nFile = () => {
+    return Promise.resolve()
+        .then(() => {
+            const arrLines = readFile(filePath);
+            const destFolder = filePath.substring(0, filePath.lastIndexOf("\\") + 1);
+            var stringToTranslate = prepareStringToTranslate(arrLines, '');
+            translate(`${CONTENT}${stringToTranslate}${CONTENT_END}`, sourceLang, targetLang)
+                .then((res) => {
+                    const resultJson = createResultJsonFile(arrLines, res);
+                    fs.writeFile(`${destFolder}${targetLang}.json`, JSON.stringify(resultJson, null, 2), function (err) {
+                        if (err)  { tools.logError(err); }
+                        tools.logInfo(`File ${targetLang}.json created.`);
+                    });
+
+                }, (err) => {
+                    tools.logInfo(`Error: ${err}`);
+                });
+        }).catch((error) => {
+            tools.logError(error);
+          });
+}
+
+translateI18nFile();
+
+module.exports.translateI18nFile = translateI18nFile;