Merge branch 'master' of https://github.com/nestjs/nest

liudpfork · Sep 13, 2018 · 14f737f · 14f737f
2 parents a9922da + b1f7096
commit 14f737f
Show file tree

Hide file tree

Showing 84 changed files with 7,005 additions and 109 deletions.
diff --git a/packages/common/cache/interfaces/cache-module.interface.ts b/packages/common/cache/interfaces/cache-module.interface.ts
@@ -1,4 +1,4 @@
-import { ModuleMetadata, Type } from './../../interfaces';
+import { ModuleMetadata, Type } from '../../interfaces';
 import { CacheManagerOptions } from './cache-manager.interface';
 
 export interface CacheModuleOptions extends CacheManagerOptions {

diff --git a/packages/common/exceptions/bad-gateway.exception.ts b/packages/common/exceptions/bad-gateway.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class BadGatewayException extends HttpException {
   constructor(message?: string | object | any, error = 'Bad Gateway') {

diff --git a/packages/common/exceptions/bad-request.exception.ts b/packages/common/exceptions/bad-request.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class BadRequestException extends HttpException {
   constructor(message?: string | object | any, error = 'Bad Request') {

diff --git a/packages/common/exceptions/conflict.exception.ts b/packages/common/exceptions/conflict.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class ConflictException extends HttpException {
   constructor(message?: string | object | any, error = 'Conflict') {

diff --git a/packages/common/exceptions/forbidden.exception.ts b/packages/common/exceptions/forbidden.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class ForbiddenException extends HttpException {
   constructor(message?: string | object | any, error = 'Forbidden') {

diff --git a/packages/common/exceptions/gateway-timeout.exception.ts b/packages/common/exceptions/gateway-timeout.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class GatewayTimeoutException extends HttpException {
   constructor(message?: string | object | any, error = 'Gateway Timeout') {

diff --git a/packages/common/exceptions/gone.exception.ts b/packages/common/exceptions/gone.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class GoneException extends HttpException {
   constructor(message?: string | object | any, error = 'Gone') {

diff --git a/packages/common/exceptions/internal-server-error.exception.ts b/packages/common/exceptions/internal-server-error.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class InternalServerErrorException extends HttpException {
   constructor(

diff --git a/packages/common/exceptions/method-not-allowed.exception.ts b/packages/common/exceptions/method-not-allowed.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class MethodNotAllowedException extends HttpException {
   constructor(message?: string | object | any, error = 'Method Not Allowed') {

diff --git a/packages/common/exceptions/not-acceptable.exception.ts b/packages/common/exceptions/not-acceptable.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class NotAcceptableException extends HttpException {
   constructor(message?: string | object | any, error = 'Not Acceptable') {

diff --git a/packages/common/exceptions/not-found.exception.ts b/packages/common/exceptions/not-found.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class NotFoundException extends HttpException {
   constructor(message?: string | object | any, error = 'Not Found') {

diff --git a/packages/common/exceptions/not-implemented.exception.ts b/packages/common/exceptions/not-implemented.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class NotImplementedException extends HttpException {
   constructor(message?: string | object | any, error = 'Not Implemented') {

diff --git a/packages/common/exceptions/payload-too-large.exception.ts b/packages/common/exceptions/payload-too-large.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class PayloadTooLargeException extends HttpException {
   constructor(message?: string | object | any, error = 'Payload Too Large') {

diff --git a/packages/common/exceptions/request-timeout.exception.ts b/packages/common/exceptions/request-timeout.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class RequestTimeoutException extends HttpException {
   constructor(message?: string | object | any, error = 'Request Timeout') {

diff --git a/packages/common/exceptions/service-unavailable.exception.ts b/packages/common/exceptions/service-unavailable.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class ServiceUnavailableException extends HttpException {
   constructor(message?: string | object | any, error = 'Service Unavailable') {

diff --git a/packages/common/exceptions/unauthorized.exception.ts b/packages/common/exceptions/unauthorized.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class UnauthorizedException extends HttpException {
   constructor(message?: string | object | any, error = 'Unauthorized') {

diff --git a/packages/common/exceptions/unprocessable-entity.exception.ts b/packages/common/exceptions/unprocessable-entity.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class UnprocessableEntityException extends HttpException {
   constructor(message?: string | object | any, error = 'Unprocessable Entity') {

diff --git a/packages/common/exceptions/unsupported-media-type.exception.ts b/packages/common/exceptions/unsupported-media-type.exception.ts
@@ -1,6 +1,6 @@
 import { HttpException } from './http.exception';
 import { HttpStatus } from '../enums/http-status.enum';
-import { createHttpExceptionBody } from './../utils/http-exception-body.util';
+import { createHttpExceptionBody } from '../utils/http-exception-body.util';
 
 export class UnsupportedMediaTypeException extends HttpException {
   constructor(

diff --git a/packages/common/files/interceptors/file-fields.interceptor.ts b/packages/common/files/interceptors/file-fields.interceptor.ts
@@ -7,10 +7,10 @@ import {
   MulterField,
   MulterOptions,
 } from '../../interfaces/external/multer-options.interface';
-import { NestInterceptor } from './../../interfaces/features/nest-interceptor.interface';
-import { MULTER_MODULE_OPTIONS } from './../files.constants';
-import { MulterModuleOptions } from './../interfaces';
-import { transformException } from './../multer/multer.utils';
+import { NestInterceptor } from '../../interfaces/features/nest-interceptor.interface';
+import { MULTER_MODULE_OPTIONS } from '../files.constants';
+import { MulterModuleOptions } from '../interfaces';
+import { transformException } from '../multer/multer.utils';
 
 type MulterInstance = any;
 

diff --git a/packages/common/files/interceptors/file.interceptor.ts b/packages/common/files/interceptors/file.interceptor.ts
@@ -4,10 +4,10 @@ import { Inject, Optional } from '../../decorators';
 import { mixin } from '../../decorators/core/component.decorator';
 import { ExecutionContext } from '../../interfaces';
 import { MulterOptions } from '../../interfaces/external/multer-options.interface';
-import { NestInterceptor } from './../../interfaces/features/nest-interceptor.interface';
-import { MULTER_MODULE_OPTIONS } from './../files.constants';
-import { MulterModuleOptions } from './../interfaces';
-import { transformException } from './../multer/multer.utils';
+import { NestInterceptor } from '../../interfaces/features/nest-interceptor.interface';
+import { MULTER_MODULE_OPTIONS } from '../files.constants';
+import { MulterModuleOptions } from '../interfaces';
+import { transformException } from '../multer/multer.utils';
 
 type MulterInstance = any;
 

diff --git a/packages/common/files/interceptors/files.interceptor.ts b/packages/common/files/interceptors/files.interceptor.ts
@@ -4,10 +4,10 @@ import { Inject, Optional } from '../../decorators';
 import { mixin } from '../../decorators/core/component.decorator';
 import { ExecutionContext } from '../../interfaces';
 import { MulterOptions } from '../../interfaces/external/multer-options.interface';
-import { NestInterceptor } from './../../interfaces/features/nest-interceptor.interface';
-import { MULTER_MODULE_OPTIONS } from './../files.constants';
-import { MulterModuleOptions } from './../interfaces';
-import { transformException } from './../multer/multer.utils';
+import { NestInterceptor } from '../../interfaces/features/nest-interceptor.interface';
+import { MULTER_MODULE_OPTIONS } from '../files.constants';
+import { MulterModuleOptions } from '../interfaces';
+import { transformException } from '../multer/multer.utils';
 
 type MulterInstance = any;
 

diff --git a/packages/common/files/interfaces/files-upload-module.interface.ts b/packages/common/files/interfaces/files-upload-module.interface.ts
@@ -1,5 +1,5 @@
 import { ModuleMetadata, Type } from '@nestjs/common/interfaces';
-import { MulterOptions } from './../../interfaces/external/multer-options.interface';
+import { MulterOptions } from '../../interfaces/external/multer-options.interface';
 
 export interface MulterModuleOptions extends MulterOptions {}
 

diff --git a/packages/common/files/multer/multer.utils.ts b/packages/common/files/multer/multer.utils.ts
@@ -1,4 +1,4 @@
-import { BadRequestException, HttpException, PayloadTooLargeException } from './../../exceptions';
+import { BadRequestException, HttpException, PayloadTooLargeException } from '../../exceptions';
 import { multerExceptions } from './multer.constants';
 
 export function transformException(error: Error | undefined) {

diff --git a/packages/common/interfaces/exceptions/exception-filter.interface.ts b/packages/common/interfaces/exceptions/exception-filter.interface.ts
@@ -1,4 +1,4 @@
-import { ArgumentsHost } from './../features/arguments-host.interface';
+import { ArgumentsHost } from '../features/arguments-host.interface';
 
 export interface ExceptionFilter<T = any> {
   catch(exception: T, host: ArgumentsHost);

diff --git a/packages/common/interfaces/exceptions/rpc-exception-filter.interface.ts b/packages/common/interfaces/exceptions/rpc-exception-filter.interface.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ArgumentsHost } from './../features/arguments-host.interface';
+import { ArgumentsHost } from '../features/arguments-host.interface';
 
 export interface RpcExceptionFilter<T = any, R = any> {
   catch(exception: T, host: ArgumentsHost): Observable<R>;

diff --git a/packages/common/interfaces/exceptions/ws-exception-filter.interface.ts b/packages/common/interfaces/exceptions/ws-exception-filter.interface.ts
@@ -1,4 +1,4 @@
-import { ArgumentsHost } from './../features/arguments-host.interface';
+import { ArgumentsHost } from '../features/arguments-host.interface';
 
 export interface WsExceptionFilter<T = any> {
   catch(exception: T, host: ArgumentsHost);

diff --git a/packages/common/interfaces/features/execution-context.interface.ts b/packages/common/interfaces/features/execution-context.interface.ts
@@ -1,4 +1,4 @@
-import { Type } from './../index';
+import { Type } from '../index';
 import { ArgumentsHost } from './arguments-host.interface';
 
 export interface ExecutionContext extends ArgumentsHost {

diff --git a/packages/common/interfaces/microservices/client-metadata.interface.ts b/packages/common/interfaces/microservices/client-metadata.interface.ts
@@ -1,4 +1,4 @@
-import { Transport } from './../../enums/transport.enum';
+import { Transport } from '../../enums/transport.enum';
 import {
   TcpOptions,
   RedisOptions,

diff --git a/packages/common/interfaces/modules/provider.interface.ts b/packages/common/interfaces/modules/provider.interface.ts
@@ -1,4 +1,4 @@
-import { Type } from './../type.interface';
+import { Type } from '../type.interface';
 
 export type Provider =
   | Type<any>

diff --git a/packages/common/interfaces/nest-application-context.interface.ts b/packages/common/interfaces/nest-application-context.interface.ts
@@ -1,4 +1,4 @@
-import { LoggerService } from './../services/logger.service';
+import { LoggerService } from '../services/logger.service';
 import { Type } from './type.interface';
 
 export interface INestApplicationContext {

diff --git a/packages/common/pipes/validation.pipe.ts b/packages/common/pipes/validation.pipe.ts
@@ -4,7 +4,7 @@ import { ValidatorOptions } from '../interfaces/external/validator-options.inter
 import { PipeTransform } from '../interfaces/features/pipe-transform.interface';
 import { loadPackage } from '../utils/load-package.util';
 import { isNil } from '../utils/shared.utils';
-import { Injectable } from './../decorators/core/component.decorator';
+import { Injectable } from '../decorators/core/component.decorator';
 
 export interface ValidationPipeOptions extends ValidatorOptions {
   transform?: boolean;

diff --git a/packages/common/test/cache/cache.module.ts b/packages/common/test/cache/cache.module.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { CACHE_MODULE_OPTIONS } from '../../cache/cache.constants';
-import { CacheModule } from './../../cache/cache.module';
+import { CacheModule } from '../../cache/cache.module';
 
 describe('CacheModule', () => {
   describe('register', () => {

diff --git a/packages/common/test/files/interceptors/file-fields.interceptor.spec.ts b/packages/common/test/files/interceptors/file-fields.interceptor.spec.ts
@@ -2,7 +2,7 @@ import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context.hos
 import { expect } from 'chai';
 import { of } from 'rxjs';
 import * as sinon from 'sinon';
-import { FileFieldsInterceptor } from './../../../files/interceptors/file-fields.interceptor';
+import { FileFieldsInterceptor } from '../../../files/interceptors/file-fields.interceptor';
 
 describe('FileFieldsInterceptor', () => {
   it('should return metatype with expected structure', async () => {

diff --git a/packages/common/test/files/interceptors/file.interceptor.spec.ts b/packages/common/test/files/interceptors/file.interceptor.spec.ts
@@ -2,7 +2,7 @@ import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context.hos
 import { expect } from 'chai';
 import { of } from 'rxjs';
 import * as sinon from 'sinon';
-import { FileInterceptor } from './../../../files/interceptors/file.interceptor';
+import { FileInterceptor } from '../../../files/interceptors/file.interceptor';
 
 describe('FileInterceptor', () => {
   it('should return metatype with expected structure', async () => {

diff --git a/packages/common/test/files/interceptors/files.interceptor.spec.ts b/packages/common/test/files/interceptors/files.interceptor.spec.ts
@@ -2,7 +2,7 @@ import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context.hos
 import { expect } from 'chai';
 import { of } from 'rxjs';
 import * as sinon from 'sinon';
-import { FilesInterceptor } from './../../../files/interceptors/files.interceptor';
+import { FilesInterceptor } from '../../../files/interceptors/files.interceptor';
 
 describe('FilesInterceptor', () => {
   it('should return metatype with expected structure', async () => {

diff --git a/packages/common/test/files/multer.module.spec.ts b/packages/common/test/files/multer.module.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { MULTER_MODULE_OPTIONS } from '../../files/files.constants';
-import { MulterModule } from './../../files/multer.module';
+import { MulterModule } from '../../files/multer.module';
 
 describe('MulterModule', () => {
   describe('register', () => {

diff --git a/packages/common/test/files/multer/multer.utils.spec.ts b/packages/common/test/files/multer/multer.utils.spec.ts
@@ -5,7 +5,7 @@ import {
   PayloadTooLargeException,
 } from '../../../exceptions';
 import { multerExceptions } from '../../../files/multer/multer.constants';
-import { transformException } from './../../../files/multer/multer.utils';
+import { transformException } from '../../../files/multer/multer.utils';
 
 describe('transformException', () => {
   describe('if error does not exist', () => {

diff --git a/packages/common/test/pipes/parse-int.pipe.spec.ts b/packages/common/test/pipes/parse-int.pipe.spec.ts
@@ -1,7 +1,7 @@
 import * as sinon from 'sinon';
 import { expect } from 'chai';
 import { ArgumentMetadata } from '../../interfaces';
-import { ParseIntPipe } from './../../pipes/parse-int.pipe';
+import { ParseIntPipe } from '../../pipes/parse-int.pipe';
 
 describe('ParseIntPipe', () => {
   let target: ParseIntPipe;

diff --git a/packages/common/test/pipes/validation.pipe.spec.ts b/packages/common/test/pipes/validation.pipe.spec.ts
@@ -2,7 +2,7 @@ import * as sinon from 'sinon';
 import { expect } from 'chai';
 import { ArgumentMetadata } from '../../interfaces';
 import { IsString } from 'class-validator';
-import { ValidationPipe } from './../../pipes/validation.pipe';
+import { ValidationPipe } from '../../pipes/validation.pipe';
 
 class TestModel {
   constructor() {}

diff --git a/packages/common/test/utils/load-package.util.spec.ts b/packages/common/test/utils/load-package.util.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { loadPackage } from './../../utils/load-package.util';
+import { loadPackage } from '../../utils/load-package.util';
 
 describe('loadPackage', () => {
   describe('when package is available', () => {

diff --git a/packages/core/injector/injector.ts b/packages/core/injector/injector.ts
@@ -146,9 +146,7 @@ export class Injector {
           );
         } else {
           const factoryResult = currentMetatype.metatype(...instances);
-          currentMetatype.instance = await this.resolveFactoryInstance(
-            factoryResult,
-          );
+          currentMetatype.instance = await factoryResult;
         }
         currentMetatype.isResolved = true;
         done();
@@ -330,12 +328,4 @@ export class Injector {
     }
     return componentRef;
   }
-
-  public async resolveFactoryInstance(factoryResult): Promise<any> {
-    if (!(factoryResult instanceof Promise)) {
-      return factoryResult;
-    }
-    const result = await factoryResult;
-    return result;
-  }
 }
diff --git a/packages/core/middleware/builder.ts b/packages/core/middleware/builder.ts
@@ -36,7 +36,7 @@ export class MiddlewareBuilder implements MiddlewareConsumer {
   private static ConfigProxy = class implements MiddlewareConfigProxy {
     private contextParameters = null;
     private excludedRoutes: RouteInfo[] = [];
-    private includedRoutes: any[];
+    private readonly includedRoutes: any[];
 
     constructor(private readonly builder: MiddlewareBuilder, middleware) {
       this.includedRoutes = filterMiddleware(middleware);

diff --git a/packages/core/middleware/middleware-module.ts b/packages/core/middleware/middleware-module.ts
@@ -172,10 +172,6 @@ export class MiddlewareModule {
       );
     const resolve = instance.resolve();
 
-    if (!(resolve instanceof Promise)) {
-      bindWithProxy(resolve);
-      return;
-    }
     const middleware = await resolve;
     bindWithProxy(middleware);
   }

diff --git a/packages/core/test/exceptions/exceptions-handler.spec.ts b/packages/core/test/exceptions/exceptions-handler.spec.ts
@@ -5,7 +5,7 @@ import { Logger } from '../../../common/services/logger.service';
 import { NestEnvironment } from '../../../common/enums/nest-environment.enum';
 import { InvalidExceptionFilterException } from '../../errors/exceptions/invalid-exception-filter.exception';
 import { HttpException } from '@nestjs/common';
-import { ExpressAdapter } from './../../adapters/express-adapter';
+import { ExpressAdapter } from '../../adapters/express-adapter';
 import { ExecutionContextHost } from '../../helpers/execution-context.host';
 
 describe('ExceptionsHandler', () => {

diff --git a/packages/core/test/guards/guards-consumer.spec.ts b/packages/core/test/guards/guards-consumer.spec.ts
@@ -1,6 +1,6 @@
 import * as sinon from 'sinon';
 import { expect } from 'chai';
-import { GuardsConsumer } from './../../guards/guards-consumer';
+import { GuardsConsumer } from '../../guards/guards-consumer';
 import { Observable, of } from 'rxjs';
 
 describe('GuardsConsumer', () => {