fix(migrations): remove generic arguments from the injected type reference (#57127)

crisbeto · dylhunn · commit 1cf616f6710d · 2024-07-26T10:00:32.000-07:00
Currently if an injected type has type arguments, we copy it over together with the type arguments to inject, because `inject()` isn't able to infer the generic properly otherwise. E.g. if there's `constructor(el: ElementRef<HTMLElement>)` we produce `inject<ElementRef<HTMLElement>>(ElementRef<HTMLElement>);`. These changes drop the generics from the `inject()` parameter since we're overwriting the type anyway. The example from above would become `inject<ElementRef<HTMLElement>>(ElementRef);`. PR Close #57127
diff --git a/packages/core/schematics/ng-generate/inject-migration/migration.ts b/packages/core/schematics/ng-generate/inject-migration/migration.ts
@@ -309,10 +309,21 @@ function createInjectReplacementCall(
   const sourceFile = param.getSourceFile();
   const decorators = getAngularDecorators(localTypeChecker, ts.getDecorators(param) || []);
   const literalProps: ts.ObjectLiteralElementLike[] = [];
-  let injectedType = param.type?.getText() || '';
-  let typeArguments = param.type && hasGenerics(param.type) ? [param.type] : undefined;
+  const type = param.type;
+  let injectedType = '';
+  let typeArguments = type && hasGenerics(type) ? [type] : undefined;
   let hasOptionalDecorator = false;
 
+  if (type) {
+    // Remove the type arguments from generic type references, because
+    // they'll be specified as type arguments to `inject()`.
+    if (ts.isTypeReferenceNode(type) && type.typeArguments && type.typeArguments.length > 0) {
+      injectedType = type.typeName.getText();
+    } else {
+      injectedType = type.getText();
+    }
+  }
+
   for (const decorator of decorators) {
     if (decorator.moduleName !== moduleName) {
       continue;
@@ -328,9 +339,7 @@ function createInjectReplacementCall(
           // `inject` no longer officially supports string injection so we need
           // to cast to any. We maintain the type by passing it as a generic.
           if (ts.isStringLiteralLike(firstArg)) {
-            typeArguments = [
-              param.type || ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword),
-            ];
+            typeArguments = [type || ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)];
             injectedType += ' as any';
           }
         }
diff --git a/packages/core/schematics/test/inject_migration_spec.ts b/packages/core/schematics/test/inject_migration_spec.ts
@@ -166,7 +166,7 @@ describe('inject migration', () => {
       ``,
       `@Directive()`,
       `class MyDir {`,
-      `  private one = inject<ElementRef<HTMLElement>>(ElementRef<HTMLElement>);`,
+      `  private one = inject<ElementRef<HTMLElement>>(ElementRef);`,
       `  private two = inject<ElementRef<HTMLButtonElement> | ElementRef<HTMLSpanElement>>(ElementRef);`,
       `}`,
     ]);
