@nestjs/core 8.0.2 → 8.0.6

package/Readme.md

@@ -108,6 +108,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/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/injector/module.js

@@ -259,8 +259,8 @@ class Module {
             return addExportedUnit(provider);
         }
         else if (this.isDynamicModule(provider)) {
-            const { module } = provider;
-            return addExportedUnit(module.name);
+            const { module: moduleClassRef } = provider;
+            return addExportedUnit(moduleClassRef);
         }
         addExportedUnit(provider);
     }

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.2",
+  "version": "8.0.6",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.2"
+    "@nestjs/common": "8.0.6"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

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;