@nestjs/core 8.0.3 → 8.0.7

package/Readme.md

@@ -67,8 +67,11 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 <table style="text-align:center;"><tr><td>
   <a href="https://careers.labster.com/departments/platform" target="_blank"><img src="https://nestjs.com/img/labster-logo.png" width="170" valign="middle" /></a></td><td>
-<a href="https://weld.so/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td><td>
-<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td></tr></table>
+<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td>
+  <td>
+<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td>
+<td>
+<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td></</tr></table>
 
 #### Silver Sponsors
 
@@ -76,7 +79,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 <a href="https://neoteric.eu/" target="_blank"><img src="https://nestjs.com/img/neoteric-cut.png" width="120" valign="middle" /></a> </td><td>
   <a href="http://gojob.com" target="_blank"><img src="http://nestjs.com/img/gojob-logo.png" valign="middle" width="100" /></a> </td><td>
 <a href="http://www.leogistics.com" target="_blank"><img src="https://nestjs.com/img/leogistics-logo.jpeg" width="150" valign="middle" /></td><td>
-<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td><td>
+<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-roles-logo.svg" width="150" valign="middle" /></td><td>
 <a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td></tr></table>
 
 #### Sponsors
@@ -108,6 +111,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
   <td align="center" valign="middle"><a href="https://www.bystored.com/" target="_blank"><img src="https://nestjs.com/img/stored-logo.svg" width="110" valign="middle" /></a></td>
   <td align="center" valign="middle"><a href="https://studyclerk.com/pay-for-research-paper" target="_blank"><img src="https://nestjs.com/img/studyclerk-logo.png" width="125" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://xyndata.com" target="_blank"><img src="https://nestjs.com/img/xyndata-logo.png" width="125" valign="middle" /></a></td></tr><tr>
   <td align="center" valign="middle"><a href="https://www.anonymistic.com/" target="_blank"><img src="https://nestjs.com/img/anonymistic-logo.png" width="125" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://www.naologic.com/" target="_blank"><img src="https://nestjs.com/img/naologic-logo.svg" width="125" valign="middle" /></a></td>
   </tr></table>
 
 ## Backers

package/adapters/http-adapter.d.ts

