@eui/cli 21.0.0-alpha.9 → 21.0.0-next.2

package/lib/utils.js

@@ -1,3 +1,11 @@
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
+const fs = require('fs');
+const fse = require('fs-extra');
+const glob = require('glob');
+const path = require('path');
+const figlet = require('figlet');
+
 module.exports.getAngularPath = (targetPath, appName, appType, artifactId) => {
   switch(appType) {
     case 'angular':
@@ -11,3 +19,199 @@ module.exports.getAngularPath = (targetPath, appName, appType, artifactId) => {
       return `${targetPath}/client`;
   }
 }
+
+module.exports.getArgs = () => {
+  const argv = require('yargs').argv;
+
+  const processArgs = process.env._CSDR_ARGS;
+
+  let args = {};
+
+  if (processArgs) {
+    processArgs.split(',').forEach((item) => {
+      // check if it's defined as array - example format : someArray:test1=test1|test2=test2
+      if (item.indexOf('Array') > 0) {
+        const arrayItems = item.split(':')[1];
+        const subItems = arrayItems.split('|');
+        const array = [];
+        subItems.forEach((sub) => {
+          const subItemSplit = sub.split('=');
+          const newItem = {};
+          newItem[subItemSplit[0].trim()] = subItemSplit[1].trim();
+          array.push(newItem);
+        })
+        args[item.split(':')[0]] = array;
+
+      // otherwise normal key/value pairs - example format : test1:test1,test2:test2
+      } else {
+        const itemSplit = item.split(':');
+        args[itemSplit[0].trim()] = itemSplit[1].trim();
+      }
+    })
+  }
+
+  return {
+    root: argv._[0],
+    ...argv,
+    ...args
+  }
+}
+
+
+module.exports.logBigTitle = (text) => {
+  console.log('\n\n');
+  console.log('\x1b[33m', figlet.textSync(text, { horizontalLayout: 'full' }) ,'\x1b[0m');
+  console.log('\n');
+}
+
+module.exports.logTitle = (msg) => {
+  log(msg, 0);
+}
+
+const logInfo = module.exports.logInfo = (msg) => {
+  log(msg, 1);
+}
+
+module.exports.logSuccess = (msg) => {
+  if (!msg) msg = 'OK';
+  log(msg, 2);
+}
+
+module.exports.logError = (msg) => {
+  log(msg, 3);
+}
+module.exports.logErrorTrace = (filename, method, e) => {
+  log(`ERROR in ${filename}`, 3);
+  log(`...method : ${method}`, 3);
+  log(`...message : ${e.message}`, 3);
+}
+
+module.exports.logWarning = (msg) => {
+  log(msg, 4);
+}
+
+module.exports.logAccent = (msg) => {
+  log(msg, 5);
+}
+
+module.exports.logBanner = (msg) => {
+  log(msg, 6);
+}
+
+module.exports.logDebug = (msg) => {
+  if (getArgs().debug) {
+    log(msg, 7);
+  }
+}
+module.exports.logDebugTrace = (filename, method, e) => {
+  if (getArgs().debug) {
+    log(`ERROR in ${filename}`, 7);
+    log(`...method : ${method}`, 7);
+    log(`...message : ${e.message}`, 7);
+  }
+}
+module.exports.logDebugResponse = (response) => {
+  if (getArgs().debug) {
+    console.log(response);
+  }
+}
+
+module.exports.isDirEmpty = (path) => {
+  try {
+    var files = fse.readdirSync(path);
+
+    if (files.length === 0) {
+      return true;
+    } else {
+      return false;
+    }
+
+  } catch (err) {
+    return false;
+  }
+}
+
+const isFileExists = module.exports.isFileExists = (path) => {
+  try {
+      return fs.statSync(path);
+  } catch (err) {
+      return false;
+  }
+}
+
+
+module.exports.mkdir = (path) => {
+  if (!fs.existsSync(path)) {
+      fs.mkdirSync(path);
+  }
+}
+
+module.exports.copydir = (from, to, overwrite = true, globPattern = '**/*') => {
+  function _recursiveMkDir(dir) {
+    if (!fs.existsSync(dir)) {
+        _recursiveMkDir(path.dirname(dir));
+        fs.mkdirSync(dir);
+    }
+  }
+  
+  logInfo('----->copydir from : ' + from + ' ====> to : ' + to );
+  var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+  files.forEach(file => {
+      const origin = path.join(from, file);
+      const dest = path.join(to, file);
+      _recursiveMkDir(path.dirname(dest));
+      fse.copySync(origin, dest, { overwrite: overwrite });
+  });
+}
+
+module.exports.move = (from, to) => {
+    fse.removeSync(to);
+    fse.moveSync(from, to, );
+}
+
+module.exports.remove = (path) => {
+  fse.removeSync(path);
+}
+
+module.exports.copy = (origin, dest) => {
+  fse.copySync(origin, dest);
+}
+
+const log = (msg, type) => {
+  var msgContent;
+
+  if (type === 0 || !type) {
+      msgContent = `\n${msg.toUpperCase()}`;
+      console.info('\x1b[33m', msgContent ,'\x1b[0m');
+  }
+  if (type === 1) {
+      msgContent = `${msg}`;
+      console.info('\x1b[34m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 2) {
+      msgContent = `${msg}\n`;
+      console.info('\x1b[32m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 3) {
+      msgContent = `\n${msg}`;
+      console.info('\x1b[31m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 4) {
+      msgContent = `\n${msg}\n`;
+      console.info('\x1b[33m', msgContent ,'\x1b[0m');
+  }
+  if (type === 5) {
+      msgContent = `${msg}\n`;
+      console.info(msgContent);
+  }
+  if (type === 6) {
+      msgContent = msg
+      console.info('\n\n');
+      console.info(msgContent);
+      console.info('\n');
+  }
+  if (type === 7) {
+    msgContent = `${msg}`;
+    console.info(msgContent);
+  }
+}

package/package.json

@@ -1,33 +1,30 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.9",
+    "version": "21.0.0-next.2",
     "tag": "next",
     "license": "EUPL-1.1",
-    "description": "eUI CLI app generator",
+    "description": "eUI CLI app generator & tools",
     "bin": {
         "eui-cli": "bin/eui-cli.js"
     },
     "main": "./lib/cli.js",
     "repository": {
         "type": "git",
-        "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
+        "url": "https://sdlc.webcloud.ec.europa.eu/csdr/eui/eui.git"
     },
     "dependencies": {
-        "@eui/tools": "6.21.108"
-    },
-    "peerDependencies": {
-        "@eui/tools": "^6.0.0",
-        "chalk": "^4.1.0",
-        "figlet": "^1.7.0",
-        "replace-in-file": "^7.1.0",
-        "execa": "^5.1.1",
-        "inquirer": "^8.1.0"
+        "figlet": "1.9.3",
+        "inquirer": "6.5.0",
+        "yargs": "17.7.2",
+        "fs-extra": "9.0.0",
+        "glob": "7.2.3",
+        "cross-spawn": "7.0.6"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",
     "author": "ec.europa.eui@gmail.com",
     "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
         "yarn": ">=1.22.4 <2"
     }
 }

package/.version.properties

@@ -1 +0,0 @@
-19.3.2

package/lib/skeletons/_angular/base/.euirc.json

@@ -1,8 +0,0 @@
-{
-    "projects": {
-        "app": {
-            "name": "app",
-            "folder": "."
-        }
-    }
-}

package/lib/skeletons/web-symfony/myapp-web/angular.json

@@ -1,169 +0,0 @@
-{
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
-    "newProjectRoot": "projects",
-    "defaultProject": "app",
-    "cli": {
-        "analytics": false
-    },
-    "projects": {
-      "app": {
-        "root": "",
-        "sourceRoot": "src",
-        "projectType": "application",
-        "prefix": "app",
-        "schematics": {
-          "@schematics/angular:component": {
-            "styleext": "scss"
-          }
-        },
-        "architect": {
-          "build": {
-            "builder": "ngx-build-plus:build",
-            "options": {
-              "outputPath": "dist",
-              "index": "src/index.html",
-              "main": "src/main.ts",
-              "polyfills": "src/polyfills.ts",
-              "tsConfig": "src/tsconfig.app.json",
-              "assets": [
-                "src/favicon.ico",
-                "src/assets",
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/core/assets/",
-                  "output": "./assets"
-                },
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/styles/dist/assets/images",
-                  "output": "./assets/images"
-                }
-              ],
-              "styles": [
-                "node_modules/@eui/styles/dist/styles/eui.css",
-                "node_modules/@eui/styles/dist/styles/eui-utilities.css",
-                "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap-utilities.css",
-                "src/styles.scss"
-              ]
-            },
-            "configurations": {
-              "production": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.prod.ts"
-                  }
-                ],
-                "optimization": true,
-                "outputHashing": "all",
-                "sourceMap": false,
-                "extractCss": true,
-                "namedChunks": true,
-                "aot": true,
-                "extractLicenses": true,
-                "vendorChunk": false,
-                "buildOptimizer": true,
-                "budgets": [
-                  {
-                    "type": "initial",
-                    "maximumWarning": "3mb",
-                    "maximumError": "5mb"
-                  }
-                ]
-              },
-              "dev": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.dev.ts"
-                  }
-                ]
-              }
-            }
-          },
-          "serve": {
-            "builder": "@angular-devkit/build-angular:dev-server",
-            "options": {
-              "browserTarget": "app:build"
-            },
-            "configurations": {
-              "proxy-mock": {
-                "browserTarget": "app:build",
-                "proxyConfig": "proxy-mock.conf.json"
-              },
-              "proxy": {
-                "browserTarget": "app:build",
-                "proxyConfig": "proxy.conf.json"
-              },
-              "production": {
-                "browserTarget": "app:build:production"
-              }
-            }
-          },
-          "test": {
-            "builder": "@angular-devkit/build-angular:karma",
-            "options": {
-              "main": "src/test.ts",
-              "polyfills": "src/polyfills.ts",
-              "tsConfig": "src/tsconfig.spec.json",
-              "karmaConfig": "src/karma.conf.js",
-              "styles": [
-                "src/styles.scss"
-              ],
-              "scripts": [],
-              "assets": [
-                "src/favicon.ico",
-                "src/assets",
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/core/assets/",
-                  "output": "./assets"
-                }
-              ]
-            }
-          },
-          "lint": {
-            "builder": "@angular-devkit/build-angular:tslint",
-            "options": {
-              "tsConfig": [
-                "src/tsconfig.app.json",
-                "src/tsconfig.spec.json"
-              ],
-              "exclude": [
-                "**/node_modules/**"
-              ]
-            }
-          }
-        }
-      },
-      "app-e2e": {
-        "root": "e2e/",
-        "projectType": "application",
-        "prefix": "",
-        "architect": {
-          "e2e": {
-            "builder": "@angular-devkit/build-angular:protractor",
-            "options": {
-              "protractorConfig": "e2e/protractor.conf.js",
-              "devServerTarget": "app:serve"
-            },
-            "configurations": {
-              "production": {
-                "devServerTarget": "app:serve:production"
-              }
-            }
-          },
-          "lint": {
-            "builder": "@angular-devkit/build-angular:tslint",
-            "options": {
-              "tsConfig": "e2e/tsconfig.e2e.json",
-              "exclude": [
-                "**/node_modules/**"
-              ]
-            }
-          }
-        }
-      }
-    }
-  }

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,23 +0,0 @@
-{
-    "name": "eui-angular-app",
-    "version": "21.0.0-alpha.8",
-    "license": "EUPL-1.1",
-    "description": "eUI JEE Symfony app scripts",
-    "scripts": {
-        "ng": "ng",
-        "e2e": "ng e2e",
-        "stylelint": "stylelint \"src/**/*.scss\"",
-        "tslint": "tslint \"src/**/*.ts\"",
-        "clean": "rimraf out-tsc dist packages/**/dist/** packages/**/out-tsc/** packages/**/src/lib/**/*.js packages/**/src/lib/**/*.js.map",
-        "start-symfony": "eui-scripts start-symfony --configuration=dev",
-        "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
-        "start": "npm run clean && npm-run-all --parallel start-symfony start-serve",
-        "start-mean": "npm run clean && npm-run-all --parallel start-mock-server-mean start-serve",
-        "start-proxy": "npm run clean && eui-scripts serve-app --configuration=proxy",
-        "generate-changelog": "eui-scripts generate-changelog"
-    },
-    "private": true,
-    "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.8"
-    }
-}

