@nestjs/core 9.3.0-beta.3 → 9.3.1

package/helpers/context-id-factory.d.ts

@@ -1,6 +1,6 @@
 import { ContextId, HostComponentInfo } from '../injector/instance-wrapper';
 export declare function createContextId(): ContextId;
-export declare type ContextIdResolverFn = (info: HostComponentInfo) => ContextId;
+export type ContextIdResolverFn = (info: HostComponentInfo) => ContextId;
 export interface ContextIdResolver {
     /**
      * Payload associated with the custom context id

package/helpers/external-context-creator.d.ts

@@ -1,15 +1,12 @@
 import { ParamData } from '@nestjs/common';
 import { ContextType, Controller, PipeTransform } from '@nestjs/common/interfaces';
 import { ExternalExceptionFilterContext } from '../exceptions/external-exception-filter-context';
-import { GuardsConsumer } from '../guards/guards-consumer';
-import { GuardsContextCreator } from '../guards/guards-context-creator';
+import { GuardsConsumer, GuardsContextCreator } from '../guards';
 import { NestContainer } from '../injector/container';
 import { ContextId } from '../injector/instance-wrapper';
 import { ModulesContainer } from '../injector/modules-container';
-import { InterceptorsConsumer } from '../interceptors/interceptors-consumer';
-import { InterceptorsContextCreator } from '../interceptors/interceptors-context-creator';
-import { PipesConsumer } from '../pipes/pipes-consumer';
-import { PipesContextCreator } from '../pipes/pipes-context-creator';
+import { InterceptorsConsumer, InterceptorsContextCreator } from '../interceptors';
+import { PipesConsumer, PipesContextCreator } from '../pipes';
 import { ParamProperties } from './context-utils';
 import { ExternalHandlerMetadata } from './interfaces/external-handler-metadata.interface';
 import { ParamsMetadata } from './interfaces/params-metadata.interface';

package/helpers/external-context-creator.js

@@ -7,13 +7,10 @@ const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const rxjs_1 = require("rxjs");
 const external_exception_filter_context_1 = require("../exceptions/external-exception-filter-context");
 const constants_2 = require("../guards/constants");
-const guards_consumer_1 = require("../guards/guards-consumer");
-const guards_context_creator_1 = require("../guards/guards-context-creator");
+const guards_1 = require("../guards");
 const constants_3 = require("../injector/constants");
-const interceptors_consumer_1 = require("../interceptors/interceptors-consumer");
-const interceptors_context_creator_1 = require("../interceptors/interceptors-context-creator");
-const pipes_consumer_1 = require("../pipes/pipes-consumer");
-const pipes_context_creator_1 = require("../pipes/pipes-context-creator");
+const interceptors_1 = require("../interceptors");
+const pipes_1 = require("../pipes");
 const context_utils_1 = require("./context-utils");
 const external_proxy_1 = require("./external-proxy");
 const handler_metadata_storage_1 = require("./handler-metadata-storage");
@@ -32,12 +29,12 @@ class ExternalContextCreator {
         this.handlerMetadataStorage = new handler_metadata_storage_1.HandlerMetadataStorage();
     }
     static fromContainer(container) {
-        const guardsContextCreator = new guards_context_creator_1.GuardsContextCreator(container, container.applicationConfig);
-        const guardsConsumer = new guards_consumer_1.GuardsConsumer();
-        const interceptorsContextCreator = new interceptors_context_creator_1.InterceptorsContextCreator(container, container.applicationConfig);
-        const interceptorsConsumer = new interceptors_consumer_1.InterceptorsConsumer();
-        const pipesContextCreator = new pipes_context_creator_1.PipesContextCreator(container, container.applicationConfig);
-        const pipesConsumer = new pipes_consumer_1.PipesConsumer();
+        const guardsContextCreator = new guards_1.GuardsContextCreator(container, container.applicationConfig);
+        const guardsConsumer = new guards_1.GuardsConsumer();
+        const interceptorsContextCreator = new interceptors_1.InterceptorsContextCreator(container, container.applicationConfig);
+        const interceptorsConsumer = new interceptors_1.InterceptorsConsumer();
+        const pipesContextCreator = new pipes_1.PipesContextCreator(container, container.applicationConfig);
+        const pipesConsumer = new pipes_1.PipesConsumer();
         const filtersContextCreator = new external_exception_filter_context_1.ExternalExceptionFilterContext(container, container.applicationConfig);
         const externalContextCreator = new ExternalContextCreator(guardsContextCreator, guardsConsumer, interceptorsContextCreator, interceptorsConsumer, container.getModules(), pipesContextCreator, pipesConsumer, filtersContextCreator);
         externalContextCreator.container = container;

package/helpers/handler-metadata-storage.d.ts

@@ -6,9 +6,9 @@ import { ContextId } from '../injector/instance-wrapper';
 import { HeaderStream } from '../router/sse-stream';
 import { ParamProperties } from './context-utils';
 export declare const HANDLER_METADATA_SYMBOL: unique symbol;
-export declare type HandleResponseFn = HandlerResponseBasicFn | HandleSseResponseFn;
-export declare type HandlerResponseBasicFn = <TResult, TResponse>(result: TResult, res: TResponse, req?: any) => any;
-export declare type HandleSseResponseFn = <TResult extends Observable<unknown> = any, TResponse extends HeaderStream = any, TRequest extends IncomingMessage = any>(result: TResult, res: TResponse, req: TRequest) => any;
+export type HandleResponseFn = HandlerResponseBasicFn | HandleSseResponseFn;
+export type HandlerResponseBasicFn = <TResult, TResponse>(result: TResult, res: TResponse, req?: any) => any;
+export type HandleSseResponseFn = <TResult extends Observable<unknown> = any, TResponse extends HeaderStream = any, TRequest extends IncomingMessage = any>(result: TResult, res: TResponse, req: TRequest) => any;
 export interface HandlerMetadata {
     argsLength: number;
     paramtypes: any[];

package/helpers/interfaces/external-handler-metadata.interface.d.ts

@@ -1,6 +1,6 @@
 import { ContextId } from '../../injector';
 import { ParamProperties } from '../context-utils';
-declare type ParamPropertiesWithMetatype<T = any> = ParamProperties & {
+type ParamPropertiesWithMetatype<T = any> = ParamProperties & {
     metatype?: T;
 };
 export interface ExternalHandlerMetadata {

package/helpers/interfaces/params-metadata.interface.d.ts

@@ -1,5 +1,5 @@
 import { ParamData } from '@nestjs/common';
-export declare type ParamsMetadata = Record<number, ParamMetadata>;
+export type ParamsMetadata = Record<number, ParamMetadata>;
 export interface ParamMetadata {
     index: number;
     data?: ParamData;

package/injector/injector.d.ts

@@ -5,7 +5,7 @@ import { InstanceToken, Module } from './module';
 /**
  * The type of an injectable dependency
  */
-export declare type InjectorDependency = InjectionToken;
+export type InjectorDependency = InjectionToken;
 /**
  * The property-based dependency
  */

package/injector/injector.js

@@ -162,7 +162,7 @@ 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/injector/instance-wrapper.js

@@ -8,7 +8,7 @@ const cli_colors_util_1 = require("@nestjs/common/utils/cli-colors.util");
 const random_string_generator_util_1 = require("@nestjs/common/utils/random-string-generator.util");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const iterare_1 = require("iterare");
-const deterministic_uuid_registry_1 = require("../inspector/deterministic-uuid-registry");
+const uuid_factory_1 = require("../inspector/uuid-factory");
 const constants_1 = require("./constants");
 const provider_classifier_1 = require("./helpers/provider-classifier");
 exports.INSTANCE_METADATA_SYMBOL = Symbol.for('instance_metadata:cache');
@@ -118,7 +118,8 @@ class InstanceWrapper {
         if (isStatic) {
             return false;
         }
-        const isTreeNonDurable = this.introspectDepsAttribute((collection, registry) => collection.every((item) => !item.isDependencyTreeDurable(registry)), lookupRegistry);
+        const isTreeNonDurable = this.introspectDepsAttribute((collection, registry) => collection.some((item) => !item.isDependencyTreeStatic() &&
+            !item.isDependencyTreeDurable(registry)), lookupRegistry);
         this.isTreeDurable = !isTreeNonDurable && this.durable !== false;
         if (this.isTreeDurable) {
             this.printIntrospectedAsDurable();
@@ -137,7 +138,10 @@ class InstanceWrapper {
         }
         const propertiesHosts = (properties || []).map(item => item.wrapper);
         introspectionResult =
-            introspectionResult && callback(propertiesHosts, lookupRegistry);
+            introspectionResult &&
+                ((properties &&
+                    callback(properties.map(item => item.wrapper), lookupRegistry)) ||
+                    !properties);
         if (!introspectionResult || !enhancers) {
             return introspectionResult;
         }
@@ -278,7 +282,7 @@ class InstanceWrapper {
         var _b, _c, _d, _e, _f;
         let key = (_c = (_b = this.name) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : (_d = this.token) === null || _d === void 0 ? void 0 : _d.toString();
         key += (_f = (_e = this.host) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '';
-        return key ? deterministic_uuid_registry_1.DeterministicUuidRegistry.get(key) : (0, random_string_generator_util_1.randomStringGenerator)();
+        return key ? uuid_factory_1.UuidFactory.get(key) : (0, random_string_generator_util_1.randomStringGenerator)();
     }
 }
 exports.InstanceWrapper = InstanceWrapper;

package/injector/module-ref.d.ts

@@ -1,11 +1,23 @@
 import { IntrospectionResult, Type } from '@nestjs/common';
-import { GetOrResolveOptions } from '@nestjs/common/interfaces';
 import { AbstractInstanceResolver } from './abstract-instance-resolver';
 import { NestContainer } from './container';
 import { Injector } from './injector';
 import { InstanceLinksHost } from './instance-links-host';
 import { ContextId } from './instance-wrapper';
 import { Module } from './module';
+export interface ModuleRefGetOrResolveOpts {
+    /**
+     * If enabled, lookup will only be performed in the host module.
+     * @default true
+     */
+    strict?: boolean;
+    /**
+     * If enabled, instead of returning a first instance registered under a given token,
+     * a list of instances will be returned.
+     * @default false
+     */
+    each?: boolean;
+}
 export declare abstract class ModuleRef extends AbstractInstanceResolver {
     protected readonly container: NestContainer;
     protected readonly injector: Injector;
@@ -22,7 +34,12 @@ export declare abstract class ModuleRef extends AbstractInstanceResolver {
      * @returns {TResult}
      */
     abstract get<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol, options: {
+        /**
+         * If enabled, lookup will only be performed in the host module.
+         * @default true
+         */
         strict?: boolean;
+        /** This indicates that only the first instance registered will be returned. */
         each?: undefined | false;
     }): TResult;
     /**
@@ -30,14 +47,19 @@ export declare abstract class ModuleRef extends AbstractInstanceResolver {
      * @returns {Array<TResult>}
      */
     abstract get<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol, options: {
+        /**
+         * If enabled, lookup will only be performed in the host module.
+         * @default true
+         */
         strict?: boolean;
+        /** This indicates that a list of instances will be returned. */
         each: true;
     }): Array<TResult>;
     /**
      * Retrieves an instance (or a list of instances) of either injectable or controller, otherwise, throws exception.
      * @returns {TResult | Array<TResult>}
      */
-    abstract get<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol, options?: GetOrResolveOptions): TResult | Array<TResult>;
+    abstract get<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol, options?: ModuleRefGetOrResolveOpts): TResult | Array<TResult>;
     /**
      * Resolves transient or request-scoped instance of either injectable or controller, otherwise, throws exception.
      * @returns {Array<TResult>}
@@ -76,7 +98,7 @@ export declare abstract class ModuleRef extends AbstractInstanceResolver {
      */
     abstract resolve<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol, contextId?: {
         id: number;
-    }, options?: GetOrResolveOptions): Promise<TResult | Array<TResult>>;
+    }, options?: ModuleRefGetOrResolveOpts): Promise<TResult | Array<TResult>>;
     abstract create<T = any>(type: Type<T>): Promise<T>;
     introspect<T = any>(token: Type<T> | string | symbol): IntrospectionResult;
     registerRequestByContextId<T = any>(request: T, contextId: ContextId): void;

