Merge pull request #1 from devonfw/develop

update repository

Author: mperezor19

documentation/_Footer.md

@@ -0,0 +1 @@
+<a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/"><img alt="Creative Commons License Agreement" style="border-width:0" src="http://i.creativecommons.org/l/by-nd/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">This documentation</span> is licensed under the <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons License (Attribution-NoDerivatives 4.0 International)</a>.

documentation/guides-cli.asciidoc

@@ -54,6 +54,12 @@ devon4node new -h
 | --dry-run             | Allow to test changes before execute command.
 | --skip-git, -g        | Allow to skip git repository initialization.
 | --skip-install, -s    | Allow to skip package installation.
+| --typeorm, -t         | Allow to select the type of database.
+| --config-module, -c   | Allow to add config module or not.
+| --swagger, -a         | Allow to add swagger module or not.
+| --security, -y        | Allow to add security (cors + HTTP security headers) or not.
+| --mailer, -m          | Allow to add mailer module or not.
+| --auth-jwt, -j        | Allow to add Auth JWT module or not.
 | --version, -v         | Show version number
 |========
 
@@ -62,6 +68,7 @@ Examples:
 ----
 devon4node new my-app -sg
 devon4node new my-app -n
+devon4node new my-app -n -typeorm sqlite -config-module -auth-jwt
 ----
 
 === generate

documentation/samples-step-by-step.asciidoc

@@ -199,21 +199,21 @@ export abstract class BaseEntity {
 ----
 @Entity()
 export class Employee extends BaseEntity {
-  @ApiModelPropertyOptional()
+  @ApiPropertyOptional()
   @IsDefined({ groups: [CrudValidationGroups.CREATE] })
   @IsOptional({ groups: [CrudValidationGroups.UPDATE] })
   @MaxLength(255)
   @Column('varchar', { length: 255, nullable: true })
   name?: string;
 
-  @ApiModelPropertyOptional()
+  @ApiPropertyOptional()
   @IsDefined({ groups: [CrudValidationGroups.CREATE] })
   @IsOptional({ groups: [CrudValidationGroups.UPDATE] })
   @MaxLength(255)
   @Column('varchar', { length: 255, nullable: true })
   surname?: string;
 
-  @ApiModelPropertyOptional()
+  @ApiPropertyOptional()
   @IsDefined({ groups: [CrudValidationGroups.CREATE] })
   @IsOptional({ groups: [CrudValidationGroups.UPDATE] })
   @MaxLength(255)
@@ -227,7 +227,7 @@ export class Employee extends BaseEntity {
 +
 [source,typescript]
 ----
-@ApiUseTags('employee')
+@ApiTags('employee')
 ----
 +
 . Generate database migrations

package.json

@@ -18,13 +18,12 @@
     "format": "lerna run format"
   },
   "dependencies": {
-    "@angular-devkit/core": "^9.0.5",
-    "@angular-devkit/schematics": "^9.0.5",
-    "@angular-devkit/schematics-cli": "^0.901.0",
-    "@devon4node/schematics": "^1.11.0",
+    "@angular-devkit/core": "^10.0.5",
+    "@angular-devkit/schematics": "^10.0.5",
+    "@angular-devkit/schematics-cli": "^0.1000.5",
     "@nestjs/cli": "^7.0.2",
     "@nestjs/schematics": "^7.0.0",
-    "@schematics/angular": "^9.0.5",
+    "@schematics/angular": "^10.0.5",
     "chalk": "^4.0.0",
     "fs-extra": "^9.0.0",
     "inquirer": "^7.0.6",
@@ -35,25 +34,25 @@
     "pluralize": "^8.0.0",
     "prettier": "^2.0.0",
     "rxjs": "^6.5.4",
-    "tmp-promise": "^2.0.2",
+    "tmp-promise": "^3.0.2",
     "ts-morph": "^7.0.0",
     "typeorm": "^0.2.24",
     "typescript": "^3.8.3",
     "yargs": "^15.1.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^8.3.5",
-    "@commitlint/config-conventional": "^8.3.4",
+    "@commitlint/cli": "^9.1.1",
+    "@commitlint/config-conventional": "^9.1.1",
     "@nestjs/common": "^7.0.4",
     "@nestjs/core": "^7.0.4",
     "@nestjs/platform-express": "^7.0.4",
     "@nestjs/testing": "^7.0.4",
-    "@types/inquirer": "^6.5.0",
+    "@types/inquirer": "^7.3.0",
     "@types/jasmine": "^3.5.2",
-    "@types/jest": "^25.1.4",
+    "@types/jest": "^26.0.9",
     "@types/js-yaml": "^3.12.2",
     "@types/lodash": "^4.14.149",
-    "@types/node": "^13.9.0",
+    "@types/node": "^14.0.27",
     "@types/node-fetch": "^2.5.5",
     "@types/nodemailer": "^6.4.0",
     "@types/pluralize": "^0.0.29",
@@ -62,10 +61,10 @@
     "@types/yargs": "^15.0.4",
     "@typescript-eslint/eslint-plugin": "^2.22.0",
     "@typescript-eslint/parser": "^2.22.0",
-    "class-transformer": "^0.2.3",
+    "class-transformer": "^0.3.1",
     "class-validator": "^0.12.0-rc.0",
     "commitizen": "^4.0.3",
-    "cz-conventional-changelog": "3.1.0",
+    "cz-conventional-changelog": "3.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
@@ -75,7 +74,6 @@
     "jasmine": "^3.5.0",
     "jest": "^25.2.3",
     "lerna": "^3.20.2",
-    "lint-staged": "^10.0.8",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.5.4",
     "ts-jest": "^25.2.1"
@@ -88,10 +86,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
+      "pre-commit": "lerna run lint"
     }
-  },
-  "lint-staged": {
-    "*.ts": "eslint --cache --fix"
   }
 }