@@ -6,9 +6,9 @@ import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-applicati
  * @publicApi
  */
 export declare abstract class AbstractHttpAdapter<TServer = any, TRequest = any, TResponse = any> implements HttpServer<TRequest, TResponse> {
-    protected readonly instance: any;
+    protected instance?: any;
     protected httpServer: TServer;
-    constructor(instance: any);
+    constructor(instance?: any);
     init(): Promise<void>;
     use(...args: any[]): any;
     get(handler: RequestHandler): any;
@@ -31,6 +31,7 @@ export declare abstract class AbstractHttpAdapter<TServer = any, TRequest = any,
     listen(port: string | number, hostname: string, callback?: () => void): any;
     getHttpServer(): TServer;
     setHttpServer(httpServer: TServer): void;
+    setInstance<T = any>(instance: T): void;
     getInstance<T = any>(): T;
     abstract close(): any;
     abstract initHttpServer(options: NestApplicationOptions): any;

package/adapters/http-adapter.js

@@ -46,6 +46,9 @@ class AbstractHttpAdapter {
     setHttpServer(httpServer) {
         this.httpServer = httpServer;
     }
+    setInstance(instance) {
+        this.instance = instance;
+    }
     getInstance() {
         return this.instance;
     }

package/hooks/before-app-shutdown.hook.js

@@ -32,7 +32,12 @@ function callOperator(instances, signal) {
 async function callBeforeAppShutdownHook(module, signal) {
     const providers = module.getNonAliasProviders();
     const [_, moduleClassHost] = providers.shift();
-    const instances = [...module.controllers, ...providers];
+    const instances = [
+        ...module.controllers,
+        ...providers,
+        ...module.injectables,
+        ...module.middlewares,
+    ];
     const nonTransientInstances = transient_instances_1.getNonTransientInstances(instances);
     await Promise.all(callOperator(nonTransientInstances, signal));
     const transientInstances = transient_instances_1.getTransientInstances(instances);

package/injector/injector.js

@@ -78,7 +78,7 @@ class Injector {
         return done;
     }
     async resolveConstructorParams(wrapper, moduleRef, inject, callback, contextId = constants_2.STATIC_CONTEXT, inquirer, parentInquirer) {
-        const inquirerId = this.getInquirerId(inquirer);
+        let inquirerId = this.getInquirerId(inquirer);
         const metadata = wrapper.getCtorMetadata();
         if (metadata && contextId !== constants_2.STATIC_CONTEXT) {
             const deps = await this.loadCtorMetadata(metadata, contextId, inquirer, parentInquirer);
@@ -96,6 +96,10 @@ class Injector {
                 if (this.isInquirer(param, parentInquirer)) {
                     return parentInquirer && parentInquirer.instance;
                 }
+                if ((inquirer === null || inquirer === void 0 ? void 0 : inquirer.isTransient) && parentInquirer) {
+                    inquirer = parentInquirer;
+                    inquirerId = this.getInquirerId(parentInquirer);
+                }
                 const paramWrapper = await this.resolveSingleParam(wrapper, param, { index, dependencies }, moduleRef, contextId, inquirer, index);
                 const instanceHost = paramWrapper.getInstanceByContextId(contextId, inquirerId);
                 if (!instanceHost.isResolved && !paramWrapper.forwardRef) {

package/middleware/middleware-module.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MiddlewareModule = void 0;
+const request_method_enum_1 = require("@nestjs/common/enums/request-method.enum");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const invalid_middleware_exception_1 = require("../errors/exceptions/invalid-middleware.exception");
 const runtime_exception_1 = require("../errors/exceptions/runtime.exception");
@@ -13,6 +14,7 @@ const router_proxy_1 = require("../router/router-proxy");
 const builder_1 = require("./builder");
 const resolver_1 = require("./resolver");
 const routes_mapper_1 = require("./routes-mapper");
+const utils_1 = require("./utils");
 class MiddlewareModule {
     constructor() {
         this.routerProxy = new router_proxy_1.RouterProxy();
@@ -92,13 +94,12 @@ class MiddlewareModule {
         if (shared_utils_1.isUndefined(instance === null || instance === void 0 ? void 0 : instance.use)) {
             throw new invalid_middleware_exception_1.InvalidMiddlewareException(metatype.name);
         }
-        const router = await applicationRef.createMiddlewareFactory(method);
         const isStatic = wrapper.isDependencyTreeStatic();
         if (isStatic) {
             const proxy = await this.createProxy(instance);
-            return this.registerHandler(router, path, proxy);
+            return this.registerHandler(applicationRef, method, path, proxy);
         }
-        this.registerHandler(router, path, async (req, res, next) => {
+        await this.registerHandler(applicationRef, method, path, async (req, res, next) => {
             try {
                 const contextId = context_id_factory_1.ContextIdFactory.getByRequest(req);
                 if (!req[request_constants_1.REQUEST_CONTEXT_ID]) {
@@ -130,15 +131,25 @@ class MiddlewareModule {
         const middleware = instance.use.bind(instance);
         return this.routerProxy.createProxy(middleware, exceptionsHandler);
     }
-    registerHandler(router, path, proxy) {
+    async registerHandler(applicationRef, method, path, proxy) {
         const prefix = this.config.getGlobalPrefix();
         const basePath = shared_utils_1.addLeadingSlash(prefix);
-        if (basePath && path === '/*') {
+        if ((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith('/')) && (path === null || path === void 0 ? void 0 : path.startsWith('/'))) {
             // strip slash when a wildcard is being used
             // and global prefix has been set
-            path = '*';
+            path = path === null || path === void 0 ? void 0 : path.slice(1);
         }
-        router(basePath + path, proxy);
+        const isMethodAll = utils_1.isRequestMethodAll(method);
+        const requestMethod = request_method_enum_1.RequestMethod[method];
+        const router = await applicationRef.createMiddlewareFactory(method);
+        router(basePath + path, isMethodAll
+            ? proxy
+            : (req, res, next) => {
+                if (applicationRef.getRequestMethod(req) === requestMethod) {
+                    return proxy(req, res, next);
+                }
+                return next();
+            });
     }
 }
 exports.MiddlewareModule = MiddlewareModule;

package/middleware/utils.d.ts

@@ -1,7 +1,9 @@
+import { RequestMethod } from '@nestjs/common';
 import { HttpServer, RouteInfo, Type } from '@nestjs/common/interfaces';
 declare type RouteInfoRegex = RouteInfo & {
     regex: RegExp;
 };
+export declare const isRequestMethodAll: (method: RequestMethod) => boolean;
 export declare const filterMiddleware: <T extends Function | Type<any> = any>(middleware: T[], excludedRoutes: RouteInfo[], httpAdapter: HttpServer) => Type<any>[];
 export declare const mapToClass: <T extends Function | Type<any>>(middleware: T, excludedRoutes: RouteInfoRegex[], httpAdapter: HttpServer) => Type<any>;
 export declare function isMiddlewareClass(middleware: any): middleware is Type<any>;

package/middleware/utils.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRouteExcluded = exports.assignToken = exports.isMiddlewareClass = exports.mapToClass = exports.filterMiddleware = void 0;
-/* eslint-disable @typescript-eslint/no-use-before-define */
+exports.isRouteExcluded = exports.assignToken = exports.isMiddlewareClass = exports.mapToClass = exports.filterMiddleware = exports.isRequestMethodAll = void 0;
 const common_1 = require("@nestjs/common");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const iterare_1 = require("iterare");
 const pathToRegexp = require("path-to-regexp");
 const uuid_1 = require("uuid");
+const isRequestMethodAll = (method) => {
+    return common_1.RequestMethod.ALL === method || method === -1;
+};
+exports.isRequestMethodAll = isRequestMethodAll;
 const filterMiddleware = (middleware, excludedRoutes, httpAdapter) => {
     const excluded = excludedRoutes.map(route => (Object.assign(Object.assign({}, route), { regex: pathToRegexp(route.path) })));
     return iterare_1.iterate([])
@@ -75,9 +78,7 @@ function isRouteExcluded(req, excludedRoutes, httpAdapter) {
         ? originalUrl.slice(0, queryParamsIndex)
         : originalUrl;
     const isExcluded = excludedRoutes.some(({ method, regex }) => {
-        if (common_1.RequestMethod.ALL === method ||
-            common_1.RequestMethod[method] === reqMethod ||
-            method === -1) {
+        if (exports.isRequestMethodAll(method) || common_1.RequestMethod[method] === reqMethod) {
             return regex.exec(pathname);
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "8.0.3",
+  "version": "8.0.7",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -32,11 +32,11 @@
     "iterare": "1.2.1",
     "object-hash": "2.2.0",
     "path-to-regexp": "3.2.0",
-    "tslib": "2.3.0",
+    "tslib": "2.3.1",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.3"
+    "@nestjs/common": "8.0.7"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

package/router/router-explorer.js

@@ -112,7 +112,7 @@ class RouterExplorer {
             if (isVersioned &&
                 routePathMetadata.versioningOptions.type !== version_type_enum_1.VersioningType.URI) {
                 // All versioning (except for URI Versioning) is done via the "Version Filter"
-                routeHandler = this.applyVersionFilter(routePathMetadata, routeHandler);
+                routeHandler = this.applyVersionFilter(router, routePathMetadata, routeHandler);
             }
             routePathMetadata.methodPath = path;
             const pathsToRegister = this.routePathFactory.create(routePathMetadata, requestMethod);
@@ -159,9 +159,16 @@ class RouterExplorer {
             return next();
         };
     }
-    applyVersionFilter(routePathMetadata, handler) {
+    applyVersionFilter(router, routePathMetadata, handler) {
         const { versioningOptions } = routePathMetadata;
         const version = this.routePathFactory.getVersion(routePathMetadata);
+        if (router === null || router === void 0 ? void 0 : router.applyVersionFilter) {
+            return router.applyVersionFilter(handler, version, versioningOptions);
+        }
+        /**
+         * This can be removed in the next major release.
+         * Left for backward-compatibility.
+         */
         return (req, res, next) => {
             var _a, _b, _c, _d;
             if (version === version_options_interface_1.VERSION_NEUTRAL) {

package/router/router-module.d.ts

@@ -12,6 +12,7 @@ export declare class RouterModule {
     private readonly routes;
     constructor(modulesContainer: ModulesContainer, routes: Routes);
     static register(routes: Routes): DynamicModule;
+    private deepCloneRoutes;
     private initialize;
     private registerModulePathMetadata;
     private updateTargetModulesCache;

package/router/router-module.js

@@ -17,6 +17,7 @@ let RouterModule = RouterModule_1 = class RouterModule {
     constructor(modulesContainer, routes) {
         this.modulesContainer = modulesContainer;
         this.routes = routes;
+        this.routes = this.deepCloneRoutes(routes);
         this.initialize();
     }
     static register(routes) {
@@ -30,6 +31,17 @@ let RouterModule = RouterModule_1 = class RouterModule {
             ],
         };
     }
+    deepCloneRoutes(routes) {
+        return routes.map((routeOrType) => {
+            if (typeof routeOrType === 'function') {
+                return routeOrType;
+            }
+            if (routeOrType.children) {
+                return Object.assign(Object.assign({}, routeOrType), { children: this.deepCloneRoutes(routeOrType.children) });
+            }
+            return Object.assign({}, routeOrType);
+        });
+    }
     initialize() {
         const flattenedRoutes = utils_1.flattenRoutePaths(this.routes);
         flattenedRoutes.forEach(route => {

package/scanner.js

@@ -159,15 +159,17 @@ class DependenciesScanner {
         // Skip "InternalCoreModule" from calculating distance
         modulesGenerator.next();
         const modulesStack = [];
-        const calculateDistance = (moduleRef, distance = 0) => {
+        const calculateDistance = (moduleRef, distance = 1) => {
             if (modulesStack.includes(moduleRef)) {
                 return;
             }
             modulesStack.push(moduleRef);
             const moduleImports = moduleRef.imports;
             moduleImports.forEach(importedModuleRef => {
-                importedModuleRef.distance = distance;
-                calculateDistance(importedModuleRef, distance + 1);
+                if (importedModuleRef) {
+                    importedModuleRef.distance = distance;
+                    calculateDistance(importedModuleRef, distance + 1);
+                }
             });
         };
         const rootModule = modulesGenerator.next().value;