@eui/tools 5.3.14 → 5.3.17

package/.version.properties

@@ -1 +1 @@
-5.3.14
+5.3.17

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.17 (2022-06-20)
+
+##### Bug Fixes
+
+* **other:**
+  * csdr package init wrong declarations of routed package - MWP-8187 [MWP-8187](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8187)  ([aa939d6f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/aa939d6fd6c21d865080f5fbcdb4a8958a7c2631))
+
+* * *
+* * *
+## 5.3.16 (2022-06-20)
+
+##### Bug Fixes
+
+* **other:**
+  * package creation on empty csdr-root - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([236ca4fa](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/236ca4faa7398dd3083e49660e3eeb77b9639f1a))
+
+* * *
+* * *
+## 5.3.15 (2022-06-20)
+
+##### Chores
+
+* **other:**
+  * v10 host adaptations - cleanup of old route replacement - multi config handles - multi base route replacement - remotes imports from install - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([b0801ba5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b0801ba59694af456e187d2e62e4b88c7a2da208))
+
+* * *
+* * *
 ## 5.3.14 (2022-06-17)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/module.ts

@@ -14,4 +14,4 @@ import { Cmp1Component } from './components/cmp1/cmp1.component';
     exports: [
     ],
 })
-export class CommonModule { }
+export class Module { }

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { Cmp1Component } from './components/cmp1/cmp1.component';
 
-const routes: Routes = [
+export const routes: Routes = [
     { path: '', component: Cmp1Component },
 ];
 

package/scripts/csdr/config/angular.js

@@ -1509,9 +1509,24 @@ module.exports.registerModulePaths = (pkg, isReset) => {
     tools.copy(fileDev, fileBuildSpec);
   }
 
-  const jsonFileDev = require(fileDev);
-  const jsonFileBuild = require(fileBuild);
-  const jsonFileBuildSpec = require(fileBuildSpec);
+  let jsonFileDev, jsonFileBuild, jsonFileBuildSpec;
+  if (!tools.isFileExists(fileDev)) {
+    jsonFileDev = tsConfigDef;
+  } else {
+    jsonFileDev = require(fileDev);
+  }
+
+  if (!tools.isFileExists(fileBuild)) {
+    jsonFileBuild = tsConfigDef;
+  } else {
+    jsonFileBuild = require(fileBuild);
+  }
+
+  if (!tools.isFileExists(fileBuildSpec)) {
+    jsonFileBuildSpec = tsConfigDef;
+  } else {
+    jsonFileBuildSpec = require(fileBuildSpec);
+  }
 
   var pathBase = './packages';
   if (pkg.child) {

package/scripts/csdr/install/common.js

@@ -10,7 +10,7 @@ const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
 
 // FETCH ARGS
-const { dryRun, skipInstall, registry, npm } = tools.getArgs();
+const { dryRun, skipInstall, registry, remotesImport } = tools.getArgs();
 
 
 
@@ -36,6 +36,7 @@ const installDeps = (deps) => {
         return executeInstall(rootFolder);
       }
     })
+
     .catch((e) => {
       throw e;
     })
@@ -58,11 +59,7 @@ const executeInstall = (cwdPath) => {
 
       tools.logInfo(`Install from : ${installRegistry}`);
       if (!dryRun && !skipInstall) {
-        if (npm) {
-          return execa.shellSync(`npm install --registry ${installRegistry}`, { cwd: cwdPath, stdio: 'inherit' });
-        } else {
-          return execa.shellSync(`yarn --registry ${installRegistry}`, { cwd: cwdPath, stdio: 'inherit' });
-        }
+        return execa.shellSync(`yarn --registry ${installRegistry}`, { cwd: cwdPath, stdio: 'inherit' });
       }
     })
 
@@ -296,7 +293,9 @@ const getLocalPackagesCompositeDepsRemapped = () => {
 }
 
 
