@eui/tools 4.15.14 → 4.16.0

package/.version.properties

@@ -1 +1 @@
-4.15.14
+4.16.0

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 4.16.0 (2021-11-03)
+
+##### Chores
+
+* **other:**
+  * refactoring  ([6bd95ede](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6bd95ede679710adc95353089c0efe1691cac5f0))
+##### New Features
+
+* **other:**
+  * refactoring - added timestamp to logger - cleanup - added dynamic resolutions generation on sync and init - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([0ab46918](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0ab46918dbfd7fc73609c90fc00e901f5e36469f))
+##### Bug Fixes
+
+* **other:**
+  * wrong declaration of private method  ([70ad7ceb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/70ad7cebf87369f20cdc431fdce95cb14549cbfa))
+
+* * *
+* * *
 ## 4.15.14 (2021-10-29)
 
 ##### Bug Fixes

package/bin/eui-scripts.js

@@ -31,8 +31,6 @@ const scriptIndex = args.findIndex(
     x === 'release-app' ||
     x === 'generate-translations' ||
     x === 'csdr-sync' ||
-    x === 'csdr-migrate-package' ||
-    x === 'csdr-jira-update' ||
     x === 'csdr-cli' ||
     x === 'csdr-stats' ||
     x === 'generate-app-metadata' ||
@@ -65,11 +63,9 @@ switch (script) {
     case 'csdr-init':
     case 'csdr-upgrade-deps':
     case 'csdr-serve-app':
-    case 'csdr-migrate-package':
     case 'release-package':
     case 'release-app':
     case 'csdr-sync':
-    case 'csdr-jira-update':
     case 'csdr-cli':
     case 'csdr-stats':
     case 'generate-app-metadata':

package/global.test.js

@@ -96,10 +96,6 @@ describe('eUI tools - test imports', () => {
     const csdrInstallUtils = require('./scripts/csdr/install/install-utils');
     const csdrInstallLocalDev = require('./scripts/csdr/install/local-dev');
 
-    // csdr - jira
-    // const csdrJiraUtils = require('./scripts/csdr/jira/jira-utils');
-    // const csdrJiraUpdate = require('./scripts/csdr/jira/update');
-
     // csdr - metadata
     const csdrMetadataAppEnvs = require('./scripts/csdr/metadata/app-envs');
     const csdrMetadataAppHistory = require('./scripts/csdr/metadata/app-history');
@@ -117,6 +113,7 @@ describe('eUI tools - test imports', () => {
     const csdrReleasePackageCommon = require('./scripts/csdr/release/package/common');
     const csdrReleasePackageRemote = require('./scripts/csdr/release/package/remote');
     const csdrReleasePackageUi = require('./scripts/csdr/release/package/ui');
+    const csdrReleasePackageBackend = require('./scripts/csdr/release/package/backend');
 
     // csdr - template
     const csdrTemplateUtils = require('./scripts/csdr/templates/template-utils');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.15.14",
+    "version": "4.16.0",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -12,8 +12,8 @@
     "dependencies": {
         "inquirer": "6.5.0",
         "execa": "1.0.0",
-        "figlet": "1.3.0",
-        "chalk": "2.4.2",
+        "figlet": "1.5.2",
+        "chalk": "4.1.2",
         "fs-extra": "9.0.0",
         "replace-in-file": "4.1.3",
         "semver": "6.0.0",
@@ -28,9 +28,9 @@
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "jest": "26.6.3",
-        "supertest": "4.0.2",
-        "memfs": "3.2.4",
+        "jest": "27.3.1",
+        "supertest": "6.1.6",
+        "memfs": "3.3.0",
         "json-server": "0.16.3",
         "faker": "5.5.3",
         "nodemon": "2.0.12",

package/sandbox.js

@@ -596,8 +596,15 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 return Promise.resolve()
   .then(() => {
-    const prjName = 'eui-showcase-ux';
-    const prj = configUtils.projects.getCsdrProject(prjName);
-    console.log(prj);
+    tools.logBigTitle('BIG TITLE');
+    tools.logTitle('TITLE');
+    tools.logInfo('test log info');
+    tools.logInfo('test log info');
+    tools.logInfo('test log info');
+    tools.logSuccess('test log success');
+    tools.logError('test log error');
+    tools.logWarning('test log warning');
+    tools.logAccent('test log accent');
+    tools.logBanner('this is the content of the banner');
   })
 

package/scripts/csdr/config/packages.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
+const configUtils = require('./config-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -233,3 +234,30 @@ module.exports.getDepGraph = () => {
 
   return graph;
 }
+
+
+module.exports.getLocalPackagesEuiVersion = () => {
+  tools.logInfo('getting local installed eUI version...');
+
+  const pkgs = configUtils.packages.getPackages();
+  let versionsFound = [];
+
+  pkgs.forEach((p) => {
+    if (p.parent !== true && p.tsPackage !== false) {
+
+      let version = 'DEFAULT';
+
+      if (p.build) {
+        if (p.build.euiVersion) {
+          version = p.build.euiVersion;
+        }
+      }
+      tools.logInfo(`checking ${p.name} - version found : ${version}`);
+      versionsFound.push(version);
+    }
+  })
+
+  versionsFound = tools.removeArrayDuplicates(versionsFound);
+
+  return versionsFound;
+}

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

@@ -171,3 +171,40 @@ module.exports.importExtraTsConfig = () => {
       throw e;
     })
 }
+
+
+module.exports.processLocalEuiVersions = () => {
+ tools.logTitle('Processing injections for local installed eUI versions if needed');
+
+  return Promise.resolve()
+    .then(() => {
+      const euiVersionsLocal = configUtils.packages.getLocalPackagesEuiVersion();
+
+      if (euiVersionsLocal.length > 1) {
+        throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
+      }
+
+      const euiVersion = euiVersionsLocal[0];
+
+      if (euiVersion === 'DEFAULT') {
+        tools.logInfo('Default eUI version found, taking default resolutions..skipping');
+
+      } else {
+        const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
+        const rootPackageJson = require(rootPackageJsonFile);
+
+        const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+        const resolutionsJson = require(resolutionsJsonFile);
+
+        tools.logInfo('Injecting resolutions content');
+        console.log(resolutionsJson);
+        rootPackageJson.resolutions = resolutionsJson;
+
+        tools.logInfo('Updating root package.json');
+        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/init/init.js

@@ -77,6 +77,12 @@ module.exports.init = () => {
       return initUtils.importPackages(finalResponse);
     })
 
+    // adapt and inject particular root data/config for eUI version detected on project
+    // if multiple versions of eUI are detected on the same project, an exception is thrown
+    .then(() => {
+      return initUtils.processLocalEuiVersions();
+    })
+
     // Install deps based on current config generated => take last know snapshots
     .then(() => {
       // this is only executed for local dev installation,

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -0,0 +1,15 @@
+{
+    "lodash": ">=4.17.21",
+    "handlebars": ">=4.5.3",
+    "mem": ">=4.3.0 <=8.1.1",
+    "https-proxy-agent": ">=2.2.3",
+    "minimatch": ">=3.0.4",
+    "acorn-globals": ">=6.0.0",
+    "open": ">=7.0.3",
+    "dot-prop": ">=5.2.0",
+    "serialize-javascript": ">=3.1.0",
+    "socket.io": ">=2.4.0",
+    "ssri": ">=8.0.1",
+    "@types/node": ">=14.14.10",
+    "hosted-git-info": ">=3.0.8"
+}

package/scripts/csdr/install/build-package.js

@@ -100,87 +100,3 @@ module.exports.install = (prj, pkg, isMaster) => {
       throw e;
     })
 }
-
-
-
-
-
-
-module.exports.checkDeps = (pkg) => {
-  tools.logTitle('Checking package internal dependencies');
-
-  return Promise.resolve()
-   .then(() => {
-     var depsFound = [];
-     var files = glob.sync('**/*.ts', { cwd: pkg.paths.pkgLibFolder, nodir: true, follow: true, dot: true });
-     files.forEach(file => {
-       const filePath = path.join(pkg.paths.pkgLibFolder, file);
-       const fileContent = tools.getFileContent(filePath);
-       var regex = /@cc\/|@mywp\/|@opsys\/|@sfc\//gi, result, indices = [];
-       while ( (result = regex.exec(fileContent)) ) {
-           indices.push(result.index);
-       }
-       if (indices.length !== 0) {
-         // tools.logInfo(`Number of occurences found : ${indices.length}`);
-         indices.forEach((i) => {
-           const endPos = fileContent.substr(i, 40).indexOf("'");
-           const dep = fileContent.substr(i, endPos);
-           if (endPos > -1) {
-             // tools.logInfo(`dep found on : ${dep}`);
-             depsFound.push(dep);
-
-           } else {
-             tools.logInfo(`Potential wrong import detected on file : ${file}`);
-             const subContent = fileContent.substr(i, 40);
-             const detectMultiSlashes = subContent.match(/\//g);
-             if (detectMultiSlashes.length > 0) {
-               tools.logError('Multislashes on import : ');
-               console.log(subContent);
-             }
-           }
-         })
-       }
-     });
-     depsFound = tools.removeArrayDuplicates(depsFound);
-     tools.logWarning(`Dependencies found : ${depsFound.length}`);
-     console.log(depsFound);
-
-     return depsFound;
-   })
-
-   .then((depsFound) => {
-     var depsLevel;
-
-     switch(true) {
-         case (depsFound.length === 1):
-           depsLevel = 'LOW (1)';
-           break;
-         case (depsFound.length > 1 && depsFound.length <= 3):
-           depsLevel = 'MEDIUM (between 1 and 3)';
-           break;
-         case (depsFound.length > 3 && depsFound.length <= 5):
-           depsLevel = 'HIGH (between 3 and 5)';
-           break;
-         case (depsFound.length > 5):
-           depsLevel = 'VERY HIGH (>5)';
-           break;
-         default:
-           depsLevel = 'NONE';
-     }
-
-     var message = `Internal dependencies detected : ${depsFound.length} - deps level: ${depsLevel}\n`;
-     message += depsFound.join('\n');
-
-
-     return notificationUtils.package.sendPackageMessage({
-      package: pkg,
-      text: message
-     });
-   })
-
-   .catch((e) => {
-     console.log(e);
-   })
-
- }
-

package/scripts/csdr/install/common.js

@@ -217,22 +217,6 @@ const getLocalPackagesDeps = () => {
 }
 
 
-// const getLocalPackageCompositeDeps = (pkg) => {
-//   let pkgJsonFile;
-
-//   if (pkg.parent) {
-//     return {};
-//   } else {
-//     if (pkg.child) {
-//       pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
-//     } else {
-//       pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
-//     }
-//   }
-
-//   return tools.getJsonFileContent(pkgJsonFile) || {};
-// }
-
 const getLocalPackageCompositeDeps = (pkg) => {
   let pkgJsonFile;
 

package/scripts/csdr/metadata/app.js

@@ -98,7 +98,7 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
       console.log(appMetadata);
 
       if (!dryRun) {
@@ -112,7 +112,7 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata-history.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
 
       if (!dryRun && envTarget && envTarget !== 'DEV') {
         return tools.writeJsonFileSync(metadataFile, historyMetadata);
@@ -160,7 +160,7 @@ const storeMetadataAssetsStandAlone = () => {
 
       const metadataFile = path.join(prj.folder, 'src', 'assets', 'app-metadata.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
       console.log(appMetadata);
 
       if (!dryRun) {

package/scripts/csdr/release/package/backend.js

@@ -0,0 +1,26 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// LOCAL
+const installUtils = require('../../install/install-utils');
+const configUtils = require('../../config/config-utils');
+
+module.exports.install = (pkg, isMaster) => {
+  return Promise.resolve()
+
+  // FETCHING CURRENT PACKAGES & INSTALL
+  .then(() => {
+    // fetch related project if passed as arguments
+    const prj = configUtils.projects.getProject();
+
+    // install the dependencies for current package build
+    return installUtils.buildPackage.install(prj, pkg, isMaster);
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+

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

@@ -381,7 +381,7 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 
 
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
-  console.log(pkgMetadata);
+  // console.log(pkgMetadata);
 
   return Promise.resolve()
   .then(() => {

package/scripts/csdr/release/package/release-package.js

@@ -14,6 +14,7 @@ const metadataUtils = require('../../metadata/metadata-utils');
 const innerCommon = require('./common');
 const innerUi = require('./ui');
 const innerRemote = require('./remote');
+const innerBackend = require('./backend');
 
 
 module.exports.run = () => {
@@ -80,6 +81,9 @@ module.exports.run = () => {
         if (pkg.remote) {
           return innerRemote.install(pkg, branches.isMaster);
 
+        } else if (pkg.backend) {
+          return innerBackend.install(pkg, branches.isMaster);
+
         } else {
           return innerUi.install(pkg, branches.isMaster);
         }

package/scripts/csdr/release/package/ui.js

@@ -7,6 +7,8 @@ const path = require('path');
 const installUtils = require('../../install/install-utils');
 const configUtils = require('../../config/config-utils');
 const auditUtils = require('../../audit/audit-utils');
+const notificationUtils = require('../../../utils/notification/notification-utils');
+const tools = require('../../../utils/tools');
 
 
 module.exports.install = (pkg, isMaster) => {
@@ -24,7 +26,7 @@ module.exports.install = (pkg, isMaster) => {
 
   // CHECK INTERNAL DEPENDENCIES
   .then(() => {
-    return installUtils.buildPackage.checkDeps(pkg);
+    return checkDeps(pkg);
   })
 
 
@@ -38,3 +40,83 @@ module.exports.install = (pkg, isMaster) => {
     throw e;
   })
 }
+
+
+const checkDeps = (pkg) => {
+  tools.logTitle('Checking package internal dependencies');
+
+  return Promise.resolve()
+   .then(() => {
+     var depsFound = [];
+     var files = glob.sync('**/*.ts', { cwd: pkg.paths.pkgLibFolder, nodir: true, follow: true, dot: true });
+     files.forEach(file => {
+       const filePath = path.join(pkg.paths.pkgLibFolder, file);
+       const fileContent = tools.getFileContent(filePath);
+       var regex = /@cc\/|@mywp\/|@opsys\/|@sfc\//gi, result, indices = [];
+       while ( (result = regex.exec(fileContent)) ) {
+           indices.push(result.index);
+       }
+       if (indices.length !== 0) {
+         // tools.logInfo(`Number of occurences found : ${indices.length}`);
+         indices.forEach((i) => {
+           const endPos = fileContent.substr(i, 40).indexOf("'");
+           const dep = fileContent.substr(i, endPos);
+           if (endPos > -1) {
+             // tools.logInfo(`dep found on : ${dep}`);
+             depsFound.push(dep);
+
+           } else {
+             tools.logInfo(`Potential wrong import detected on file : ${file}`);
+             const subContent = fileContent.substr(i, 40);
+             const detectMultiSlashes = subContent.match(/\//g);
+             if (detectMultiSlashes.length > 0) {
+               tools.logError('Multislashes on import : ');
+               console.log(subContent);
+             }
+           }
+         })
+       }
+     });
+     depsFound = tools.removeArrayDuplicates(depsFound);
+     tools.logWarning(`Dependencies found : ${depsFound.length}`);
+     console.log(depsFound);
+
+     return depsFound;
+   })
+
+   .then((depsFound) => {
+     var depsLevel;
+
+     switch(true) {
+         case (depsFound.length === 1):
+           depsLevel = 'LOW (1)';
+           break;
+         case (depsFound.length > 1 && depsFound.length <= 3):
+           depsLevel = 'MEDIUM (between 1 and 3)';
+           break;
+         case (depsFound.length > 3 && depsFound.length <= 5):
+           depsLevel = 'HIGH (between 3 and 5)';
+           break;
+         case (depsFound.length > 5):
+           depsLevel = 'VERY HIGH (>5)';
+           break;
+         default:
+           depsLevel = 'NONE';
+     }
+
+     var message = `Internal dependencies detected : ${depsFound.length} - deps level: ${depsLevel}\n`;
+     message += depsFound.join('\n');
+
+
+     return notificationUtils.package.sendPackageMessage({
+      package: pkg,
+      text: message
+     });
+   })
+
+   .catch((e) => {
+     console.log(e);
+   })
+
+ }
+

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

@@ -16,10 +16,10 @@ module.exports.sync = () => {
     tools.logInfo('Resetting package.json');
     return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
   })
-  .then(() => {
-    tools.logInfo('Removing yarn.lock');
-    return tools.remove(path.join(process.cwd(), 'yarn.lock'));
-  })
+  // .then(() => {
+  //   tools.logInfo('Removing yarn.lock');
+  //   return tools.remove(path.join(process.cwd(), 'yarn.lock'));
+  // })
   .then(() => {
     tools.logSuccess();
   })
@@ -53,6 +53,9 @@ module.exports.sync = () => {
   .then(() => {
     return initUtils.meta.init();
   })
+  .then(() => {
+    return initUtils.processLocalEuiVersions();
+  })
   .catch((e) => {
     throw e;
   })

package/scripts/csdr/version/package.js

@@ -37,8 +37,9 @@ const getCurrentVersion = (pkg) => {
           // 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();

package/scripts/utils/build/app/build-app-utils.js

@@ -120,7 +120,7 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
 
         tools.logInfo(`ng test : watching = ${watch || false}`);
 
-        console.log(`running Angular TEST with args: ${args} on`);
+        tools.logInfo(`running Angular TEST with args: ${args} on :`);
         console.log(currentProject.paths.angularPath);
 
         if (!dryRun) {
@@ -204,7 +204,7 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
 
       tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
 
-      console.log(`running Angular BUILD with args: ${args} on`);
+      tools.logInfo(`running Angular BUILD with args: ${args} on :`);
       console.log(currentProject.paths.angularPath);
 
       if (!dryRun && !skipCompile) {

package/scripts/utils/build/package/element.js

@@ -91,7 +91,7 @@ module.exports.build = (pkg, isMaster) => {
 
       tools.logInfo(`ng test : watching = ${watch || false}`);
 
-      console.log(`running Angular TEST with args: ${args} on`);
+      tools.logInfo(`running Angular TEST with args: ${args} on`);
       console.log(pkg.paths.pkgRootDirectory);
 
       if (!dryRun) {
@@ -140,7 +140,7 @@ module.exports.build = (pkg, isMaster) => {
 
     tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
 
-    console.log(`running Angular BUILD with args: ${args} on`);
+    tools.logInfo(`running Angular BUILD with args: ${args} on`);
     console.log(pkg.paths.pkgRootDirectory);
 
     if (!dryRun) {

package/scripts/utils/notification/common.js

@@ -64,6 +64,11 @@ module.exports.getMessage = (options) => {
         message.detailText = 'Another build has been detected for the current package being build\n Retry again this build after 30m, lock will be auto-cleared';
         break;
 
+      case 'MULTIPLE_LOCAL_EUI_VERSIONS_FOUND':
+        message.detailTitle = 'MULTIPLE eUI VERSIONS FOUND IN LOCAL PROJECT - ABORTING!';
+        message.detailText = 'Uncompatible version of eUI found installed in the local CSDR project, please adjust and keep same compatible versions of eUI packages and projects';
+        break;
+
       default:
         message.detailTitle = 'GENERAL ERROR!';
         message.detailText = options.exception;

package/scripts/utils/notification/mail-utils.js

@@ -10,6 +10,9 @@ let { dryRun, debug} = tools.getArgs();
 
 const sendCore = (subject, body, recipient) => {
   tools.logInfo(`Sending mail to : ${recipient}`);
+  tools.logInfo('Message subject / body :');
+  console.log(subject);
+  console.log(body);
 
   if (dryRun) {
     console.log('----------------------------------------------');

package/scripts/utils/notification/mailstack.js

@@ -33,9 +33,6 @@ module.exports.endMailStack = () => {
 }
 
 module.exports.bufferMessage = (message) => {
-  tools.logInfo('Buffering mail content');
-  console.log(message);
-
   if (message.text) {
     mailContent.buffer.push(message.text);
 
@@ -73,8 +70,9 @@ const sendMailStack = (config, scope, target) => {
       status = 'ERROR';
     }
 
-    const subject = `RELEASE <b style="color: ${statusColor};">${status}</b> - <b style="color:blue;">${scope}</b> - branch: <b styles="color: blue;">${target}</b>`;
-    let fullMessage = mailContent.buffer.join('\n');
+    // const subject = `RELEASE <b style="color: ${statusColor};">${status}</b> - <b style="color:blue;">${scope}</b> - branch: <b styles="color: blue;">${target}</b>`;
+    const subject = `Release of **${scope}**  for ${target} ---- status : ${status}`;
+    let fullMessage = `<pre>${mailContent.buffer.join('\n')}</pre>`;
 
     if (mailContent.exception) {
       fullMessage += mailContent.exception;

package/scripts/utils/notification/package.js

@@ -15,8 +15,6 @@ const innerMailstack = require('./mailstack');
 
 module.exports.sendPackageMessage = (options) => {
 
-  tools.logInfo('Sending package message');
-
   const message = innerCommon.getMessage(options);
 
   // buffer message