@nestjs/core 9.0.11 → 9.1.1

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

@@ -1,14 +1,24 @@
 import { ContextId, HostComponentInfo } from '../injector/instance-wrapper';
 export declare function createContextId(): ContextId;
+export declare type ContextIdResolverFn = (info: HostComponentInfo) => ContextId;
+export interface ContextIdResolver {
+    /**
+     * Payload associated with the custom context id
+     */
+    payload: unknown;
+    /**
+     * A context id resolver function
+     */
+    resolve: ContextIdResolverFn;
+}
 export interface ContextIdStrategy<T = any> {
     /**
      * Allows to attach a parent context id to the existing child context id.
      * This lets you construct durable DI sub-trees that can be shared between contexts.
      * @param contextId auto-generated child context id
      * @param request request object
-     * @returns a context id resolver function
      */
-    attach(contextId: ContextId, request: T): ((info: HostComponentInfo) => ContextId) | undefined;
+    attach(contextId: ContextId, request: T): ContextIdResolverFn | ContextIdResolver | undefined;
 }
 export declare class ContextIdFactory {
     private static strategy?;
@@ -27,4 +37,5 @@ export declare class ContextIdFactory {
      * @param strategy strategy instance
      */
     static apply(strategy: ContextIdStrategy): void;
+    private static isContextIdResolverWithPayload;
 }

package/helpers/context-id-factory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextIdFactory = exports.createContextId = void 0;
+const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const request_constants_1 = require("../router/request/request-constants");
 function createContextId() {
     /**
@@ -42,7 +43,14 @@ class ContextIdFactory {
             return ContextIdFactory.create();
         }
         const contextId = createContextId();
-        contextId.getParent = this.strategy.attach(contextId, request);
+        const resolverObjectOrFunction = this.strategy.attach(contextId, request);
+        if (this.isContextIdResolverWithPayload(resolverObjectOrFunction)) {
+            contextId.getParent = resolverObjectOrFunction.resolve;
+            contextId.payload = resolverObjectOrFunction.payload;
+        }
+        else {
+            contextId.getParent = resolverObjectOrFunction;
+        }
         return contextId;
     }
     /**
@@ -53,5 +61,8 @@ class ContextIdFactory {
     static apply(strategy) {
         this.strategy = strategy;
     }
+    static isContextIdResolverWithPayload(resolverOrResolverFn) {
+        return (0, shared_utils_1.isObject)(resolverOrResolverFn);
+    }
 }
 exports.ContextIdFactory = ContextIdFactory;

package/injector/instance-wrapper.d.ts

@@ -15,6 +15,7 @@ export interface HostComponentInfo {
 }
 export interface ContextId {
     readonly id: number;
+    payload?: unknown;
     getParent?(info: HostComponentInfo): ContextId;
 }
 export interface InstancePerContext<T> {

package/middleware/middleware-module.js

@@ -109,7 +109,7 @@ class MiddlewareModule {
                         writable: false,
                         configurable: false,
                     });
-                    this.container.registerRequestProvider(req, contextId);
+                    this.container.registerRequestProvider(contextId.getParent ? contextId.payload : req, contextId);
                 }
                 const contextInstance = await this.injector.loadPerContext(instance, moduleRef, collection, contextId);
                 const proxy = await this.createProxy(contextInstance, contextId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.0.11",
+  "version": "9.1.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "object-hash": "3.0.0",
     "path-to-regexp": "3.2.0",
     "tslib": "2.4.0",
-    "uuid": "8.3.2"
+    "uuid": "9.0.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.0.11"
+    "@nestjs/common": "9.1.1"
   },
   "peerDependencies": {
     "@nestjs/common": "^9.0.0",

package/router/router-explorer.js

@@ -196,7 +196,7 @@ class RouterExplorer {
                 writable: false,
                 configurable: false,
             });
-            this.container.registerRequestProvider(request, contextId);
+            this.container.registerRequestProvider(contextId.getParent ? contextId.payload : request, contextId);
         }
         return contextId;
     }

package/services/reflector.service.js

@@ -31,7 +31,7 @@ class Reflector {
      *
      */
     getAll(metadataKey, targets) {
-        return (targets || []).map(target => Reflect.getMetadata(metadataKey, target));
+        return (targets || []).map(target => this.get(metadataKey, target));
     }
     /**
      * Retrieve metadata for a specified key for a specified set of targets and merge results.
@@ -63,7 +63,13 @@ class Reflector {
      *
      */
     getAllAndOverride(metadataKey, targets) {
-        return this.getAll(metadataKey, targets).find(item => item !== undefined);
+        for (const target of targets) {
+            const result = this.get(metadataKey, target);
+            if (result !== undefined) {
+                return result;
+            }
+        }
+        return undefined;
     }
 }
 exports.Reflector = Reflector;