-const getLocalProjectDeps = (prj) => {
+const getLocalProjectDeps = (prj, snapshotsMetadata) => {
+  tools.logInfo(`Getting deps for ${prj.name}`);
+
   // check dependencies file - default
   const prjJsonFile = path.join(process.cwd(), prj.folder, 'dependencies-base.json');
   const prjDeps = tools.getJsonFileContent(prjJsonFile) || {};
@@ -311,17 +310,41 @@ const getLocalProjectDeps = (prj) => {
   } else {
     prjCompDeps = depsJson || {}
   }
-  return { ...prjDeps, ...prjCompDeps };
+
+  let remoteDeps = {};
+  if (prj.initRemoteDependencies && remotesImport && snapshotsMetadata) {
+
+    tools.logInfo('Importing remotes deps... this might take a while');
+
+    const remotes = configUtils.packages.getCsdrRemotePackages()
+      .filter((p) => {
+        return p.active === true
+      })
+      .map((p) => {
+        return { npmgPkg: p.npmPkg, version: snapshotsMetadata[p.npmPkg] }
+      })
+      .filter((dep) => {
+        return dep.version !== undefined
+      })
+
+    remotes.forEach((r) => {
+      remoteDeps[r.npmgPkg] = r.version;
+    });
+  }
+
+  return { ...prjDeps, ...prjCompDeps, ...remoteDeps };
 }
 
 
-const getLocalProjectsDeps = () => {
+const getLocalProjectsDeps = (snapshotsMetadata) => {
+  tools.logTitle('Getting project dependencies');
+
   const projects = configUtils.projects.getProjects();
   let deps = {};
 
   projects.forEach(p => {
     if (p) {
-      const prjDeps = getLocalProjectDeps(p);
+      const prjDeps = getLocalProjectDeps(p, snapshotsMetadata);
       deps = { ...deps, ...prjDeps };
     }
   })
@@ -378,6 +401,66 @@ const getLocalProjectsFixedDeps = async _ => {
   return deps;
 }
 
+
+const importLocalProjectRemotes = (prj, deps) => {
+  if (prj.initRemoteDependencies) {
+    tools.logInfo(`Import remotes for project : ${prj.name}`);
+
+    const remoteDeps = Object.keys(deps).filter((dep) => {
+      return dep.indexOf('remote-el') !== -1;
+    })
+
+    if (remoteDeps.length === 0) {
+      tools.logWarning('Remotes not found...skipping');
+
+    } else {
+      tools.logInfo(`Initializing ${remoteDeps.length} remotes`);
+
+      remoteDeps.forEach((remoteNpmPkg) => {
+        tools.logInfo(`Checking import for : ${remoteNpmPkg}`);
+
+        // check if package has been installed locally
+        const localPackage = configUtils.packages.getPackages().filter((p) => {
+          return p.npmPkg === remoteNpmPkg
+        })[0];
+
+        if (localPackage) {
+          tools.logInfo('remote is installed locally...skipping import');
+
+        } else {
+          const pkg = configUtils.packages.getPackageByNpmPkg(remoteNpmPkg, true);
+          const projectElementsPath = path.join(process.cwd(), prj.folder, 'src', 'assets', 'elements', pkg.name, 'bundles');
+
+          const npmPkgScope = remoteNpmPkg.substr(0, remoteNpmPkg.indexOf('/'));
+          const npmPkgName = remoteNpmPkg.substr(remoteNpmPkg.indexOf('/') + 1);
+          const remoteNmPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'bundles');
+
+          tools.logInfo(`${remoteNpmPkg} - injecting in ${projectElementsPath}`);
+          tools.copydir(remoteNmPath, projectElementsPath);
+        }
+
+      });
+    }
+  }
+}
+
+
+const importLocalProjectsRemotes = (deps) => {
+  const projects = configUtils.projects.getProjects();
+
+  tools.logTitle('Importing local projects remotes');
+
+  if (remotesImport) {
+    projects.forEach(p => {
+      if (p) {
+        importLocalProjectRemotes(p, deps);
+      }
+    })
+  }
+}
+
+
+
 module.exports = {
   installDeps,
   executeInstall,
@@ -390,5 +473,7 @@ module.exports = {
   getLocalProjectDeps,
   getLocalProjectsDeps,
   getLocalProjectFixedDeps,
-  getLocalProjectsFixedDeps
+  getLocalProjectsFixedDeps,
+  importLocalProjectRemotes,
+  importLocalProjectsRemotes
 }

package/scripts/csdr/install/local-dev.js

@@ -20,7 +20,7 @@ const { dryRun, skipInstall } = tools.getArgs();
 
 
 module.exports.install = (pkg) => {
-  let packagesDeps, packagesCompositeDeps, projectsDeps, projectsFixedDeps, finalDeps;
+  let packagesDeps, packagesCompositeDeps, projectsDeps, projectsFixedDeps, finalDeps, snapshotsMetadata;
 
   return Promise.resolve()
 
@@ -29,6 +29,13 @@ module.exports.install = (pkg) => {
       return metadataUtils.common.cloneMetadataRepo(true);
     })
 
+    // getting packages snapshot deps metadata and storing
+    .then(() => {
+      return metadataUtils.package.getPackagesDeps('packages');
+    })
+    .then((depsMetadata) => {
+      snapshotsMetadata = depsMetadata;
+    })
 
     // getting internal packages deps - cloned locally
     .then(() => {
@@ -50,7 +57,7 @@ module.exports.install = (pkg) => {
       // storing
       packagesCompositeDeps = pkgCompositeDeps;
 
-      return innerCommon.getLocalProjectsDeps();
+      return innerCommon.getLocalProjectsDeps(snapshotsMetadata);
     })
     .then((prjDeps) => {
       projectsDeps = prjDeps;
@@ -98,6 +105,11 @@ module.exports.install = (pkg) => {
       }
     })
 
+    // Import remotes into local projects
+    .then(() => {
+      return innerCommon.importLocalProjectsRemotes(finalDeps);
+    })
+
     // checking remotes
     .then(() => {
       return innerRemotes.installDeps(pkg);

package/scripts/utils/pre-build/injection/config.js

@@ -7,6 +7,43 @@ const configUtils = require('../../../csdr/config/config-utils');
 const installUtils = require('../../../csdr/install/install-utils');
 
 
+const injectConfigCore = (project, npmPkg) => {
+  // check if package is locally cloned
+  const localPackage = configUtils.packages.getPackages().filter((p) => {
+    return p.npmPkg === npmPkg
+  })[0];
+
+  var pkgAssetsPath;
+  const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
+  const projectEnvironmentsPath = path.join(process.cwd(), project.folder, 'src', 'environments');
+
+  // if local package is found
+  if (localPackage) {
+    pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, 'assets');
+
+  // if not sources are taken from the npm package def in node_modules
+  } else {
+    const npmPkgScope = npmPkg.substr(0, npmPkg.indexOf('/'));
+    const npmPkgName = npmPkg.substr(npmPkg.indexOf('/') + 1);
+    pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'assets');
+  }
+
+  if (!tools.isDirExists(pkgAssetsPath)) {
+    tools.logWarning(`Linked config pkg : ${npmPkg} cannot be found in node_modules`);
+    return;
+  }
+
+  tools.logInfo(`${npmPkg}/assets - injecting in ${projectAssetsPath}`);
+  tools.copydir(pkgAssetsPath, projectAssetsPath);
+
+  const pkgEnvironmentsPath = path.join(pkgAssetsPath, 'environments');
+  if (tools.isDirExists(pkgEnvironmentsPath)) {
+    tools.logInfo(`${npmPkg}/assets/environments - injecting in ${projectEnvironmentsPath}`);
+    tools.copydir(pkgEnvironmentsPath, projectEnvironmentsPath);
+  }
+}
+
+
 
 const injectConfig = (project) => {
 
@@ -14,42 +51,20 @@ const injectConfig = (project) => {
 
   return Promise.resolve()
     .then(() => {
-      if (!project.config.npmPkg) {
+      if (!project.config) {
         tools.logWarning('No linked config package found in project config');
         return;
       }
-      // check if package is locally cloned
-      const localPackage = configUtils.packages.getPackages().filter((p) => {
-        return p.npmPkg === project.config.npmPkg
-      })[0];
 
-      var pkgAssetsPath;
-      const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-      const projectEnvironmentsPath = path.join(process.cwd(), project.folder, 'src', 'environments');
-
-      // if local package is found
-      if (localPackage) {
-        pkgAssetsPath = path.join(process.cwd(), 'packages', localPackage.name, 'assets');
+      // multi-config defined : api config and routes config for MWP
+      if (Array.isArray(project.config)) {
+        project.config.forEach((configNpmPkg) => {
+          injectConfigCore(project, configNpmPkg);
+        })
 
-      // if not sources are taken from the npm package def in node_modules
+      // single config/npm package defined
       } else {
-        const npmPkgScope = project.config.npmPkg.substr(0, project.config.npmPkg.indexOf('/'));
-        const npmPkgName = project.config.npmPkg.substr(project.config.npmPkg.indexOf('/') + 1);
-        pkgAssetsPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, 'assets');
-      }
-
-      if (!tools.isDirExists(pkgAssetsPath)) {
-        tools.logWarning(`Linked config pkg : ${project.config.npmPkg} cannot be found in node_modules`);
-        return;
-      }
-
-      tools.logInfo(`${project.config.npmPkg}/assets - injecting in ${projectAssetsPath}`);
-      tools.copydir(pkgAssetsPath, projectAssetsPath);
-
-      const pkgEnvironmentsPath = path.join(pkgAssetsPath, 'environments');
-      if (tools.isDirExists(pkgEnvironmentsPath)) {
-        tools.logInfo(`${project.config.npmPkg}/assets/environments - injecting in ${projectEnvironmentsPath}`);
-        tools.copydir(pkgEnvironmentsPath, projectEnvironmentsPath);
+        injectConfigCore(project, project.config.npmPkg);
       }
     })
 
@@ -70,7 +85,7 @@ const injectPackagesConfig = (project) => {
 
     // fetching current project linked composite packages dependencies
     .then(() => {
-      return installUtils.common.getLocalProjectsDeps(project);
+      return installUtils.common.getLocalProjectDeps(project);
     })
 
 

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -58,7 +58,7 @@ const getEnvConfig = (project, envTarget, build) => {
     })
 }
 
-const getRoutesFile = (project, isFullReplacement) => {
+const getRoutesFile = (project) => {
   tools.logInfo('Getting routes file for replacement');
 
   return Promise.resolve()
@@ -69,48 +69,37 @@ const getRoutesFile = (project, isFullReplacement) => {
       }
 
       let routesFilePath;
+      let srcRoutesFilePath;
 
-      if (isFullReplacement) {
-        let srcRoutesFilePath;
-
-        if (!project.appSources.routesFileNpmPkg || !project.appSources.routesFileSource || !project.appSources.routesFilePath) {
-          tools.logError('project requires appSources.routesFileNpmPkg, routesFileSources and routesFilePath definitions');
-          return;
-        }
-
-        // check if package is locally cloned
-        const localPackage = configUtils.packages.getPackages().filter((p) => {
-          return p.npmPkg === project.appSources.routesFileNpmPkg
-        })[0];
-
-        // if local package is found
-        if (localPackage) {
-          tools.logInfo('local package found, copying from local');
-          srcRoutesFilePath = path.join(process.cwd(), 'packages', localPackage.name, project.appSources.routesFileSource);
-
-        // if not sources are taken from the npm package def in node_modules
-        } else {
-          tools.logInfo('remote package found, copying from remote');
-          const npmPkgScope = project.appSources.routesFileNpmPkg.substr(0, project.appSources.routesFileNpmPkg.indexOf('/'));
-          const npmPkgName = project.appSources.routesFileNpmPkg.substr(project.appSources.routesFileNpmPkg.indexOf('/') + 1);
-
-          srcRoutesFilePath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, project.appSources.routesFileSource);
-        }
+      if (!project.appSources.routesFileNpmPkg || !project.appSources.routesFileSource || !project.appSources.routesFilePath) {
+        tools.logError('project requires appSources.routesFileNpmPkg, routesFileSources and routesFilePath definitions');
+        return;
+      }
 
-        routesFilePath = path.join(project.paths.rootPath, project.appSources.routesFilePath);
+      // check if package is locally cloned
+      const localPackage = configUtils.packages.getPackages().filter((p) => {
+        return p.npmPkg === project.appSources.routesFileNpmPkg
+      })[0];
 
-        // copy source file to project destination
-        tools.copy(srcRoutesFilePath, routesFilePath);
+      // if local package is found
+      if (localPackage) {
+        tools.logInfo('local package found, copying from local');
+        srcRoutesFilePath = path.join(process.cwd(), 'packages', localPackage.name, project.appSources.routesFileSource);
 
+      // if not sources are taken from the npm package def in node_modules
       } else {
-        if (!project.appSources.routesFilePath) {
-          tools.logError('project requires appSources.routesFilePath definition');
-          return;
-        }
+        tools.logInfo('remote package found, copying from remote');
+        const npmPkgScope = project.appSources.routesFileNpmPkg.substr(0, project.appSources.routesFileNpmPkg.indexOf('/'));
+        const npmPkgName = project.appSources.routesFileNpmPkg.substr(project.appSources.routesFileNpmPkg.indexOf('/') + 1);
 
-        routesFilePath = path.join(project.paths.rootPath, project.appSources.routesFilePath);
+        srcRoutesFilePath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, project.appSources.routesFileSource);
       }
 
+      routesFilePath = path.join(project.paths.rootPath, project.appSources.routesFilePath);
+
+      // copy source file to project destination
+      tools.copy(srcRoutesFilePath, routesFilePath);
+
       // checking is routes path declared
       if (!tools.isFileExists(routesFilePath)) {
         tools.logError(`Unable to find ${routesFilePath}`);
@@ -125,51 +114,6 @@ const getRoutesFile = (project, isFullReplacement) => {
     })
 }
 
-const remapRoutes = (config, routesFileContent) => {
-  tools.logInfo('config.routesRemapping found...Staring routes remapping');
-
-  console.log(routesFileContent);
-
-  return Promise.resolve()
-    .then(() => {
-      config.routesRemapping.forEach((route) => {
-        tools.logInfo(`\nchecking replacement for : ${JSON.stringify(route)}`);
-        const tokenToSearch = `./features/${route.featureModule}-lib.module#Module`;
-        tools.logInfo(`Searching token : ${tokenToSearch}`);
-        if (routesFileContent.indexOf(tokenToSearch) > -1) {
-          tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.routeModuleDef}`);
-          routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.routeModuleDef);
-        } else {
-          tools.logWarning(`token ${tokenToSearch} NOT FOUND`);
-        }
-      })
-
-      if (!config.extraRoutesRemapping) {
-        tools.logWarning('No extra routes remapping found in current config...skipping');
-
-      } else {
-        tools.logInfo('Extra routes remapping');
-        config.extraRoutesRemapping.forEach((route) => {
-          tools.logInfo(`checking replacement ${JSON.stringify(route)}`);
-          const tokenToSearch = route.currentRoute;
-          if (routesFileContent.indexOf(tokenToSearch) > -1) {
-            tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.updatedRoute}`);
-            routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.updatedRoute);
-          } else {
-            tools.logWarning(`token ${tokenToSearch} NOT FOUND`);
-          }
-        })
-      }
-
-      return routesFileContent;
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
 const replaceRoutes = (project, envTarget, build, routesFileContent) => {
   tools.logInfo('config.routesRemapping not found...Starting full routes replacement');
 
@@ -177,7 +121,11 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
     .then(() => {
       // getting base route defs content
       const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-      const baseRouteDefsPath = path.join(projectAssetsPath, 'route-defs-base.json');
+      let routeDefsBaseFilename = 'route-defs-base.json';
+      if (project.appSources.routesBaseFilename) {
+        routeDefsBaseFilename = project.appSources.routesBaseFilename;
+      }
+      const baseRouteDefsPath = path.join(projectAssetsPath, routeDefsBaseFilename);
 
       if (!tools.isFileExists(baseRouteDefsPath)) {
         tools.logError(`${baseRouteDefsPath} File NOT FOUND`);
@@ -283,12 +231,7 @@ module.exports.buildRoutes = (project, envTarget, build) => {
     })
 
     .then(() => {
-      if (config.routesRemapping) {
-        return getRoutesFile(project);
-
-      } else {
-        return getRoutesFile(project, true);
-      }
+      return getRoutesFile(project);
     })
     .then((outRoutesFile) => {
       if (!outRoutesFile) {
@@ -298,14 +241,8 @@ module.exports.buildRoutes = (project, envTarget, build) => {
       routesFileContent = tools.getFileContent(routesFile);
     })
 
-
     .then(() => {
-      if (config.routesRemapping) {
-        return remapRoutes(config, routesFileContent);
-
-      } else {
-        return replaceRoutes(project, envTarget, build, routesFileContent);
-      }
+      return replaceRoutes(project, envTarget, build, routesFileContent);
     })
 
     .then((finalRouteFileContent) => {

package/scripts/utils/serve/app.js

@@ -24,9 +24,6 @@ module.exports.serve = () => {
 
   const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
 
-  tools.logInfo('Provided arguments:\n');
-  console.log(`configuration=${configuration}, baseHref=${baseHref}, host=${host}`);
-
 
   return Promise.resolve()
     .then(() => {