bugfix(@nestjs/core) use ApplicationConfig within ExternalContextCreator

.gitignore

@@ -1,6 +1,7 @@
 # dependencies
 node_modules/
 package-lock.json
+
 # IDE
 /.idea
 /.awcache
@@ -9,6 +10,7 @@ package-lock.json
 # misc
 lerna-debug.log
 npm-debug.log
+yarn-error.log
 /src/common/npm-debug.log
 /src/core/npm-debug.log
 /src/testing/npm-debug.log

CHANGELOG.md

@@ -1,9 +1,12 @@
 ## 4.6.5
 ### Bug Fixes
 - **common**: `File(s)Interceptor` does not populate thrown exception [#437](https://github.com/nestjs/nest/issues/437)
+- **core**: `NestFactory.create()` returns `any`
+- **core**: use `ApplicationConfig` within `ExternalContextCreator` [#434](https://github.com/nestjs/nest/issues/434) 
 
 ### Improvements
 - **common**: `HttpException` extends `Error`
+- **core**: make `cors` middleware customizable (`enableCors()`, `{ cors }`) [#457](https://github.com/nestjs/nest/issues/437) 
 - **microservices**: `RpcException` extends `Error`
 - **websockets**: `WsException` extends `Error`
 

lib/common/exceptions/http.exception.d.ts

@@ -1,10 +1,10 @@
-export declare class HttpException {
+export declare class HttpException extends Error {
     private readonly response;
     private readonly status;
-    private readonly message;
+    readonly message: any;
     /**
      * The base Nest Application exception, which is handled by the default Exceptions Handler.
-     * If you throw an exception from your HTTP route handlers, Nest will map them to the appropriate HTTP response and send to the client.
+     * If you throw an exception from your HTTP route handler, Nest will map them to the appropriate HTTP response and send to the client.
      *
      * When `response` is an object:
      * - object will be stringified and returned to the user as a JSON response,

lib/common/exceptions/http.exception.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class HttpException {
+class HttpException extends Error {
     /**
      * The base Nest Application exception, which is handled by the default Exceptions Handler.
-     * If you throw an exception from your HTTP route handlers, Nest will map them to the appropriate HTTP response and send to the client.
+     * If you throw an exception from your HTTP route handler, Nest will map them to the appropriate HTTP response and send to the client.
      *
      * When `response` is an object:
      * - object will be stringified and returned to the user as a JSON response,
@@ -16,6 +16,7 @@ class HttpException {
      * ```
      */
     constructor(response, status) {
+        super();
         this.response = response;
         this.status = status;
         this.message = response;

lib/common/interceptors/file.interceptor.js

@@ -17,7 +17,12 @@ function FileInterceptor(fieldName, options) {
         }
         intercept(request, context, stream$) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield new Promise((resolve, reject) => this.upload.single(fieldName)(request, request.res, resolve));
+                yield new Promise((resolve, reject) => this.upload.single(fieldName)(request, request.res, err => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    resolve();
+                }));
                 return stream$;
             });
         }

lib/common/interceptors/files.interceptor.js

@@ -16,7 +16,12 @@ function FilesInterceptor(fieldName, maxCount, options) {
         }
         intercept(request, context, stream$) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield new Promise((resolve, reject) => this.upload.array(fieldName, maxCount)(request, request.res, resolve));
+                yield new Promise((resolve, reject) => this.upload.array(fieldName, maxCount)(request, request.res, err => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    resolve();
+                }));
                 return stream$;
             });
         }

lib/common/utils/http-exception-body.util.d.ts

@@ -5,4 +5,5 @@ export declare const createHttpExceptionBody: (message: any, error: string, stat
 } | {
     statusCode: number;
     error: string;
+    message?: undefined;
 };

lib/core/nest-factory.d.ts

@@ -1,5 +1,5 @@
 import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
