fix(migrations): inject migration always inserting generated variables before super call (#58393)

crisbeto · alxhub · commit 90c7ec39a06e · 2024-10-28T12:39:04.000-07:00
Fixes that if a class has a `super` call, the `inject` migration would always insert the generated variable before it, even if there's other code before the `super` call. PR Close #58393
diff --git a/packages/core/schematics/ng-generate/inject-migration/migration.ts b/packages/core/schematics/ng-generate/inject-migration/migration.ts
@@ -166,10 +166,10 @@ function migrateClass(
     ? getSuperParameters(constructor, superCall, localTypeChecker)
     : null;
   const removedStatementCount = removedStatements.size;
-  const innerReference =
-    superCall ||
-    constructor.body?.statements.find((statement) => !removedStatements.has(statement)) ||
-    constructor;
+  const firstConstructorStatement = constructor.body?.statements.find(
+    (statement) => !removedStatements.has(statement),
+  );
+  const innerReference = superCall || firstConstructorStatement || constructor;
   const innerIndentation = getLeadingLineWhitespaceOfNode(innerReference);
   const prependToConstructor: string[] = [];
   const afterSuper: string[] = [];
@@ -217,7 +217,7 @@ function migrateClass(
     if (prependToConstructor.length > 0) {
       tracker.insertText(
         sourceFile,
-        innerReference.getFullStart(),
+        (firstConstructorStatement || innerReference).getFullStart(),
         `\n${prependToConstructor.join('\n')}\n`,
       );
     }
diff --git a/packages/core/schematics/test/inject_migration_spec.ts b/packages/core/schematics/test/inject_migration_spec.ts
@@ -1464,6 +1464,43 @@ describe('inject migration', () => {
     ]);
   });
 
+  it('should insert generated variables on top of statements that appear before the `super` call', async () => {
+    writeFile(
+      '/dir.ts',
+      [
+        `import { Directive } from '@angular/core';`,
+        `import { Parent } from './parent';`,
+        `import { SomeService } from './service';`,
+        ``,
+        `@Directive()`,
+        `class MyDir extends Parent {`,
+        `  constructor(service: SomeService) {`,
+        `    console.log(service.getId());`,
+        `    super(service);`,
+        `  }`,
+        `}`,
+      ].join('\n'),
+    );
+
+    await runMigration();
+
+    expect(tree.readContent('/dir.ts').split('\n')).toEqual([
+      `import { Directive, inject } from '@angular/core';`,
+      `import { Parent } from './parent';`,
+      `import { SomeService } from './service';`,
+      ``,
+      `@Directive()`,
+      `class MyDir extends Parent {`,
+      `  constructor() {`,
+      `    const service = inject(SomeService);`,
+      ``,
+      `    console.log(service.getId());`,
+      `    super(service);`,
+      `  }`,
+      `}`,
+    ]);
+  });
+
   describe('internal-only behavior', () => {
     function runInternalMigration() {
       return runMigration({_internalCombineMemberInitializers: true});
