fix(migrations): Mark hoisted properties as removed in inject migration

Ryan Russell · Ryan Russell · commit 609472d50a3c · 2024-11-21T20:23:18.000Z
Before, in a situation like shown in the test, all of the initializers
would be dropped, as the code would try to insert it at the hoisted
property which is going to be deleted.
diff --git a/packages/core/schematics/ng-generate/inject-migration/migration.ts b/packages/core/schematics/ng-generate/inject-migration/migration.ts
@@ -814,6 +814,7 @@ function applyInternalOnlyChanges(
       memberIndentation + printer.printNode(ts.EmitHint.Unspecified, decl, decl.getSourceFile()),
     );
     tracker.removeNode(decl, true);
+    removedMembers.add(decl);
   });
 
   // If we added any hoisted properties, separate them visually with a new line.
diff --git a/packages/core/schematics/test/inject_migration_spec.ts b/packages/core/schematics/test/inject_migration_spec.ts
@@ -2122,6 +2122,45 @@ describe('inject migration', () => {
       ]);
     });
 
+    it('should handle re-ordering when all fields are removed or hoisted', async () => {
+      writeFile(
+        '/dir.ts',
+        [
+          `import { Injectable } from '@angular/core';`,
+          `import { ActivatedRoute } from '@angular/router';`,
+          ``,
+          `@Injectable()`,
+          `export class MyClass {`,
+          `  uninitialized!: string;`,
+          ``,
+          `  readonly b;`,
+          `  readonly a;`,
+          ``,
+          `  constructor(private readonly route: ActivatedRoute) {`,
+          `    this.a = this.route.get();`,
+          `    this.b = this.a.get();`,
+          `  }`,
+          `}`,
+        ].join('\n'),
+      );
+
+      await runInternalMigration();
+
+      expect(tree.readContent('/dir.ts').split('\n')).toEqual([
+        `import { Injectable, inject } from '@angular/core';`,
+        `import { ActivatedRoute } from '@angular/router';`,
+        ``,
+        `@Injectable()`,
+        `export class MyClass {`,
+        `  uninitialized!: string;`,
+        ``,
+        `  private readonly route = inject(ActivatedRoute);`,
+        `  readonly a = this.route.get();`,
+        `  readonly b = this.a.get();`,
+        `}`,
+      ]);
+    });
+
     it('should be able to insert statements after the `super` call when running in internal migration mode', async () => {
       writeFile(
         '/dir.ts',