-import { INestMicroservice, INestApplicationContext } from '@nestjs/common';
+import { INestApplication, INestMicroservice, INestApplicationContext } from '@nestjs/common';
 import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
 import { NestMicroserviceOptions } from '@nestjs/common/interfaces/microservices/nest-microservice-options.interface';
 export declare class NestFactoryStatic {
@@ -8,9 +8,9 @@ export declare class NestFactoryStatic {
      * Creates an instance of the NestApplication (returns Promise)
      * @returns an `Promise` of the INestApplication instance
      */
-    create(module: any): any;
-    create(module: any, options: NestApplicationOptions): any;
-    create(module: any, express: any, options: NestApplicationOptions): any;
+    create(module: any): Promise<INestApplication>;
+    create(module: any, options: NestApplicationOptions): Promise<INestApplication>;
+    create(module: any, express: any, options: NestApplicationOptions): Promise<INestApplication>;
     /**
      * Creates an instance of the NestMicroservice (returns Promise)
      *

lib/microservices/exceptions/rpc-exception.d.ts

@@ -1,5 +1,6 @@
-export declare class RpcException {
+export declare class RpcException extends Error {
     private readonly error;
+    readonly message: any;
     constructor(error: string | object);
     getError(): string | object;
 }

lib/microservices/exceptions/rpc-exception.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class RpcException {
+class RpcException extends Error {
     constructor(error) {
+        super();
         this.error = error;
+        this.message = error;
     }
     getError() {
         return this.error;

lib/websockets/exceptions/ws-exception.d.ts

@@ -1,5 +1,6 @@
-export declare class WsException {
+export declare class WsException extends Error {
     private readonly error;
+    readonly message: any;
     constructor(error: string | object);
     getError(): string | object;
 }

lib/websockets/exceptions/ws-exception.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class WsException {
+class WsException extends Error {
     constructor(error) {
+        super();
         this.error = error;
+        this.message = error;
     }
     getError() {
         return this.error;

package.json

@@ -47,6 +47,7 @@
   "devDependencies": {
     "@types/chai": "^3.5.2",
     "@types/chai-as-promised": "0.0.31",
+    "@types/cors": "^2.8.3",
     "@types/express": "^4.0.39",
     "@types/mocha": "^2.2.38",
     "@types/node": "^7.0.5",

src/core/injector/container.ts

@@ -12,6 +12,7 @@ import { InvalidModuleException } from './../errors/exceptions/invalid-module.ex
 import { DynamicModule } from '@nestjs/common';
 import { ModulesContainer } from './modules-container';
 import { NestApplicationContext } from './../nest-application-context';
+import { ApplicationConfig } from './../application-config';
 
 export class NestContainer {
   private readonly globalModules = new Set<Module>();
@@ -23,6 +24,14 @@ export class NestContainer {
   private readonly moduleTokenFactory = new ModuleTokenFactory();
   private applicationRef: any;
 
+  constructor(
+    private readonly _applicationConfig: ApplicationConfig = void 0,
+  ) {}
+
+  get applicationConfig(): ApplicationConfig | undefined {
+    return this._applicationConfig;
+  }
+
   public setApplicationRef(applicationRef: any) {
     this.applicationRef = applicationRef;
   }

src/core/injector/module.ts

@@ -51,8 +51,8 @@ export class Module {
   private _exports = new Set<string>();
 
   constructor(
-    private _metatype: NestModuleMetatype,
-    private _scope: NestModuleMetatype[],
+    private readonly _metatype: NestModuleMetatype,
+    private readonly _scope: NestModuleMetatype[],
     container: NestContainer,
   ) {
     this.addCoreInjectables(container);
@@ -146,9 +146,9 @@ export class Module {
       metatype: ExternalContextCreator,
       isResolved: true,
       instance: new ExternalContextCreator(
-        new GuardsContextCreator(container),
+        new GuardsContextCreator(container, container.applicationConfig),
         new GuardsConsumer(),
-        new InterceptorsContextCreator(container),
+        new InterceptorsContextCreator(container, container.applicationConfig),
         new InterceptorsConsumer(),
         container.getModules(),
       ),
@@ -272,11 +272,9 @@ export class Module {
   ) {
     if (this.isCustomProvider(exportedComponent as any)) {
       return this.addCustomExportedComponent(exportedComponent as any);
-    }
-    else if (isString(exportedComponent)) {
+    } else if (isString(exportedComponent)) {
       return this._exports.add(exportedComponent);
-    }
-    else if (this.isDynamicModule(exportedComponent)) {
+    } else if (this.isDynamicModule(exportedComponent)) {
       const { module } = exportedComponent;
       return this._exports.add(module.name);
     }

src/core/nest-factory.ts

@@ -53,8 +53,8 @@ export class NestFactoryStatic {
       ? [expressOrOptions, options]
       : [ExpressAdapter.create(), expressOrOptions];
 
-    const container = new NestContainer();
     const applicationConfig = new ApplicationConfig();
+    const container = new NestContainer(applicationConfig);
 
     this.applyLogger(appOptions);
     await this.initialize(
@@ -87,8 +87,8 @@ export class NestFactoryStatic {
     if (!NestMicroservice) {
       throw new MicroservicesPackageNotFoundException();
     }
-    const container = new NestContainer();
     const applicationConfig = new ApplicationConfig();
+    const container = new NestContainer(applicationConfig);
 
     this.applyLogger(options);
     await this.initialize(module, container, applicationConfig);