@eui/cli 15.4.1 → 15.4.2

package/bin/eui-cli.js

@@ -1,70 +1,70 @@
-#!/usr/bin/env node
-
-const tools = require('@eui/tools/scripts/utils/tools');
-const chalk = require('chalk');
-const figlet = require('figlet');
-const path = require('path');
-const generators = require('../lib/generators');
-const config = require('../lib/config');
-
-// fetching cli arguments
-const args = tools.getArgs();
-
-// Print header and version
-console.info(
-  '\n\n',
-  chalk.yellow(figlet.textSync('eUI CLI', { horizontalLayout: 'full' })),
-  chalk.green(`\n  v${config.version}\n`)
-);
-
-// remapping config if passed as argument - automated mode
-var inputConfig = config.parseInputConfig(args.config);
-
-
-// Detecting targetPath and create it if present as argument - local and automated mode
-let targetPath;
-
-if (args.targetPath) {
-  targetPath = path.join(config.targetPath, args.targetPath);
-
-  if (args.m) {
-    targetPath = path.join(targetPath, 'packages');
-  }
-
-  if (!tools.isDirExists(targetPath)) {
-    tools.mkdir(targetPath);
-  }
-
-// otherwise taking the default config targetPath defined
-} else {
-  if (args.m) {
-    targetPath = path.join(config.targetPath, 'packages');
-
-  } else {
-    targetPath = config.targetPath;
-  }
-}
-
-if (args.v) {
-  console.info('Current eUI CLI version installed : ' + config.version);
-
-// } else if (args.m) {
-//   // module/sub-package generator
-//   return generators.moduleGenerate({
-//     inputConfig: inputConfig,
-//     targetPath: targetPath
-//   });
-
-// } else if (args.f) {
-//   return generators.featureGenerate({
-//     inputConfig: inputConfig,
-//     targetPath: targetPath
-//   });
-
-} else {
-  // Application generator
-  return generators.appGenerate({
-    inputConfig: inputConfig,
-    targetPath: targetPath
-  });
-}
+#!/usr/bin/env node
+
+const tools = require('@eui/tools/scripts/utils/tools');
+const chalk = require('chalk');
+const figlet = require('figlet');
+const path = require('path');
+const generators = require('../lib/generators');
+const config = require('../lib/config');
+
+// fetching cli arguments
+const args = tools.getArgs();
+
+// Print header and version
+console.info(
+  '\n\n',
+  chalk.yellow(figlet.textSync('eUI CLI', { horizontalLayout: 'full' })),
+  chalk.green(`\n  v${config.version}\n`)
+);
+
+// remapping config if passed as argument - automated mode
+var inputConfig = config.parseInputConfig(args.config);
+
+
+// Detecting targetPath and create it if present as argument - local and automated mode
+let targetPath;
+
+if (args.targetPath) {
+  targetPath = path.join(config.targetPath, args.targetPath);
+
+  if (args.m) {
+    targetPath = path.join(targetPath, 'packages');
+  }
+
+  if (!tools.isDirExists(targetPath)) {
+    tools.mkdir(targetPath);
+  }
+
+// otherwise taking the default config targetPath defined
+} else {
+  if (args.m) {
+    targetPath = path.join(config.targetPath, 'packages');
+
+  } else {
+    targetPath = config.targetPath;
+  }
+}
+
+if (args.v) {
+  console.info('Current eUI CLI version installed : ' + config.version);
+
+// } else if (args.m) {
+//   // module/sub-package generator
+//   return generators.moduleGenerate({
+//     inputConfig: inputConfig,
+//     targetPath: targetPath
+//   });
+
+// } else if (args.f) {
+//   return generators.featureGenerate({
+//     inputConfig: inputConfig,
+//     targetPath: targetPath
+//   });
+
+} else {
+  // Application generator
+  return generators.appGenerate({
+    inputConfig: inputConfig,
+    targetPath: targetPath
+  });
+}

package/lib/build.js

