fix: don't include type arguments as part of the service identifier i…

…nside parsed constructor arguments
wessberg · May 21, 2021 · 3a2f3ff · 3a2f3ff
1 parent c59150f
commit 3a2f3ff
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/transformer/before/visitor/visit-class-like-declaration.ts b/src/transformer/before/visitor/visit-class-like-declaration.ts
@@ -8,6 +8,7 @@ import {
   updateClassExpression,
 } from "../../../util/ts-util";
 import { VisitorContext } from "../../visitor-context";
+import { pickServiceOrImplementationName } from "../util";
 
 export function visitClassLikeDeclaration(
   options: BeforeVisitorOptions<TS.ClassLikeDeclaration>
@@ -91,8 +92,8 @@ function getParameterTypeNamesAsArrayLiteral(
     if (parameter.type == null) {
       constructorParams[i] = compatFactory.createIdentifier("undefined");
     } else {
-      constructorParams[i] = compatFactory.createStringLiteral(
-        parameter.type.getFullText().trim()
+      constructorParams[i] = compatFactory.createNoSubstitutionTemplateLiteral(
+        pickServiceOrImplementationName(parameter.type, context)
       );
     }
   }

diff --git a/test/constructor-arguments.test.ts b/test/constructor-arguments.test.ts
@@ -31,7 +31,7 @@ test(
 				constructor(foo) {
 					this.foo = foo;
 				}
-				static get [Symbol.for("___CTOR_ARGS___")]() { return ["IFoo"]; }
+				static get [Symbol.for("___CTOR_ARGS___")]() { return [\`IFoo\`]; }
 			}
 			`)
     );
@@ -66,9 +66,44 @@ test(
 					this.foo = foo;
 					this.bar = bar;
 				}
-				static get [Symbol.for("___CTOR_ARGS___")]() { return ["IFoo", undefined]; }
+				static get [Symbol.for("___CTOR_ARGS___")]() { return [\`IFoo\`, undefined]; }
 			}
 			`)
     );
   }
 );
+
+test(
+  "When declaring service dependencies via constructor arguments, their type arguments should be irrelevant. #1",
+  withTypeScript,
+  (t, { typescript }) => {
+    const bundle = generateTransformerResult(
+      [
+        {
+          entry: true,
+          fileName: "index.ts",
+          text: `
+          interface IFoo<T> {}
+          class Foo {
+            constructor (private foo: IFoo<string>) {}
+          }
+			`,
+        },
+      ],
+      { typescript }
+    );
+    const [file] = bundle;
+
+    t.deepEqual(
+      formatCode(file.text),
+      formatCode(`\
+      class Foo {${gte(typescript.version, "4.3.0") ? `\n\t\tfoo;` : ""}
+          constructor(foo) {
+              this.foo = foo;
+          }
+          static get [Symbol.for("___CTOR_ARGS___")]() { return [\`IFoo\`]; }
+      }
+			`)
+    );
+  }
+);