@nestjs/schematics 7.1.2 → 7.2.1

package/dist/lib/application/files/js/package.json

@@ -29,7 +29,7 @@
     "@babel/preset-env": "^7.6.2",
     "@babel/register": "^7.6.2",
     "@babel/runtime": "^7.6.2",
-    "jest": "26.4.2",
+    "jest": "26.6.3",
     "nodemon": "^1.19.2",
     "prettier": "^1.18.2",
     "supertest": "^4.0.2"

package/dist/lib/application/files/ts/.eslintrc.js

@@ -6,10 +6,9 @@ module.exports = {
   },
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
-    'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
-    'prettier',
     'prettier/@typescript-eslint',
+    'plugin:prettier/recommended',
   ],
   root: true,
   env: {

package/dist/lib/application/files/ts/package.json

@@ -21,34 +21,34 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "^7.0.0",
-    "@nestjs/core": "^7.0.0",
-    "@nestjs/platform-express": "^7.0.0",
+    "@nestjs/common": "^7.5.1",
+    "@nestjs/core": "^7.5.1",
+    "@nestjs/platform-express": "^7.5.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^6.5.4"
+    "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@nestjs/cli": "^7.0.0",
-    "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.0",
-    "@types/express": "^4.17.3",
-    "@types/jest": "26.0.10",
-    "@types/node": "^13.9.1",
-    "@types/supertest": "^2.0.8",
-    "@typescript-eslint/eslint-plugin": "3.9.1",
-    "@typescript-eslint/parser": "3.9.1",
-    "eslint": "7.7.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
-    "jest": "26.4.2",
-    "prettier": "^1.19.1",
-    "supertest": "^4.0.2",
-    "ts-jest": "26.2.0",
-    "ts-loader": "^6.2.1",
-    "ts-node": "9.0.0",
+    "@nestjs/cli": "^7.5.1",
+    "@nestjs/schematics": "^7.1.3",
+    "@nestjs/testing": "^7.5.1",
+    "@types/express": "^4.17.8",
+    "@types/jest": "^26.0.15",
+    "@types/node": "^14.14.6",
+    "@types/supertest": "^2.0.10",
+    "@typescript-eslint/eslint-plugin": "^4.6.1",
+    "@typescript-eslint/parser": "^4.6.1",
+    "eslint": "^7.12.1",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "jest": "^26.6.3",
+    "prettier": "^2.1.2",
+    "supertest": "^6.0.0",
+    "ts-jest": "^26.4.3",
+    "ts-loader": "^8.0.8",
+    "ts-node": "^9.0.0",
     "tsconfig-paths": "^3.9.0",
-    "typescript": "^3.7.4"
+    "typescript": "^4.0.5"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -57,10 +57,13 @@
       "ts"
     ],
     "rootDir": "src",
-    "testRegex": ".spec.ts$",
+    "testRegex": ".*\\.spec\\.ts$",
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
     },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }

package/dist/lib/defaults.d.ts

@@ -5,6 +5,7 @@ export declare const DEFAULT_VERSION = "0.0.1";
 export declare const DEFAULT_PATH_NAME = "src";
 export declare const DEFAULT_LIB_PATH = "libs";
 export declare const DEFAULT_APPS_PATH = "apps";
