@eui/tools 5.0.0-rc.2 → 5.0.0-rc.22

package/sandbox.js

@@ -1,6 +1,7 @@
 'use strict';
 const path = require('path');
 const fs = require('fs');
+const glob = require('glob');
 const tools = require('./scripts/utils/tools');
 const semver = require('semver');
 const gitUtils = require('./scripts/utils/git-utils');
@@ -11,9 +12,11 @@ const initUtils = require('./scripts/csdr/init/init-utils');
 const buildAppUtils = require('./scripts/utils/build/app/build-app-utils');
 const buildPackageUtils = require('./scripts/utils/build/package/build-package-utils');
 const injectionUtils = require('./scripts/utils/pre-build/injection/injection-utils');
-const compositeUtils = require('./scripts/csdr/install/composite-utils');
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
+const translationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
+const apiUtils = require('./scripts/utils/api-utils');
+const versionUtils = require('./scripts/csdr/version/version-utils');
 
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
@@ -591,12 +594,337 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 // return Promise.resolve()
 //   .then(() => {
-//     console.log(tools.isDirEmpty(process.cwd()));
+//     const a = configUtils.packages.getCsdrRemotePackages()
+//                 .map((p) => {
+//                   return { name: p.name, npmPkg: p.npmPkg }
+//                 });
+//     console.log(tools.sortArray(a, 'name'));
 //   })
+// return Promise.resolve()
+//   .then(() => {
+//     console.log('t1')
+//     console.log(new Date());
+
+//     return new Promise((resolve) => {
+//       setTimeout(resolve, 8000);
+//     });
+//   })
+
+//   .then(() => {
+//     console.log('t2')
+//     console.log(new Date());
+//   })
+
+//   .then(() => {
+//     console.log('T3')
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     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');
+//   })
+
+
+
+
+
+
+
+// const prjName = 'my-workplace';
+// const prj = configUtils.projects.getCsdrProject(prjName);
+
+// return Promise.resolve()
+//   // .then(() => {
+//   //   return injectionUtils.externals.injectExternalAppSources(prj);
+//   // })
+//   .then(() => {
+//     // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
+//     return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
+//   })
+
+
+
+
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('opsys-result-quality-management-eui10-remote-el-ui', true);
+//     return translationUtils.elements.generate('eui,opsys', pkg)
+//   })
+
+
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('eui', true);
+//     console.log(pkg);
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg =  configUtils.packages.getPackageByNpmPkg('@csdr/core', true);
+//     console.log(pkg);
+//     const versions = metadataUtils.package.getPackageVersions(pkg);
+
+//     console.log(
+//       versions.filter((v) => {
+//         return v.version.split('.')[0] === '1'
+//       }).splice(-1)[0]
+//     );
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const prjName = 'my-workplace';
+//     const prj = configUtils.projects.getCsdrProject(prjName);
+
+//     return compositeUtils.getDeps(prj, 'DEV');
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const configOptions = configUtils.global.getConfigOptions();
+//     console.log(configOptions);
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const versions = configUtils.packages.getLocalPackagesEuiVersion();
+//     console.log(versions);
+//     const prj = configUtils.projects.getProject();
+//     console.log(prj);
+//   })
+
+  // return Promise.resolve()
+  // .then(() => {
+  //   const pkg = configUtils.packages.getPackage('cc-task-centre-eui10-remote-el-ui', true);
+  //   return installUtils.remotes.installDeps(pkg);
+  // })
+  // .then((deps) => {
+  //   console.log(deps);
+  // })
+  // .catch((e) => {
+  //   console.log(e);
+  //   process.exit(1);
+  // })
 
