@nestjs/core 7.6.0 → 7.6.4

package/injector/injector.d.ts

@@ -40,21 +40,21 @@ export interface InjectorDependencyContext {
     dependencies?: InjectorDependency[];
 }
 export declare class Injector {
+    loadPrototype<T>({ name }: InstanceWrapper<T>, collection: Map<string, InstanceWrapper<T>>, contextId?: ContextId): void;
+    loadInstance<T>(wrapper: InstanceWrapper<T>, collection: Map<string, InstanceWrapper>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
     loadMiddleware(wrapper: InstanceWrapper, collection: Map<string, InstanceWrapper>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
     loadController(wrapper: InstanceWrapper<Controller>, moduleRef: Module, contextId?: ContextId): Promise<void>;
     loadInjectable<T = any>(wrapper: InstanceWrapper<T>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
     loadProvider(wrapper: InstanceWrapper<Injectable>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
-    loadPrototype<T>({ name }: InstanceWrapper<T>, collection: Map<string, InstanceWrapper<T>>, contextId?: ContextId): void;
     applyDoneHook<T>(wrapper: InstancePerContext<T>): () => void;
-    loadInstance<T>(wrapper: InstanceWrapper<T>, collection: Map<string, InstanceWrapper>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
-    resolveConstructorParams<T>(wrapper: InstanceWrapper<T>, moduleRef: Module, inject: InjectorDependency[], callback: (args: unknown[]) => void, contextId?: ContextId, inquirer?: InstanceWrapper, parentInquirer?: InstanceWrapper): Promise<void>;
+    resolveConstructorParams<T>(wrapper: InstanceWrapper<T>, moduleRef: Module, inject: InjectorDependency[], callback: (args: unknown[]) => void | Promise<void>, contextId?: ContextId, inquirer?: InstanceWrapper, parentInquirer?: InstanceWrapper): Promise<void>;
     reflectConstructorParams<T>(type: Type<T>): any[];
     reflectOptionalParams<T>(type: Type<T>): any[];
     reflectSelfParams<T>(type: Type<T>): any[];
     resolveSingleParam<T>(wrapper: InstanceWrapper<T>, param: Type<any> | string | symbol | any, dependencyContext: InjectorDependencyContext, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number): Promise<InstanceWrapper<any>>;
     resolveParamToken<T>(wrapper: InstanceWrapper<T>, param: Type<any> | string | symbol | any): any;
     resolveComponentInstance<T>(moduleRef: Module, name: any, dependencyContext: InjectorDependencyContext, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number): Promise<InstanceWrapper>;
-    resolveComponentHost<T>(moduleRef: Module, instanceWrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<InstanceWrapper>;
+    resolveComponentHost<T>(moduleRef: Module, instanceWrapper: InstanceWrapper<T | Promise<T>>, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<InstanceWrapper>;
     lookupComponent<T = any>(providers: Map<string | symbol, InstanceWrapper>, moduleRef: Module, dependencyContext: InjectorDependencyContext, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number): Promise<InstanceWrapper<T>>;
     lookupComponentInParentModules<T = any>(dependencyContext: InjectorDependencyContext, moduleRef: Module, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number): Promise<any>;
     lookupComponentInImports(moduleRef: Module, name: any, wrapper: InstanceWrapper, moduleRegistry?: any[], contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number, isTraversing?: boolean): Promise<any>;

package/injector/injector.js

@@ -11,33 +11,6 @@ const constants_2 = require("./constants");
 const inquirer_1 = require("./inquirer");
 const instance_wrapper_1 = require("./instance-wrapper");
 class Injector {
-    async loadMiddleware(wrapper, collection, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
-        const { metatype } = wrapper;
-        const targetWrapper = collection.get(metatype.name);
-        if (!shared_utils_1.isUndefined(targetWrapper.instance)) {
-            return;
-        }
-        const loadInstance = (instances) => {
-            targetWrapper.instance = targetWrapper.isDependencyTreeStatic()
-                ? new metatype(...instances)
-                : Object.create(metatype.prototype);
-        };
-        await this.resolveConstructorParams(wrapper, moduleRef, null, loadInstance, contextId, inquirer);
-    }
-    async loadController(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT) {
-        const controllers = moduleRef.controllers;
-        await this.loadInstance(wrapper, controllers, moduleRef, contextId, wrapper);
-        await this.loadEnhancersPerContext(wrapper, contextId, wrapper);
-    }
-    async loadInjectable(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
-        const injectables = moduleRef.injectables;
-        await this.loadInstance(wrapper, injectables, moduleRef, contextId, inquirer);
-    }
-    async loadProvider(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
-        const providers = moduleRef.providers;
-        await this.loadInstance(wrapper, providers, moduleRef, contextId, inquirer);
-        await this.loadEnhancersPerContext(wrapper, contextId, wrapper);
-    }
     loadPrototype({ name }, collection, contextId = constants_2.STATIC_CONTEXT) {
         if (!collection) {
             return;
@@ -49,14 +22,6 @@ class Injector {
             collection.set(name, wrapper);
         }
     }
-    applyDoneHook(wrapper) {
-        let done;
-        wrapper.donePromise = new Promise((resolve, reject) => {
-            done = resolve;
-        });
-        wrapper.isPending = true;
-        return done;
-    }
     async loadInstance(wrapper, collection, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
         const inquirerId = this.getInquirerId(inquirer);
         const instanceHost = wrapper.getInstanceByContextId(contextId, inquirerId);
@@ -80,6 +45,37 @@ class Injector {
         };
         await this.resolveConstructorParams(wrapper, moduleRef, inject, callback, contextId, wrapper, inquirer);
     }
+    async loadMiddleware(wrapper, collection, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
+        const { metatype } = wrapper;
+        const targetWrapper = collection.get(metatype.name);
+        if (!shared_utils_1.isUndefined(targetWrapper.instance)) {
+            return;
+        }
+        targetWrapper.instance = Object.create(metatype.prototype);
+        await this.loadInstance(wrapper, collection, moduleRef, contextId, inquirer || wrapper);
+    }
+    async loadController(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT) {
+        const controllers = moduleRef.controllers;
+        await this.loadInstance(wrapper, controllers, moduleRef, contextId, wrapper);
+        await this.loadEnhancersPerContext(wrapper, contextId, wrapper);
+    }
+    async loadInjectable(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
+        const injectables = moduleRef.injectables;
+        await this.loadInstance(wrapper, injectables, moduleRef, contextId, inquirer);
+    }
+    async loadProvider(wrapper, moduleRef, contextId = constants_2.STATIC_CONTEXT, inquirer) {
+        const providers = moduleRef.providers;
+        await this.loadInstance(wrapper, providers, moduleRef, contextId, inquirer);
+        await this.loadEnhancersPerContext(wrapper, contextId, wrapper);
+    }
+    applyDoneHook(wrapper) {
+        let done;
+        wrapper.donePromise = new Promise((resolve, reject) => {
+            done = resolve;
+        });
+        wrapper.isPending = true;
+        return done;
+    }
     async resolveConstructorParams(wrapper, moduleRef, inject, callback, contextId = constants_2.STATIC_CONTEXT, inquirer, parentInquirer) {
         const inquirerId = this.getInquirerId(inquirer);
         const metadata = wrapper.getCtorMetadata();
@@ -104,7 +100,7 @@ class Injector {
                 if (!instanceHost.isResolved && !paramWrapper.forwardRef) {
                     isResolved = false;
                 }
-                return instanceHost && instanceHost.instance;
+                return instanceHost === null || instanceHost === void 0 ? void 0 : instanceHost.instance;
             }
             catch (err) {
                 const isOptional = optionalDependenciesIds.includes(index);

package/injector/module-token-factory.js

@@ -39,11 +39,15 @@ class ModuleTokenFactory {
     }
     replacer(key, value) {
         if (typeof value === 'function') {
-            const isClass = /^class\s/.test(Function.prototype.toString.call(value));
+            const funcAsString = value.toString();
+            const isClass = /^class\s/.test(funcAsString);
             if (isClass) {
                 return value.name;
             }
-            return hash(value.toString(), { ignoreUnknown: true });
+            return hash(funcAsString, { ignoreUnknown: true });
+        }
+        if (typeof value === 'symbol') {
+            return value.toString();
         }
         return value;
     }

package/middleware/middleware-module.js

@@ -81,6 +81,9 @@ class MiddlewareModule {
             if (shared_utils_1.isUndefined(instanceWrapper)) {
                 throw new runtime_exception_1.RuntimeException();
             }
+            if (instanceWrapper.isTransient) {
+                return;
+            }
             await this.bindHandler(instanceWrapper, applicationRef, routeInfo.method, routeInfo.path, moduleRef, collection);
         }
     }

package/package.json

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