+export declare const DEFAULT_APP_NAME = "app";
 export declare const DEFAULT_DIR_ENTRY_APP = "main";
 export declare const TEST_ENV = "test";
 export declare const PROJECT_TYPE: {

package/dist/lib/defaults.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROJECT_TYPE = exports.TEST_ENV = exports.DEFAULT_DIR_ENTRY_APP = exports.DEFAULT_APPS_PATH = exports.DEFAULT_LIB_PATH = exports.DEFAULT_PATH_NAME = exports.DEFAULT_VERSION = exports.DEFAULT_LANGUAGE = exports.DEFAULT_DESCRIPTION = exports.DEFAULT_AUTHOR = void 0;
+exports.PROJECT_TYPE = exports.TEST_ENV = exports.DEFAULT_DIR_ENTRY_APP = exports.DEFAULT_APP_NAME = exports.DEFAULT_APPS_PATH = exports.DEFAULT_LIB_PATH = exports.DEFAULT_PATH_NAME = exports.DEFAULT_VERSION = exports.DEFAULT_LANGUAGE = exports.DEFAULT_DESCRIPTION = exports.DEFAULT_AUTHOR = void 0;
 exports.DEFAULT_AUTHOR = '';
 exports.DEFAULT_DESCRIPTION = '';
 exports.DEFAULT_LANGUAGE = 'ts';
@@ -8,6 +8,7 @@ exports.DEFAULT_VERSION = '0.0.1';
 exports.DEFAULT_PATH_NAME = 'src';
 exports.DEFAULT_LIB_PATH = 'libs';
 exports.DEFAULT_APPS_PATH = 'apps';
+exports.DEFAULT_APP_NAME = 'app';
 exports.DEFAULT_DIR_ENTRY_APP = 'main';
 exports.TEST_ENV = 'test';
 exports.PROJECT_TYPE = {

package/dist/lib/resource/files/ts/__name__.controller.ts

@@ -1,7 +1,7 @@
-<% if (crud && type === 'rest') { %>import { Controller, Get, Post, Body, Put, Param, Delete } from '@nestjs/common';<% 
+<% if (crud && type === 'rest') { %>import { Controller, Get, Post, Body, Put, Param, Delete } from '@nestjs/common';<%
 } else if (crud && type === 'microservice') { %>import { Controller } from '@nestjs/common';
-import { MessagePattern, Payload } from '@nestjs/microservices';<% 
-} else { %>import { Controller } from '@nestjs/common';<% 
+import { MessagePattern, Payload } from '@nestjs/microservices';<%
+} else { %>import { Controller } from '@nestjs/common';<%
 } %>
 import { <%= classify(name) %>Service } from './<%= name %>.service';<% if (crud) { %>
 import { Create<%= singular(classify(name)) %>Dto } from './dto/create-<%= singular(name) %>.dto';
@@ -10,7 +10,7 @@ import { Update<%= singular(classify(name)) %>Dto } from './dto/update-<%= singu
 <% if (type === 'rest') { %>@Controller('<%= dasherize(name) %>')<% } else { %>@Controller()<% } %>
 export class <%= classify(name) %>Controller {
   constructor(private readonly <%= lowercased(name) %>Service: <%= classify(name) %>Service) {}<% if (type === 'rest' && crud) { %>
-  
+
   @Post()
   create(@Body() create<%= singular(classify(name)) %>Dto: Create<%= singular(classify(name)) %>Dto) {
     return this.<%= lowercased(name) %>Service.create(create<%= singular(classify(name)) %>Dto);

package/dist/lib/resource/files/ts/dto/create-__name@singular__.dto.ts

@@ -1 +1 @@
-export class Create<%= singular(classify(name)) %>Dto {}
+export class Create<%= singular(classify(name)) %>Dto {}

package/dist/lib/resource/files/ts/dto/create-__name@singular__.input.ts

@@ -4,4 +4,4 @@
 export class Create<%= singular(classify(name)) %>Input {
   @Field(() => Int, { description: 'Example field (placeholder)' })
   exampleField: number;
-}<% } else { %>export class Create<%= singular(classify(name)) %>Input {}<% } %>
+}<% } else { %>export class Create<%= singular(classify(name)) %>Input {}<% } %>

package/dist/lib/resource/files/ts/dto/update-__name@singular__.dto.ts

@@ -3,4 +3,4 @@ import { Create<%= singular(classify(name)) %>Dto } from './create-<%= singular(
 
 export class Update<%= singular(classify(name)) %>Dto extends PartialType(Create<%= singular(classify(name)) %>Dto) {<% if ((type === 'microservice' || type === 'ws') && crud) { %>
   id: number;
-<% }%>}
+<% }%>}

package/dist/lib/resource/files/ts/dto/update-__name@singular__.input.ts

@@ -1,13 +1,13 @@
-import { PartialType } from '@nestjs/mapped-types';
 import { Create<%= singular(classify(name)) %>Input } from './create-<%= singular(name) %>.input';<% if (type === 'graphql-code-first') { %>
-import { InputType, Field, Int } from '@nestjs/graphql';
+import { InputType, Field, Int, PartialType } from '@nestjs/graphql';
 
 @InputType()
 export class Update<%= singular(classify(name)) %>Input extends PartialType(Create<%= singular(classify(name)) %>Input) {
   @Field(() => Int)
   id: number;
 }<% } else { %>
+import { PartialType } from '@nestjs/graphql';
 
 export class Update<%= singular(classify(name)) %>Input extends PartialType(Create<%= singular(classify(name)) %>Input) {
   id: number;
-}<% } %>
+}<% } %>

package/dist/lib/sub-app/files/ts/src/__name__.controller.spec.ts

@@ -0,0 +1,22 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+describe('<%= classify(name) %>Controller', () => {
+  let <%= camelize(name) %>Controller: <%= classify(name) %>Controller;
+
+  beforeEach(async () => {
+    const app: TestingModule = await Test.createTestingModule({
+      controllers: [<%= classify(name) %>Controller],
+      providers: [<%= classify(name) %>Service],
+    }).compile();
+
+    <%= camelize(name) %>Controller = app.get<<%= classify(name) %>Controller>(<%= classify(name) %>Controller);
+  });
+
+  describe('root', () => {
+    it('should return "Hello World!"', () => {
+      expect(<%= camelize(name) %>Controller.getHello()).toBe('Hello World!');
+    });
+  });
+});

package/dist/lib/sub-app/files/ts/src/__name__.controller.ts

@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+@Controller()
+export class <%= classify(name) %>Controller {
+  constructor(private readonly <%= camelize(name) %>Service: <%= classify(name) %>Service) {}
+
+  @Get()
+  getHello(): string {
+    return this.<%= camelize(name) %>Service.getHello();
+  }
+}

package/dist/lib/sub-app/files/ts/src/__name__.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+@Module({
+  imports: [],
+  controllers: [<%= classify(name) %>Controller],
+  providers: [<%= classify(name) %>Service],
+})
+export class <%= classify(name) %>Module {}

