Merge branch 'master' into update/version-5

Author: kamilmysliwiec

CHANGELOG.md

@@ -1,34 +1,51 @@
+## 4.6.4
+### Bug Fixes
+- **microservices**: can't select/get from context when using `NestFactory.createMicroservice` [#398](https://github.com/nestjs/nest/issues/398)
+
+## 4.6.3
+### Bug Fixes
+- **core**: error thrown when connecting to microservice (hybrid applicaton) [#425](https://github.com/nestjs/nest/issues/425)
+
 ## 4.6.2
-- **core**: [improvement] simplify `NestFactory.create(...args)` signature
+### Improvements
+- **core**: simplify `NestFactory.create(...args)` signature
 
 ## 4.6.1
-- **common**: [improvement] create `ModuleMetadata` interface
-- **common**: [bugfix] update `class-validator` [#417](https://github.com/nestjs/nest/issues/417)
+### Improvements
+- **common**: create `ModuleMetadata` interface
+- **core**: majority of methods (`INestApplication`, `INestMicroservice`, and `INestApplicationContext`) return `this` instead of `void`
+- **core**: remove static dependencies & relationships inside `NestFactory`
+
+### Features
 - **core**: [feature] add `appOptions` property to `create[..]` methods of `NestFactory`
-- **core**: [improvement] majority of methods (`INestApplication`, `INestMicroservice`, and `INestApplicationContext`) return `this` instead of `void`
-- **core**: [refactor] remove static dependencies & relationships
+
+### Bug Fixes
+- **common**: [bugfix] update `class-validator` [#417](https://github.com/nestjs/nest/issues/417)
 - **core**: [bugfix] catch error thrown by `bodyParser` in exception filter [#422](https://github.com/nestjs/nest/issues/422)
 
 ## 4.6.0
-- **common**: [feature] `ValidationPipe` improvements [#383](https://github.com/nestjs/nest/pull/383)
-- **common**: [feature] `ParseIntPipe` improvements [#385](https://github.com/nestjs/nest/pull/385)
-- **common**: [feature] add `FileInterceptor`, `FilesInterceptor`, `@UploadedFile()` and `@UploadedFiles()` (`multer` integration)
-- **common**: [feature] add `HttpModule` that exposes `HttpService` (`axios` integration)
-- **core**: [feature] add `app.disable()` and `app.enable()` wrappers around `express` app
-- **core**: [feature] add ability to inject `express` reference (`EXPRESS_REF` token)
-- **core**: [feature] enable possibility to extend metadata (inheritance support) [#228](https://github.com/nestjs/nest/issues/228)
-- **core**: [feature] `NestFactory.create()` now accepts third argument `HttpsOptions`
-- **core**: [feature] add `app.enableCors()` to `INestApplication` (`cors` integration)
-- **core**: [feature] add `@Render()` decorator (MVC applications)
-- **core**: [feature] provide `Logger.overrideLogger()` [#247](https://github.com/nestjs/nest/issues/247)
-- **core**: [improvement] simplify HTTPS usage
-- **core**: [bugfix] custom transport strategy - thrown exceptions issue [#290](https://github.com/nestjs/nest/issues/290)
-- **core**: [bugfix] injector fails silently [#287](https://github.com/nestjs/nest/issues/287)
-- **core**: [bugfix] secure websockets (`wss://`) [#384](https://github.com/nestjs/nest/issues/384)
-- **core**: [bugfix] can't select/get from context when using `NestFactory.createMicroservice()` [#398](https://github.com/nestjs/nest/issues/398)
-- **core**: [bugfix] interceptor `$stream` observable returns another observable instead of the response object [#376](https://github.com/nestjs/nest/issues/376)
-- **core**: [bugfix] `Observable.throw` from controller results in unhandled rejection promise [#373](https://github.com/nestjs/nest/issues/373)
-- **microservices**: [feature]: add `listenAsync()` to `INestMicroservice` instance
+### Features
+- **common**: `ValidationPipe` improvements [#383](https://github.com/nestjs/nest/pull/383)
+- **common**: `ParseIntPipe` improvements [#385](https://github.com/nestjs/nest/pull/385)
+- **common**: add `FileInterceptor`, `FilesInterceptor`, `@UploadedFile()` and `@UploadedFiles()` (`multer` integration)
+- **common**: add `HttpModule` that exposes `HttpService` (`axios` integration)
+- **core**: add `app.disable()` and `app.enable()` wrappers around `express` app
+- **core**: add ability to inject `express` reference (`EXPRESS_REF` token)
+- **core**: enable possibility to extend metadata (inheritance support) [#228](https://github.com/nestjs/nest/issues/228)
+- **core**: `NestFactory.create()` now accepts third argument `HttpsOptions`
+- **core**: add `app.enableCors()` to `INestApplication` (`cors` integration)
+- **core**: add `@Render()` decorator (MVC applications)
+- **core**: provide `Logger.overrideLogger()` [#247](https://github.com/nestjs/nest/issues/247)
+- **microservices**: add `listenAsync()` to `INestMicroservice` instance
+
+### Bug Fixes
+- **core**: simplify HTTPS protocol usage
+- **core**: custom transport strategy - thrown exceptions issue [#290](https://github.com/nestjs/nest/issues/290)
+- **core**: injector fails silently [#287](https://github.com/nestjs/nest/issues/287)
+- **core**: secure websockets (`wss://`) [#384](https://github.com/nestjs/nest/issues/384)
+- **core**: can't select/get from context when using `NestFactory.createMicroservice()` [#398](https://github.com/nestjs/nest/issues/398)
+- **core**: interceptor `$stream` observable returns another observable instead of the response object [#376](https://github.com/nestjs/nest/issues/376)
+- **core**: `Observable.throw` from controller results in unhandled rejection promise [#373](https://github.com/nestjs/nest/issues/373)
 
 ## 4.5.10
 - **core**: [bugfix] #343

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "lib/*"
   ],
-  "version": "4.6.2"
+  "version": "4.6.3"
 }

lib/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/common",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@common)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",

lib/core/nest-application.js

@@ -17,6 +17,7 @@ const iterare_1 = require("iterare");
 const logger_service_1 = require("@nestjs/common/services/logger.service");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const express_adapter_1 = require("./adapters/express-adapter");
+const application_config_1 = require("./application-config");
 const constants_1 = require("./constants");
 const middlewares_module_1 = require("./middlewares/middlewares-module");
 const routes_resolver_1 = require("./router/routes-resolver");
@@ -114,7 +115,8 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         if (!NestMicroservice) {
             throw new microservices_package_not_found_exception_1.MicroservicesPackageNotFoundException();
         }
-        const instance = new NestMicroservice(this.container, config);
+        const applicationConfig = new application_config_1.ApplicationConfig();
+        const instance = new NestMicroservice(this.container, config, applicationConfig);
         instance.setupListeners();
         instance.setIsInitialized(true);
         instance.setIsInitHookCalled(true);

lib/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Modern, fast, powerful node.js web framework",
   "main": "index.js",
   "scripts": {

src/common/interceptors/file.interceptor.ts

@@ -2,9 +2,10 @@ import * as multer from 'multer';
 import { NestInterceptor } from './../interfaces/features/nest-interceptor.interface';
 import { Observable } from 'rxjs/Observable';
 import { MulterOptions } from '../interfaces/external/multer-options.interface';
+import { mixin } from '../decorators/core/component.decorator';
 
 export function FileInterceptor(fieldName: string, options?: MulterOptions) {
-  const Interceptor = class implements NestInterceptor {
+  return mixin(class implements NestInterceptor {
     readonly upload = multer(options);
 
     async intercept(
@@ -17,6 +18,5 @@ export function FileInterceptor(fieldName: string, options?: MulterOptions) {
       );
       return stream$;
     }
-  };
-  return Interceptor;
+  });
 }

src/core/nest-application-context.ts

@@ -13,7 +13,12 @@ export class NestApplicationContext implements INestApplicationContext {
     protected contextModule,
   ) {}
 
-  public select<T>(module: Type<T>): INestApplicationContext {
+  public selectContextModule() {
+    const modules = this.container.getModules().values();
+    this.contextModule = modules.next().value;
+  }
+
+  public select<T>(module: Metatype<T>): INestApplicationContext {
     const modules = this.container.getModules();
     const moduleMetatype = this.contextModule.metatype;
     const scope = this.scope.concat(moduleMetatype);

src/core/nest-application.ts

@@ -82,11 +82,6 @@ export class NestApplication extends NestApplicationContext
     );
   }
 
-  public selectContextModule() {
-    const modules = this.container.getModules().values();
-    this.contextModule = modules.next().value;
-  }
-
   public applyOptions() {
     if (!this.appOptions) {
       return undefined;
@@ -116,7 +111,8 @@ export class NestApplication extends NestApplicationContext
   }
 
   public async init(): Promise<this> {
-    const useBodyParser = this.appOptions && this.appOptions.bodyParser !== false;
+    const useBodyParser =
+      this.appOptions && this.appOptions.bodyParser !== false;
     useBodyParser && this.setupParserMiddlewares();
 
     await this.setupModules();
@@ -161,7 +157,12 @@ export class NestApplication extends NestApplicationContext
     if (!NestMicroservice) {
       throw new MicroservicesPackageNotFoundException();
     }
-    const instance = new NestMicroservice(this.container as any, config as any);
+    const applicationConfig = new ApplicationConfig();
+    const instance = new NestMicroservice(
+      this.container as any,
+      config as any,
+      applicationConfig,
+    );
     instance.setupListeners();
     instance.setIsInitialized(true);
     instance.setIsInitHookCalled(true);

src/core/router/routes-resolver.ts

@@ -10,7 +10,7 @@ import { MetadataScanner } from '../metadata-scanner';
 import { RouterExplorer } from './interfaces/explorer.inteface';
 import { ExpressRouterExplorer } from './router-explorer';
 import { ApplicationConfig } from './../application-config';
-import { NotFoundException } from '@nestjs/common';
+import { NotFoundException, BadRequestException } from '@nestjs/common';
 import { MODULE_PATH } from '@nestjs/common/constants';
 
 export class RoutesResolver implements Resolver {
@@ -43,8 +43,8 @@ export class RoutesResolver implements Resolver {
         : undefined;
       this.setupRouters(routes, moduleName, path, router);
     });
-
     this.setupNotFoundHandler(router);
+    this.setupExceptionHandler(router);
     this.setupExceptionHandler(express);
   }
 
@@ -79,7 +79,7 @@ export class RoutesResolver implements Resolver {
 
   public setupExceptionHandler(express: Application) {
     const callback = (err, req, res, next) => {
-      throw err;
+      throw this.mapExternalException(err);
     };
     const exceptionHandler = this.routerExceptionsFilter.create(
       {},
@@ -91,4 +91,13 @@ export class RoutesResolver implements Resolver {
     );
     express.use(proxy);
   }
+
+  public mapExternalException(err: any) {
+    switch (true) {
+      case (err instanceof SyntaxError): 
+        return new BadRequestException(err.message);
+      default: 
+        return err; 
+    }
+  }
 }