Auto stash before merge of "master" and "origin/master"

Author: kamilmysliwiec

lib/core/injector/container.d.ts

@@ -5,12 +5,16 @@ import { Metatype } from '@nestjs/common/interfaces/metatype.interface';
 import { Module } from './module';
 import { DynamicModule } from '@nestjs/common';
 import { ModulesContainer } from './modules-container';
+import { ApplicationConfig } from './../application-config';
 export declare class NestContainer {
+    private readonly _applicationConfig;
     private readonly globalModules;
     private readonly modules;
     private readonly dynamicModulesMetadata;
     private readonly moduleTokenFactory;
     private applicationRef;
+    constructor(_applicationConfig?: ApplicationConfig);
+    readonly applicationConfig: ApplicationConfig | undefined;
     setApplicationRef(applicationRef: any): void;
     getApplicationRef(): any;
     addModule(metatype: NestModuleMetatype | DynamicModule, scope: NestModuleMetatype[]): void;

lib/core/injector/container.js

@@ -17,12 +17,16 @@ const module_token_factory_1 = require("./module-token-factory");
 const invalid_module_exception_1 = require("./../errors/exceptions/invalid-module.exception");
 const modules_container_1 = require("./modules-container");
 class NestContainer {
-    constructor() {
+    constructor(_applicationConfig = void 0) {
+        this._applicationConfig = _applicationConfig;
         this.globalModules = new Set();
         this.modules = new modules_container_1.ModulesContainer();
         this.dynamicModulesMetadata = new Map();
         this.moduleTokenFactory = new module_token_factory_1.ModuleTokenFactory();
     }
+    get applicationConfig() {
+        return this._applicationConfig;
+    }
     setApplicationRef(applicationRef) {
         this.applicationRef = applicationRef;
     }

lib/core/injector/module.d.ts

@@ -19,8 +19,8 @@ export declare type CustomValue = CustomComponent & {
 };
 export declare type ComponentMetatype = Metatype<Injectable> | CustomFactory | CustomValue | CustomClass;
 export declare class Module {
-    private _metatype;
-    private _scope;
+    private readonly _metatype;
+    private readonly _scope;
     private _relatedModules;
     private _components;
     private _injectables;

lib/core/injector/module.js

@@ -96,7 +96,7 @@ class Module {
             name: external_context_creator_1.ExternalContextCreator.name,
             metatype: external_context_creator_1.ExternalContextCreator,
             isResolved: true,
-            instance: new external_context_creator_1.ExternalContextCreator(new guards_context_creator_1.GuardsContextCreator(container), new guards_consumer_1.GuardsConsumer(), new interceptors_context_creator_1.InterceptorsContextCreator(container), new interceptors_consumer_1.InterceptorsConsumer(), container.getModules()),
+            instance: new external_context_creator_1.ExternalContextCreator(new guards_context_creator_1.GuardsContextCreator(container, container.applicationConfig), new guards_consumer_1.GuardsConsumer(), new interceptors_context_creator_1.InterceptorsContextCreator(container, container.applicationConfig), new interceptors_consumer_1.InterceptorsConsumer(), container.getModules()),
         });
     }
     addModulesContainer(container) {

lib/core/nest-application.d.ts

@@ -7,6 +7,7 @@ import { ApplicationConfig } from './application-config';
 import { NestContainer } from './injector/container';
 import { NestApplicationContext } from './nest-application-context';
 import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
+import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 export declare class NestApplication extends NestApplicationContext implements INestApplication {
     private readonly express;
     private readonly config;
@@ -21,7 +22,7 @@ export declare class NestApplication extends NestApplicationContext implements I
     private readonly microservices;
     private isInitialized;
     constructor(container: NestContainer, express: any, config: ApplicationConfig, appOptions?: NestApplicationOptions);
-    applyOptions(): any;
+    applyOptions(): this;
     createServer(): any;
     setupModules(): Promise<void>;
     init(): Promise<this>;
@@ -38,7 +39,7 @@ export declare class NestApplication extends NestApplicationContext implements I
     set(...args: any[]): this;
     disable(...args: any[]): this;
     enable(...args: any[]): this;
-    enableCors(): this;
+    enableCors(options?: CorsOptions): this;
     listen(port: number | string, callback?: () => void): any;
     listen(port: number | string, hostname: string, callback?: () => void): any;
     listenAsync(port: number | string, hostname?: string): Promise<any>;

lib/core/nest-application.js

@@ -53,10 +53,14 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.routesResolver = new routes_resolver_1.RoutesResolver(container, express_adapter_1.ExpressAdapter, this.config);
     }
     applyOptions() {
-        if (!this.appOptions) {
+        if (!this.appOptions || !this.appOptions.cors) {
             return undefined;
         }
-        this.appOptions.cors && this.enableCors();
+        const isCorsOptionsObj = shared_utils_1.isObject(this.appOptions.cors);
+        if (!isCorsOptionsObj) {
+            return this.enableCors();
+        }
+        this.enableCors(this.appOptions.cors);
     }
     createServer() {
         if (this.appOptions && this.appOptions.httpsOptions) {
@@ -152,8 +156,8 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.express.enable(...args);
         return this;
     }
-    enableCors() {
-        this.express.use(cors());
+    enableCors(options) {
+        this.express.use(cors(options));
         return this;
     }
     listen(port, ...args) {

lib/core/nest-factory.js

@@ -33,8 +33,8 @@ class NestFactoryStatic {
             const [expressInstance, appOptions] = isExpressInstance
                 ? [expressOrOptions, options]
                 : [express_adapter_1.ExpressAdapter.create(), expressOrOptions];
-            const container = new container_1.NestContainer();
             const applicationConfig = new application_config_1.ApplicationConfig();
+            const container = new container_1.NestContainer(applicationConfig);
             this.applyLogger(appOptions);
             yield this.initialize(module, container, applicationConfig, expressInstance);
             return this.createNestInstance(new nest_application_1.NestApplication(container, expressInstance, applicationConfig, appOptions));
@@ -52,8 +52,8 @@ class NestFactoryStatic {
             if (!NestMicroservice) {
                 throw new microservices_package_not_found_exception_1.MicroservicesPackageNotFoundException();
             }
-            const container = new container_1.NestContainer();
             const applicationConfig = new application_config_1.ApplicationConfig();
+            const container = new container_1.NestContainer(applicationConfig);
             this.applyLogger(options);
             yield this.initialize(module, container, applicationConfig);
             return this.createNestInstance(new NestMicroservice(container, options, applicationConfig));