package/injector/module-ref.js

@@ -9,17 +9,17 @@ const injector_1 = require("./injector");
 const instance_links_host_1 = require("./instance-links-host");
 const instance_wrapper_1 = require("./instance-wrapper");
 class ModuleRef extends abstract_instance_resolver_1.AbstractInstanceResolver {
-    constructor(container) {
-        super();
-        this.container = container;
-        this.injector = new injector_1.Injector();
-    }
     get instanceLinksHost() {
         if (!this._instanceLinksHost) {
             this._instanceLinksHost = new instance_links_host_1.InstanceLinksHost(this.container);
         }
         return this._instanceLinksHost;
     }
+    constructor(container) {
+        super();
+        this.container = container;
+        this.injector = new injector_1.Injector();
+    }
     introspect(token) {
         const { wrapperRef } = this.instanceLinksHost.get(token);
         let scope = common_1.Scope.DEFAULT;

package/injector/module.d.ts

@@ -7,7 +7,7 @@ import { ModuleRef } from './module-ref';
  * @note
  * Left for backward compatibility
  */
-export declare type InstanceToken = InjectionToken;
+export type InstanceToken = InjectionToken;
 export declare class Module {
     private readonly _metatype;
     private readonly container;

package/injector/module.js

@@ -9,7 +9,7 @@ const exceptions_1 = require("../errors/exceptions");
 const context_id_factory_1 = require("../helpers/context-id-factory");
 const get_class_scope_1 = require("../helpers/get-class-scope");
 const is_durable_1 = require("../helpers/is-durable");
-const deterministic_uuid_registry_1 = require("../inspector/deterministic-uuid-registry");
+const uuid_factory_1 = require("../inspector/uuid-factory");
 const constants_1 = require("./constants");
 const instance_wrapper_1 = require("./instance-wrapper");
 const module_ref_1 = require("./module-ref");
@@ -372,15 +372,21 @@ class Module {
             constructor() {
                 super(self.container);
             }
-            get(typeOrToken, options = { strict: true }) {
-                return !(options && options.strict)
-                    ? this.find(typeOrToken, options)
-                    : this.find(typeOrToken, {
+            get(typeOrToken, options = {}) {
+                var _a, _b;
+                (_a = options.strict) !== null && _a !== void 0 ? _a : (options.strict = true);
+                (_b = options.each) !== null && _b !== void 0 ? _b : (options.each = false);
+                return this.find(typeOrToken, options.strict
+                    ? {
                         moduleId: self.id,
                         each: options.each,
-                    });
+                    }
+                    : options);
             }
-            resolve(typeOrToken, contextId = (0, context_id_factory_1.createContextId)(), options = { strict: true }) {
+            resolve(typeOrToken, contextId = (0, context_id_factory_1.createContextId)(), options = {}) {
+                var _a, _b;
+                (_a = options.strict) !== null && _a !== void 0 ? _a : (options.strict = true);
+                (_b = options.each) !== null && _b !== void 0 ? _b : (options.each = false);
                 return this.resolvePerContext(typeOrToken, self, contextId, options);
             }
             async create(type) {
@@ -395,9 +401,7 @@ class Module {
         var _a, _b, _c;
         const UUID_NAMESPACE = 'fb848993-0c82-4b9e-ae95-3c3c1dbe3d6b';
         const key = (_b = (_a = this.name) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : (_c = this.token) === null || _c === void 0 ? void 0 : _c.toString();
-        return key
-            ? deterministic_uuid_registry_1.DeterministicUuidRegistry.get(key, UUID_NAMESPACE)
-            : (0, random_string_generator_util_1.randomStringGenerator)();
+        return key ? uuid_factory_1.UuidFactory.get(key, UUID_NAMESPACE) : (0, random_string_generator_util_1.randomStringGenerator)();
     }
 }
 exports.Module = Module;

package/inspector/interfaces/edge.interface.d.ts

@@ -1,12 +1,12 @@
 import { InjectionToken } from '@nestjs/common';
-declare type CommonEdgeMetadata = {
+type CommonEdgeMetadata = {
     sourceModuleName: string;
     targetModuleName: string;
 };
-declare type ModuleToModuleEdgeMetadata = {
+type ModuleToModuleEdgeMetadata = {
     type: 'module-to-module';
 } & CommonEdgeMetadata;
-declare type ClassToClassEdgeMetadata = {
+type ClassToClassEdgeMetadata = {
     type: 'class-to-class';
     sourceClassName: string;
     targetClassName: string;

package/inspector/interfaces/entrypoint.interface.d.ts

@@ -1,17 +1,17 @@
 import { RequestMethod } from '@nestjs/common';
 import { VersionValue } from '@nestjs/common/interfaces';
-export declare type HttpEntrypointMetadata = {
+export type HttpEntrypointMetadata = {
     path: string;
     requestMethod: keyof typeof RequestMethod;
     methodVersion?: VersionValue;
     controllerVersion?: VersionValue;
 };
-export declare type MiddlewareEntrypointMetadata = {
+export type MiddlewareEntrypointMetadata = {
     path: string;
     requestMethod: keyof typeof RequestMethod;
     version?: VersionValue;
 };
-export declare type Entrypoint<T> = {
+export type Entrypoint<T> = {
     id?: string;
     type: string;
     methodName: string;

package/inspector/interfaces/node.interface.d.ts

@@ -1,6 +1,6 @@
 import { InjectionToken, Scope } from '@nestjs/common';
 import { EnhancerSubtype } from '@nestjs/common/constants';
-export declare type ModuleNode = {
+export type ModuleNode = {
     metadata: {
         type: 'module';
         global: boolean;
@@ -8,7 +8,7 @@ export declare type ModuleNode = {
         internal: boolean;
     };
 };
-export declare type ClassNode = {
+export type ClassNode = {
     parent: string;
     metadata: {
         type: 'provider' | 'controller' | 'middleware' | 'injectable';
@@ -41,7 +41,7 @@ export declare type ClassNode = {
         internal?: boolean;
     };
 };
-export declare type Node = {
+export type Node = {
     id: string;
     label: string;
 } & (ClassNode | ModuleNode);

package/inspector/noop-graph-inspector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoopGraphInspector = void 0;
 const graph_inspector_1 = require("./graph-inspector");
+// eslint-disable-next-line @typescript-eslint/no-empty-function
 const noop = () => { };
 exports.NoopGraphInspector = new Proxy(graph_inspector_1.GraphInspector.prototype, {
     get: () => noop,

package/inspector/serialized-graph.d.ts

@@ -3,7 +3,7 @@ import { Edge } from './interfaces/edge.interface';
 import { Entrypoint } from './interfaces/entrypoint.interface';
 import { Extras, OrphanedEnhancerDefinition } from './interfaces/extras.interface';
 import { Node } from './interfaces/node.interface';
-declare type WithOptionalId<T extends Record<'id', string>> = Omit<T, 'id'> & Partial<Pick<T, 'id'>>;
+type WithOptionalId<T extends Record<'id', string>> = Omit<T, 'id'> & Partial<Pick<T, 'id'>>;
 export declare class SerializedGraph {
     private readonly nodes;
     private readonly edges;

package/inspector/uuid-factory.d.ts

@@ -0,0 +1,9 @@
+export declare enum UuidFactoryMode {
+    Random = "random",
+    Deterministic = "deterministic"
+}
+export declare class UuidFactory {
+    private static _mode;
+    static set mode(value: UuidFactoryMode);
+    static get(key?: string, namespace?: string): any;
+}

package/inspector/uuid-factory.js

@@ -0,0 +1,22 @@
+"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 deterministic_uuid_registry_1 = require("./deterministic-uuid-registry");
+var UuidFactoryMode;
+(function (UuidFactoryMode) {
+    UuidFactoryMode["Random"] = "random";
+    UuidFactoryMode["Deterministic"] = "deterministic";
+})(UuidFactoryMode = exports.UuidFactoryMode || (exports.UuidFactoryMode = {}));
+class UuidFactory {
+    static set mode(value) {
+        this._mode = value;
+    }
+    static get(key = '', namespace) {
+        return this._mode === UuidFactoryMode.Deterministic
+            ? deterministic_uuid_registry_1.DeterministicUuidRegistry.get(key, namespace)
+            : (0, random_string_generator_util_1.randomStringGenerator)();
+    }
+}
+exports.UuidFactory = UuidFactory;
+UuidFactory._mode = UuidFactoryMode.Random;

package/middleware/middleware-module.d.ts

@@ -32,4 +32,5 @@ export declare class MiddlewareModule<TAppOptions extends NestApplicationContext
     private bindHandler;
     private createProxy;
     private registerHandler;
+    private getContextId;
 }

package/middleware/middleware-module.js

@@ -129,18 +129,10 @@ class MiddlewareModule {
             const proxy = await this.createProxy(instance);
             return this.registerHandler(applicationRef, routeInfo, proxy);
         }
+        const isTreeDurable = wrapper.isDependencyTreeDurable();
         await this.registerHandler(applicationRef, routeInfo, async (req, res, next) => {
             try {
-                const contextId = context_id_factory_1.ContextIdFactory.getByRequest(req);
-                if (!req[request_constants_1.REQUEST_CONTEXT_ID]) {
-                    Object.defineProperty(req, request_constants_1.REQUEST_CONTEXT_ID, {
-                        value: contextId,
-                        enumerable: false,
-                        writable: false,
-                        configurable: false,
-                    });
-                    this.container.registerRequestProvider(contextId.getParent ? contextId.payload : req, contextId);
-                }
+                const contextId = this.getContextId(req, isTreeDurable);
                 const contextInstance = await this.injector.loadPerContext(instance, moduleRef, collection, contextId);
                 const proxy = await this.createProxy(contextInstance, contextId);
                 return proxy(req, res, next);
@@ -164,9 +156,10 @@ class MiddlewareModule {
     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)) ||
-            ['*', '/*', '(.*)', '/(.*)'].includes(path)) {
+            isAWildcard) {
             path = (0, shared_utils_1.addLeadingSlash)(path);
         }
         else {
@@ -186,14 +179,29 @@ class MiddlewareModule {
         const isMethodAll = (0, utils_1.isRequestMethodAll)(method);
         const requestMethod = request_method_enum_1.RequestMethod[method];
         const router = await applicationRef.createMiddlewareFactory(method);
-        router(path, isMethodAll
+        const middlewareFunction = isMethodAll
             ? proxy
             : (req, res, next) => {
                 if (applicationRef.getRequestMethod(req) === requestMethod) {
                     return proxy(req, res, next);
                 }
                 return next();
+            };
+        router(path, middlewareFunction);
+    }
+    getContextId(request, isTreeDurable) {
+        const contextId = context_id_factory_1.ContextIdFactory.getByRequest(request);
+        if (!request[request_constants_1.REQUEST_CONTEXT_ID]) {
+            Object.defineProperty(request, request_constants_1.REQUEST_CONTEXT_ID, {
+                value: contextId,
+                enumerable: false,
+                writable: false,
+                configurable: false,
             });
+            const requestProviderValue = isTreeDurable ? contextId.payload : request;
+            this.container.registerRequestProvider(requestProviderValue, contextId);
+        }
+        return contextId;
     }
 }
 exports.MiddlewareModule = MiddlewareModule;

package/middleware/utils.js

@@ -11,6 +11,7 @@ const mapToExcludeRoute = (routes) => {
     return routes.map(({ path, method }) => ({
         pathRegex: pathToRegexp(path),
         requestMethod: method,
+        path,
     }));
 };
 exports.mapToExcludeRoute = mapToExcludeRoute;

package/nest-application-context.d.ts

@@ -101,7 +101,7 @@ export declare class NestApplicationContext<TOptions extends NestApplicationCont
      * Terminates the application
      * @returns {Promise<void>}
      */
-    close(): Promise<void>;
+    close(signal?: string): Promise<void>;
     /**
      * Sets custom logger service.
      * Flushes buffered logs if auto flush is on.

package/nest-application-context.js

@@ -16,6 +16,12 @@ const instance_links_host_1 = require("./injector/instance-links-host");
  * @publicApi
  */
 class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstanceResolver {
+    get instanceLinksHost() {
+        if (!this._instanceLinksHost) {
+            this._instanceLinksHost = new instance_links_host_1.InstanceLinksHost(this.container);
+        }
+        return this._instanceLinksHost;
+    }
     constructor(container, appOptions = {}, contextModule = null, scope = new Array()) {
         super();
         this.container = container;
@@ -34,12 +40,6 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
             this.printInPreviewModeWarning();
         }
     }
-    get instanceLinksHost() {
-        if (!this._instanceLinksHost) {
-            this._instanceLinksHost = new instance_links_host_1.InstanceLinksHost(this.container);
-        }
-        return this._instanceLinksHost;
-    }
     selectContextModule() {
         const modules = this.container.getModules().values();
         this.contextModule = modules.next().value;
@@ -107,11 +107,11 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * Terminates the application
      * @returns {Promise<void>}
      */
-    async close() {
+    async close(signal) {
         await this.callDestroyHook();
-        await this.callBeforeShutdownHook();
+        await this.callBeforeShutdownHook(signal);
         await this.dispose();
-        await this.callShutdownHook();
+        await this.callShutdownHook(signal);
         this.unsubscribeFromProcessSignals();
     }
     /**
@@ -176,13 +176,20 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * @param {string[]} signals The system signals it should listen to
      */
     listenToShutdownSignals(signals) {
+        let receivedSignal = false;
         const cleanup = async (signal) => {
             try {
-                signals.forEach(sig => process.removeListener(sig, cleanup));
+                if (receivedSignal) {
+                    // If we receive another signal while we're waiting
+                    // for the server to stop, just ignore it.
+                    return;
+                }
+                receivedSignal = true;
                 await this.callDestroyHook();
                 await this.callBeforeShutdownHook(signal);
                 await this.dispose();
                 await this.callShutdownHook(signal);
+                signals.forEach(sig => process.removeListener(sig, cleanup));
                 process.kill(process.pid, signal);
             }
             catch (err) {

package/nest-application.d.ts

@@ -41,6 +41,7 @@ export declare class NestApplication extends NestApplicationContext<NestApplicat
     getHttpServer(): any;
     startAllMicroservices(): Promise<this>;
     use(...args: [any, any?]): this;
+    useBodyParser(...args: [any, any?]): this;
     enableCors(options?: CorsOptions | CorsOptionsDelegate<any>): void;
     enableVersioning(options?: VersioningOptions): this;
     listen(port: number | string): Promise<any>;

package/nest-application.js

@@ -147,6 +147,16 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.httpAdapter.use(...args);
         return this;
     }
+    useBodyParser(...args) {
+        if (!('useBodyParser' in this.httpAdapter)) {
+            this.logger.warn('Your HTTP Adapter does not support `.useBodyParser`.');
+            return this;
+        }
+        const [parserType, ...otherArgs] = args;
+        const rawBody = !!this.appOptions.rawBody;
+        this.httpAdapter.useBodyParser(...[parserType, rawBody, ...otherArgs]);
+        return this;
+    }
     enableCors(options) {
         this.httpAdapter.enableCors(options);
     }
@@ -229,11 +239,13 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
                     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,
                 };
             });
             this.config.setGlobalPrefixOptions(Object.assign(Object.assign({}, options), { exclude }));

package/nest-factory.js

@@ -14,6 +14,7 @@ const injector_1 = require("./injector/injector");
 const instance_loader_1 = require("./injector/instance-loader");
 const graph_inspector_1 = require("./inspector/graph-inspector");
 const noop_graph_inspector_1 = require("./inspector/noop-graph-inspector");
+const uuid_factory_1 = require("./inspector/uuid-factory");
 const metadata_scanner_1 = require("./metadata-scanner");
 const nest_application_1 = require("./nest-application");
 const nest_application_context_1 = require("./nest-application-context");
@@ -90,6 +91,9 @@ class NestFactoryStatic {
         return this.createProxy(instance);
     }
     async initialize(module, container, graphInspector, config = new application_config_1.ApplicationConfig(), options = {}, httpServer = null) {
+        uuid_factory_1.UuidFactory.mode = options.snapshot
+            ? uuid_factory_1.UuidFactoryMode.Deterministic
+            : uuid_factory_1.UuidFactoryMode.Random;
         const injector = new injector_1.Injector({ preview: options.preview });
         const instanceLoader = new instance_loader_1.InstanceLoader(container, injector, graphInspector);
         const metadataScanner = new metadata_scanner_1.MetadataScanner();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.3.0-beta.3",
+  "version": "9.3.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "uuid": "9.0.0"
   },
   "devDependencies": {
-    "@nestjs/common": "^9.3.0-beta.3"
+    "@nestjs/common": "9.3.1"
   },
   "peerDependencies": {
     "@nestjs/common": "^9.0.0",

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

@@ -8,7 +8,7 @@ class DebugReplFn extends repl_function_1.ReplFunction {
         super(...arguments);
         this.fnDefinition = {
             name: 'debug',
-            description: 'Print all registered modules as a list together with their controllers and providers. If the argument is passed in, for example, "debug(MyModule)" then it will only print components of this specific module.',
+            description: 'Print all registered modules as a list together with their controllers and providers.\nIf the argument is passed in, for example, "debug(MyModule)" then it will only print components of this specific module.',
             signature: '(moduleCls?: ClassRef | string) => void',
         };
     }

package/repl/repl-context.d.ts

@@ -1,12 +1,12 @@
 import { INestApplicationContext, InjectionToken, Logger } from '@nestjs/common';
 import { ReplFunction } from './repl-function';
 import type { ReplFunctionClass } from './repl.interfaces';
-declare type ModuleKey = string;
-export declare type ModuleDebugEntry = {
+type ModuleKey = string;
+export type ModuleDebugEntry = {
     controllers: Record<string, InjectionToken>;
     providers: Record<string, InjectionToken>;
 };
-declare type ReplScope = Record<string, any>;
+type ReplScope = Record<string, any>;
 export declare class ReplContext {
     readonly app: INestApplicationContext;
     readonly logger: Logger;

package/repl/repl-native-commands.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+import type { REPLServer } from 'repl';
+export declare function defineDefaultCommandsOnRepl(replServer: REPLServer): void;

package/repl/repl-native-commands.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineDefaultCommandsOnRepl = void 0;
+/**
+ * Displays a list of available commands in the REPL alongside with their
+ * descriptions.
+ * (c) This code was inspired by the 'help' command from Node.js core:
+ * {@link https://github.com/nodejs/node/blob/58b60c1393dd65cd228a8b0084a19acd2c1d16aa/lib/repl.js#L1741-L1759}
+ */
+function listAllCommands(replServer) {
+    Object.keys(replServer.commands)
+        .sort()
+        .forEach(name => {
+        const cmd = replServer.commands[name];
+        if (cmd) {
+            replServer.output.write(`${name}\t${cmd.help || ''}\n`);
+        }
+    });
+}
+function defineDefaultCommandsOnRepl(replServer) {
+    replServer.defineCommand('help', {
+        help: 'Show REPL options',
+        action(name) {
+            this.clearBufferedCommand();
+            if (name) {
+                // Considering native commands before native nestjs injected functions.
+                const nativeCommandOrFunction = this.commands[name] || this.context[name];
+                // NOTE: If the command was retrieve from the context, it will have a `help`
+                // 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;
+                if (helpMessage) {
+                    this.output.write(`${helpMessage}\n`);
+                }
+            }
+            else {
+                listAllCommands(this);
+                this.output.write('\n\n');
+                this.context.help();
+                this.output.write('\nPress Ctrl+C to abort current expression, Ctrl+D to exit the REPL\n');
+            }
+            this.displayPrompt();
+        },
+    });
+}
+exports.defineDefaultCommandsOnRepl = defineDefaultCommandsOnRepl;

package/repl/repl.interfaces.d.ts

@@ -1,6 +1,6 @@
 import type { ReplContext } from './repl-context';
 import type { ReplFunction } from './repl-function';
-export declare type ReplFnDefinition = {
+export type ReplFnDefinition = {
     /** Function's name. Note that this should be a valid JavaScript function name. */
     name: string;
     /** Alternative names to the function. */
@@ -13,4 +13,4 @@ export declare type ReplFnDefinition = {
      */
     signature: string;
 };
-export declare type ReplFunctionClass = new (replContext: ReplContext) => ReplFunction;
+export type ReplFunctionClass = new (replContext: ReplContext) => ReplFunction;

package/repl/repl.js

@@ -8,6 +8,7 @@ const assign_to_object_util_1 = require("./assign-to-object.util");
 const constants_1 = require("./constants");
 const repl_context_1 = require("./repl-context");
 const repl_logger_1 = require("./repl-logger");
+const repl_native_commands_1 = require("./repl-native-commands");
 async function repl(module) {
     const app = await nest_factory_1.NestFactory.createApplicationContext(module, {
         abortOnError: false,
@@ -22,6 +23,7 @@ async function repl(module) {
         ignoreUndefined: true,
     });
     (0, assign_to_object_util_1.assignToObject)(replServer.context, replContext.globalScope);
+    (0, repl_native_commands_1.defineDefaultCommandsOnRepl)(replServer);
     return replServer;
 }
 exports.repl = repl;

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

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

package/router/interfaces/routes.interface.d.ts

@@ -4,4 +4,4 @@ export interface RouteTree {
     module?: Type<any>;
     children?: Routes | Type<any>[];
 }
-export declare type Routes = RouteTree[];
+export type Routes = RouteTree[];

package/router/router-explorer.js

@@ -8,17 +8,14 @@ const logger_service_1 = require("@nestjs/common/services/logger.service");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const pathToRegexp = require("path-to-regexp");
 const unknown_request_mapping_exception_1 = require("../errors/exceptions/unknown-request-mapping.exception");
-const guards_consumer_1 = require("../guards/guards-consumer");
-const guards_context_creator_1 = require("../guards/guards-context-creator");
+const guards_1 = require("../guards");
 const context_id_factory_1 = require("../helpers/context-id-factory");
 const execution_context_host_1 = require("../helpers/execution-context-host");
 const messages_1 = require("../helpers/messages");
 const router_method_factory_1 = require("../helpers/router-method-factory");
 const constants_2 = require("../injector/constants");
-const interceptors_consumer_1 = require("../interceptors/interceptors-consumer");
-const interceptors_context_creator_1 = require("../interceptors/interceptors-context-creator");
-const pipes_consumer_1 = require("../pipes/pipes-consumer");
-const pipes_context_creator_1 = require("../pipes/pipes-context-creator");
+const interceptors_1 = require("../interceptors");
+const pipes_1 = require("../pipes");
 const paths_explorer_1 = require("./paths-explorer");
 const request_constants_1 = require("./request/request-constants");
 const route_params_factory_1 = require("./route-params-factory");
@@ -38,12 +35,12 @@ class RouterExplorer {
         this.exceptionFiltersCache = new WeakMap();
         this.pathsExplorer = new paths_explorer_1.PathsExplorer(metadataScanner);
         const routeParamsFactory = new route_params_factory_1.RouteParamsFactory();
-        const pipesContextCreator = new pipes_context_creator_1.PipesContextCreator(container, config);
-        const pipesConsumer = new pipes_consumer_1.PipesConsumer();
-        const guardsContextCreator = new guards_context_creator_1.GuardsContextCreator(container, config);
-        const guardsConsumer = new guards_consumer_1.GuardsConsumer();
-        const interceptorsContextCreator = new interceptors_context_creator_1.InterceptorsContextCreator(container, config);
-        const interceptorsConsumer = new interceptors_consumer_1.InterceptorsConsumer();
+        const pipesContextCreator = new pipes_1.PipesContextCreator(container, config);
+        const pipesConsumer = new pipes_1.PipesConsumer();
+        const guardsContextCreator = new guards_1.GuardsContextCreator(container, config);
+        const guardsConsumer = new guards_1.GuardsConsumer();
+        const interceptorsContextCreator = new interceptors_1.InterceptorsContextCreator(container, config);
+        const interceptorsConsumer = new interceptors_1.InterceptorsConsumer();
         this.executionContextCreator = new router_execution_context_1.RouterExecutionContext(routeParamsFactory, pipesContextCreator, pipesConsumer, guardsContextCreator, guardsConsumer, interceptorsContextCreator, interceptorsConsumer, container.getHttpAdapterRef());
     }
     explore(instanceWrapper, moduleKey, applicationRef, host, routePathMetadata) {
@@ -161,9 +158,10 @@ class RouterExplorer {
     createRequestScopedHandler(instanceWrapper, requestMethod, moduleRef, moduleKey, methodName) {
         const { instance } = instanceWrapper;
         const collection = moduleRef.controllers;
+        const isTreeDurable = instanceWrapper.isDependencyTreeDurable();
         return async (req, res, next) => {
             try {
-                const contextId = this.getContextId(req);
+                const contextId = this.getContextId(req, isTreeDurable);
                 const contextInstance = await this.injector.loadPerContext(instance, moduleRef, collection, contextId);
                 await this.createCallbackProxy(contextInstance, contextInstance[methodName], methodName, moduleKey, requestMethod, contextId, instanceWrapper.id)(req, res, next);
             }
@@ -178,7 +176,7 @@ class RouterExplorer {
             }
         };
     }
-    getContextId(request) {
+    getContextId(request, isTreeDurable) {
         const contextId = context_id_factory_1.ContextIdFactory.getByRequest(request);
         if (!request[request_constants_1.REQUEST_CONTEXT_ID]) {
             Object.defineProperty(request, request_constants_1.REQUEST_CONTEXT_ID, {
@@ -187,7 +185,8 @@ class RouterExplorer {
                 writable: false,
                 configurable: false,
             });
-            this.container.registerRequestProvider(contextId.getParent ? contextId.payload : request, contextId);
+            const requestProviderValue = isTreeDurable ? contextId.payload : request;
+            this.container.registerRequestProvider(requestProviderValue, contextId);
         }
         return contextId;
     }

package/router/router-proxy.d.ts

@@ -1,6 +1,6 @@
 import { ExceptionsHandler } from '../exceptions/exceptions-handler';
-export declare type RouterProxyCallback = <TRequest, TResponse>(req?: TRequest, res?: TResponse, next?: () => void) => void;
+export type RouterProxyCallback = <TRequest, TResponse>(req?: TRequest, res?: TResponse, next?: () => void) => void;
 export declare class RouterProxy {
-    createProxy(targetCallback: RouterProxyCallback, exceptionsHandler: ExceptionsHandler): <TRequest, TResponse>(req: TRequest, res: TResponse, next: () => void) => Promise<void>;
-    createExceptionLayerProxy(targetCallback: <TError, TRequest, TResponse>(err: TError, req: TRequest, res: TResponse, next: () => void) => void, exceptionsHandler: ExceptionsHandler): <TError, TRequest, TResponse>(err: TError, req: TRequest, res: TResponse, next: () => void) => Promise<void>;
+    createProxy(targetCallback: RouterProxyCallback, exceptionsHandler: ExceptionsHandler): <TRequest, TResponse>(req: TRequest, res: TResponse, next: () => void) => Promise<TResponse>;
+    createExceptionLayerProxy(targetCallback: <TError, TRequest, TResponse>(err: TError, req: TRequest, res: TResponse, next: () => void) => void, exceptionsHandler: ExceptionsHandler): <TError, TRequest, TResponse>(err: TError, req: TRequest, res: TResponse, next: () => void) => Promise<TResponse>;
 }

package/router/router-proxy.js

@@ -11,6 +11,7 @@ class RouterProxy {
             catch (e) {
                 const host = new execution_context_host_1.ExecutionContextHost([req, res, next]);
                 exceptionsHandler.next(e, host);
+                return res;
             }
         };
     }
@@ -22,6 +23,7 @@ class RouterProxy {
             catch (e) {
                 const host = new execution_context_host_1.ExecutionContextHost([req, res, next]);
                 exceptionsHandler.next(e, host);
+                return res;
             }
         };
     }

package/router/sse-stream.d.ts

@@ -4,7 +4,7 @@
 import { MessageEvent } from '@nestjs/common/interfaces';
 import { IncomingMessage, OutgoingHttpHeaders } from 'http';
 import { Transform } from 'stream';
-export declare type AdditionalHeaders = Record<string, string[] | string | number | undefined>;
+export type AdditionalHeaders = Record<string, string[] | string | number | undefined>;
 interface ReadHeaders {
     getHeaders?(): AdditionalHeaders;
 }
@@ -14,8 +14,8 @@ interface WriteHeaders {
     writeHead?(statusCode: number, headers?: OutgoingHttpHeaders): void;
     flushHeaders?(): void;
 }
-export declare type WritableHeaderStream = NodeJS.WritableStream & WriteHeaders;
-export declare type HeaderStream = WritableHeaderStream & ReadHeaders;
+export type WritableHeaderStream = NodeJS.WritableStream & WriteHeaders;
+export type HeaderStream = WritableHeaderStream & ReadHeaders;
 /**
  * Adapted from https://raw.githubusercontent.com/EventSource/node-ssestream
  * Transforms "messages" to W3C event stream content.

package/scanner.d.ts

@@ -1,9 +1,6 @@
 import { DynamicModule, ForwardReference, Provider } from '@nestjs/common';
 import { EnhancerSubtype } from '@nestjs/common/constants';
-import { ClassProvider, ExistingProvider, FactoryProvider, ValueProvider } from '@nestjs/common/interfaces';
-import { Controller } from '@nestjs/common/interfaces/controllers/controller.interface';
-import { Injectable } from '@nestjs/common/interfaces/injectable.interface';
-import { Type } from '@nestjs/common/interfaces/type.interface';
+import { ClassProvider, ExistingProvider, FactoryProvider, ValueProvider, Controller, Injectable, Type } from '@nestjs/common/interfaces';
 import { ApplicationConfig } from './application-config';
 import { NestContainer } from './injector/container';
 import { InstanceWrapper } from './injector/instance-wrapper';

package/scanner.js

@@ -13,7 +13,7 @@ const invalid_module_exception_1 = require("./errors/exceptions/invalid-module.e
 const undefined_module_exception_1 = require("./errors/exceptions/undefined-module.exception");
 const get_class_scope_1 = require("./helpers/get-class-scope");
 const internal_core_module_factory_1 = require("./injector/internal-core-module/internal-core-module-factory");
-const deterministic_uuid_registry_1 = require("./inspector/deterministic-uuid-registry");
+const uuid_factory_1 = require("./inspector/uuid-factory");
 class DependenciesScanner {
     constructor(container, metadataScanner, graphInspector, applicationConfig = new application_config_1.ApplicationConfig()) {
         this.container = container;
@@ -214,7 +214,7 @@ class DependenciesScanner {
         if (!providersKeys.includes(type)) {
             return this.container.addProvider(provider, token);
         }
-        const uuid = deterministic_uuid_registry_1.DeterministicUuidRegistry.get(type.toString());
+        const uuid = uuid_factory_1.UuidFactory.get(type.toString());
         const providerToken = `${type} (UUID: ${uuid})`;
         let scope = provider.scope;
         if ((0, shared_utils_1.isNil)(scope) && provider.useClass) {

package/test/utils/string.cleaner.d.ts

@@ -1 +0,0 @@
-export declare function stringCleaner(str: string): string;

package/test/utils/string.cleaner.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringCleaner = void 0;
-function stringCleaner(str) {
-    return str ? str.replace(/\s+/g, '').replace(/\n+/g, '') : str;
-}
-exports.stringCleaner = stringCleaner;