@eui/cli 21.0.0-alpha.4 → 21.0.0-alpha.40

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/services/BuildingSearchCriteria.java

@@ -0,0 +1,26 @@
+package @app.group.id@.@app.name@.services;
+
+import org.springframework.util.Assert;
+
+import java.io.Serializable;
+
+public class BuildingSearchCriteria implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String name;
+
+    public BuildingSearchCriteria() {
+    }
+
+    public BuildingSearchCriteria(String name) {
+        Assert.notNull(name, "The name of the building should not be null.");
+        this.name = name;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/services/BuildingService.java

@@ -0,0 +1,10 @@
+package @app.group.id@.@app.name@.services;
+
+import @app.group.id@.@app.name@.domain.Building;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface BuildingService {
+    Page<Building> findAll(Pageable pageable);
+    Page<Building> find(BuildingSearchCriteria criteria, Pageable pageable);
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/java/myapp/services/BuildingServiceImpl.java

@@ -0,0 +1,26 @@
+package @app.group.id@.@app.name@.services;
+
+import @app.group.id@.@app.name@.domain.Building;
+import @app.group.id@.@app.name@.repositories.BuildingRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
+@Component()
+public class BuildingServiceImpl implements BuildingService {
+    private BuildingRepository buildingRepository;
+
+    public BuildingServiceImpl(BuildingRepository buildingRepository) {
+        this.buildingRepository = buildingRepository;
+    }
+
+    @Override
+    public Page<Building> findAll(Pageable pageable) {
+        return buildingRepository.findAll(pageable);
+    }
+
+    @Override
+    public Page<Building> find(BuildingSearchCriteria criteria, Pageable pageable) {
+        return buildingRepository.findByNameContainingAllIgnoringCase(criteria.getName(), pageable);
+    }
+}

package/lib/skeletons/web-spring-boot/myapp-web-rest/src/main/resources/data.sql

@@ -0,0 +1,11 @@
+insert into t_address (address_id, street, postal_code, city, country) values (-4, 'rue Montoyer, 15', '1000', 'Bruxelles', 'Belgium');
+insert into t_building (building_id, name, address_id) values ((select seq_building.nextval from dual), 'Montoyer 15 "Black Pearl"', -4);
+
+insert into t_address (address_id, street, postal_code, city, country) values (-3, 'rue de la Loi, 200', '1040', 'Bruxelles', 'Belgium');
+insert into t_building (building_id, name, address_id) values ((select seq_building.nextval from dual), 'Berlaymont', -3);
+
+insert into t_address (address_id, street, postal_code, city, country) values (-2, 'rue Breydel, 4', '1040', 'Bruxelles', 'Belgium');
+insert into t_building (building_id, name, address_id) values ((select seq_building.nextval from dual), 'Belliard 232', -2);
+
+insert into t_address (address_id, street, postal_code, city, country) values (-1, 'Place Rogier, 16', '1210', 'Saint-Josse', 'Belgium');
+insert into t_building (building_id, name, address_id) values ((select seq_building.nextval from dual), 'Covent Garden 2', -1);

package/lib/skeletons/web-spring-boot/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>@app.group.id@.@app.name@</groupId>
+    <artifactId>@app.name@</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>@app.name@</name>
+    <description>Demo project for Spring Boot</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.4.4</version>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>21</java.version>
+    </properties>
+
+    <modules>
+        <module>@app.name@-web-rest</module>
+        <module>@app.name@-web</module>
+    </modules>
+
+</project>

package/lib/utils.js

@@ -0,0 +1,217 @@
+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':
+    case 'mobile':
+      return targetPath;
+    case 'web-maven':
+      return `${targetPath}/src/main/angular`;
+    case 'web-spring-boot':
+      return `${targetPath}/${artifactId}-web/src/main/angular`;
+    case 'web-symfony':
+      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.4",
+    "version": "21.0.0-alpha.40",
     "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.106"
-    },
-    "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/sonar-project.properties

@@ -0,0 +1,14 @@
+sonar.projectKey=CSDR-EUI-CLI
+sonar.projectName=EUI-CLI
+sonar.projectVersion=375ec32
+
+
+sonar.sources=/builds/csdr/eui/eui/packages/cli
+sonar.sourceEncoding=UTF-8
+
+sonar.test.inclusions=**/*.spec.ts
+
+sonar.ts.tslint.configPath=tslint.json
+sonar.typescript.lcov.reportPaths=/builds/csdr/eui/eui/packages/cli/test/reports/coverage-lcov/lcov.info
+
+sonar.exclusions=**/*.js, **/mock/**/*, **/mocks/**/*