fix(di): preserve original metadata on @Inject decorator

Closes #2399
tsedio · Aug 15, 2023 · 1a04809 · 1a04809
1 parent 1fc62a0
commit 1a04809
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/packages/di/jest.config.js b/packages/di/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
   coverageThreshold: {
     global: {
       statements: 98.81,
-      branches: 96.71,
+      branches: 96.54,
       lines: 98.81,
       functions: 98.32
     }

diff --git a/packages/di/src/common/decorators/inject.spec.ts b/packages/di/src/common/decorators/inject.spec.ts
@@ -67,7 +67,7 @@ describe("@Inject()", () => {
       class MyService1 implements InterfaceGroup {
         readonly type: string = "service1";
 
-        constructor(@Inject(InjectorService) readonly injector: InjectorService) {}
+        constructor(@Inject(InjectorService) readonly injector: any) {}
       }
 
       @Injectable({
@@ -76,7 +76,7 @@ describe("@Inject()", () => {
       class MyService2 implements InterfaceGroup {
         readonly type: string = "service2";
 
-        constructor(@Inject(InjectorService) readonly injector: InjectorService) {}
+        constructor(@Inject(InjectorService) readonly injector: any) {}
       }
 
       const TokenAsync = Symbol.for("MyService2");

diff --git a/packages/di/src/common/decorators/inject.ts b/packages/di/src/common/decorators/inject.ts
@@ -3,6 +3,7 @@ import {DI_PARAM_OPTIONS, INJECTABLE_PROP} from "../constants/constants";
 import {InvalidPropertyTokenError} from "../errors/InvalidPropertyTokenError";
 import type {InjectablePropertyOptions} from "../interfaces/InjectableProperties";
 import {TokenProvider} from "../interfaces/TokenProvider";
+import {getConstructorDependencies, setConstructorDependencies} from "../utils/getConstructorDependencies";
 
 export function injectProperty(target: any, propertyKey: string, options: Partial<InjectablePropertyOptions>) {
   Store.from(target).merge(INJECTABLE_PROP, {
@@ -39,18 +40,17 @@ export function Inject(token?: TokenProvider | (() => TokenProvider), onGet = (b
     switch (bindingType) {
       case DecoratorTypes.PARAM_CTOR:
         if (token) {
-          const paramTypes = Metadata.getParamTypes(target, propertyKey);
+          const paramTypes = getConstructorDependencies(target);
           const type = paramTypes[descriptor as number];
 
           paramTypes[descriptor as number] = type === Array ? [token] : token;
 
-          Metadata.setParamTypes(target, propertyKey!, paramTypes);
+          setConstructorDependencies(target, paramTypes);
         }
         break;
 
       case DecoratorTypes.PROP:
         const useType = token || Metadata.getType(target, propertyKey);
-        const originalType = Metadata.getType(target, propertyKey);
 
         if (useType === Object) {
           throw new InvalidPropertyTokenError(target, String(propertyKey));

diff --git a/packages/di/src/common/domain/Provider.ts b/packages/di/src/common/domain/Provider.ts
@@ -1,4 +1,4 @@
-import {classOf, getClassOrSymbol, isClass, methodsOf, nameOf, Store, Type} from "@tsed/core";
+import {classOf, getClassOrSymbol, isClass, Metadata, methodsOf, nameOf, Store, Type} from "@tsed/core";
 import {ProviderOpts} from "../interfaces/ProviderOpts";
 import {TokenProvider} from "../interfaces/TokenProvider";
 import {ProviderScope} from "./ProviderScope";

diff --git a/packages/di/src/common/index.ts b/packages/di/src/common/index.ts
@@ -51,4 +51,5 @@ export * from "./services/InjectorService";
 export * from "./utils/colors";
 export * from "./utils/createContainer";
 export * from "./utils/getConfiguration";
+export * from "./utils/getConstructorDependencies";
 export * from "./utils/resolveControllers";
diff --git a/packages/di/src/common/services/InjectorService.ts b/packages/di/src/common/services/InjectorService.ts
@@ -33,6 +33,7 @@ import {ResolvedInvokeOptions} from "../interfaces/ResolvedInvokeOptions";
 import {TokenProvider} from "../interfaces/TokenProvider";
 import {GlobalProviders} from "../registries/GlobalProviders";
 import {createContainer} from "../utils/createContainer";
+import {getConstructorDependencies} from "../utils/getConstructorDependencies";
 import {resolveControllers} from "../utils/resolveControllers";
 import {DIConfiguration} from "./DIConfiguration";
 
@@ -701,7 +702,7 @@ export class InjectorService extends Container {
       };
     } else {
       // useClass
-      deps = deps || Metadata.getParamTypes(provider.useClass);
+      deps = deps || getConstructorDependencies(provider.useClass);
       construct = (deps: TokenProvider[]) => new provider.useClass(...deps);
     }
 

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