packages/cli/bin/devon4node

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const devon4node = require("../dist/devon4node");
+const devon4node = require('../dist/devon4node');
 
 try {
   devon4node.executable();

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devon4node/cli",
-  "version": "2.0.3",
+  "version": "3.0.1",
   "description": "devon4node CLI",
   "bin": {
     "devon4node": "./bin/devon4node",
@@ -10,7 +10,7 @@
     "build": "tsc -p tsconfig.json",
     "build:prod": "tsc -p tsconfig.build.json",
     "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "eslint {src,apps,libs,test}/**/*.ts --fix",
+    "lint": "eslint src/**/*.ts --fix",
     "test": "npm run build && jasmine src/**/*.spec.js",
     "prepublish:npm": "npm run build:prod",
     "publish:npm": "npm publish --access public",
@@ -38,14 +38,14 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular-devkit/schematics-cli": "^0.901.0",
-    "@devon4node/schematics": "^2.0.3",
+    "@angular-devkit/schematics-cli": "^0.1000.5",
+    "@devon4node/schematics": "^3.0.1",
     "@nestjs/cli": "^7.0.2",
     "chalk": "^4.0.0",
     "inquirer": "^7.0.6",
     "node-fetch": "^2.6.0",
     "rxjs": "^6.5.4",
-    "tmp-promise": "^2.0.2",
+    "tmp-promise": "^3.0.2",
     "typeorm": "^0.2.24",
     "yargs": "^15.1.0"
   }

packages/cli/src/commands/new.command.ts

@@ -300,6 +300,36 @@ export function builder(args: yargs.Argv): yargs.Argv {
       alias: 's',
       describe: 'Allow to skip package installation.',
       type: 'boolean',
+    })
+    .option('typeorm', {
+      alias: 't',
+      describe: 'Allow to select the type of database.',
+      type: 'string',
+    })
+    .option('config-module', {
+      alias: 'c',
+      describe: 'Allow to add config module or not.',
+      type: 'boolean',
+    })
+    .option('swagger', {
+      alias: 'a',
+      describe: 'Allow to add swagger module or not.',
+      type: 'boolean',
+    })
+    .option('security', {
+      alias: 'y',
+      describe: 'Allow to add security (cors + HTTP security headers) or not.',
+      type: 'boolean',
+    })
+    .option('mailer', {
+      alias: 'm',
+      describe: 'Allow to add mailer module or not.',
+      type: 'boolean',
+    })
+    .option('auth-jwt', {
+      alias: 'j',
+      describe: 'Allow to add Auth JWT module or not.',
+      type: 'boolean',
     });
 }
 
@@ -402,12 +432,80 @@ export async function generateCode(args: yargs.Arguments<any>): Promise<void> {
     process.exit(1);
   }
 
