@nestjs/core 9.3.6 → 9.3.8

package/injector/module.d.ts

@@ -17,6 +17,7 @@ export declare class Module {
     private readonly _injectables;
     private readonly _middlewares;
     private readonly _controllers;
+    private readonly _entryProviderKeys;
     private readonly _exports;
     private _distance;
     private _initOnPreview;
@@ -48,6 +49,7 @@ export declare class Module {
     get routes(): Map<InstanceToken, InstanceWrapper<Controller>>;
     get injectables(): Map<InstanceToken, InstanceWrapper<Injectable>>;
     get controllers(): Map<InstanceToken, InstanceWrapper<Controller>>;
+    get entryProviders(): Array<InstanceWrapper<Injectable>>;
     get exports(): Set<InstanceToken>;
     get instance(): NestModule;
     get metatype(): Type<any>;
@@ -90,5 +92,6 @@ export declare class Module {
         InstanceWrapper<Injectable>
     ]>;
     createModuleReferenceType(): Type<ModuleRef>;
+    private isEntryProvider;
     private generateUuid;
 }

package/injector/module.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Module = void 0;
+const constants_1 = require("@nestjs/common/constants");
 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");
@@ -10,7 +11,7 @@ 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 uuid_factory_1 = require("../inspector/uuid-factory");
-const constants_1 = require("./constants");
+const constants_2 = require("./constants");
 const instance_wrapper_1 = require("./instance-wrapper");
 const module_ref_1 = require("./module-ref");
 class Module {
@@ -22,6 +23,7 @@ class Module {
         this._injectables = new Map();
         this._middlewares = new Map();
         this._controllers = new Map();
+        this._entryProviderKeys = new Set();
         this._exports = new Set();
         this._distance = 0;
         this._initOnPreview = false;
@@ -86,6 +88,9 @@ class Module {
     get controllers() {
         return this._controllers;
     }
+    get entryProviders() {
+        return Array.from(this._entryProviderKeys).map(token => this.providers.get(token));
+    }
     get exports() {
         return this._exports;
     }
@@ -142,7 +147,7 @@ class Module {
     }
     addInjectable(injectable, enhancerSubtype, host) {
         if (this.isCustomProvider(injectable)) {
-            return this.addCustomProvider(injectable, this._injectables);
+            return this.addCustomProvider(injectable, this._injectables, enhancerSubtype);
         }
         let instanceWrapper = this.injectables.get(injectable);
         if (!instanceWrapper) {
@@ -167,6 +172,9 @@ class Module {
     }
     addProvider(provider, enhancerSubtype) {
         if (this.isCustomProvider(provider)) {
+            if (this.isEntryProvider(provider.provide)) {
+                this._entryProviderKeys.add(provider.provide);
+            }
             return this.addCustomProvider(provider, this._providers, enhancerSubtype);
         }
         this._providers.set(provider, new instance_wrapper_1.InstanceWrapper({
@@ -179,6 +187,9 @@ class Module {
             durable: (0, is_durable_1.isDurable)(provider),
             host: this,
         }));
+        if (this.isEntryProvider(provider)) {
+            this._entryProviderKeys.add(provider);
+        }
         return provider;
     }
     isCustomProvider(provider) {
@@ -223,8 +234,9 @@ class Module {
         if ((0, shared_utils_1.isUndefined)(durable)) {
             durable = (0, is_durable_1.isDurable)(useClass);
         }
-        collection.set(provider.provide, new instance_wrapper_1.InstanceWrapper({
-            token: provider.provide,
+        const token = provider.provide;
+        collection.set(token, new instance_wrapper_1.InstanceWrapper({
+            token,
             name: (useClass === null || useClass === void 0 ? void 0 : useClass.name) || useClass,
             metatype: useClass,
             instance: null,
@@ -328,7 +340,7 @@ class Module {
         this.assignControllerUniqueId(controller);
     }
     assignControllerUniqueId(controller) {
-        Object.defineProperty(controller, constants_1.CONTROLLER_ID_KEY, {
+        Object.defineProperty(controller, constants_2.CONTROLLER_ID_KEY, {
             enumerable: false,
             writable: false,
             configurable: true,
@@ -404,6 +416,11 @@ class Module {
             }
         };
     }
+    isEntryProvider(metatype) {
+        return typeof metatype === 'function'
+            ? !!Reflect.getMetadata(constants_1.ENTRY_PROVIDER_WATERMARK, metatype)
+            : false;
+    }
     generateUuid() {
         var _a, _b, _c;
         const prefix = 'M_';

package/inspector/deterministic-uuid-registry.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeterministicUuidRegistry = void 0;
 class DeterministicUuidRegistry {
     static get(str, inc = 0) {
-        const key = inc ? `${str}_${inc}` : `${str}`;
-        if (this.registry.has(key)) {
+        const id = inc ? this.hashCode(`${str}_${inc}`) : this.hashCode(str);
+        if (this.registry.has(id)) {
             return this.get(str, inc + 1);
         }
-        const id = this.hashCode(key);
         this.registry.set(id, true);
         return id;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.3.6",
+  "version": "9.3.8",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "uid": "2.0.1"
   },
   "devDependencies": {
-    "@nestjs/common": "9.3.6"
+    "@nestjs/common": "9.3.8"
   },
   "peerDependencies": {
     "@nestjs/common": "^9.0.0",

package/scanner.d.ts

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

package/scanner.js

@@ -290,10 +290,11 @@ class DependenciesScanner {
             const modulesContainer = this.container.getModules();
             const { injectables } = modulesContainer.get(moduleKey);
             const instanceWrapper = injectables.get(providerKey);
-            (0, iterare_1.iterate)(modulesContainer.values())
-                .map(module => module.controllers.values())
+            const iterableIterator = modulesContainer.values();
+            (0, iterare_1.iterate)(iterableIterator)
+                .map(moduleRef => Array.from(moduleRef.controllers.values()).concat(moduleRef.entryProviders))
                 .flatten()
-                .forEach(controller => controller.addEnhancerMetadata(instanceWrapper));
+                .forEach(controllerOrEntryProvider => controllerOrEntryProvider.addEnhancerMetadata(instanceWrapper));
         });
     }
     applyApplicationProviders() {