package/lib/skeletons/web-symfony/myapp-web/src/app/app-routing.module.ts

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
-    { path: 'index.jsp', redirectTo: 'screen/home' },
-    { path: 'screen/home', loadChildren: './features/home/home.module#Module' },
-    { path: 'screen/products', loadChildren: './features/products/products.module#ProductsModule' },
-    { path: 'screen/module1', loadChildren: './features/module1/module1.module#Module' },
-    { path: 'screen/module2', loadChildren: './features/module2/module2.module#Module' }
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forRoot(routes),
-    ],
-})
-export class AppRoutingModule {}

package/lib/skeletons/web-symfony/myapp-web/src/app/app.component.ts

@@ -1,77 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
-import { Store } from '@ngrx/store';
-
-import { UserState, getUserState, UxLink, UxLanguage } from '@eui/core';
-
-@Component({
-    selector: 'app-root',
-    templateUrl: './app.component.html'
-})
-export class AppComponent implements OnInit {
-    userState: Observable<UserState>;
-
-    menuLinks: UxLink[] = [];
-    notificationLinks: UxLink[] = [];
-
-    constructor(
-        private translateService: TranslateService,
-        private store: Store<any>,
-    ) {
-    }
-
-    ngOnInit() {
-        this.userState = <any>this.store.select(getUserState);
-
-        this._createMenuLinks();
-        this._createNotifications();
-    }
-
-    onLanguageChanged(language: UxLanguage) {
-        this.translateService.use(language.code);
-    }
-
-    private _createMenuLinks() {
-        this.menuLinks = [
-            new UxLink(
-                {
-                    label: 'HOME', url: '/screen/home', isHome: true
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Module1', url: '/screen/module1', children: [
-                        new UxLink({ label: 'disabled item', disabled: true }),
-                        new UxLink({ label: 'Page 1', url: '/screen/module1/page1' }),
-                        new UxLink({ label: 'Page 2', url: '/screen/module1/page2' })
-                    ]
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Module2', url: '/screen/module2'
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Products', url: '/screen/products'
-                }
-            )
-        ];
-    }
-
-    private _createNotifications() {
-        this.notificationLinks = [
-            new UxLink(
-                { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-            new UxLink(
-                { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-            new UxLink(
-                 { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-        ];
-    }
-}