@eui/tools 6.14.21 → 6.15.1

package/.version.properties

@@ -1 +1 @@
-6.14.21
+6.15.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.15.1 (2023-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * version not update for virtual-remote release - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([676be9db](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/676be9db76eaaf5c849992c4d7139d7d9e0c797c))
+
+* * *
+* * *
+## 6.15.0 (2023-12-15)
+
+##### New Features
+
+* **other:**
+  * refactoring for non-metadata driven release scripts - virtual remote re-newed functions for diffs gathering - cleanup obsolete code - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([c024cc64](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c024cc643fc1b885ddfd3db0c2e4c3e92e36f7b1))
+
+* * *
+* * *
 ## 6.14.21 (2023-12-15)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -1477,37 +1477,27 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     });
 //   })
 
-// TODO test commit history gathering when hotfix is compared as old
-
-// "name": "eac-pmm-lib-ui",
-// "old": "3.17.2-3",
-// "new": "3.18.0",
-
-// "name": "eac-pmm-shared-ui",
-// "old": "3.25.3-0",
-// "new": "3.26.0",
-
-// "name": "eac-pmm-lib-budget-ui",
-// "old": "3.15.6-0",
-// "new": "3.16.0",
-
-// "name": "cc-pmm-participants-ui",
-// "old": "3.27.3-2",
-// "new": "3.28.0",
-
 // Promise.resolve()
 //   .then(() => {
-//     // const test = configUtils.packages.isRemote('sedia-mop-eui10-remote-el-ui');
-//     // const test = configUtils.packages.isRemote('sedia-mop-ui');
-//     // console.log(test);
+//     const remote = configUtils.remotes.getRemote('cc-pmm-participants-eui15-remote-el-ui');
+//     return metadataUtils.remoteHistory.generateDiffReport(remote, 'TST');
+//   })
+//   .then((output) => { console.log(output)})
+//   .catch((e) => {
+//     console.log(e);
 //   })
 
+
 Promise.resolve()
   .then(() => {
-    const pkg = configUtils.packages.getPackage('pmob-sysper-ui', true);
+    const remote = configUtils.remotes.getRemote('cc-pmm-participants-eui15-remote-el-ui');
+    return metadataUtils.remoteHistory.generateDiffCommitsMetadataReport(remote, 'TRN');
+  })
 
-    return metadataUtils.package.isNewPackageBuild(pkg);
+  .then((finalOutput) => {
+    console.log(finalOutput);
   })
-  .then((output) => {
-    console.log(output);
+
+  .catch((e) => {
+    console.log(e);
   })

package/scripts/csdr/audit/styles.js

@@ -749,7 +749,7 @@ module.exports.audit = (pkg) => {
         tools.logInfo('===> no forced gates flag detected ...');
         tools.logInfo('Checking if package is newly created -- all versions gates are checked in that case');
 
-        if (metadataUtils.package.isNewPackageBuild(pkg)) {
+        if (metadataUtils.packageUtils.isNewPackageBuild(pkg)) {
           gates = allNewGates;
         } else {
           if (euiVersionGates) {

package/scripts/csdr/config/remotes.js

@@ -48,7 +48,7 @@ module.exports.getRemote = (remoteName) => {
     dependencies: tools.getJsonFileContent(path.join(remotePath, 'dependencies.json')),
     devopsMetadataFile: `${remoteName}-build-metadata.json`,
     devopsVersionsMetadataFile: `${remoteName}-versions-metadata.json`,
-    devopsHistoryMetadataFile: `${remoteName}-history-metadata.json`,
+    devopsHistoryMetadataFile: `${remoteName}-history-metadata-v2.json`,
     devopsEnvsMetadataFile: `${remoteName}-envs-metadata.json`,
     ...remoteConfig,
   }

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

@@ -7,14 +7,14 @@ const tools = require('../../utils/tools');
 const innerProjects = require('./projects');
 
 
-module.exports.install = (prj, envTarget, compositeType) => {
+module.exports.install = (prj, envTarget) => {
   return Promise.resolve()
     // checking remotes
     .then(() => {
       if (prj.standalone) {
         return innerProjects.installDepsStandalone(prj);
       } else {
-        return innerProjects.installDeps(prj, envTarget, compositeType);
+        return innerProjects.installDeps(prj, envTarget);
       }
     })
 

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

@@ -27,13 +27,13 @@ module.exports.installPackage = (prj, pkg, isMaster) => {
     })
 }
 
-module.exports.installRemote = (pkg, envTarget, compositeType) => {
+module.exports.installRemote = (pkg, envTarget) => {
   let deps;
 
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      return innerRemotes.installDeps(pkg, envTarget, compositeType);
+      return innerRemotes.installDeps(pkg, envTarget);
     })
     .then((outputDeps) => {
       deps = outputDeps;

package/scripts/csdr/install/common.js

@@ -111,7 +111,7 @@ module.exports.getResolvedCarretDeps = (deps, isMaster, isDevEnvTarget) => {
 
             } else {
               // getting last major version from metadata history for pkg found
-              const lastMajorVersion = metadataUtils.package.getLastMajorVersion(
+              const lastMajorVersion = metadataUtils.packageUtils.getLastMajorVersion(
                 pkg,
                 version.substr(1).split('.')[0],
                 isMaster,

package/scripts/csdr/install/composite-core.js

@@ -13,7 +13,7 @@ const innerCommon = require('./common');
 
 
 
-const getDeps_DEV = (compositeDeps, prevSnapshotEnabled) => {
+const getDeps_DEV = (compositeDeps) => {
   return Promise.resolve()
     .then(() => {
       return innerCommon.getResolvedCarretDeps(compositeDeps, false, true);
@@ -26,7 +26,7 @@ const getDeps_DEV = (compositeDeps, prevSnapshotEnabled) => {
 
 
 
-const getDeps_TST = (compositeDeps, prevSnapshotEnabled) => {
+const getDeps_TST = (compositeDeps) => {
   return Promise.resolve()
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((metadataDeps) => {
@@ -41,7 +41,7 @@ const getDeps_TST = (compositeDeps, prevSnapshotEnabled) => {
 
 
 
-const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMetadata, prevEnv, currentEnv) => {
+const getCompositeDepsByEnv = (compositePath, envTarget, envsMetadata, prevEnv, currentEnv) => {
 
   let prevEnvDeps = {}, currentEnvDeps = {};
 
@@ -59,85 +59,54 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 
 
   // if default composite type then we iterate over all detected composite files by env
-  if (compositeType === 'DEFAULT') {
-    let depsToResolve = false;
+  let depsToResolve = false;
 
-    return Promise.resolve()
-    .then(() => {
-      tools.logTitle('Processing accumulated composites for ALL composite types');
-      const filesByEnv = tools.getFiles(compositePath).filter(f => f.startsWith(`dependencies-composite-${envTarget}` ));
-      var returnedDeps = {};
-
-      filesByEnv.forEach((f) => {
-        tools.logInfo(`Parsing : ${f}`);
-        const compositeFile = path.join(process.cwd(), compositePath, f);
-        const fileDeps = tools.getJsonFileContent(compositeFile);
-        const deps = fileDeps.lockedDependencies || fileDeps.forcedCarretDependencies || {};
-        console.log(JSON.stringify(deps, null, 2));
-        returnedDeps = { ...returnedDeps, ...deps};
-        if (fileDeps.forcedCarretDependencies) {
-          depsToResolve = true;
-        }
-      });
-
-      return { ...prevEnvDeps, ...returnedDeps };
-    })
-
-    .then((deps) => {
-      if (depsToResolve) {
-        tools.logInfo('Resolving forced dependencies for env');
-        return innerCommon.getResolvedCarretDeps(deps, true, false);
-      } else {
-        return deps;
+  return Promise.resolve()
+  .then(() => {
+    tools.logTitle('Processing accumulated composites for ALL composite types');
+    const filesByEnv = tools.getFiles(compositePath).filter(f => f.startsWith(`dependencies-composite-${envTarget}` ));
+    var returnedDeps = {};
+
+    filesByEnv.forEach((f) => {
+      tools.logInfo(`Parsing : ${f}`);
+      const compositeFile = path.join(process.cwd(), compositePath, f);
+      const fileDeps = tools.getJsonFileContent(compositeFile);
+      const deps = fileDeps.lockedDependencies || fileDeps.forcedCarretDependencies || {};
+      console.log(JSON.stringify(deps, null, 2));
+      returnedDeps = { ...returnedDeps, ...deps};
+      if (fileDeps.forcedCarretDependencies) {
+        depsToResolve = true;
       }
-    })
-
-    .then((deps) => {
-      tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
-      const depsToScan = Object.keys(deps);
-      depsToScan.forEach((d) => {
-        if (deps[d].indexOf('-rc.') > -1) {
-          tools.logInfo(`RC deps found : ${deps[d]}`);
-          tools.logWarning('In order to prevent this, your RC next/ branch should be released to develop/master branch of the package, support/ branch created for supporting older version in upper environments')
-          throw new Error('NOT_ALLOWED_RC_DEPS_FOR_NON_DEV_ENVIRONMENT_FOUND');
-        }
-      })
-      return deps;
-    })
-    .catch((e) => {
-      throw e;
-    })
-
-  // if particular composite type is provided, the dependencies are taken only from this one
-  } else {
-    return Promise.resolve()
-    .then(() => {
-      tools.logTitle(`Processing dependencies for composite type : ${compositeType}`);
-      const compositeFile = path.join(process.cwd(), compositePath, `dependencies-composite-${envTarget}-${compositeType}.json`);
-      const fileDeps = tools.getJsonFileContent(compositeFile).lockedDependencies || {};
-      console.log(JSON.stringify(fileDeps, null, 2));
+    });
 
-      tools.logInfo(`Current deps found for ${envTarget}:`);
-      console.log(JSON.stringify(currentEnvDeps, null, 2));
+    return { ...prevEnvDeps, ...returnedDeps };
+  })
 
-      return { ...currentEnvDeps, ...fileDeps };
-    })
-    .then((deps) => {
-      tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
-      const depsToScan = Object.keys(deps);
-      depsToScan.forEach((d) => {
-        if (deps[d].indexOf('-rc.') > -1) {
-          tools.logInfo(`RC deps found : ${deps[d]}`);
-          tools.logWarning('In order to prevent this, your RC next/ branch should be released to develop/master branch of the package, support/ branch created for supporting older version in upper environments')
-          throw new Error('NOT_ALLOWED_RC_DEPS_FOR_NON_DEV_ENVIRONMENT_FOUND');
-        }
-      })
+  .then((deps) => {
+    if (depsToResolve) {
+      tools.logInfo('Resolving forced dependencies for env');
+      return innerCommon.getResolvedCarretDeps(deps, true, false);
+    } else {
       return deps;
+    }
+  })
+
+  .then((deps) => {
+    tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
+    const depsToScan = Object.keys(deps);
+    depsToScan.forEach((d) => {
+      if (deps[d].indexOf('-rc.') > -1) {
+        tools.logInfo(`RC deps found : ${deps[d]}`);
+        tools.logWarning('In order to prevent this, your RC next/ branch should be released to develop/master branch of the package, support/ branch created for supporting older version in upper environments')
+        throw new Error('NOT_ALLOWED_RC_DEPS_FOR_NON_DEV_ENVIRONMENT_FOUND');
+      }
     })
-    .catch((e) => {
-      throw e;
-    })
-  }
+    return deps;
+  })
+  .catch((e) => {
+    throw e;
+  })
+
 }
 
 
@@ -150,12 +119,10 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 module.exports.getCompositeDeps = (
   compositePath,
   envTarget = 'DEV',
-  compositeType = 'DEFAULT',
-  prevSnapshotEnabled = false,
   envsMetadata
 ) => {
 
-  tools.logInfo(`Processing installation at : ${compositePath} for env: ${envTarget} - compositeType: ${compositeType}`);
+  tools.logInfo(`Processing installation at : ${compositePath} for env: ${envTarget}`);
 
   return Promise.resolve()
     // getting root composite - dependencies-composite.json content
@@ -170,14 +137,14 @@ module.exports.getCompositeDeps = (
       }
     })
 
-    // getting env specific composite with compositeType if provided
+    // getting env specific composite
     .then((compositeDeps) => {
       /**
       * For DEV target, we take the outermost known versions of the packages,
       * including : SNAPSHOTS & LATEST
       */
       if (envTarget === 'DEV') {
-        return getDeps_DEV(compositeDeps, prevSnapshotEnabled);
+        return getDeps_DEV(compositeDeps);
       }
 
 
@@ -186,7 +153,7 @@ module.exports.getCompositeDeps = (
       * including : LATEST
       */
       if (envTarget === 'TST') {
-        return getDeps_TST(compositeDeps, prevSnapshotEnabled);
+        return getDeps_TST(compositeDeps);
       }
 
 
@@ -200,7 +167,6 @@ module.exports.getCompositeDeps = (
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
-          compositeType,
           envsMetadata,
           'TST', 'INT'
         );
@@ -216,7 +182,6 @@ module.exports.getCompositeDeps = (
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
-          compositeType,
           envsMetadata,
           'INT', 'ACC'
         );
@@ -231,7 +196,6 @@ module.exports.getCompositeDeps = (
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
-          compositeType,
           envsMetadata,
           'TRN', 'PROD'
         );
@@ -247,7 +211,6 @@ module.exports.getCompositeDeps = (
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
-          compositeType,
           envsMetadata,
           'ACC', 'TRN'
         );
@@ -262,7 +225,6 @@ module.exports.getCompositeDeps = (
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
-          compositeType,
           envsMetadata,
           'ACC', 'DLT'
         );

package/scripts/csdr/install/projects.js

@@ -15,7 +15,7 @@ const innerCompositeCore = require('./composite-core');
 // FETCH ARGS
 const { remotesImport } = tools.getArgs();
 
-const getDeps = (module.exports.getDeps = (prj, envTarget, compositeType) => {
+const getDeps = (module.exports.getDeps = (prj, envTarget) => {
   return Promise.resolve()
     .then(() => {
       return metadataUtils.appEnvs.getMetadata(prj);
@@ -24,8 +24,6 @@ const getDeps = (module.exports.getDeps = (prj, envTarget, compositeType) => {
       return innerCompositeCore.getCompositeDeps(
         prj.folder,
         envTarget,
-        compositeType,
-        prj.build && prj.build.prevSnapshotEnabled,
         envsMetadata
       );
     })
@@ -85,7 +83,7 @@ const getLocalProjectFixedDeps = (module.exports.getLocalProjectFixedDeps = (prj
 
         prj.fixedDependencies.forEach((dep) => {
           const pkg = configUtils.packages.getPackageByNpmPkg(dep, true);
-          const newDep = { [dep]: metadataUtils.package.getPackageVersionLast(pkg) };
+          const newDep = { [dep]: metadataUtils.packageUtils.getPackageVersionLast(pkg) };
           deps = { ...deps, ...newDep };
         });
       }
@@ -115,12 +113,12 @@ module.exports.getLocalProjectsFixedDeps = async (_) => {
   return deps;
 };
 
-module.exports.installDeps = (prj, envTarget, compositeType) => {
+module.exports.installDeps = (prj, envTarget) => {
   let finalDeps, compositeDeps;
 
   return Promise.resolve()
     .then(() => {
-      return getDeps(prj, envTarget, compositeType);
+      return getDeps(prj, envTarget);
     })
     .then((deps) => {
       // storing compositeDeps
@@ -183,7 +181,7 @@ const getLocalProjectRemoteDeps = (module.exports.getLocalProjectRemoteDeps = (p
     remotes
       .map((r) => configUtils.remotes.getRemote(r.name))
       .map((r) => {
-        return { npmgPkg: r.npmPkg, version: metadataUtils.package.getPackageVersionLast(r) };
+        return { npmgPkg: r.npmPkg, version: metadataUtils.packageUtils.getPackageVersionLast(r) };
       })
       .forEach((r) => {
         if (!r.version) {

package/scripts/csdr/install/remotes.js

@@ -17,7 +17,7 @@ const innerCompositeCore = require('./composite-core');
 const { dryRun, skipRemotes } = tools.getArgs();
 
 
-const allPkgInstall = (envTarget, compositeType) => {
+const allPkgInstall = (envTarget) => {
   return Promise.resolve()
 
     // getting packages to be remotely installed
@@ -42,7 +42,7 @@ const allPkgInstall = (envTarget, compositeType) => {
     .then((packages) => Promise.resolve().then(() => {
       return packages.reduce((promise, pkg) => {
         return promise.then(() => (
-          pkgInstall(pkg, envTarget, compositeType)
+          pkgInstall(pkg, envTarget)
         ));
       }, Promise.resolve());
     }))
@@ -52,7 +52,7 @@ const allPkgInstall = (envTarget, compositeType) => {
     });
 }
 
-const pkgInstall = (pkg, envTarget, compositeType) => {
+const pkgInstall = (pkg, envTarget) => {
   tools.logTitle(`Processing installation for : ${pkg.name}`);
 
   let finalDeps;
@@ -60,7 +60,7 @@ const pkgInstall = (pkg, envTarget, compositeType) => {
   return Promise.resolve()
     .then(() => {
       // fetching deps from dependencies base and composite if any
-      return getDeps(pkg, envTarget, compositeType);
+      return getDeps(pkg, envTarget);
     })
     .then((compositeDeps) => {
       // storing for later exports
@@ -83,6 +83,8 @@ const pkgInstall = (pkg, envTarget, compositeType) => {
 
       pkgJson.dependencies = deps;
 
+      // store dependencies metadata for later fetch of remote deps installed for a particular version published
+      pkgJson.remoteDependencies = deps;
 
       // getting package eUI version
       const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
@@ -134,17 +136,15 @@ const pkgInstall = (pkg, envTarget, compositeType) => {
 }
 
 
-const getDeps = module.exports.getDeps = (pkg, envTarget, compositeType) => {
+const getDeps = module.exports.getDeps = (pkg, envTarget) => {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.packageEnvs.getMetadata(pkg);
+      return metadataUtils.remotePackage.getMetadataEnvs(pkg);
     })
     .then((envsMetadata) => {
       return innerCompositeCore.getCompositeDeps(
         pkg.paths.fromRoot,
         envTarget,
-        compositeType,
-        pkg.build && pkg.build.prevSnapshotEnabled,
         envsMetadata
       );
     })
@@ -155,15 +155,15 @@ const getDeps = module.exports.getDeps = (pkg, envTarget, compositeType) => {
 }
 
 
-module.exports.installDeps = (pkg, envTarget, compositeType) => {
+module.exports.installDeps = (pkg, envTarget) => {
   tools.logTitle('Remote dependencies installation');
 
   return Promise.resolve()
     .then(() => {
       if (pkg) {
-        return pkgInstall(pkg, envTarget, compositeType);
+        return pkgInstall(pkg, envTarget);
       } else {
-        return allPkgInstall(envTarget, compositeType);
+        return allPkgInstall(envTarget);
       }
     })
 

package/scripts/csdr/metadata/app.js

@@ -11,7 +11,7 @@ const installUtils = require('../install/install-utils');
 const versionUtils = require('../version/version-utils');
 
 // INNER
-const innerPackage = require('./package');
+const innerPackageUtils = require('./package-utils');
 
 // FETCH ARGS
 const { dryRun } = tools.getArgs();
@@ -156,7 +156,7 @@ const storeMetadataAssetsStandAlone = () => {
         packageDepsMetadata = Object.keys(deps).map((d) => {
           const pkg = configUtils.packages.getPackageByNpmPkg(d, true);
           tools.logInfo(`getting pkg versions metadata for : ${pkg.name} / version: ${deps[d]}`);
-          const pkgVersionMetadata = innerPackage.getVersionMetadata(pkg, deps[d]);
+          const pkgVersionMetadata = innerPackageUtils.getVersionMetadata(pkg, deps[d]);
 
           if (!pkgVersionMetadata) {
             tools.logWarning(`===> version of pkg not found in metadata, probably caused by a failure of the package build`);