@nestjs/core 9.3.0 → 9.3.2

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 - 2022 Kamil Mysliwiec
+ * Copyright(c) 2017 - 2023 Kamil Mysliwiec
  * https://nestjs.com
  * MIT Licensed
  */

package/injector/compiler.d.ts

@@ -1,4 +1,4 @@
-import { DynamicModule, Type } from '@nestjs/common/interfaces';
+import { DynamicModule, ForwardReference, Type } from '@nestjs/common/interfaces';
 import { ModuleTokenFactory } from './module-token-factory';
 export interface ModuleFactory {
     type: Type<any>;
@@ -9,9 +9,9 @@ export declare class ModuleCompiler {
     private readonly moduleTokenFactory;
     constructor(moduleTokenFactory?: ModuleTokenFactory);
     compile(metatype: Type<any> | DynamicModule | Promise<DynamicModule>): Promise<ModuleFactory>;
-    extractMetadata(metatype: Type<any> | DynamicModule): {
+    extractMetadata(metatype: Type<any> | ForwardReference | DynamicModule): {
         type: Type<any>;
         dynamicMetadata?: Partial<DynamicModule> | undefined;
     };
-    isDynamicModule(module: Type<any> | DynamicModule): module is DynamicModule;
+    isDynamicModule(module: Type<any> | DynamicModule | ForwardReference): module is DynamicModule;
 }

package/injector/compiler.js

@@ -14,7 +14,11 @@ class ModuleCompiler {
     }
     extractMetadata(metatype) {
         if (!this.isDynamicModule(metatype)) {
-            return { type: metatype };
+            return {
+                type: (metatype === null || metatype === void 0 ? void 0 : metatype.forwardRef)
+                    ? metatype.forwardRef()
+                    : metatype,
+            };
         }
         const { module: type } = metatype, dynamicMetadata = tslib_1.__rest(metatype, ["module"]);
         return { type, dynamicMetadata };

package/injector/injector.js

@@ -162,7 +162,9 @@ class Injector {
         ];
     }
     reflectConstructorParams(type) {
-        const paramtypes = [...(Reflect.getMetadata(constants_1.PARAMTYPES_METADATA, type) || [])];
+        const paramtypes = [
+            ...(Reflect.getMetadata(constants_1.PARAMTYPES_METADATA, type) || []),
+        ];
         const selfParams = this.reflectSelfParams(type);
         selfParams.forEach(({ index, param }) => (paramtypes[index] = param));
         return paramtypes;

package/inspector/uuid-factory.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UuidFactory = exports.UuidFactoryMode = void 0;
-const random_string_generator_util_1 = require("../../common/utils/random-string-generator.util");
+const random_string_generator_util_1 = require("@nestjs/common/utils/random-string-generator.util");
 const deterministic_uuid_registry_1 = require("./deterministic-uuid-registry");
 var UuidFactoryMode;
 (function (UuidFactoryMode) {

package/middleware/middleware-module.d.ts

@@ -6,10 +6,8 @@ import { NestContainer } from '../injector/container';
 import { Injector } from '../injector/injector';
 import { Module } from '../injector/module';
 import { GraphInspector } from '../inspector/graph-inspector';
-import { RoutePathFactory } from '../router/route-path-factory';
 import { MiddlewareContainer } from './container';
 export declare class MiddlewareModule<TAppOptions extends NestApplicationContextOptions = NestApplicationContextOptions> {
-    private readonly routePathFactory;
     private readonly routerProxy;
     private readonly exceptionFiltersCache;
     private readonly logger;
@@ -17,12 +15,11 @@ export declare class MiddlewareModule<TAppOptions extends NestApplicationContext
     private routerExceptionFilter;
     private routesMapper;
     private resolver;
-    private config;
     private container;
     private httpAdapter;
     private graphInspector;
     private appOptions;
-    constructor(routePathFactory: RoutePathFactory);
+    private routeInfoPathExtractor;
     register(middlewareContainer: MiddlewareContainer, container: NestContainer, config: ApplicationConfig, injector: Injector, httpAdapter: HttpServer, graphInspector: GraphInspector, options: TAppOptions): Promise<void>;
     resolveMiddleware(middlewareContainer: MiddlewareContainer, modules: Map<string, Module>): Promise<void>;
     loadConfiguration(middlewareContainer: MiddlewareContainer, moduleRef: Module, moduleKey: string): Promise<void>;

package/middleware/middleware-module.js

@@ -15,10 +15,10 @@ const router_proxy_1 = require("../router/router-proxy");
 const utils_1 = require("../router/utils");
 const builder_1 = require("./builder");
 const resolver_1 = require("./resolver");
+const route_info_path_extractor_1 = require("./route-info-path-extractor");
 const routes_mapper_1 = require("./routes-mapper");
 class MiddlewareModule {
-    constructor(routePathFactory) {
-        this.routePathFactory = routePathFactory;
+    constructor() {
         this.routerProxy = new router_proxy_1.RouterProxy();
         this.exceptionFiltersCache = new WeakMap();
         this.logger = new common_1.Logger(MiddlewareModule.name);
@@ -29,7 +29,7 @@ class MiddlewareModule {
         this.routerExceptionFilter = new router_exception_filters_1.RouterExceptionFilters(container, config, appRef);
         this.routesMapper = new routes_mapper_1.RoutesMapper(container);
         this.resolver = new resolver_1.MiddlewareResolver(middlewareContainer, injector);
-        this.config = config;
+        this.routeInfoPathExtractor = new route_info_path_extractor_1.RouteInfoPathExtractor(config);
         this.injector = injector;
         this.container = container;
         this.httpAdapter = httpAdapter;
@@ -153,29 +153,9 @@ class MiddlewareModule {
         const middleware = instance.use.bind(instance);
         return this.routerProxy.createProxy(middleware, exceptionsHandler);
     }
-    async registerHandler(applicationRef, { path, method, version }, proxy) {
-        const prefix = this.config.getGlobalPrefix();
-        const excludedRoutes = this.config.getGlobalPrefixOptions().exclude;
-        const isAWildcard = ['*', '/*', '(.*)', '/(.*)'].includes(path);
-        if ((Array.isArray(excludedRoutes) &&
-            (0, utils_1.isRouteExcluded)(excludedRoutes, path, method)) ||
-            isAWildcard) {
-            path = (0, shared_utils_1.addLeadingSlash)(path);
-        }
-        else {
-            const basePath = (0, 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 applicationVersioningConfig = this.config.getVersioning();
-        if (version && applicationVersioningConfig.type === common_1.VersioningType.URI) {
-            const versionPrefix = this.routePathFactory.getVersionPrefix(applicationVersioningConfig);
-            path = `/${versionPrefix}${version.toString()}${path}`;
-        }
+    async registerHandler(applicationRef, routeInfo, proxy) {
+        const { method } = routeInfo;
+        const paths = this.routeInfoPathExtractor.extractPathsFrom(routeInfo);
         const isMethodAll = (0, utils_1.isRequestMethodAll)(method);
         const requestMethod = request_method_enum_1.RequestMethod[method];
         const router = await applicationRef.createMiddlewareFactory(method);
@@ -187,7 +167,7 @@ class MiddlewareModule {
                 }
                 return next();
             };
-        router(path, middlewareFunction);
+        paths.forEach(path => router(path, middlewareFunction));
     }
     getContextId(request, isTreeDurable) {
         const contextId = context_id_factory_1.ContextIdFactory.getByRequest(request);

package/middleware/route-info-path-extractor.d.ts

@@ -0,0 +1,8 @@
+import { RouteInfo } from '@nestjs/common/interfaces';
+import { ApplicationConfig } from '../application-config';
+export declare class RouteInfoPathExtractor {
+    private readonly applicationConfig;
+    private routePathFactory;
+    constructor(applicationConfig: ApplicationConfig);
+    extractPathsFrom({ path, method, version }: RouteInfo): string[];
+}

package/middleware/route-info-path-extractor.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteInfoPathExtractor = void 0;
+const common_1 = require("@nestjs/common");
+const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
+const utils_1 = require("../router/utils");
+const route_path_factory_1 = require("./../router/route-path-factory");
+class RouteInfoPathExtractor {
+    constructor(applicationConfig) {
+        this.applicationConfig = applicationConfig;
+        this.routePathFactory = new route_path_factory_1.RoutePathFactory(applicationConfig);
+    }
+    extractPathsFrom({ path, method, version }) {
+        const prefixPath = (0, shared_utils_1.stripEndSlash)((0, shared_utils_1.addLeadingSlash)(this.applicationConfig.getGlobalPrefix()));
+        const excludedRoutes = this.applicationConfig.getGlobalPrefixOptions().exclude;
+        const applicationVersioningConfig = this.applicationConfig.getVersioning();
+        let versionPath = '';
+        if (version && (applicationVersioningConfig === null || applicationVersioningConfig === void 0 ? void 0 : applicationVersioningConfig.type) === common_1.VersioningType.URI) {
+            const versionPrefix = this.routePathFactory.getVersionPrefix(applicationVersioningConfig);
+            versionPath = (0, shared_utils_1.addLeadingSlash)(versionPrefix + version.toString());
+        }
+        const isAWildcard = ['*', '/*', '/*/', '(.*)', '/(.*)'].includes(path);
+        if (isAWildcard) {
+            return Array.isArray(excludedRoutes)
+                ? [
+                    prefixPath + versionPath + (0, shared_utils_1.addLeadingSlash)(path),
+                    ...excludedRoutes.map(route => versionPath + (0, shared_utils_1.addLeadingSlash)(route.path)),
+                ]
+                : [prefixPath + versionPath + (0, shared_utils_1.addLeadingSlash)(path)];
+        }
+        if (Array.isArray(excludedRoutes) &&
+            (0, utils_1.isRouteExcluded)(excludedRoutes, path, method)) {
+            return [versionPath + (0, shared_utils_1.addLeadingSlash)(path)];
+        }
+        return [prefixPath + versionPath + (0, shared_utils_1.addLeadingSlash)(path)];
+    }
+}
+exports.RouteInfoPathExtractor = RouteInfoPathExtractor;

package/middleware/utils.d.ts

@@ -1,6 +1,6 @@
 import { HttpServer, RouteInfo, Type } from '@nestjs/common/interfaces';
 import { ExcludeRouteMetadata } from '../router/interfaces/exclude-route-metadata.interface';
-export declare const mapToExcludeRoute: (routes: RouteInfo[]) => ExcludeRouteMetadata[];
+export declare const mapToExcludeRoute: (routes: (string | 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>;

package/middleware/utils.js

@@ -8,11 +8,20 @@ const pathToRegexp = require("path-to-regexp");
 const uuid_1 = require("uuid");
 const utils_1 = require("../router/utils");
 const mapToExcludeRoute = (routes) => {
-    return routes.map(({ path, method }) => ({
-        pathRegex: pathToRegexp(path),
-        requestMethod: method,
-        path,
-    }));
+    return routes.map(route => {
+        if ((0, shared_utils_1.isString)(route)) {
+            return {
+                path: route,
+                requestMethod: common_1.RequestMethod.ALL,
+                pathRegex: pathToRegexp((0, shared_utils_1.addLeadingSlash)(route)),
+            };
+        }
+        return {
+            path: route.path,
+            requestMethod: route.method,
+            pathRegex: pathToRegexp((0, shared_utils_1.addLeadingSlash)(route.path)),
+        };
+    });
 };
 exports.mapToExcludeRoute = mapToExcludeRoute;
 const filterMiddleware = (middleware, routes, httpAdapter) => {

package/nest-application.js

@@ -7,15 +7,14 @@ const load_package_util_1 = require("@nestjs/common/utils/load-package.util");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const iterare_1 = require("iterare");
 const os_1 = require("os");
-const pathToRegexp = require("path-to-regexp");
 const application_config_1 = require("./application-config");
 const constants_1 = require("./constants");
 const optional_require_1 = require("./helpers/optional-require");
 const injector_1 = require("./injector/injector");
 const container_1 = require("./middleware/container");
 const middleware_module_1 = require("./middleware/middleware-module");
+const utils_1 = require("./middleware/utils");
 const nest_application_context_1 = require("./nest-application-context");
-const route_path_factory_1 = require("./router/route-path-factory");
 const routes_resolver_1 = require("./router/routes-resolver");
 const { SocketModule } = (0, optional_require_1.optionalRequire)('@nestjs/websockets/socket-module', () => require('@nestjs/websockets/socket-module'));
 const { MicroservicesModule } = (0, optional_require_1.optionalRequire)('@nestjs/microservices/microservices-module', () => require('@nestjs/microservices/microservices-module'));
@@ -39,7 +38,7 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.selectContextModule();
         this.registerHttpServer();
         this.injector = new injector_1.Injector({ preview: this.appOptions.preview });
-        this.middlewareModule = new middleware_module_1.MiddlewareModule(new route_path_factory_1.RoutePathFactory(config));
+        this.middlewareModule = new middleware_module_1.MiddlewareModule();
         this.routesResolver = new routes_resolver_1.RoutesResolver(this.container, this.config, this.injector, this.graphInspector);
     }
     async dispose() {
@@ -234,20 +233,9 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
     setGlobalPrefix(prefix, options) {
         this.config.setGlobalPrefix(prefix);
         if (options) {
-            const exclude = options === null || options === void 0 ? void 0 : options.exclude.map((route) => {
-                if ((0, shared_utils_1.isString)(route)) {
-                    return {
-                        requestMethod: common_1.RequestMethod.ALL,
-                        pathRegex: pathToRegexp((0, shared_utils_1.addLeadingSlash)(route)),
-                        path: route,
-                    };
-                }
-                return {
-                    requestMethod: route.method,
-                    pathRegex: pathToRegexp((0, shared_utils_1.addLeadingSlash)(route.path)),
-                    path: route.path,
-                };
-            });
+            const exclude = (options === null || options === void 0 ? void 0 : options.exclude)
+                ? (0, utils_1.mapToExcludeRoute)(options.exclude)
+                : [];
             this.config.setGlobalPrefixOptions(Object.assign(Object.assign({}, options), { exclude }));
         }
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.3.0",
+  "version": "9.3.2",
   "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": "3.0.0",
     "path-to-regexp": "3.2.0",
-    "tslib": "2.4.1",
+    "tslib": "2.5.0",
     "uuid": "9.0.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.3.0"
+    "@nestjs/common": "9.3.2"
   },
   "peerDependencies": {
     "@nestjs/common": "^9.0.0",

package/router/interfaces/exclude-route-metadata.interface.d.ts

@@ -1,5 +1,8 @@
 import { RequestMethod } from '@nestjs/common';
 export interface ExcludeRouteMetadata {
+    /**
+     * Route path.
+     */
     path: string;
     /**
      * Regular expression representing the route path.

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRouteExcluded = exports.isRequestMethodAll = void 0;
 const common_1 = require("@nestjs/common");
+const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const isRequestMethodAll = (method) => {
     return common_1.RequestMethod.ALL === method || method === -1;
 };
@@ -10,7 +11,7 @@ function isRouteExcluded(excludedRoutes, path, requestMethod) {
     return excludedRoutes.some(route => {
         if ((0, exports.isRequestMethodAll)(route.requestMethod) ||
             route.requestMethod === requestMethod) {
-            return route.pathRegex.exec(path);
+            return route.pathRegex.exec((0, shared_utils_1.addLeadingSlash)(path));
         }
         return false;
     });