fix(di): fix @Inject when the decorator is used to inject many providers

tsedio · Sep 6, 2023 · 9fc43c0 · 9fc43c0
1 parent 6d9af54
commit 9fc43c0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 53 deletions.
diff --git a/packages/di/src/common/decorators/inject.ts b/packages/di/src/common/decorators/inject.ts
@@ -40,11 +40,12 @@ export function Inject(token?: TokenProvider | (() => TokenProvider), onGet = (b
     switch (bindingType) {
       case DecoratorTypes.PARAM_CTOR:
         if (token) {
-          const paramTypes = getConstructorDependencies(target);
+          const paramTypes = getConstructorDependencies(target, propertyKey);
           const type = paramTypes[descriptor as number];
 
           paramTypes[descriptor as number] = type === Array ? [token] : token;
 
+          Metadata.setParamTypes(target, propertyKey!, paramTypes);
           setConstructorDependencies(target, paramTypes);
         }
         break;

diff --git a/packages/di/src/common/utils/getConstructorDependencies.ts b/packages/di/src/common/utils/getConstructorDependencies.ts
@@ -1,7 +1,7 @@
 import {Metadata} from "@tsed/core";
 
-export function getConstructorDependencies(target: any) {
-  return [...(Metadata.get("override:ctor:design:paramtypes", target, undefined) || Metadata.getParamTypes(target) || [])];
+export function getConstructorDependencies(target: any, propertyKey?: string | symbol | undefined) {
+  return Metadata.getOwn("override:ctor:design:paramtypes", target, propertyKey) || [...Metadata.getParamTypes(target, propertyKey)] || [];
 }
 
 export function setConstructorDependencies(target: any, deps: any[]) {

diff --git a/packages/orm/mongoose/jest.config.js b/packages/orm/mongoose/jest.config.js
@@ -9,10 +9,10 @@ module.exports = {
   },
   coverageThreshold: {
     global: {
-      statements: 98.95,
-      branches: 95,
+      statements: 99.06,
+      branches: 95.41,
       functions: 99,
-      lines: 98.95
+      lines: 99.06
     }
   }
 };
diff --git a/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts b/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts
@@ -18,8 +18,8 @@ export class PostsRepository {
     return this.collection.groupBy.bind(this.collection);
   }
 
-  deleteMany(args: Prisma.PostDeleteManyArgs) {
-    return this.collection.deleteMany(args);
+  protected deserialize<T>(obj: null | Post | Post[]): T {
+    return deserialize<T>(obj, {type: PostModel, collectionType: isArray(obj) ? Array : undefined});
   }
 
   async findUnique(args: Prisma.PostFindUniqueArgs): Promise<PostModel | null> {
@@ -57,8 +57,8 @@ export class PostsRepository {
     return this.deserialize<PostModel>(obj);
   }
 
-  protected deserialize<T>(obj: null | Post | Post[]): T {
-    return deserialize<T>(obj, {type: PostModel, collectionType: isArray(obj) ? Array : undefined});
+  deleteMany(args: Prisma.PostDeleteManyArgs) {
+    return this.collection.deleteMany(args);
   }
 
   updateMany(args: Prisma.PostUpdateManyArgs) {

diff --git a/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts b/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts
@@ -18,8 +18,8 @@ export class UsersRepository {
     return this.collection.groupBy.bind(this.collection);
   }
 
-  deleteMany(args: Prisma.UserDeleteManyArgs) {
-    return this.collection.deleteMany(args);
+  protected deserialize<T>(obj: null | User | User[]): T {
+    return deserialize<T>(obj, {type: UserModel, collectionType: isArray(obj) ? Array : undefined});
   }
 
   async findUnique(args: Prisma.UserFindUniqueArgs): Promise<UserModel | null> {
@@ -57,8 +57,8 @@ export class UsersRepository {
     return this.deserialize<UserModel>(obj);
   }
 
-  protected deserialize<T>(obj: null | User | User[]): T {
-    return deserialize<T>(obj, {type: UserModel, collectionType: isArray(obj) ? Array : undefined});
+  deleteMany(args: Prisma.UserDeleteManyArgs) {
+    return this.collection.deleteMany(args);
   }
 
   updateMany(args: Prisma.UserUpdateManyArgs) {

diff --git a/packages/specs/schema/jest.config.js b/packages/specs/schema/jest.config.js
@@ -6,10 +6,10 @@ module.exports = {
   roots: ["<rootDir>/src", "<rootDir>/test"],
   coverageThreshold: {
     global: {
-      statements: 99.46,
-      branches: 96.23,
+      statements: 99.45,
+      branches: 96.18,
       functions: 100,
-      lines: 99.46
+      lines: 99.45
     }
   },
   moduleNameMapper: {

diff --git a/packages/specs/schema/src/tsconfig.json b/packages/specs/schema/src/tsconfig.json
diff --git a/packages/specs/schema/test/tsconfig.json b/packages/specs/schema/test/tsconfig.json