fixup! feat(core): add migration to remove moduleId references

devversion · devversion · commit cc6dd2770fa6 · 2023-03-23T13:27:10.000Z
Address feedback
diff --git a/packages/core/schematics/migrations/remove-module-id/index.ts b/packages/core/schematics/migrations/remove-module-id/index.ts
@@ -10,7 +10,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
 import {relative} from 'path';
 import ts from 'typescript';
 
-import {extractDirectiveMetadata} from '../../utils/directive_extractor';
+import {extractAngularClassMetadata} from '../../utils/extract_metadata';
 import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
 import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';
 import {getPropertyNameText} from '../../utils/typescript/property_name';
@@ -53,7 +53,7 @@ function runRemoveModuleIdMigration(tree: Tree, tsconfigPath: string, basePath:
 function collectUpdatesForFile(typeChecker: ts.TypeChecker, file: ts.SourceFile): ts.Node[] {
   const removeNodes: ts.Node[] = [];
   const attemptMigrateClass = (node: ts.ClassDeclaration) => {
-    const metadata = extractDirectiveMetadata(typeChecker, node);
+    const metadata = extractAngularClassMetadata(typeChecker, node);
     if (metadata === null) {
       return;
     }
diff --git a/packages/core/schematics/test/remove_module_id_spec.ts b/packages/core/schematics/test/remove_module_id_spec.ts
@@ -60,7 +60,6 @@ describe('Remove `moduleId` migration', () => {
     shx.rm('-r', tmpDirPath);
   });
 
-
   it('should remove `moduleId` from `@Directive`', async () => {
     writeFile('/index.ts', dedent`
       import {Directive} from '@angular/core';
@@ -86,6 +85,43 @@ describe('Remove `moduleId` migration', () => {
     `);
   });
 
+  it('should be able to remove `moduleId` from multiple classes in the same file', async () => {
+    writeFile('/index.ts', dedent`
+      import {Directive} from '@angular/core';
+
+      @Directive({
+        selector: 'my-dir-a',
+        moduleId: module.id,
+        standalone: true,
+      })
+      export class MyDirA {}
+
+      @Directive({
+        selector: 'my-dir-b',
+        moduleId: module.id,
+        standalone: true,
+      })
+      export class MyDirB {}
+    `);
+
+    await runMigration();
+
+    expect(tree.readContent('/index.ts')).toEqual(dedent`
+      import {Directive} from '@angular/core';
+
+      @Directive({
+        selector: 'my-dir-a',
+        standalone: true,
+      })
+      export class MyDirA {}
+
+      @Directive({
+        selector: 'my-dir-b',
+        standalone: true,
+      })
+      export class MyDirB {}
+    `);
+  });
 
   it('should not fail if `moduleId` is last property of decorator', async () => {
     writeFile('/index.ts', dedent`
diff --git a/packages/core/schematics/utils/extract_metadata.ts b/packages/core/schematics/utils/extract_metadata.ts
@@ -11,15 +11,15 @@ import ts from 'typescript';
 import {getAngularDecorators} from './ng_decorators';
 import {unwrapExpression} from './typescript/functions';
 
-/** Interface describing metadata of a directive class. */
-export interface DirectiveMetadata {
+/** Interface describing metadata of an Angular class. */
+export interface AngularClassMetadata {
   type: 'component'|'directive';
   node: ts.ObjectLiteralExpression;
 }
 
 /** Extracts `@Directive` or `@Component` metadata from the given class. */
-export function extractDirectiveMetadata(
-    typeChecker: ts.TypeChecker, node: ts.ClassDeclaration): DirectiveMetadata|null {
+export function extractAngularClassMetadata(
+    typeChecker: ts.TypeChecker, node: ts.ClassDeclaration): AngularClassMetadata|null {
   const decorators = ts.getDecorators(node);
 
   if (!decorators || !decorators.length) {
diff --git a/packages/core/schematics/utils/ng_component_template.ts b/packages/core/schematics/utils/ng_component_template.ts
@@ -10,10 +10,8 @@ import {Tree} from '@angular-devkit/schematics';
 import {dirname, relative, resolve} from 'path';
 import ts from 'typescript';
 
-import {extractDirectiveMetadata} from './directive_extractor';
+import {extractAngularClassMetadata} from './extract_metadata';
 import {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings';
-import {getAngularDecorators} from './ng_decorators';
-import {unwrapExpression} from './typescript/functions';
 import {getPropertyNameText} from './typescript/property_name';
 
 export interface ResolvedTemplate {
@@ -55,7 +53,7 @@ export class NgComponentTemplateVisitor {
   }
 
   private visitClassDeclaration(node: ts.ClassDeclaration) {
-    const metadata = extractDirectiveMetadata(this.typeChecker, node);
+    const metadata = extractAngularClassMetadata(this.typeChecker, node);
     if (metadata === null || metadata.type !== 'component') {
       return;
     }
