@nestjs/core 9.4.3 → 10.0.1

package/middleware/builder.js

@@ -21,6 +21,7 @@ class MiddlewareBuilder {
         return this.httpAdapter;
     }
 }
+exports.MiddlewareBuilder = MiddlewareBuilder;
 MiddlewareBuilder.ConfigProxy = class {
     constructor(builder, middleware, routeInfoPathExtractor) {
         this.builder = builder;
@@ -32,12 +33,16 @@ MiddlewareBuilder.ConfigProxy = class {
         return this.excludedRoutes;
     }
     exclude(...routes) {
-        this.excludedRoutes = this.getRoutesFlatList(routes).map(route => (Object.assign(Object.assign({}, route), { path: this.routeInfoPathExtractor.extractPathFrom(route) })));
+        this.excludedRoutes = this.getRoutesFlatList(routes).map(route => ({
+            ...route,
+            path: this.routeInfoPathExtractor.extractPathFrom(route),
+        }));
         return this;
     }
     forRoutes(...routes) {
         const { middlewareCollection } = this.builder;
-        const forRoutes = this.getRoutesFlatList(routes);
+        const flattedRoutes = this.getRoutesFlatList(routes);
+        const forRoutes = this.removeOverlappedRoutes(flattedRoutes);
         const configuration = {
             middleware: (0, utils_1.filterMiddleware)(this.middleware, this.excludedRoutes, this.builder.getHttpAdapter()),
             forRoutes,
@@ -52,5 +57,23 @@ MiddlewareBuilder.ConfigProxy = class {
             .flatten()
             .toArray();
     }
+    removeOverlappedRoutes(routes) {
+        const regexMatchParams = /(:[^\/]*)/g;
+        const wildcard = '([^/]*)';
+        const routesWithRegex = routes
+            .filter(route => route.path.includes(':'))
+            .map(route => ({
+            path: route.path,
+            regex: new RegExp('^(' + route.path.replace(regexMatchParams, wildcard) + ')$', 'g'),
+        }));
+        return routes.filter(route => {
+            const isOverlapped = (v) => {
+                return route.path !== v.path && route.path.match(v.regex);
+            };
+            const routeMatch = routesWithRegex.find(isOverlapped);
+            if (routeMatch === undefined) {
+                return route;
+            }
+        });
+    }
 };
-exports.MiddlewareBuilder = MiddlewareBuilder;

package/middleware/container.d.ts

@@ -1,13 +1,13 @@
+import { InjectionToken } from '@nestjs/common';
 import { MiddlewareConfiguration } from '@nestjs/common/interfaces/middleware/middleware-configuration.interface';
 import { NestContainer } from '../injector/container';
 import { InstanceWrapper } from '../injector/instance-wrapper';
-import { InstanceToken } from '../injector/module';
 export declare class MiddlewareContainer {
     private readonly container;
     private readonly middleware;
     private readonly configurationSets;
     constructor(container: NestContainer);
-    getMiddlewareCollection(moduleKey: string): Map<InstanceToken, InstanceWrapper>;
+    getMiddlewareCollection(moduleKey: string): Map<InjectionToken, InstanceWrapper>;
     getConfigurations(): Map<string, Set<MiddlewareConfiguration>>;
     insertConfig(configList: MiddlewareConfiguration[], moduleKey: string): void;
     private getTargetConfig;

package/middleware/container.js

@@ -25,12 +25,11 @@ class MiddlewareContainer {
         const targetConfig = this.getTargetConfig(moduleKey);
         const configurations = configList || [];
         const insertMiddleware = (metatype) => {
-            var _a;
             const token = metatype;
             middleware.set(token, new instance_wrapper_1.InstanceWrapper({
                 scope: (0, get_class_scope_1.getClassScope)(metatype),
                 durable: (0, is_durable_1.isDurable)(metatype),
-                name: (_a = token === null || token === void 0 ? void 0 : token.name) !== null && _a !== void 0 ? _a : token,
+                name: token?.name ?? token,
                 metatype,
                 token,
             }));

package/middleware/middleware-module.js

@@ -27,7 +27,7 @@ class MiddlewareModule {
         this.appOptions = options;
         const appRef = container.getHttpAdapterRef();
         this.routerExceptionFilter = new router_exception_filters_1.RouterExceptionFilters(container, config, appRef);
-        this.routesMapper = new routes_mapper_1.RoutesMapper(container);
+        this.routesMapper = new routes_mapper_1.RoutesMapper(container, config);
         this.resolver = new resolver_1.MiddlewareResolver(middlewareContainer, injector);
         this.routeInfoPathExtractor = new route_info_path_extractor_1.RouteInfoPathExtractor(config);
         this.injector = injector;
@@ -90,7 +90,6 @@ class MiddlewareModule {
         }
     }
     async registerRouteMiddleware(middlewareContainer, routeInfo, config, moduleKey, applicationRef) {
-        var _a;
         const middlewareCollection = [].concat(config.middleware);
         const moduleRef = this.container.getModuleByKey(moduleKey);
         for (const metatype of middlewareCollection) {
@@ -111,7 +110,8 @@ class MiddlewareModule {
                 metadata: {
                     key: routeInfo.path,
                     path: routeInfo.path,
-                    requestMethod: (_a = request_method_enum_1.RequestMethod[routeInfo.method]) !== null && _a !== void 0 ? _a : 'ALL',
+                    requestMethod: request_method_enum_1.RequestMethod[routeInfo.method] ??
+                        'ALL',
                     version: routeInfo.version,
                 },
             };
@@ -121,7 +121,7 @@ class MiddlewareModule {
     }
     async bindHandler(wrapper, applicationRef, routeInfo, moduleRef, collection) {
         const { instance, metatype } = wrapper;
-        if ((0, shared_utils_1.isUndefined)(instance === null || instance === void 0 ? void 0 : instance.use)) {
+        if ((0, shared_utils_1.isUndefined)(instance?.use)) {
             throw new invalid_middleware_exception_1.InvalidMiddlewareException(metatype.name);
         }
         const isStatic = wrapper.isDependencyTreeStatic();

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

@@ -44,8 +44,7 @@ class RouteInfoPathExtractor {
         return this.prefixPath + versionPath + (0, shared_utils_1.addLeadingSlash)(path);
     }
     extractVersionPathFrom(version) {
-        var _a;
-        if (!version || ((_a = this.versioningConfig) === null || _a === void 0 ? void 0 : _a.type) !== common_1.VersioningType.URI)
+        if (!version || this.versioningConfig?.type !== common_1.VersioningType.URI)
             return '';
         const versionPrefix = this.routePathFactory.getVersionPrefix(this.versioningConfig);
         return (0, shared_utils_1.addLeadingSlash)(versionPrefix + version.toString());

package/middleware/routes-mapper.d.ts

@@ -1,10 +1,12 @@
 import { RouteInfo, Type } from '@nestjs/common/interfaces';
+import { ApplicationConfig } from '../application-config';
 import { NestContainer } from '../injector/container';
 export declare class RoutesMapper {
     private readonly container;
+    private readonly applicationConfig;
     private readonly pathsExplorer;
-    constructor(container: NestContainer);
-    mapRouteToRouteInfo(route: Type<any> | RouteInfo | string): RouteInfo[];
+    constructor(container: NestContainer, applicationConfig: ApplicationConfig);
+    mapRouteToRouteInfo(controllerOrRoute: Type<any> | RouteInfo | string): RouteInfo[];
     private getRouteInfoFromPath;
     private getRouteInfoFromObject;
     private getRouteInfoFromController;
@@ -13,4 +15,5 @@ export declare class RoutesMapper {
     private getRoutePath;
     private getHostModuleOfController;
     private getModulePath;
+    private getVersionMetadata;
 }

package/middleware/routes-mapper.js

@@ -2,24 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutesMapper = void 0;
 const constants_1 = require("@nestjs/common/constants");
+const interfaces_1 = require("@nestjs/common/interfaces");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const metadata_scanner_1 = require("../metadata-scanner");
 const paths_explorer_1 = require("../router/paths-explorer");
 const router_module_1 = require("../router/router-module");
 class RoutesMapper {
-    constructor(container) {
+    constructor(container, applicationConfig) {
         this.container = container;
+        this.applicationConfig = applicationConfig;
         this.pathsExplorer = new paths_explorer_1.PathsExplorer(new metadata_scanner_1.MetadataScanner());
     }
-    mapRouteToRouteInfo(route) {
-        if ((0, shared_utils_1.isString)(route)) {
-            return this.getRouteInfoFromPath(route);
+    mapRouteToRouteInfo(controllerOrRoute) {
+        if ((0, shared_utils_1.isString)(controllerOrRoute)) {
+            return this.getRouteInfoFromPath(controllerOrRoute);
         }
-        const routePathOrPaths = this.getRoutePath(route);
-        if (this.isRouteInfo(routePathOrPaths, route)) {
-            return this.getRouteInfoFromObject(route);
+        const routePathOrPaths = this.getRoutePath(controllerOrRoute);
+        if (this.isRouteInfo(routePathOrPaths, controllerOrRoute)) {
+            return this.getRouteInfoFromObject(controllerOrRoute);
         }
-        return this.getRouteInfoFromController(route, routePathOrPaths);
+        return this.getRouteInfoFromController(controllerOrRoute, routePathOrPaths);
     }
     getRouteInfoFromPath(routePath) {
         const defaultRequestMethod = -1;
@@ -42,27 +44,37 @@ class RoutesMapper {
     }
     getRouteInfoFromController(controller, routePath) {
         const controllerPaths = this.pathsExplorer.scanForPaths(Object.create(controller), controller.prototype);
+        const controllerVersion = this.getVersionMetadata(controller);
+        const versioningConfig = this.applicationConfig.getVersioning();
         const moduleRef = this.getHostModuleOfController(controller);
-        const modulePath = this.getModulePath(moduleRef === null || moduleRef === void 0 ? void 0 : moduleRef.metatype);
+        const modulePath = this.getModulePath(moduleRef?.metatype);
         const concatPaths = (acc, currentValue) => acc.concat(currentValue);
+        const toUndefinedIfNeural = (version) => version === interfaces_1.VERSION_NEUTRAL ? undefined : version;
+        const toRouteInfo = (item, prefix) => item.path
+            ?.map(p => {
+            let endpointPath = modulePath ?? '';
+            endpointPath += this.normalizeGlobalPath(prefix) + (0, shared_utils_1.addLeadingSlash)(p);
+            const routeInfo = {
+                path: endpointPath,
+                method: item.requestMethod,
+            };
+            const version = item.version ?? controllerVersion;
+            if (version && versioningConfig) {
+                if (typeof version !== 'string' && Array.isArray(version)) {
+                    return version.map(v => ({
+                        ...routeInfo,
+                        version: toUndefinedIfNeural(v),
+                    }));
+                }
+                routeInfo.version = toUndefinedIfNeural(version);
+            }
+            return routeInfo;
+        })
+            .flat();
         return []
             .concat(routePath)
             .map(routePath => controllerPaths
-            .map(item => {
-            var _a;
-            return (_a = item.path) === null || _a === void 0 ? void 0 : _a.map(p => {
-                let path = modulePath !== null && modulePath !== void 0 ? modulePath : '';
-                path += this.normalizeGlobalPath(routePath) + (0, shared_utils_1.addLeadingSlash)(p);
-                const routeInfo = {
-                    path,
-                    method: item.requestMethod,
-                };
-                if (item.version) {
-                    routeInfo.version = item.version;
-                }
-                return routeInfo;
-            });
-        })
+            .map(item => toRouteInfo(item, routePath))
             .reduce(concatPaths, []))
             .reduce(concatPaths, []);
     }
@@ -86,7 +98,7 @@ class RoutesMapper {
             return;
         }
         const modules = Array.from(modulesContainer.values()).filter(moduleRef => moduleRefsSet.has(moduleRef));
-        return modules.find(({ routes }) => routes.has(metatype));
+        return modules.find(({ controllers }) => controllers.has(metatype));
     }
     getModulePath(metatype) {
         if (!metatype) {
@@ -94,7 +106,14 @@ class RoutesMapper {
         }
         const modulesContainer = this.container.getModules();
         const modulePath = Reflect.getMetadata(constants_1.MODULE_PATH + modulesContainer.applicationId, metatype);
-        return modulePath !== null && modulePath !== void 0 ? modulePath : Reflect.getMetadata(constants_1.MODULE_PATH, metatype);
+        return modulePath ?? Reflect.getMetadata(constants_1.MODULE_PATH, metatype);
+    }
+    getVersionMetadata(metatype) {
+        const versioningConfig = this.applicationConfig.getVersioning();
+        if (versioningConfig) {
+            return (Reflect.getMetadata(constants_1.VERSION_METADATA, metatype) ??
+                versioningConfig.defaultVersion);
+        }
     }
 }
 exports.RoutesMapper = RoutesMapper;

package/middleware/utils.js

@@ -65,15 +65,14 @@ const mapToClass = (middleware, excludedRoutes, httpAdapter) => {
 };
 exports.mapToClass = mapToClass;
 function isMiddlewareClass(middleware) {
-    var _a, _b;
     const middlewareStr = middleware.toString();
     if (middlewareStr.substring(0, 5) === 'class') {
         return true;
     }
     const middlewareArr = middlewareStr.split(' ');
     return (middlewareArr[0] === 'function' &&
-        /[A-Z]/.test((_a = middlewareArr[1]) === null || _a === void 0 ? void 0 : _a[0]) &&
-        (0, shared_utils_1.isFunction)((_b = middleware.prototype) === null || _b === void 0 ? void 0 : _b.use));
+        /[A-Z]/.test(middlewareArr[1]?.[0]) &&
+        (0, shared_utils_1.isFunction)(middleware.prototype?.use));
 }
 exports.isMiddlewareClass = isMiddlewareClass;
 function assignToken(metatype, token = (0, uid_1.uid)(21)) {

package/nest-application-context.js

@@ -66,11 +66,10 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * @returns {TResult | Array<TResult>}
      */
     get(typeOrToken, options = { strict: false }) {
-        var _a;
         return !(options && options.strict)
             ? this.find(typeOrToken, options)
             : this.find(typeOrToken, {
-                moduleId: (_a = this.contextModule) === null || _a === void 0 ? void 0 : _a.id,
+                moduleId: this.contextModule?.id,
                 each: options.each,
             });
     }
@@ -193,7 +192,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
                 process.kill(process.pid, signal);
             }
             catch (err) {
-                common_1.Logger.error(constants_1.MESSAGES.ERROR_DURING_SHUTDOWN, err === null || err === void 0 ? void 0 : err.stack, NestApplicationContext.name);
+                common_1.Logger.error(constants_1.MESSAGES.ERROR_DURING_SHUTDOWN, err?.stack, NestApplicationContext.name);
                 process.exit(1);
             }
         };
@@ -272,14 +271,13 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
         }
     }
     getModulesToTriggerHooksOn() {
-        var _a;
         if (this._moduleRefsForHooksByDistance) {
             return this._moduleRefsForHooksByDistance;
         }
         const modulesContainer = this.container.getModules();
         const compareFn = (a, b) => b.distance - a.distance;
         const modulesSortedByDistance = Array.from(modulesContainer.values()).sort(compareFn);
-        this._moduleRefsForHooksByDistance = ((_a = this.appOptions) === null || _a === void 0 ? void 0 : _a.preview)
+        this._moduleRefsForHooksByDistance = this.appOptions?.preview
             ? modulesSortedByDistance.filter(moduleRef => moduleRef.initOnPreview)
             : modulesSortedByDistance;
         return this._moduleRefsForHooksByDistance;

package/nest-application.js

@@ -88,9 +88,8 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.socketModule.register(this.container, this.config, this.graphInspector, this.appOptions, this.httpServer);
     }
     async init() {
-        var _a;
         this.applyOptions();
-        await ((_a = this.httpAdapter) === null || _a === void 0 ? void 0 : _a.init());
+        await this.httpAdapter?.init();
         const useBodyParser = this.appOptions && this.appOptions.bodyParser !== false;
         useBodyParser && this.registerParserMiddleware();
         await this.registerModules();
@@ -103,9 +102,8 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         return this;
     }
     registerParserMiddleware() {
-        var _a;
         const prefix = this.config.getGlobalPrefix();
-        const rawBody = !!((_a = this.appOptions) === null || _a === void 0 ? void 0 : _a.rawBody);
+        const rawBody = !!this.appOptions?.rawBody;
         this.httpAdapter.registerParserMiddleware(prefix, rawBody);
     }
     async registerRouter() {
@@ -168,8 +166,7 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         !this.isInitialized && (await this.init());
         return new Promise((resolve, reject) => {
             const errorHandler = (e) => {
-                var _a;
-                this.logger.error((_a = e === null || e === void 0 ? void 0 : e.toString) === null || _a === void 0 ? void 0 : _a.call(e));
+                this.logger.error(e?.toString?.());
                 reject(e);
             };
             this.httpServer.once('error', errorHandler);
@@ -178,8 +175,7 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
                 ? args.slice(0, args.length - 1)
                 : args;
             this.httpAdapter.listen(port, ...listenFnArgs, (...originalCallbackArgs) => {
-                var _a, _b;
-                if ((_b = (_a = this.appOptions) === null || _a === void 0 ? void 0 : _a.autoFlushLogs) !== null && _b !== void 0 ? _b : true) {
+                if (this.appOptions?.autoFlushLogs ?? true) {
                     this.flushLogs();
                 }
                 if (originalCallbackArgs[0] instanceof Error) {
@@ -233,10 +229,13 @@ 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)
+            const exclude = options?.exclude
                 ? (0, utils_1.mapToExcludeRoute)(options.exclude)
                 : [];
-            this.config.setGlobalPrefixOptions(Object.assign(Object.assign({}, options), { exclude }));
+            this.config.setGlobalPrefixOptions({
+                ...options,
+                exclude,
+            });
         }
         return this;
     }

package/nest-factory.js

@@ -100,7 +100,7 @@ class NestFactoryStatic {
         const dependenciesScanner = new scanner_1.DependenciesScanner(container, metadataScanner, graphInspector, config);
         container.setHttpAdapter(httpServer);
         const teardown = this.abortOnError === false ? rethrow_1.rethrow : undefined;
-        await (httpServer === null || httpServer === void 0 ? void 0 : httpServer.init());
+        await httpServer?.init();
         try {
             this.logger.log(constants_1.MESSAGES.APPLICATION_START);
             await exceptions_zone_1.ExceptionsZone.asyncRun(async () => {
@@ -158,7 +158,7 @@ class NestFactoryStatic {
         if (bufferLogs) {
             logger_service_1.Logger.attachBuffer();
         }
-        this.autoFlushLogs = autoFlushLogs !== null && autoFlushLogs !== void 0 ? autoFlushLogs : true;
+        this.autoFlushLogs = autoFlushLogs ?? true;
     }
     createHttpAdapter(httpServer) {
         const { ExpressAdapter } = (0, load_adapter_1.loadAdapter)('@nestjs/platform-express', 'HTTP', () => require('@nestjs/platform-express'));
@@ -200,7 +200,7 @@ class NestFactoryStatic {
         return proxy;
     }
     createGraphInspector(appOptions, container) {
-        return (appOptions === null || appOptions === void 0 ? void 0 : appOptions.snapshot)
+        return appOptions?.snapshot
             ? new graph_inspector_1.GraphInspector(container)
             : noop_graph_inspector_1.NoopGraphInspector;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.4.3",
+  "version": "10.0.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -36,13 +36,13 @@
     "uid": "2.0.2"
   },
   "devDependencies": {
-    "@nestjs/common": "9.4.3"
+    "@nestjs/common": "10.0.1"
   },
   "peerDependencies": {
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/microservices": "^9.0.0",
-    "@nestjs/platform-express": "^9.0.0",
-    "@nestjs/websockets": "^9.0.0",
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/microservices": "^10.0.0",
+    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/websockets": "^10.0.0",
     "reflect-metadata": "^0.1.12",
     "rxjs": "^7.1.0"
   },

package/repl/native-functions/help-repl-fn.js

@@ -24,6 +24,6 @@ class HelpReplFn extends repl_function_1.ReplFunction {
             '\n');
     }
 }
+exports.HelpReplFn = HelpReplFn;
 HelpReplFn.buildHelpMessage = ({ name, description }) => cli_colors_util_1.clc.cyanBright(name) +
     (description ? ` ${cli_colors_util_1.clc.bold('-')} ${description}` : '');
-exports.HelpReplFn = HelpReplFn;

package/repl/native-functions/methods-repl-fn.js

@@ -17,7 +17,7 @@ class MethodsReplFn extends repl_function_1.ReplFunction {
     action(token) {
         const proto = typeof token !== 'function'
             ? Object.getPrototypeOf(this.ctx.app.get(token))
-            : token === null || token === void 0 ? void 0 : token.prototype;
+            : token?.prototype;
         const methods = this.metadataScanner.getAllMethodNames(proto);
         this.ctx.writeToStdout('\n');
         this.ctx.writeToStdout(`${cli_colors_util_1.clc.green('Methods')}:\n`);

package/repl/repl-context.js

@@ -41,7 +41,6 @@ class ReplContext {
         });
     }
     introspectCollection(moduleRef, moduleKey, collection) {
-        var _a;
         const moduleDebugEntry = {};
         moduleRef[collection].forEach(({ token }) => {
             const stringifiedToken = this.stringifyToken(token);
@@ -62,21 +61,23 @@ class ReplContext {
             }
             moduleDebugEntry[stringifiedToken] = token;
         });
-        this.debugRegistry[moduleKey] = Object.assign(Object.assign({}, (_a = this.debugRegistry) === null || _a === void 0 ? void 0 : _a[moduleKey]), { [collection]: moduleDebugEntry });
+        this.debugRegistry[moduleKey] = {
+            ...this.debugRegistry?.[moduleKey],
+            [collection]: moduleDebugEntry,
+        };
     }
     stringifyToken(token) {
         return typeof token !== 'string'
             ? typeof token === 'function'
                 ? token.name
-                : token === null || token === void 0 ? void 0 : token.toString()
+                : token?.toString()
             : `"${token}"`;
     }
     addNativeFunction(NativeFunctionRef) {
-        var _a;
         const nativeFunction = new NativeFunctionRef(this);
         const nativeFunctions = [nativeFunction];
         this.nativeFunctions.set(nativeFunction.fnDefinition.name, nativeFunction);
-        (_a = nativeFunction.fnDefinition.aliases) === null || _a === void 0 ? void 0 : _a.forEach(aliasName => {
+        nativeFunction.fnDefinition.aliases?.forEach(aliasName => {
             const aliasNativeFunction = Object.create(nativeFunction);
             aliasNativeFunction.fnDefinition = {
                 name: aliasName,

package/repl/repl-logger.js

@@ -14,9 +14,9 @@ class ReplLogger extends common_1.ConsoleLogger {
         return super.log.apply(this, Array.from(arguments));
     }
 }
+exports.ReplLogger = ReplLogger;
 ReplLogger.ignoredContexts = [
     routes_resolver_1.RoutesResolver.name,
     router_explorer_1.RouterExplorer.name,
     nest_application_1.NestApplication.name,
 ];
-exports.ReplLogger = ReplLogger;

package/repl/repl-native-commands.js

@@ -29,7 +29,7 @@ function defineDefaultCommandsOnRepl(replServer) {
                 // getter property that outputs the helper message and returns undefined.
                 // But if the command was retrieve from the `commands` object, it will
                 // have a `help` property that returns the helper message.
-                const helpMessage = nativeCommandOrFunction === null || nativeCommandOrFunction === void 0 ? void 0 : nativeCommandOrFunction.help;
+                const helpMessage = nativeCommandOrFunction?.help;
                 if (helpMessage) {
                     this.output.write(`${helpMessage}\n`);
                 }

package/router/route-path-factory.d.ts

@@ -1,12 +1,14 @@
 import { RequestMethod, VersioningOptions } from '@nestjs/common';
+import { VersionValue } from '@nestjs/common/interfaces';
 import { ApplicationConfig } from '../application-config';
 import { RoutePathMetadata } from './interfaces/route-path-metadata.interface';
 export declare class RoutePathFactory {
     private readonly applicationConfig;
     constructor(applicationConfig: ApplicationConfig);
     create(metadata: RoutePathMetadata, requestMethod?: RequestMethod): string[];
-    getVersion(metadata: RoutePathMetadata): import("@nestjs/common/interfaces").VersionValue;
+    getVersion(metadata: RoutePathMetadata): VersionValue;
     getVersionPrefix(versioningOptions: VersioningOptions): string;
     appendToAllIfDefined(paths: string[], fragmentToAppend: string | string[] | undefined): string[];
-    isExcludedFromGlobalPrefix(path: string, requestMethod?: RequestMethod): boolean;
+    isExcludedFromGlobalPrefix(path: string, requestMethod?: RequestMethod, versionOrVersions?: VersionValue, versioningOptions?: VersioningOptions): boolean;
+    private truncateVersionPrefixFromPath;
 }

package/router/route-path-factory.js

@@ -9,11 +9,10 @@ class RoutePathFactory {
         this.applicationConfig = applicationConfig;
     }
     create(metadata, requestMethod) {
-        var _a;
         let paths = [''];
         const versionOrVersions = this.getVersion(metadata);
         if (versionOrVersions &&
-            ((_a = metadata.versioningOptions) === null || _a === void 0 ? void 0 : _a.type) === common_1.VersioningType.URI) {
+            metadata.versioningOptions?.type === common_1.VersioningType.URI) {
             const versionPrefix = this.getVersionPrefix(metadata.versioningOptions);
             if (Array.isArray(versionOrVersions)) {
                 paths = (0, common_1.flatten)(paths.map(path => versionOrVersions.map(version => 
@@ -34,7 +33,7 @@ class RoutePathFactory {
         paths = this.appendToAllIfDefined(paths, metadata.methodPath);
         if (metadata.globalPrefix) {
             paths = paths.map(path => {
-                if (this.isExcludedFromGlobalPrefix(path, requestMethod)) {
+                if (this.isExcludedFromGlobalPrefix(path, requestMethod, versionOrVersions, metadata.versioningOptions)) {
                     return path;
                 }
                 return (0, shared_utils_1.stripEndSlash)(metadata.globalPrefix || '') + path;
@@ -72,14 +71,31 @@ class RoutePathFactory {
         }
         return paths.map(path => concatPaths(path, fragmentToAppend));
     }
-    isExcludedFromGlobalPrefix(path, requestMethod) {
+    isExcludedFromGlobalPrefix(path, requestMethod, versionOrVersions, versioningOptions) {
         if ((0, shared_utils_1.isUndefined)(requestMethod)) {
             return false;
         }
         const options = this.applicationConfig.getGlobalPrefixOptions();
         const excludedRoutes = options.exclude;
+        if (versionOrVersions &&
+            versionOrVersions !== common_1.VERSION_NEUTRAL &&
+            versioningOptions?.type === common_1.VersioningType.URI) {
+            path = this.truncateVersionPrefixFromPath(path, versionOrVersions, versioningOptions);
+        }
         return (Array.isArray(excludedRoutes) &&
             (0, utils_1.isRouteExcluded)(excludedRoutes, path, requestMethod));
     }
+    truncateVersionPrefixFromPath(path, versionValue, versioningOptions) {
+        if (typeof versionValue !== 'string') {
+            versionValue.forEach(version => {
+                if (typeof version === 'string') {
+                    path = this.truncateVersionPrefixFromPath(path, version, versioningOptions);
+                }
+            });
+            return path;
+        }
+        const prefix = `/${this.getVersionPrefix(versioningOptions)}${versionValue}`;
+        return path.startsWith(prefix) ? path.replace(prefix, '') : path;
+    }
 }
 exports.RoutePathFactory = RoutePathFactory;

package/router/router-execution-context.js

@@ -166,8 +166,7 @@ class RouterExecutionContext {
         const isSseHandler = !!this.reflectSse(callback);
         if (isSseHandler) {
             return (result, res, req) => {
-                var _a;
-                this.responseController.sse(result, res.raw || res, req.raw || req, { additionalHeaders: (_a = res.getHeaders) === null || _a === void 0 ? void 0 : _a.call(res) });
+                this.responseController.sse(result, res.raw || res, req.raw || req, { additionalHeaders: res.getHeaders?.() });
             };
         }
         return async (result, res) => {

package/router/router-explorer.js

@@ -104,7 +104,10 @@ class RouterExplorer {
                 routerMethodRef(path, routeHandler);
                 this.graphInspector.insertEntrypointDefinition(entrypointDefinition, instanceWrapper.id);
             });
-            const pathsToLog = this.routePathFactory.create(Object.assign(Object.assign({}, routePathMetadata), { versioningOptions: undefined }), requestMethod);
+            const pathsToLog = this.routePathFactory.create({
+                ...routePathMetadata,
+                versioningOptions: undefined,
+            }, requestMethod);
             pathsToLog.forEach(path => {
                 if (isVersioned) {
                     const version = this.routePathFactory.getVersion(routePathMetadata);
@@ -136,7 +139,14 @@ class RouterExplorer {
             for (const exp of hostRegExps) {
                 const match = hostname.match(exp.regexp);
                 if (match) {
-                    exp.keys.forEach((key, i) => (req.hosts[key.name] = match[i + 1]));
+                    if (exp.keys.length > 0) {
+                        exp.keys.forEach((key, i) => (req.hosts[key.name] = match[i + 1]));
+                    }
+                    else if (exp.regexp && match.groups) {
+                        for (const groupName in match.groups) {
+                            req.hosts[groupName] = match.groups[groupName];
+                        }
+                    }
                     return handler(req, res, next);
                 }
             }