-return Promise.resolve()
+
+  // return Promise.resolve()
+  // .then(() => {
+  //   var from = path.join(process.cwd(), 'node_modules', '@mywp', 'config');
+  //   var globPattern = '**/*';
+  //   var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+
+  // })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const fileContent = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', 'cc-task-centre-eui10-remote-el-ui-versions-metadata.json'));
+//     let out = '';
+//     const versions = fileContent.versions.filter(v => v.duration !== undefined).map((v) => {
+//       out += `${v.date.substring(0,8)},${v.duration/1000}\n`;
+//     })
+//     tools.writeFileContent(path.join(process.cwd(), 'extract.txt'), out);
+//   })
+
+
+// Promise.resolve()
+//   .then(() => {
+//     return apiUtils.login();
+//   })
+//   .then((response) => {
+//     console.log(response);
+//   })
+//   .then(() => {
+//     return apiUtils.getDevopsMetadata();
+//   })
+//   .then((response) => {
+//     console.log(response);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+
+// A LA CARTE REMOTE TESTING
+
+const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+
+// Promise.resolve()
+//   .then(() => {
+//     return versionUtils.packageRemote.getNewVersion(pkg, 'DEV');
+//   })
+//   .then((version) => {
+//     console.log(version);
+//   })
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.packageEnvs.getMetadata(pkg);
+//   })
+//   .then((envsMetadata) => {
+//     return installUtils.compositeCore.getCompositeDeps(
+//       pkg.paths.pkgFromRoot,
+//       'DEV',
+//       'DEFAULT',
+//       false,
+//       envsMetadata
+//     )
+//   })
+//   .then((deps) => {
+//     console.log(deps);
+//   })
+
+
+// MIGRATE metadata to API - lowdb
+
+Promise.resolve()
   .then(() => {
-    const folder = path.join(process.cwd(),'packages', 'eui-tools');
-    console.log(tools.getPackageFolderStats(folder));
+    var db = {};
+
+    // process devops-metadata global
+    var globalsJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', '.devops-metadata.json'));
+
+    db["globals"] = {
+      packages: globalsJson.packages.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      latest: globalsJson.packagesLatestTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      next: globalsJson.packagesNextTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      prev: globalsJson.packagesPrevTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      prevSnapshots: globalsJson.packagesPrevSnapshotsTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+    };
+
+    // process apps and packages files
+    var from = path.join(process.cwd(), 'packages', 'devops-metadata');
+    var globPattern = '**/*.json';
+    var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+
+    // extract apps content
+    var apps = files
+      .filter(f => f.startsWith('app-'))
+      .map((f) => {
+        return f.replace('-build-metadata.json', '')
+                .replace('-envs-metadata.json', '')
+                .replace('-history-metadata.json', '')
+                .replace('-versions-metadata.json', '');
+      });
+    apps = tools.removeArrayDuplicates(apps);
+    console.log(apps);
+
+    db["apps"] = [];
+
+    apps.forEach((app) => {
+      const buildFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-build-metadata.json`));
+      const envsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-envs-metadata.json`));
+      const historyFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-history-metadata.json`));
+      const versionsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-versions-metadata.json`));
+
+      db["apps"].push({
+        name: app,
+        buildVersions: buildFileJson.versions,
+        envs: envsFileJson,
+        history: historyFileJson.versions,
+        versions: versionsFileJson.versions
+      });
+    })
+
+
+    // extract pkg content
+    var pkgs = files
+      .filter(f => !f.startsWith('app-'))
+      .map((f) => {
+        return f.replace('-build-metadata.json', '')
+                .replace('-envs-metadata.json', '')
+                .replace('-history-metadata.json', '')
+                .replace('-versions-metadata.json', '');
+      });
+    pkgs = tools.removeArrayDuplicates(pkgs);
+    console.log(pkgs);
+
+    db["packages"] = [];
+
+    pkgs.forEach((pkg) => {
+      const buildFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-build-metadata.json`));
+      const envsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-envs-metadata.json`));
+      const historyFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-history-metadata.json`));
+      const versionsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-versions-metadata.json`));
+
+      db["packages"].push({
+        name: pkg,
+        buildVersions: buildFileJson.versions,
+        envs: envsFileJson,
+        history: historyFileJson.versions,
+        versions: versionsFileJson.versions
+      });
+    })
+
+    tools.writeJsonFileSync(path.join(process.cwd(), 'db.json'), db);
   })
 
