@nestjs/core 8.4.4 → 8.4.5

package/Readme.md

@@ -72,11 +72,12 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 <table style="text-align:center;"><tr><td>
   <a href="https://careers.labster.com/departments/platform" target="_blank"><img src="https://nestjs.com/img/labster-logo.png" width="170" valign="middle" /></a></td><td>
-<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td>
+<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
 <td>
 <a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
  <td>
-<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td></</tr></table>
+<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
+<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
 
 #### Silver Sponsors
 

package/injector/container.js

@@ -103,13 +103,13 @@ class NestContainer {
         moduleRef.addRelatedModule(related);
     }
     addProvider(provider, token) {
+        const moduleRef = this.modules.get(token);
         if (!provider) {
-            throw new circular_dependency_exception_1.CircularDependencyException();
+            throw new circular_dependency_exception_1.CircularDependencyException(moduleRef === null || moduleRef === void 0 ? void 0 : moduleRef.metatype.name);
         }
-        if (!this.modules.has(token)) {
+        if (!moduleRef) {
             throw new unknown_module_exception_1.UnknownModuleException();
         }
-        const moduleRef = this.modules.get(token);
         return moduleRef.addProvider(provider);
     }
     addInjectable(injectable, token, host) {

package/injector/injector.d.ts

@@ -12,7 +12,7 @@ export declare type InjectorDependency = InjectionToken;
  * The property-based dependency
  */
 export interface PropertyDependency {
-    key: string;
+    key: symbol | string;
     name: InjectorDependency;
     isOptional?: boolean;
     instance?: any;
@@ -55,13 +55,13 @@ export declare class Injector {
     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>>;
+    resolveSingleParam<T>(wrapper: InstanceWrapper<T>, param: Type<any> | string | symbol | any, dependencyContext: InjectorDependencyContext, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: symbol | string | number): Promise<InstanceWrapper<any>>;
     resolveParamToken<T>(wrapper: InstanceWrapper<T>, param: Type<any> | string | symbol | any): any;
-    resolveComponentInstance<T>(moduleRef: Module, token: InstanceToken, dependencyContext: InjectorDependencyContext, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number): Promise<InstanceWrapper>;
+    resolveComponentInstance<T>(moduleRef: Module, token: InstanceToken, dependencyContext: InjectorDependencyContext, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: symbol | string | number): Promise<InstanceWrapper>;
     resolveComponentHost<T>(moduleRef: Module, instanceWrapper: InstanceWrapper<T | Promise<T>>, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<InstanceWrapper>;
-    lookupComponent<T = any>(providers: Map<Function | 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: InstanceToken, wrapper: InstanceWrapper, moduleRegistry?: any[], contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: string | number, isTraversing?: boolean): Promise<any>;
+    lookupComponent<T = any>(providers: Map<Function | string | symbol, InstanceWrapper>, moduleRef: Module, dependencyContext: InjectorDependencyContext, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: symbol | string | number): Promise<InstanceWrapper<T>>;
+    lookupComponentInParentModules<T = any>(dependencyContext: InjectorDependencyContext, moduleRef: Module, wrapper: InstanceWrapper<T>, contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: symbol | string | number): Promise<any>;
+    lookupComponentInImports(moduleRef: Module, name: InstanceToken, wrapper: InstanceWrapper, moduleRegistry?: any[], contextId?: ContextId, inquirer?: InstanceWrapper, keyOrIndex?: symbol | string | number, isTraversing?: boolean): Promise<any>;
     resolveProperties<T>(wrapper: InstanceWrapper<T>, moduleRef: Module, inject?: InjectorDependency[], contextId?: ContextId, inquirer?: InstanceWrapper, parentInquirer?: InstanceWrapper): Promise<PropertyDependency[]>;
     reflectProperties<T>(type: Type<T>): PropertyDependency[];
     applyProperties<T = any>(instance: T, properties: PropertyDependency[]): void;
@@ -74,7 +74,7 @@ export declare class Injector {
     private resolveScopedComponentHost;
     private isInquirerRequest;
     private isInquirer;
-    protected addDependencyMetadata(keyOrIndex: number | string, hostWrapper: InstanceWrapper, instanceWrapper: InstanceWrapper): void;
+    protected addDependencyMetadata(keyOrIndex: symbol | string | number, hostWrapper: InstanceWrapper, instanceWrapper: InstanceWrapper): void;
     private getTokenName;
     private printResolvingDependenciesLog;
     private printLookingForProviderLog;

package/injector/injector.js

@@ -386,9 +386,12 @@ class Injector {
         return param === inquirer_1.INQUIRER && parentInquirer;
     }
     addDependencyMetadata(keyOrIndex, hostWrapper, instanceWrapper) {
-        (0, shared_utils_1.isString)(keyOrIndex)
-            ? hostWrapper.addPropertiesMetadata(keyOrIndex, instanceWrapper)
-            : hostWrapper.addCtorMetadata(keyOrIndex, instanceWrapper);
+        if ((0, shared_utils_1.isSymbol)(keyOrIndex) || (0, shared_utils_1.isString)(keyOrIndex)) {
+            hostWrapper.addPropertiesMetadata(keyOrIndex, instanceWrapper);
+        }
+        else {
+            hostWrapper.addCtorMetadata(keyOrIndex, instanceWrapper);
+        }
     }
     getTokenName(token) {
         return (0, shared_utils_1.isFunction)(token) ? token.name : token.toString();

package/injector/instance-wrapper.d.ts

@@ -13,7 +13,7 @@ export interface InstancePerContext<T> {
     donePromise?: Promise<void>;
 }
 export interface PropertyMetadata {
-    key: string;
+    key: symbol | string;
     wrapper: InstanceWrapper;
 }
 export declare class InstanceWrapper<T = any> {
@@ -43,7 +43,7 @@ export declare class InstanceWrapper<T = any> {
     setInstanceByInquirerId(contextId: ContextId, inquirerId: string, value: InstancePerContext<T>): void;
     addCtorMetadata(index: number, wrapper: InstanceWrapper): void;
     getCtorMetadata(): InstanceWrapper[];
-    addPropertiesMetadata(key: string, wrapper: InstanceWrapper): void;
+    addPropertiesMetadata(key: symbol | string, wrapper: InstanceWrapper): void;
     getPropertiesMetadata(): PropertyMetadata[];
     addEnhancerMetadata(wrapper: InstanceWrapper): void;
     getEnhancersMetadata(): InstanceWrapper[];

package/nest-application-context.js

@@ -237,7 +237,7 @@ class NestApplicationContext {
             return this.get(typeOrToken, options);
         }
         const ctorHost = wrapperRef.instance || { constructor: typeOrToken };
-        const instance = await this.injector.loadPerContext(ctorHost, wrapperRef.host, collection, contextId);
+        const instance = await this.injector.loadPerContext(ctorHost, wrapperRef.host, collection, contextId, wrapperRef);
         if (!instance) {
             throw new unknown_element_exception_1.UnknownElementException();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "8.4.4",
+  "version": "8.4.5",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -32,11 +32,11 @@
     "iterare": "1.2.1",
     "object-hash": "3.0.0",
     "path-to-regexp": "3.2.0",
-    "tslib": "2.3.1",
+    "tslib": "2.4.0",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@nestjs/common": "8.4.4"
+    "@nestjs/common": "8.4.5"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",