@eui/tools 4.21.10 → 5.0.0-rc.12

package/scripts/csdr/metadata/app-history.js

@@ -336,71 +336,6 @@ const generateDiffReport = (project, newVersion, isSupportBranch, envTarget, fro
 }
 
 
-
-
-// const historyMetadataToTable = (metadata) => {
-//   tools.logTitle('Generating table from metadata...');
-
-//   const iSSUES_MANAGER_HOST = configUtils.global.getConfigOptions().iSSUES_MANAGER_HOST;
-
-//   var content;
-
-//   if (!metadata.versions) {
-//     tools.logWarning('WARNING: no content found');
-//     return content;
-//   }
-
-//   content = '';
-//   content += '<h3>MyWorkplace MAJOR versions history</h3>';
-//   content += '<table><thead><tr>';
-//   content += '<th>ENV</th>';
-//   content += '<th>VERSION</th>';
-//   content += '<th>CONTENT</th>';
-//   content += '</tr></thead>';
-//   content += '<tbody>';
-
-//   metadata.versions.reverse().forEach((item) => {
-//     content += '<tr>';
-//     content += `<td><strong>${item.envTarget}</strong></td>`
-//     content += `<td><strong>${item.name}</strong></td>`
-//     content += '<td>';
-//     if (!item.diffs || item.diffs.length === 0) {
-//       content += 'N/A';
-//     } else {
-//       item.diffs.forEach((diffItem) => {
-//         content += `<strong>${diffItem.name}</strong> : from ${diffItem.old} to ${diffItem.new}`
-//         content += `<hr />`
-//         if (diffItem.gitMetadata.length === 0) {
-//           content += 'N/A';
-//         } else {
-//           diffItem.gitMetadata.forEach((gitCommits) => {
-//             gitCommits.forEach((gitCommit) => {
-//               if (gitCommit.issue === '') {
-//                 content += `N/A - ${gitCommit.subject}`;
-//               } else {
-//                 content += `<a href="${iSSUES_MANAGER_HOST}${gitCommit.issue}">${gitCommit.issue}</a> - ${gitCommit.subject}`;
-//               }
-//               content += `<br />`;
-//             })
-//           })
-//         }
-//         content += `<br />`;
-//       })
-//     }
-//     content += '</td>';
-//     content += '</tr>';
-//   })
-//   content += '</tbody>';
-//   content += '</table>';
-
-//   tools.logSuccess();
-
-//   // return sanitizeHtml(content);
-//   return content;
-// }
-
-
-
 const flattenDiffMetadata = (metadata) => {
   return Promise.resolve()
     .then(() => {
@@ -437,7 +372,6 @@ module.exports.getMetadata = getMetadata;
 module.exports.storeMetadata = storeMetadata;
 module.exports.getDiffBetweenMajors = getDiffBetweenMajors;
 module.exports.generateDiffReport = generateDiffReport;
-// module.exports.historyMetadataToTable = historyMetadataToTable;
 module.exports.flattenDiffMetadata = flattenDiffMetadata;
 module.exports.flatDiffMetadataToMessage = flatDiffMetadataToMessage;
 module.exports.getDiffBetweenBuildVersions = getDiffBetweenBuildVersions;

package/scripts/csdr/metadata/app-versions.js

@@ -13,7 +13,7 @@ const { dryRun } = tools.getArgs();
 
 
 
-const getMetadata = (project) => {
+module.exports.getMetadata = (project) => {
   const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
 
   return Promise.resolve()
@@ -31,7 +31,7 @@ const getMetadata = (project) => {
 
 
 
-const storeMetadata = (project, newVersion, envTarget) => {
+module.exports.storeMetadata = (project, newVersion, envTarget) => {
   const appReleaseDate = moment(new Date()).format("DD/MM/YYYY HH:mm");
   const appInfos = `${newVersion} - ${appReleaseDate}`;
   const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
@@ -61,8 +61,6 @@ const storeMetadata = (project, newVersion, envTarget) => {
 
       generatedMetadata.versions = versions;
 
-      // console.log(JSON.stringify(generatedMetadata, null, 4));
-
       if (!dryRun) {
         tools.writeJsonFileSync(metadataFile, generatedMetadata);
       }
@@ -76,11 +74,3 @@ const storeMetadata = (project, newVersion, envTarget) => {
       throw e;
     })
 }
-
-
-
-
-module.exports = {
-  getMetadata,
-  storeMetadata,
-}

package/scripts/csdr/metadata/app.js

@@ -7,7 +7,7 @@ const moment = require('moment');
 // LOCAL
 const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
-const compositeUtils = require('../install/composite-utils');
+const installUtils = require('../install/install-utils');
 const versionUtils = require('../version/version-utils');
 
 // FETCH ARGS
@@ -164,7 +164,7 @@ const storeMetadataAssetsStandAlone = () => {
 
     // getting packages composite deps version
     .then(() => {
-      return compositeUtils.getDeps(prj);
+      return installUtils.projects.getDeps(prj);
     })
     .then((deps) => {
       packageDeps = deps;

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

@@ -9,4 +9,6 @@ module.exports.commit = require('./commit');
 module.exports.common = require('./common');
 module.exports.package = require('./package');
 module.exports.packageHistory = require('./package-history');
+module.exports.packageEnvs = require('./package-envs');
+module.exports.packageVersions = require('./package-versions');
 module.exports.stats = require('./stats');

package/scripts/csdr/metadata/package-envs.js

@@ -0,0 +1,71 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+const moment = require('moment');
+
+// LOCAL
+const tools = require('../../utils/tools');
+const configUtils = require('../config/config-utils');
+
+
+// FETCH ARGS
+const { dryRun } = tools.getArgs();
+
+
+module.exports.getMetadata = (pkg) => {
+  const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
+
+  return Promise.resolve()
+    .then(() => {
+      if (!DEVOPS_METADATA_PATH) {
+        throw new Error(`Devops metadata folder ${DEVOPS_METADATA_PATH} NOT FOUND`) ;
+      }
+
+      return tools.getJsonFileContent(path.join(DEVOPS_METADATA_PATH, pkg.devopsEnvsMetadataFile));
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
+module.exports.storeMetadata = (pkg, newVersion, metadata, envTarget) => {
+  const releaseDate = moment(new Date()).format("DD/MM/YYYY HH:mm");
+  const infos = `${newVersion} - ${releaseDate}`;
+  const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
+
+  return Promise.resolve()
+    .then(() => {
+      tools.logTitle('Storing package environment metadata...');
+
+      const metadataFile = path.join(DEVOPS_METADATA_PATH, pkg.devopsEnvsMetadataFile);
+
+      var generatedMetadata;
+      if (tools.isFileExists(metadataFile)) {
+        generatedMetadata = require(metadataFile);
+      } else {
+        generatedMetadata = {};
+      }
+
+      generatedMetadata[envTarget] = {
+        version: newVersion,
+        releaseDate: releaseDate,
+        infos: infos,
+        dependencies: metadata
+      };
+
+      if (!dryRun) {
+        tools.writeJsonFileSync(metadataFile, generatedMetadata);
+      }
+    })
+
+    .then(() => {
+      tools.logSuccess();
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/metadata/package-versions.js

@@ -0,0 +1,79 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+const moment = require('moment');
+
+// LOCAL
+const tools = require('../../utils/tools');
+const configUtils = require('../config/config-utils');
+
+
+// FETCH ARGS
+const { dryRun } = tools.getArgs();
+
+
+module.exports.getMetadata = (pkg) => {
+  const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
+
+  return Promise.resolve()
+    .then(() => {
+      if (!DEVOPS_METADATA_PATH) {
+        throw new Error(`Devops metadata folder ${DEVOPS_METADATA_PATH} NOT FOUND`) ;
+      }
+
+      return tools.getJsonFileContent(path.join(DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile));
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
+module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, envTarget) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo('Storing package version history metadata...');
+
+      const configOptions = configUtils.global.getConfigOptions();
+
+      var generatedMetadata = {};
+      var versions = [];
+
+      const pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
+
+      if (tools.isFileExists(pkgMetadataFile)) {
+        generatedMetadata = require(pkgMetadataFile);
+        versions = generatedMetadata.versions;
+      }
+
+      const newVersionMetadata = {
+        name: pkg.name,
+        version: pkgVersion,
+        date: moment(new Date()).format("YYYYMMDD-HH:mm"),
+        npmPkg: pkg.npmPkg,
+        duration: duration,
+        envTarget: envTarget
+      };
+
+      if (pkg.remote) {
+        tools.logInfo('Writing remote composite dependencies');
+        newVersionMetadata.dependencies = pkgCompositeDeps;
+      }
+      console.log(newVersionMetadata);
+
+      versions.push(newVersionMetadata);
+
+      generatedMetadata.versions = versions;
+
+      tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
+      if (!dryRun) {
+        tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/metadata/package.js

@@ -11,6 +11,8 @@ const gitUtils = require('../../utils/git-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
+const innerPackageEnvs = require('./package-envs');
+const innerPackageVersions = require('./package-versions');
 
 // FETCH ARGS
 const { dryRun } = tools.getArgs();
@@ -58,7 +60,7 @@ module.exports.getPackagesDeps = (depsType) => {
 
 module.exports.storeMetadata = (
     pkg, pkgVersion, pkgMetadata, isSnapshot, isMaster, isSupportBranch, isNextBranch, isSupportSnapshotBranch, isHotfixBranch,
-    pkgCompositeDeps, duration,
+    pkgCompositeDeps, duration, envTarget
   ) => {
 
   tools.logTitle('Storing central and package metadata...');
@@ -247,12 +249,18 @@ module.exports.storeMetadata = (
     })
 
     .then(() => {
-      return storeVersionsMetadata(pkg, pkgVersion, pkgCompositeDeps, duration);
+      return innerPackageVersions.storeMetadata(pkg, pkgVersion, pkgCompositeDeps, duration, envTarget);
+    })
+
+    .then(() => {
+      if (pkg.remote) {
+        return innerPackageEnvs.storeMetadata(pkg, pkgVersion, pkgCompositeDeps, envTarget);
+      }
     })
 
     .then(() => {
       if (isMaster) {
-        return storeBuildMetadata(pkg, pkgVersion, pkgMetadata);
+        return storeBuildMetadata(pkg, pkgVersion, pkgMetadata, envTarget);
       }
     })
 
@@ -285,54 +293,9 @@ module.exports.storeMetadata = (
 }
 
 
-const storeVersionsMetadata = module.exports.storeVersionsMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration) => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logInfo('Storing package version history metadata...');
-
-      const configOptions = configUtils.global.getConfigOptions();
-
-      var generatedMetadata = {};
-      var versions = [];
-
-      const pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
-
-      if (tools.isFileExists(pkgMetadataFile)) {
-        generatedMetadata = require(pkgMetadataFile);
-        versions = generatedMetadata.versions;
-      }
-
-      const newVersionMetadata = {
-        name: pkg.name,
-        version: pkgVersion,
-        date: moment(new Date()).format("YYYYMMDD-HH:mm"),
-        npmPkg: pkg.npmPkg,
-        duration: duration
-      };
-
-      if (pkg.remote) {
-        tools.logInfo('Writing remote composite dependencies');
-        newVersionMetadata.dependencies = pkgCompositeDeps;
-      }
-      console.log(newVersionMetadata);
-
-      versions.push(newVersionMetadata);
-
-      generatedMetadata.versions = versions;
-
-      tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
-      if (!dryRun) {
-        tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
-      }
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
 
 
-const storeBuildMetadata = module.exports.storeBuildMetadata = (pkg, pkgVersion, pkgMetadata) => {
+const storeBuildMetadata = module.exports.storeBuildMetadata = (pkg, pkgVersion, pkgMetadata, envTarget) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Storing package LATEST metadata...');
@@ -349,7 +312,7 @@ const storeBuildMetadata = module.exports.storeBuildMetadata = (pkg, pkgVersion,
         versions = generatedMetadata.versions;
       }
 
-      versions.push({ name: pkgVersion, gitMetadata: pkgMetadata });
+      versions.push({ name: pkgVersion, envTarget: envTarget, gitMetadata: pkgMetadata });
       generatedMetadata.versions = versions;
 
       tools.logInfo(`Write metadata on ${pkgMetadataFile}`);

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

@@ -7,7 +7,7 @@ const path = require('path');
 const installUtils = require('../../install/install-utils');
 const configUtils = require('../../config/config-utils');
 
-module.exports.install = (pkg, isMaster) => {
+module.exports.install = (pkg) => {
   return Promise.resolve()
 
   // FETCHING CURRENT PACKAGES & INSTALL
@@ -16,7 +16,7 @@ module.exports.install = (pkg, isMaster) => {
     const prj = configUtils.projects.getProject();
 
     // install the dependencies for current package build
-    return installUtils.buildPackage.install(prj, pkg, isMaster);
+    return installUtils.buildPackage.install(prj, pkg);
   })
 
   .catch((e) => {

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

@@ -15,7 +15,7 @@ const { dryRun } = utils.tools.getArgs();
 
 
 
-module.exports.getBranches = () => {
+const getBranches = module.exports.getBranches = () => {
   const { branch } = utils.tools.getArgs();
 
   const isSnapshot =  (branch === 'develop');
@@ -39,9 +39,44 @@ module.exports.getBranches = () => {
 module.exports.getEnvTarget = () => {
   const { envTarget } = utils.tools.getArgs();
 
-  return envTarget;
+  // Initialize composite type
+  if (envTarget && typeof (envTarget) === 'boolean') {
+    envTarget = null;
+  }
+
+  let envTargetGen;
+
+  // when envTarget is provided this take the lead
+  if (envTarget) {
+    envTargetGen = envTarget;
+
+  // otherwise the envTarget is derived from branches develop = DEV/ master = TST
+  } else {
+    const branches = getBranches();
+    if (branches.isSnapshot || branches.isSupportSnapshotBranch) {
+      envTargetGen = 'DEV';
+    } else {
+      envTargetGen = 'TST';
+    }
+  }
+
+  return envTargetGen;
 }
 
+module.exports.getCompositeType = () => {
+  let { compositeType } = utils.tools.getArgs();
+
+  // Initialize composite type
+  if (compositeType && typeof (compositeType) === 'boolean') {
+    compositeType = null;
+  }
+
+  if (!compositeType) {
+    compositeType = 'DEFAULT';
+  }
+
+  return compositeType;
+}
 
 
 module.exports.init = (pkg) => {
@@ -87,12 +122,6 @@ module.exports.init = (pkg) => {
     return metadataUtils.common.cloneMetadataLocksRepo();
   })
 
-  // REMOVE YARN.LOCK
-  // .then(() => {
-  //   utils.tools.logInfo('Removing yarn.lock');
-  //   return utils.tools.remove(path.join(process.cwd(), 'yarn.lock'));
-  // })
-
   .catch((e) => {
     throw e;
   })
@@ -136,7 +165,7 @@ module.exports.preReleaseChecks = (pkg) => {
 
 
 module.exports.commitMetadataChecks = (pkg) => {
-  utils.tools.logBanner('Commit metadata checks');
+  utils.tools.logBanner('COMMIT METADATA CHECKS');
 
   utils.tools.logTitle('Checking package commit metadata');
   let pkgMetadata;
@@ -187,7 +216,7 @@ module.exports.preBuild = (pkg) => {
 
 
 
-module.exports.updateVersion = (pkg, pkgMetadata) => {
+module.exports.updateVersion = (pkg, pkgMetadata, envTarget) => {
   utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
@@ -200,7 +229,15 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
   // GET NEW VERSION from VALID commits found in metadata
   .then(() => {
-    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport, branches.isHotfix);
+    return versionUtils.package.getNewVersion(
+      pkg,
+      pkgMetadata.commits,
+      (branches.isSnapshot || branches.isSupportSnapshot),
+      branches.isNext,
+      branches.isSupport,
+      branches.isHotfix,
+      envTarget
+    );
   })
 
 
@@ -208,9 +245,14 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
   .then((version) => {
     newVersion = version;
 
-    if (!dryRun) {
-      return versionUtils.package.updateVersion(pkg, version, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport, branches.isHotfix);
-    }
+    return versionUtils.package.updateVersion(
+      pkg,
+      version,
+      (branches.isSnapshot || branches.isSupportSnapshot),
+      branches.isNext,
+      branches.isSupport,
+      branches.isHotfix
+    );
   })
 
   // returning new version generated
@@ -350,7 +392,7 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 
-module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration) => {
+module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration, envTarget) => {
   utils.tools.logBanner('STORE METADATA');
 
   const branches = this.getBranches();
@@ -361,7 +403,8 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
       pkg, version, pkgMetadata,
       branches.isSnapshot, branches.isMaster, branches.isSupport, branches.isNext, branches.isSupportSnapshot, branches.isHotfix,
       pkgCompositeDeps,
-      duration
+      duration,
+      envTarget
     );
   })
 

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

@@ -31,14 +31,17 @@ module.exports.run = () => {
     // Get branches flags
     const branches = innerCommon.getBranches();
 
-    // Get envTarget (used for remotes)
+    // Get envTarget (used by remotes)
     const envTarget = innerCommon.getEnvTarget();
 
+    // Get compositeType (used by remotes)
+    const compositeType = innerCommon.getCompositeType();
+
+
     // local saved vars
     var newVersion, pkgMetadata, pkgCompositeDeps;
 
 
-
     return Promise.resolve()
       .then(() => {
         utils.tools.logVersion();
@@ -82,13 +85,13 @@ module.exports.run = () => {
       // INSTALL dependencies by type
       .then(() => {
         if (pkg.remote) {
-          return innerRemote.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport, envTarget);
+          return innerRemote.install(pkg, envTarget, compositeType);
 
         } else if (pkg.backend) {
-          return innerBackend.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport);
+          return innerBackend.install(pkg);
 
         } else {
-          return innerUi.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport);
+          return innerUi.install(pkg);
         }
       })
       .then((compositeDeps) => {
@@ -111,7 +114,7 @@ module.exports.run = () => {
 
       // GENERATE and UPDATE new version
       .then(() => {
-        return innerCommon.updateVersion(pkg, pkgMetadata);
+        return innerCommon.updateVersion(pkg, pkgMetadata, envTarget);
       })
       .then((version) => {
         // storing version for later use
@@ -161,7 +164,7 @@ module.exports.run = () => {
       .then(() => {
         // get run duration
         const duration = utils.pipeline.getTimerDuration();
-        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration);
+        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
       })
 
 

package/scripts/csdr/release/package/remote.js

@@ -4,7 +4,7 @@
 const path = require('path');
 const installUtils = require('../../install/install-utils');
 
-module.exports.install = (pkg, isMaster, envTarget) => {
+module.exports.install = (pkg, envTarget, compositeType) => {
   var pkgCompositeDeps = {};
 
   return Promise.resolve()
@@ -12,7 +12,7 @@ module.exports.install = (pkg, isMaster, envTarget) => {
   // FETCHING CURRENT PACKAGES & INSTALL
   .then(() => {
     // install the dependencies for current package build
-    return installUtils.buildPackage.installRemote(pkg, isMaster, envTarget);
+    return installUtils.buildPackage.installRemote(pkg, envTarget, compositeType);
   })
   .then((compositeDeps) => {
     // save composite deps for later exports

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

@@ -12,7 +12,7 @@ const notificationUtils = require('../../../utils/notification/notification-util
 const tools = require('../../../utils/tools');
 
 
-module.exports.install = (pkg, isMaster) => {
+module.exports.install = (pkg) => {
   return Promise.resolve()
 
   // FETCHING CURRENT PACKAGES & INSTALL
@@ -21,7 +21,7 @@ module.exports.install = (pkg, isMaster) => {
     const prj = configUtils.projects.getProject();
 
     // install the dependencies for current package build
-    return installUtils.buildPackage.install(prj, pkg, isMaster);
+    return installUtils.buildPackage.installPackage(prj, pkg);
   })
 
 

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

@@ -0,0 +1,32 @@
+'use strict';
+
+// externals
+const path = require('path');
+
+// local
+const tools = require('../../utils/tools');
+
+
+// fetch args
+const { dryRun } = tools.getArgs();
+
+
+module.exports.updatePackageVersion = (project, newVersion) => {
+  return Promise.resolve()
+    .then(() => {
+      const pkgJsonFile = path.join(process.cwd(), project.folder, 'package.json');
+      const pkgJson = require(pkgJsonFile);
+
+      tools.logTitle('Updating package version');
+      pkgJson.version = newVersion;
+
+      if (!dryRun) {
+        tools.writeJsonFileSync(pkgJsonFile, pkgJson);
+      }
+
+      tools.logSuccess(newVersion);
+    })
+    .catch((e) => {
+      throw e;
+    })
+}