+
+
+
+
+
+
+
+// METADATA API TESTING
+// --------------------
+// const metadataModule = require('./scripts/csdr/metadata/v2');
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataModule.package.getMetadata(pkg);
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
+//   .then(() => {
+//     return metadataModule.global.getMetadata();
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+

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

@@ -50,7 +50,7 @@ module.exports.audit = (pkg) => {
     .then(() => {
       return Promise.resolve()
         .then(() => {
-          return execa.shellSync('yarn audit --level moderate', { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync('yarn audit --level high', { cwd: process.cwd(), stdio: 'inherit' });
         })
         .catch((e) => {}) // it can fail
     })
@@ -61,7 +61,7 @@ module.exports.audit = (pkg) => {
         .then(() => {
           const auditFile = path.join(process.cwd(), 'audit.json');
           tools.logInfo(`Creating audit file`)
-          return execa.shellSync(`yarn audit --level moderate --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync(`yarn audit --level high --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
         })
         .then(() => {
           tools.logSuccess();

package/scripts/csdr/cli/app.js

@@ -12,14 +12,22 @@ const configUtils = require('../config/config-utils');
 
 // CONSTANTS
 const TARGET_ROOT_PATH = path.join(process.cwd(), 'apps');
-const APP_DEFAULT_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app');
+const APP_SKELETON_EUI7_PATH = path.join(__dirname, 'skeletons', 'app');
+const APP_SKELETON_EUI10_PATH = path.join(__dirname, 'skeletons', 'app-eui10');
+const APP_SKELETON_EUI13_PATH = path.join(__dirname, 'skeletons', 'app-eui13');
 const APP_SHOWCASE_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app-showcase');
+const APP_SHOWCASE_SKELETON_EUI13_PATH = path.join(__dirname, 'skeletons', 'app-showcase-eui13');
 
 const defaultConfig = {
   appType: {
     DEFAULT: 'default',
     SHOWCASE: 'showcase'
   },
+  appVersion: {
+    EUI7: 'v7',
+    EUI10: 'v10',
+    EUI13: 'v13'
+  },
   appName: 'my-app',
   appScope: '@app'
 }
@@ -44,6 +52,24 @@ const prompt = () => {
             }
           }
         },
+        {
+          type: 'list',
+          name: 'appVersion',
+          message: 'Select eUI version target :',
+          choices: [
+            { name: 'v10', value: defaultConfig.appVersion.EUI10 },
+            { name: 'v13', value: defaultConfig.appVersion.EUI13 },
+          ],
+          default: defaultConfig.appVersion.EUI10,
+          // when: function (answers) {
+          //   return (answers.appType === defaultConfig.appType.SHOWCASE);
+          // },
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          }
+        },
         {
           name: 'appName',
           type: 'input',
@@ -66,7 +92,7 @@ const prompt = () => {
 
 
 
-const build = (name, scope, appType, targetPath) => {
+const build = (name, scope, appType, targetPath, appVersion) => {
   tools.logTitle('Generating application');
 
   return Promise.resolve()
@@ -78,10 +104,22 @@ const build = (name, scope, appType, targetPath) => {
     .then(() => {
       tools.logInfo('Copying skeleton to target');
       if (appType === defaultConfig.appType.DEFAULT) {
-        return tools.copydir(APP_DEFAULT_SKELETON_PATH, targetPath, true);
+        if (appVersion === defaultConfig.appVersion.EUI13) {
+          return tools.copydir(APP_SKELETON_EUI13_PATH, targetPath, true);
+        }
+        if (appVersion === defaultConfig.appVersion.EUI10) {
+          return tools.copydir(APP_SKELETON_EUI10_PATH, targetPath, true);
+        }
+        if (appVersion === defaultConfig.appVersion.EUI7) {
+          return tools.copydir(APP_SKELETON_EUI7_PATH, targetPath, true);
+        }
 
       } else if (appType === defaultConfig.appType.SHOWCASE) {
-        return tools.copydir(APP_SHOWCASE_SKELETON_PATH, targetPath, true);
+        if (appVersion === defaultConfig.appVersion.EUI13) {
+          return tools.copydir(APP_SHOWCASE_SKELETON_EUI13_PATH, targetPath, true);
+        } else {
+          return tools.copydir(APP_SHOWCASE_SKELETON_PATH, targetPath, true);
+        }
       }
     })
 
@@ -157,7 +195,7 @@ module.exports.generate = () => {
 
       const targetPath = path.join(TARGET_ROOT_PATH, answers.appName);
 
-      return build(answers.appName, answers.appScope, answers.appType, targetPath);
+      return build(answers.appName, answers.appScope, answers.appType, targetPath, answers.appVersion);
     })
 
     .catch((e) => {

package/scripts/csdr/cli/package.js

@@ -13,7 +13,9 @@ const configUtils = require('../config/config-utils');
 const TARGET_ROOT_PATH = path.join(process.cwd(), 'packages');
 const SKELETONS_ROOT_PATH = path.join(__dirname, 'skeletons', 'package');
 const FRONTEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend');
+const FRONTEND_SKELETON_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui10');
 const FRONTEND_SKELETON_REMOTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote');
+const FRONTEND_SKELETON_REMOTE_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui10');
 const FRONTEND_OPTION_ROUTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-option-route');
 const BACKEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'backend');
 
@@ -28,7 +30,13 @@ const defaultConfig = {
     DEFAULT: 'default',
     REMOTE: 'remote'
   },
+  pkgFrontendVersion: {
+    DEFAULT: 'eui7',
+    EUI10: 'eui10'
+  },
   isRouteModule: true,
+  isCsdrRepo: true,
+  externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'
 };
 
@@ -76,6 +84,24 @@ const prompt = () => {
             }
           }
         },
+        {
+          type: 'list',
+          name: 'pkgFrontendVersion',
+          message: 'Select eUI version target :',
+          choices: [
+            { name: 'v7', value: defaultConfig.pkgFrontendVersion.DEFAULT },
+            { name: 'v10', value: defaultConfig.pkgFrontendVersion.EUI10 },
+          ],
+          default: defaultConfig.pkgFrontendType.DEFAULT,
+          when: function (answers) {
+            return (answers.pkgType === defaultConfig.pkgType.FRONTEND);
+          },
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          }
+        },
         {
           name: 'pkgScope',
           type: 'input',
@@ -99,7 +125,24 @@ const prompt = () => {
               answers.pkgFrontendType !== defaultConfig.pkgFrontendType.REMOTE
             );
           }
-        }
+        },
+        {
+          name: 'isCsdrRepo',
+          type: 'confirm',
+          message: 'Is the repository within CSDR git project ?',
+          default: defaultConfig.isCsdrRepo
+        },
+        {
+          name: 'externalRepoName',
+          type: 'input',
+          message: 'Enter the project CITnet project name where the repository is located :',
+          default: defaultConfig.externalRepoName,
+          when: function (answers) {
+            return (
+              answers.isCsdrRepo === false
+            );
+          }
+        },
       ]);
     })
 
