@nestjs/core 8.0.9 → 8.1.1

package/Readme.md

@@ -79,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-roles-logo.svg" width="150" valign="middle" /></td><td>
+<a href="https://careers.meetdandy.com/?gh_src=063ba61e3us" 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>
 <td><a href="https://www.tinystacks.com" target="_blank"><img src="https://nestjs.com/img/tinystacks-logo.png#1" width="140" valign="middle" /></td></tr></table>
 

package/index.js

@@ -4,7 +4,7 @@ exports.NestFactory = exports.APP_PIPE = exports.APP_INTERCEPTOR = exports.APP_G
 const tslib_1 = require("tslib");
 /*
  * Nest @core
- * Copyright(c) 2017 - 2020 Kamil Mysliwiec
+ * Copyright(c) 2017 - 2021 Kamil Mysliwiec
  * https://nestjs.com
  * MIT Licensed
  */

package/injector/injector.d.ts

@@ -40,6 +40,7 @@ export interface InjectorDependencyContext {
     dependencies?: InjectorDependency[];
 }
 export declare class Injector {
+    private logger;
     loadPrototype<T>({ token }: InstanceWrapper<T>, collection: Map<InstanceToken, InstanceWrapper<T>>, contextId?: ContextId): void;
     loadInstance<T>(wrapper: InstanceWrapper<T>, collection: Map<InstanceToken, InstanceWrapper>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
     loadMiddleware(wrapper: InstanceWrapper, collection: Map<InstanceToken, InstanceWrapper>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
@@ -71,4 +72,9 @@ export declare class Injector {
     private isInquirerRequest;
     private isInquirer;
     private addDependencyMetadata;
+    private getTokenName;
+    private printResolvingDependenciesLog;
+    private printLookingForProviderLog;
+    private printFoundInModuleLog;
+    private isDebugMode;
 }

package/injector/injector.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Injector = void 0;
+const common_1 = require("@nestjs/common");
 const constants_1 = require("@nestjs/common/constants");
+const cli_colors_util_1 = require("@nestjs/common/utils/cli-colors.util");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const iterare_1 = require("iterare");
 const runtime_exception_1 = require("../errors/exceptions/runtime.exception");
@@ -11,6 +13,9 @@ const constants_2 = require("./constants");
 const inquirer_1 = require("./inquirer");
 const instance_wrapper_1 = require("./instance-wrapper");
 class Injector {
+    constructor() {
+        this.logger = new common_1.Logger('InjectorLogger');
+    }
     loadPrototype({ token }, collection, contextId = constants_2.STATIC_CONTEXT) {
         if (!collection) {
             return;
@@ -145,6 +150,8 @@ class Injector {
         return param.forwardRef();
     }
     async resolveComponentInstance(moduleRef, token, dependencyContext, wrapper, contextId = constants_2.STATIC_CONTEXT, inquirer, keyOrIndex) {
+        this.printResolvingDependenciesLog(token, inquirer);
+        this.printLookingForProviderLog(token, moduleRef);
         const providers = moduleRef.providers;
         const instanceWrapper = await this.lookupComponent(providers, moduleRef, Object.assign(Object.assign({}, dependencyContext), { name: token }), wrapper, contextId, inquirer, keyOrIndex);
         return this.resolveComponentHost(moduleRef, instanceWrapper, contextId, inquirer);
@@ -182,6 +189,7 @@ class Injector {
         }
         if (providers.has(name)) {
             const instanceWrapper = providers.get(name);
+            this.printFoundInModuleLog(name, moduleRef);
             this.addDependencyMetadata(keyOrIndex, wrapper, instanceWrapper);
             return instanceWrapper;
         }
@@ -207,6 +215,7 @@ class Injector {
             if (moduleRegistry.includes(relatedModule.id)) {
                 continue;
             }
+            this.printLookingForProviderLog(name, relatedModule);
             moduleRegistry.push(relatedModule.id);
             const { providers, exports } = relatedModule;
             if (!exports.has(name) || !providers.has(name)) {
@@ -217,6 +226,7 @@ class Injector {
                 }
                 continue;
             }
+            this.printFoundInModuleLog(name, relatedModule);
             instanceWrapperRef = providers.get(name);
             this.addDependencyMetadata(keyOrIndex, wrapper, instanceWrapperRef);
             const inquirerId = this.getInquirerId(inquirer);
@@ -351,5 +361,40 @@ class Injector {
             ? hostWrapper.addPropertiesMetadata(keyOrIndex, instanceWrapper)
             : hostWrapper.addCtorMetadata(keyOrIndex, instanceWrapper);
     }
+    getTokenName(token) {
+        return shared_utils_1.isFunction(token) ? token.name : token.toString();
+    }
+    printResolvingDependenciesLog(token, inquirer) {
+        var _a;
+        if (!this.isDebugMode()) {
+            return;
+        }
+        const tokenName = this.getTokenName(token);
+        const dependentName = (_a = inquirer === null || inquirer === void 0 ? void 0 : inquirer.name) !== null && _a !== void 0 ? _a : 'unknown';
+        const isAlias = dependentName === tokenName;
+        const messageToPrint = `Resolving dependency ${cli_colors_util_1.clc.cyanBright(tokenName)}${cli_colors_util_1.clc.green(' in the ')}${cli_colors_util_1.clc.yellow(dependentName)}${cli_colors_util_1.clc.green(` provider ${isAlias ? '(alias)' : ''}`)}`;
+        this.logger.log(messageToPrint);
+    }
+    printLookingForProviderLog(token, moduleRef) {
+        var _a, _b;
+        if (!this.isDebugMode()) {
+            return;
+        }
+        const tokenName = this.getTokenName(token);
+        const moduleRefName = (_b = (_a = moduleRef === null || moduleRef === void 0 ? void 0 : moduleRef.metatype) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'unknown';
+        this.logger.log(`Looking for ${cli_colors_util_1.clc.cyanBright(tokenName)}${cli_colors_util_1.clc.green(' in ')}${cli_colors_util_1.clc.magentaBright(moduleRefName)}`);
+    }
+    printFoundInModuleLog(token, moduleRef) {
+        var _a, _b;
+        if (!this.isDebugMode()) {
+            return;
+        }
+        const tokenName = this.getTokenName(token);
+        const moduleRefName = (_b = (_a = moduleRef === null || moduleRef === void 0 ? void 0 : moduleRef.metatype) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'unknown';
+        this.logger.log(`Found ${cli_colors_util_1.clc.cyanBright(tokenName)}${cli_colors_util_1.clc.green(' in ')}${cli_colors_util_1.clc.magentaBright(moduleRefName)}`);
+    }
+    isDebugMode() {
+        return !!process.env.NEST_DEBUG;
+    }
 }
 exports.Injector = Injector;

package/middleware/middleware-module.js

@@ -3,6 +3,7 @@ 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 utils_1 = require("../router/utils");
 const invalid_middleware_exception_1 = require("../errors/exceptions/invalid-middleware.exception");
 const runtime_exception_1 = require("../errors/exceptions/runtime.exception");
 const context_id_factory_1 = require("../helpers/context-id-factory");
@@ -14,7 +15,6 @@ 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();
@@ -133,16 +133,24 @@ class MiddlewareModule {
     }
     async registerHandler(applicationRef, method, path, proxy) {
         const prefix = this.config.getGlobalPrefix();
-        const basePath = shared_utils_1.addLeadingSlash(prefix);
-        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 === null || path === void 0 ? void 0 : path.slice(1);
+        const excludedRoutes = this.config.getGlobalPrefixOptions().exclude;
+        if (Array.isArray(excludedRoutes) &&
+            utils_1.isRouteExcluded(excludedRoutes, path, method)) {
+            path = shared_utils_1.addLeadingSlash(path);
+        }
+        else {
+            const basePath = shared_utils_1.addLeadingSlash(prefix);
+            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 === null || path === void 0 ? void 0 : path.slice(1);
+            }
+            path = basePath + path;
         }
         const isMethodAll = utils_1.isRequestMethodAll(method);
         const requestMethod = request_method_enum_1.RequestMethod[method];
         const router = await applicationRef.createMiddlewareFactory(method);
-        router(basePath + path, isMethodAll
+        router(path, isMethodAll
             ? proxy
             : (req, res, next) => {
                 if (applicationRef.getRequestMethod(req) === requestMethod) {

package/middleware/utils.d.ts

@@ -1,12 +1,8 @@
-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>;
+import { ExcludeRouteMetadata } from '../router/interfaces/exclude-route-metadata.interface';
+export declare const mapToExcludeRoute: (routes: RouteInfo[]) => ExcludeRouteMetadata[];
+export declare const filterMiddleware: <T extends Function | Type<any> = any>(middleware: T[], routes: RouteInfo[], httpAdapter: HttpServer) => Type<any>[];
+export declare const mapToClass: <T extends Function | Type<any>>(middleware: T, excludedRoutes: ExcludeRouteMetadata[], httpAdapter: HttpServer) => Type<any>;
 export declare function isMiddlewareClass(middleware: any): middleware is Type<any>;
 export declare function assignToken(metatype: Type<any>, token?: any): Type<any>;
-export declare function isRouteExcluded(req: Record<string, any>, excludedRoutes: RouteInfoRegex[], httpAdapter: HttpServer): boolean;
-export {};
+export declare function isMiddlewareRouteExcluded(req: Record<string, any>, excludedRoutes: ExcludeRouteMetadata[], httpAdapter: HttpServer): boolean;

package/middleware/utils.js

@@ -1,21 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRouteExcluded = exports.assignToken = exports.isMiddlewareClass = exports.mapToClass = exports.filterMiddleware = exports.isRequestMethodAll = void 0;
+exports.isMiddlewareRouteExcluded = exports.assignToken = exports.isMiddlewareClass = exports.mapToClass = exports.filterMiddleware = exports.mapToExcludeRoute = 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;
+const utils_1 = require("../router/utils");
+const mapToExcludeRoute = (routes) => {
+    return routes.map(({ path, method }) => ({
+        pathRegex: pathToRegexp(path),
+        requestMethod: method,
+    }));
 };
-exports.isRequestMethodAll = isRequestMethodAll;
-const filterMiddleware = (middleware, excludedRoutes, httpAdapter) => {
-    const excluded = excludedRoutes.map(route => (Object.assign(Object.assign({}, route), { regex: pathToRegexp(route.path) })));
+exports.mapToExcludeRoute = mapToExcludeRoute;
+const filterMiddleware = (middleware, routes, httpAdapter) => {
+    const excludedRoutes = exports.mapToExcludeRoute(routes);
     return iterare_1.iterate([])
         .concat(middleware)
         .filter(shared_utils_1.isFunction)
-        .map((item) => exports.mapToClass(item, excluded, httpAdapter))
+        .map((item) => exports.mapToClass(item, excludedRoutes, httpAdapter))
         .toArray();
 };
 exports.filterMiddleware = filterMiddleware;
@@ -27,7 +31,7 @@ const mapToClass = (middleware, excludedRoutes, httpAdapter) => {
         const MiddlewareHost = class extends middleware {
             use(...params) {
                 const [req, _, next] = params;
-                const isExcluded = isRouteExcluded(req, excludedRoutes, httpAdapter);
+                const isExcluded = isMiddlewareRouteExcluded(req, excludedRoutes, httpAdapter);
                 if (isExcluded) {
                     return next();
                 }
@@ -40,7 +44,7 @@ const mapToClass = (middleware, excludedRoutes, httpAdapter) => {
         constructor() {
             this.use = (...params) => {
                 const [req, _, next] = params;
-                const isExcluded = isRouteExcluded(req, excludedRoutes, httpAdapter);
+                const isExcluded = isMiddlewareRouteExcluded(req, excludedRoutes, httpAdapter);
                 if (isExcluded) {
                     return next();
                 }
@@ -67,7 +71,7 @@ function assignToken(metatype, token = uuid_1.v4()) {
     return metatype;
 }
 exports.assignToken = assignToken;
-function isRouteExcluded(req, excludedRoutes, httpAdapter) {
+function isMiddlewareRouteExcluded(req, excludedRoutes, httpAdapter) {
     if (excludedRoutes.length <= 0) {
         return false;
     }
@@ -77,12 +81,6 @@ function isRouteExcluded(req, excludedRoutes, httpAdapter) {
     const pathname = queryParamsIndex >= 0
         ? originalUrl.slice(0, queryParamsIndex)
         : originalUrl;
-    const isExcluded = excludedRoutes.some(({ method, regex }) => {
-        if (exports.isRequestMethodAll(method) || common_1.RequestMethod[method] === reqMethod) {
-            return regex.exec(pathname);
-        }
-        return false;
-    });
-    return isExcluded;
+    return utils_1.isRouteExcluded(excludedRoutes, pathname, common_1.RequestMethod[reqMethod]);
 }
-exports.isRouteExcluded = isRouteExcluded;
+exports.isMiddlewareRouteExcluded = isMiddlewareRouteExcluded;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "8.0.9",
+  "version": "8.1.1",
   "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.9"
+    "@nestjs/common": "8.1.1"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

package/router/route-path-factory.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutePathFactory = void 0;
 const common_1 = require("@nestjs/common");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
+const utils_1 = require("./utils");
 class RoutePathFactory {
     constructor(applicationConfig) {
         this.applicationConfig = applicationConfig;
@@ -71,16 +72,9 @@ class RoutePathFactory {
             return false;
         }
         const options = this.applicationConfig.getGlobalPrefixOptions();
-        if (!options.exclude) {
-            return false;
-        }
-        return options.exclude.some(route => {
-            if (!route.pathRegex.exec(path)) {
-                return false;
-            }
-            return (route.requestMethod === common_1.RequestMethod.ALL ||
-                route.requestMethod === requestMethod);
-        });
+        const excludedRoutes = options.exclude;
+        return (Array.isArray(excludedRoutes) &&
+            utils_1.isRouteExcluded(excludedRoutes, path, requestMethod));
     }
 }
 exports.RoutePathFactory = RoutePathFactory;

package/router/routes-resolver.js

@@ -108,10 +108,11 @@ class RoutesResolver {
         return Reflect.getMetadata(constants_1.HOST_METADATA, metatype);
     }
     getVersionMetadata(metatype) {
-        const isVersioningEnabled = this.applicationConfig.getVersioning();
-        return isVersioningEnabled
-            ? Reflect.getMetadata(constants_1.VERSION_METADATA, metatype)
-            : undefined;
+        var _a;
+        const versioningConfig = this.applicationConfig.getVersioning();
+        if (versioningConfig) {
+            return ((_a = Reflect.getMetadata(constants_1.VERSION_METADATA, metatype)) !== null && _a !== void 0 ? _a : versioningConfig.defaultVersion);
+        }
     }
 }
 exports.RoutesResolver = RoutesResolver;

package/router/utils/exclude-route.util.d.ts

@@ -0,0 +1,4 @@
+import { RequestMethod } from '@nestjs/common';
+import { ExcludeRouteMetadata } from '../interfaces/exclude-route-metadata.interface';
+export declare const isRequestMethodAll: (method: RequestMethod) => boolean;
+export declare function isRouteExcluded(excludedRoutes: ExcludeRouteMetadata[], path: string, requestMethod?: RequestMethod): boolean;

package/router/utils/exclude-route.util.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRouteExcluded = exports.isRequestMethodAll = void 0;
+const common_1 = require("@nestjs/common");
+const isRequestMethodAll = (method) => {
+    return common_1.RequestMethod.ALL === method || method === -1;
+};
+exports.isRequestMethodAll = isRequestMethodAll;
+function isRouteExcluded(excludedRoutes, path, requestMethod) {
+    return excludedRoutes.some(route => {
+        if (exports.isRequestMethodAll(route.requestMethod) ||
+            route.requestMethod === requestMethod) {
+            return route.pathRegex.exec(path);
+        }
+        return false;
+    });
+}
+exports.isRouteExcluded = isRouteExcluded;

package/router/utils/index.d.ts

@@ -1 +1,2 @@
+export * from './exclude-route.util';
 export * from './flatten-route-paths.util';

package/router/utils/index.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./exclude-route.util"), exports);
 tslib_1.__exportStar(require("./flatten-route-paths.util"), exports);