package/dist/lib/sub-app/files/ts/src/{app.service.ts → __name__.service.ts}

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-export class AppService {
+export class <%= classify(name)%>Service {
   getHello(): string {
     return 'Hello World!';
   }

package/dist/lib/sub-app/files/ts/src/main.ts

@@ -1,8 +1,8 @@
 import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
+import { <%= classify(name) %>Module } from './<%= name %>.module';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create(<%= classify(name) %>Module);
   await app.listen(3000);
 }
 bootstrap();

package/dist/lib/sub-app/files/ts/test/app.e2e-spec.ts

@@ -1,13 +1,14 @@
 import { Test, TestingModule } from '@nestjs/testing';
+import { INestApplication } from '@nestjs/common';
 import * as request from 'supertest';
-import { AppModule } from './../src/app.module';
+import { <%= classify(name)%>Module } from './../src/<%= classify(name)%>.module';
 
-describe('AppController (e2e)', () => {
-  let app;
+describe('<%= classify(name)%>Controller (e2e)', () => {
+  let app: INestApplication;
 
   beforeEach(async () => {
     const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [AppModule],
+      imports: [<%= classify(name)%>Module],
     }).compile();
 
     app = moduleFixture.createNestApplication();

package/dist/lib/sub-app/sub-app.factory.js

@@ -43,7 +43,7 @@ function transform(options) {
     const target = Object.assign({}, options);
     const defaultSourceRoot = options.rootDir !== undefined ? options.rootDir : defaults_1.DEFAULT_APPS_PATH;
     if (!target.name) {
-        throw new schematics_1.SchematicsException('Option (name) is required.');
+        target.name = defaults_1.DEFAULT_APP_NAME;
     }
     target.language = !!target.language ? target.language : defaults_1.DEFAULT_LANGUAGE;
     target.name = core_1.strings.dasherize(target.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/schematics",
-  "version": "7.1.2",
+  "version": "7.2.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [
@@ -40,35 +40,35 @@
   },
   "homepage": "https://github.com/nestjs/schematics#readme",
   "dependencies": {
-    "@angular-devkit/core": "9.1.12",
-    "@angular-devkit/schematics": "9.1.12",
+    "@angular-devkit/core": "10.2.0",
+    "@angular-devkit/schematics": "10.2.0",
     "fs-extra": "9.0.1",
     "pluralize": "8.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^8.3.5",
-    "@commitlint/config-angular": "^8.3.4",
-    "@types/fs-extra": "9.0.1",
-    "@types/jest": "26.0.10",
-    "@types/node": "12.12.31",
-    "@typescript-eslint/eslint-plugin": "3.9.1",
-    "@typescript-eslint/parser": "3.9.1",
+    "@commitlint/cli": "^11.0.0",
+    "@commitlint/config-angular": "^11.0.0",
+    "@types/fs-extra": "9.0.3",
+    "@types/jest": "26.0.15",
+    "@types/node": "14.14.6",
+    "@typescript-eslint/eslint-plugin": "4.6.1",
+    "@typescript-eslint/parser": "4.6.1",
     "cpx": "1.5.0",
-    "eslint": "7.7.0",
-    "eslint-config-prettier": "6.11.0",
-    "eslint-plugin-import": "2.22.0",
+    "eslint": "7.12.1",
+    "eslint-config-prettier": "6.15.0",
+    "eslint-plugin-import": "2.22.1",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
-    "husky": "4.2.5",
-    "jest": "26.4.2",
+    "husky": "4.3.0",
+    "jest": "26.6.3",
     "nyc": "15.1.0",
-    "release-it": "^12.4.3",
-    "ts-jest": "26.2.0",
+    "release-it": "^14.2.1",
+    "ts-jest": "26.4.3",
     "ts-node": "9.0.0",
     "typescript": "3.9.7"
   },
   "peerDependencies": {
-    "typescript": "^3.4.5"
+    "typescript": "^3.4.5 || ^4.0.0"
   },
   "schematics": "./dist/collection.json",
   "husky": {

package/dist/lib/sub-app/files/ts/src/app.controller.spec.ts

@@ -1,22 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
-
-describe('AppController', () => {
-  let appController: AppController;
-
-  beforeEach(async () => {
-    const app: TestingModule = await Test.createTestingModule({
-      controllers: [AppController],
-      providers: [AppService],
-    }).compile();
-
-    appController = app.get<AppController>(AppController);
-  });
-
-  describe('root', () => {
-    it('should return "Hello World!"', () => {
-      expect(appController.getHello()).toBe('Hello World!');
-    });
-  });
-});

package/dist/lib/sub-app/files/ts/src/app.controller.ts

@@ -1,12 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-import { AppService } from './app.service';
-
-@Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get()
-  getHello(): string {
-    return this.appService.getHello();
-  }
-}

package/dist/lib/sub-app/files/ts/src/app.module.ts

@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
-
-@Module({
-  imports: [],
-  controllers: [AppController],
-  providers: [AppService],
-})
-export class AppModule {}