@@ -110,22 +153,40 @@ const prompt = () => {
 
 
 
-const buildFrontend = (name, scope, frontendType, isRouteModule) => {
+const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule, isCsdrRepo, externalRepoName) => {
   tools.logTitle('Generating package');
 
   let fullName = scope.substr(1) + '-' + name;
+  let npmPkgName, repoName;
+
   if (frontendType === defaultConfig.pkgFrontendType.DEFAULT) {
     fullName += '-ui';
+    npmPkgName = `${scope}/${name}`;
+
   } else if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
-    fullName += '-remote-el-ui';
+    if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
+      fullName += '-eui10-remote-el-ui';
+      npmPkgName = `${scope}/${name}-eui10-remote-el`;
+
+    } else {
+      fullName += '-remote-el-ui';
+      npmPkgName = `${scope}/${name}-remote-el`;
+    }
+  }
+
+  if (isCsdrRepo) {
+    repoName = `${fullName}.git`;
+
+  } else {
+    repoName = `${externalRepoName}/${fullName}.git`;
   }
 
   const targetPath = path.join(TARGET_ROOT_PATH, fullName);
 
   const pkg = {
     name: fullName,
-    npmPkgScope: scope,
-    npmPkgName: name
+    repoName: repoName,
+    npmPkgName: npmPkgName
   };
 
   return Promise.resolve()