@@ -1,153 +1,153 @@
-const tools = require('@eui/tools/scripts/utils/tools');
-const configUtils = require('@eui/tools/scripts/csdr/config/config-utils');
-const gitUtils = require('@eui/tools/scripts/utils/git-utils');
-const path = require('path');
-const fs = require('fs');
-const utils = require('./utils');
-const config = require('./config');
-const childProcess = require("child_process");
-const replace = require('replace-in-file');
-const execa = require('execa');
-const execSync = childProcess.execSync;
-
-module.exports.start = (options) => {
-  return Promise.resolve()
-    .then(() => {
-      return build(options.config, options.targetPath)
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-const build = (cliConfig, targetPath) => {
-  let {appName, appType, appSubType, tag, groupId, artifactId, ...args} = cliConfig;
-
-  console.log(`Building app : ${appType}`);
-
-  return Promise.resolve()
-    .then(() => {
-      let target = targetPath;
-      console.log(`--cleaning target : ${target}`);
-
-      if (!tools.isDirEmpty(target)) {
-        tools.logError(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
-        throw new Error('DIR_NOT_EMPTY');
-      } else {
-        return tools.rimraf(`${target}/**/*`);
-      }
-    })
-
-    .then(() => {
-
-      // BUILD ANGULAR
-      if (appType === 'angular' || appType === 'mobile') {
-        return Promise.resolve()
-          .then(() => {
-            console.log('---building angular');
-            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-            console.log(angularPath);
-            return copyAngular(angularPath, cliConfig, true);
-          })
-          .catch((e) => {
-            throw e;
-          })
-      }
-
-      // BUILD web-maven
-      if (appType === 'web-maven') {
-        return Promise.resolve()
-          .then(() => {
-            console.log('--building web-maven');
-            return tools.copydir(config.webMavenPath, targetPath);
-          })
-          .then(() => {
-            const angularPath = utils.getAngularPath(targetPath, appName, appType);
-            return copyAngular(angularPath, cliConfig);
-          })
-          .catch((e) => {
-            throw e;
-          })
-      }
-
-      // BUILD web-spring-boot
-      if (appType === 'web-spring-boot') {
-        return Promise.resolve()
-          .then(() => {
-            console.log('--building web-spring-boot');
-            return execSync(`mvn generate-sources -f ./maven-build/pom.xml -Pbuild-web-spring-boot -Dsrc.path=${config.webSpringBootPath} -Dtarget.path=${targetPath} -Dapp.group.id=${groupId} -Dapp.artifact.id=${artifactId}`, {
-              cwd: path.join(__dirname),
-              stdio: "inherit"
-            });
-          })
-          .then(() => {
-            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-            return copyAngular(angularPath, cliConfig, false);
-          })
-          .catch((e) => {
-            throw e;
-          })
-      }
-
-
-      // BUILD symfony
-      if (appType === 'web-symfony') {
-
-        return Promise.resolve()
-          .then(() => {
-            console.log('--cloning eui php starter repository')
-            execa.shellSync(`git clone https://${config.webPhpStarterRepo} ${targetPath}`);
-          })
-          .then(() => {
-            console.log('--building web-symfony');
-            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-            return copyAngular(angularPath, cliConfig, false);
-          })
-          .then(() => {
-            execa.shellSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
-          })
-          .catch((e) => {
-            throw e;
-          })
-          .finally(() => {
-            return tools.rimraf(`${targetPath}/.git`);
-          })
-      }
-
-    })
-    .catch((e) => {
-      console.log(e);
-      throw e;
-    })
-}
-
-
-
-
-const copyAngular = (targetPath, cliConfig, overwrite = true) => {
-  return Promise.resolve()
-    .then(() => {
-      const {angularBasePath} = config;
-      const sourcePath = angularBasePath;
-
-      return tools.copydir(sourcePath, targetPath, overwrite);
-    })
-    .then(() => {
-      if (cliConfig.appType === 'mobile') {
-        return tools.copydir(config.angularBaseMobilePath, targetPath);
-      }
-    })
-    .then(() => {
-      if (cliConfig.appOptions && cliConfig.appOptions.length !== 0) {
-        cliConfig.appOptions.forEach((item) => {
-          console.log('Applying option : ' + item);
-          tools.copydir(config.optionsPath[item], targetPath, true);
-        })
-      }
-      return Promise.resolve();
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
+const tools = require('@eui/tools/scripts/utils/tools');
+const configUtils = require('@eui/tools/scripts/csdr/config/config-utils');
+const gitUtils = require('@eui/tools/scripts/utils/git-utils');
+const path = require('path');
+const fs = require('fs');
+const utils = require('./utils');
+const config = require('./config');
+const childProcess = require("child_process");
+const replace = require('replace-in-file');
+const execa = require('execa');
+const execSync = childProcess.execSync;
+
+module.exports.start = (options) => {
+  return Promise.resolve()
+    .then(() => {
+      return build(options.config, options.targetPath)
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+const build = (cliConfig, targetPath) => {
+  let {appName, appType, appSubType, tag, groupId, artifactId, ...args} = cliConfig;
+
+  console.log(`Building app : ${appType}`);
+
+  return Promise.resolve()
+    .then(() => {
+      let target = targetPath;
+      console.log(`--cleaning target : ${target}`);
+
+      if (!tools.isDirEmpty(target)) {
+        tools.logError(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
+        throw new Error('DIR_NOT_EMPTY');
+      } else {
+        return tools.rimraf(`${target}/**/*`);
+      }
+    })
+
+    .then(() => {
+
+      // BUILD ANGULAR
+      if (appType === 'angular' || appType === 'mobile') {
+        return Promise.resolve()
+          .then(() => {
+            console.log('---building angular');
+            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
+            console.log(angularPath);
+            return copyAngular(angularPath, cliConfig, true);
+          })
+          .catch((e) => {
+            throw e;
+          })
+      }
+
+      // BUILD web-maven
+      if (appType === 'web-maven') {
+        return Promise.resolve()
+          .then(() => {
+            console.log('--building web-maven');
+            return tools.copydir(config.webMavenPath, targetPath);
+          })
+          .then(() => {
+            const angularPath = utils.getAngularPath(targetPath, appName, appType);
+            return copyAngular(angularPath, cliConfig);
+          })
+          .catch((e) => {
+            throw e;
+          })
+      }
+
+      // BUILD web-spring-boot
+      if (appType === 'web-spring-boot') {
+        return Promise.resolve()
+          .then(() => {
+            console.log('--building web-spring-boot');
+            return execSync(`mvn generate-sources -f ./maven-build/pom.xml -Pbuild-web-spring-boot -Dsrc.path=${config.webSpringBootPath} -Dtarget.path=${targetPath} -Dapp.group.id=${groupId} -Dapp.artifact.id=${artifactId}`, {
+              cwd: path.join(__dirname),
+              stdio: "inherit"
+            });
+          })
+          .then(() => {
+            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
+            return copyAngular(angularPath, cliConfig, false);
+          })
+          .catch((e) => {
+            throw e;
+          })
+      }
+
+
+      // BUILD symfony
+      if (appType === 'web-symfony') {
+
+        return Promise.resolve()
+          .then(() => {
+            console.log('--cloning eui php starter repository')
+            execa.shellSync(`git clone https://${config.webPhpStarterRepo} ${targetPath}`);
+          })
+          .then(() => {
+            console.log('--building web-symfony');
+            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
+            return copyAngular(angularPath, cliConfig, false);
+          })
+          .then(() => {
+            execa.shellSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
+          })
+          .catch((e) => {
+            throw e;
+          })
+          .finally(() => {
+            return tools.rimraf(`${targetPath}/.git`);
+          })
+      }
+
+    })
+    .catch((e) => {
+      console.log(e);
+      throw e;
+    })
+}
+
+
+
+
+const copyAngular = (targetPath, cliConfig, overwrite = true) => {
+  return Promise.resolve()
+    .then(() => {
+      const {angularBasePath} = config;
+      const sourcePath = angularBasePath;
+
+      return tools.copydir(sourcePath, targetPath, overwrite);
+    })
+    .then(() => {
+      if (cliConfig.appType === 'mobile') {
+        return tools.copydir(config.angularBaseMobilePath, targetPath);
+      }
+    })
+    .then(() => {
+      if (cliConfig.appOptions && cliConfig.appOptions.length !== 0) {
+        cliConfig.appOptions.forEach((item) => {
+          console.log('Applying option : ' + item);
+          tools.copydir(config.optionsPath[item], targetPath, true);
+        })
+      }
+      return Promise.resolve();
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/lib/cli.js

@@ -1,111 +1,111 @@
-const inquirer = require('inquirer');
-
-const defaultConfig = {
-  appName: 'my-app',
-  appScope: '@app',
-  appType: 'angular',
-  appOptions: [],
-  appFeatures: [],
-  groupId: 'ec.europa.digit',
-  artifactId: 'myapp',
-  useYarn: true,
-  npmInstall: true,
-};
-
-module.exports.start = (options) => {
-
-  // if inputConfig is provided, we merge it with defaultConfig and return without CLI interactions
-  if (options.inputConfig) {
-    return {
-      ...defaultConfig,
-      ...options.inputConfig
-    };
-  }
-
-  // CLI interactions
-  return Promise.resolve()
-    .then(() => {
-      return inquirer.prompt([
-        {
-          type: 'list',
-          name: 'appType',
-          message: 'Select an application type :',
-          choices: [
-            { name: 'eUI Angular - Desktop', value: 'angular' },
-            { name: 'eUI Angular - Mobile Ionic', value: 'mobile' },
-            { name: 'eUI Angular + Spring Boot web module - JDK + Maven required !!!', value: 'web-spring-boot' },
-            { name: 'eUI Angular + Maven web module (JEE Spring maven web module) - JDK + Maven required !!!', value: 'web-maven' },
-            { name: 'eUI Angular + PHP/Symfony starter - PHP7 and composer required !!!', value: 'web-symfony' },
-          ],
-          default: 0,
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          name: 'groupId',
-          type: 'input',
-          message: 'Enter the groupId :',
-          default: defaultConfig.groupId,
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          },
-          when: function (answers) {
-            return (answers.appType === 'web-spring-boot');
-          }
-        },
-        {
-          name: 'artifactId',
-          type: 'input',
-          message: 'Enter the artifactId :',
-          default: defaultConfig.artifactId,
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          },
-          when: function (answers) {
-            return (answers.appType === 'web-spring-boot');
-          }
-        },
-        {
-          type: 'checkbox',
-          name: 'appOptions',
-          default: defaultConfig.appOptions,
-          message: 'Select one or more additional configuration options :',
-          choices: [
-            { name: 'OpenId Connect JWT implementation', value: 'openid-jwt' },
-            { name: 'ECL app-shell template and configuration - for ec.europa.eu apps', value: 'ecl' },
-          ],
-          when: function (answers) {
-            return (answers.appType !== 'mobile');
-          }
-        },
-
-        {
-          name: 'npmInstall',
-          type: 'confirm',
-          message: 'Yarn install dependencies when the app is generated :',
-          default: defaultConfig.npmInstall
-        }
-      ]);
-    })
-    .then((answers) => {
-      let outputConfig;
-      outputConfig = {
-        ...defaultConfig,
-        ...answers
-      };
-      console.log('--provided config : \n', outputConfig);
-      return outputConfig;
-    })
-    .catch((e) => {
-      throw e;
-    })
-
-}
-
+const inquirer = require('inquirer');
+
+const defaultConfig = {
+  appName: 'my-app',
+  appScope: '@app',
+  appType: 'angular',
+  appOptions: [],
+  appFeatures: [],
+  groupId: 'ec.europa.digit',
+  artifactId: 'myapp',
+  useYarn: true,
+  npmInstall: true,
+};
+
+module.exports.start = (options) => {
+
+  // if inputConfig is provided, we merge it with defaultConfig and return without CLI interactions
+  if (options.inputConfig) {
+    return {
+      ...defaultConfig,
+      ...options.inputConfig
+    };
+  }
+
+  // CLI interactions
+  return Promise.resolve()
+    .then(() => {
+      return inquirer.prompt([
+        {
+          type: 'list',
+          name: 'appType',
+          message: 'Select an application type :',
+          choices: [
+            { name: 'eUI Angular - Desktop', value: 'angular' },
+            { name: 'eUI Angular - Mobile Ionic', value: 'mobile' },
+            { name: 'eUI Angular + Spring Boot web module - JDK + Maven required !!!', value: 'web-spring-boot' },
+            { name: 'eUI Angular + Maven web module (JEE Spring maven web module) - JDK + Maven required !!!', value: 'web-maven' },
+            { name: 'eUI Angular + PHP/Symfony starter - PHP7 and composer required !!!', value: 'web-symfony' },
+          ],
+          default: 0,
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          }
+        },
+        {
+          name: 'groupId',
+          type: 'input',
+          message: 'Enter the groupId :',
+          default: defaultConfig.groupId,
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          },
+          when: function (answers) {
+            return (answers.appType === 'web-spring-boot');
+          }
+        },
+        {
+          name: 'artifactId',
+          type: 'input',
+          message: 'Enter the artifactId :',
+          default: defaultConfig.artifactId,
+          validate: function (value) {
+            if (value.length) {
+              return true;
+            }
+          },
+          when: function (answers) {
+            return (answers.appType === 'web-spring-boot');
+          }
+        },
+        {
+          type: 'checkbox',
+          name: 'appOptions',
+          default: defaultConfig.appOptions,
+          message: 'Select one or more additional configuration options :',
+          choices: [
+            { name: 'OpenId Connect JWT implementation', value: 'openid-jwt' },
+            { name: 'ECL app-shell template and configuration - for ec.europa.eu apps', value: 'ecl' },
+          ],
+          when: function (answers) {
+            return (answers.appType !== 'mobile');
+          }
+        },
+
+        {
+          name: 'npmInstall',
+          type: 'confirm',
+          message: 'Yarn install dependencies when the app is generated :',
+          default: defaultConfig.npmInstall
+        }
+      ]);
+    })
+    .then((answers) => {
+      let outputConfig;
+      outputConfig = {
+        ...defaultConfig,
+        ...answers
+      };
+      console.log('--provided config : \n', outputConfig);
+      return outputConfig;
+    })
+    .catch((e) => {
+      throw e;
+    })
+
+}
+