-  inputs.push({ name: 'name', value: name });
+  const allInOne: ICollectionToRun[] = [];
+
+  allInOne.push({
+    name: 'application',
+    options: {
+      name,
+      language: 'ts',
+    },
+  });
+
+  if (args.c) {
+    allInOne.push({
+      name: 'config-module',
+      options: {
+        path: name,
+      },
+    });
+  }
+
+  if (args.t) {
+    allInOne.push({
+      name: 'typeorm',
+      options: {
+        path: name,
+        db: args.t,
+      },
+    });
+  }
+
+  if (args.y) {
+    allInOne.push({
+      name: 'security',
+      options: {
+        path: name,
+      },
+    });
+  }
+
+  if (args.m) {
+    allInOne.push({
+      name: 'mailer',
+      options: {
+        path: name,
+      },
+    });
+  }
+
+  if (args.a) {
+    allInOne.push({
+      name: 'swagger',
+      options: {
+        path: name,
+      },
+    });
+  }
+
+  if (args.j) {
+    allInOne.push({
+      name: 'auth-jwt',
+      options: {
+        path: name,
+      },
+    });
+  }
+
+  const file = await tmp.file();
+  writeFileSync(file.path, JSON.stringify(allInOne));
+
+  inputs.push({ name: 'path', value: '"' + file.path + '"' });
   if (args.d) {
     inputs.push({ name: 'dry-run', value: !!args.d });
   }
 
-  await generateApplicationFiles('@devon4node/schematics:application', inputs);
+  await generateApplicationFiles('@devon4node/schematics:all-in-one', inputs);
 
   if (!args.d) {
     if (!args.g) {
@@ -427,6 +525,8 @@ export async function generateCode(args: yargs.Arguments<any>): Promise<void> {
  * @param args program arguments
  */
 export async function handler(args: yargs.Arguments): Promise<void> {
+  args.name = strings.dasherize(args.name as string);
+
   if (args.n) {
     await generateCode(args);
   } else {

packages/cli/src/utils/utils.ts

@@ -6,6 +6,7 @@ import { ChildProcess, spawn } from 'child_process';
 import { writeFile } from 'fs';
 import fetch from 'node-fetch';
 import { join, resolve } from 'path';
+import { strings } from '@angular-devkit/core';
 
 export function mapSchematicOptions(collectionName: string, options: Input[]): string[] {
   return options.reduce(
@@ -86,10 +87,11 @@ export async function addGitIgnore(folder: string): Promise<void> {
 }
 
 export async function initGit(appPath: string): Promise<void> {
+  const path = strings.dasherize(appPath);
   console.log(chalk.blueBright('Initializing git repository... please wait'));
   const runner = new GitRunner();
-  await runner.run('init', true, join(process.cwd(), appPath));
-  await addGitIgnore(join(process.cwd(), appPath));
+  await runner.run('init', true, join(process.cwd(), path));
+  await addGitIgnore(join(process.cwd(), path));
   console.log(chalk.greenBright('Git initialization ends successfuly'));
 }
 

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devon4node/common",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "devon4node common library.",
   "main": "dist/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "publish:next": "npm publish --access public --tag next",
     "test": "jest",
     "format": "prettier --write \"**/*.ts\"",
-    "lint": "eslint {utils,serializer}/**/*.ts --fix"
+    "lint": "eslint serializer/**/*.ts --fix"
   },
   "keywords": [
     "nestjs",
@@ -31,9 +31,9 @@
   },
   "peerDependencies": {
     "@nestjs/common": "^7.0.4",
-    "class-transformer": "^0.2.3",
+    "class-transformer": "^0.3.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.5.3"
+    "rxjs": "^6.5.4"
   },
   "repository": {
     "type": "git",

packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devon4node/config",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "devon4node module for easy application configuration.",
   "main": "dist/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "prepublish:next": "npm run build",
     "publish:next": "npm publish --access public --tag next",
     "format": "prettier --write \"lib/**/*.ts\"",
-    "lint": "eslint {src,apps,lib,test}/**/*.ts --fix",
+    "lint": "eslint {lib,test}/**/*.ts --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -32,8 +32,8 @@
   "license": "Apache-2.0",
   "peerDependencies": {
     "@nestjs/common": "^7.0.4",
-    "class-transformer": "^0.2.3",
-    "class-validator": "^0.11.1",
+    "class-transformer": "^0.3.1",
+    "class-validator": "^0.12.0-rc.0",
     "lodash": "^4.17.15"
   },
   "repository": {