@@ -143,9 +204,17 @@ const buildFrontend = (name, scope, frontendType, isRouteModule) => {
     .then(() => {
       tools.logInfo('Copying skeleton to target');
       if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
-        return tools.copydir(FRONTEND_SKELETON_REMOTE_PATH, targetPath, true);
+        if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
+          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+        } else {
+          return tools.copydir(FRONTEND_SKELETON_REMOTE_PATH, targetPath, true);
+        }
       } else {
-        return tools.copydir(FRONTEND_SKELETON_PATH, targetPath, true);
+        if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
+          return tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
+        } else {
+          return tools.copydir(FRONTEND_SKELETON_PATH, targetPath, true);
+        }
       }
     })
 
@@ -171,6 +240,9 @@ const buildFrontend = (name, scope, frontendType, isRouteModule) => {
         .then(() => {
           return tools.replaceInPath(targetPath, '@module.scope@', scope);
         })
+        .then(() => {
+          return tools.replaceInPath(targetPath, '@module.scope-name@', `${scope.substr(1)}-${name}`);
+        })
         .then(() => {
           return tools.replaceInPath(targetPath, '@module.scope.string@', scope.substr(1));
         })
@@ -302,10 +374,22 @@ module.exports.generate = () => {
       console.log(answers);
 
       if (answers.pkgType === defaultConfig.pkgType.FRONTEND) {
-        return buildFrontend(answers.pkgName, answers.pkgScope, answers.pkgFrontendType, answers.isRouteModule);
+        return buildFrontend(
+          answers.pkgName,
+          answers.pkgScope,
+          answers.pkgFrontendType,
+          answers.pkgFrontendVersion,
+          answers.isRouteModule,
+          answers.isCsdrRepo,
+          answers.externalRepoName,
+        );
 
       } else if (answers.pkgType === defaultConfig.pkgType.BACKEND) {
-        return buildBackend(answers.pkgName, answers.pkgScope, answers.pkgGroupId);
+        return buildBackend(
+          answers.pkgName,
+          answers.pkgScope,
+          answers.pkgGroupId,
+        );
       }
     })
 

package/scripts/csdr/cli/skeletons/app-eui10/angular-config.json

@@ -0,0 +1,20 @@
+{
+    "build": {
+        "assets": [
+            "apps/@app.name@/src/favicon.ico",
+            "apps/@app.name@/src/assets",
+            {
+                "glob": "**/*",
+                "input": "node_modules/@eui/core/assets/",
+                "output": "./assets"
+            }
+        ],
+        "styles": [
+            "node_modules/@eui/styles/dist/styles/eui.css",
+            "node_modules/@eui/styles/dist/styles/eui-components.css",
+            "node_modules/@eui/styles/dist/styles/eui-next.css",
+            "apps/@app.name@/src/styles.scss"
+        ],
+        "scripts": []
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/dependencies-base.json

@@ -0,0 +1,2 @@
+{
+}

package/scripts/csdr/cli/skeletons/app-eui10/dependencies-composite.json

@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "@eui/deps-base": "^10.0.0"
+    }
+}