fix(migrations): return correct alias when conflicting import exists (#49139)

crisbeto · alxhub · commit 36b9ff7ff9e4 · 2023-02-21T13:17:21.000-08:00
Fixes that the `ImportManager` was returning the `propertyName` instead of the `name` when there's an import with a conflicting identifier. PR Close #49139
diff --git a/packages/core/schematics/test/standalone_migration_spec.ts b/packages/core/schematics/test/standalone_migration_spec.ts
@@ -1526,6 +1526,51 @@ describe('standalone migration', () => {
     `));
   });
 
+  it('should use the generated alias if a conflicting symbol already exists', async () => {
+    writeFile('module.ts', `
+      import {NgModule} from '@angular/core';
+      import {MyComp} from './comp';
+      import {MyButton} from './button';
+
+      @NgModule({declarations: [MyComp, MyButton], exports: [MyComp]})
+      export class Mod {}
+    `);
+
+    writeFile('comp.ts', `
+      import {Component} from '@angular/core';
+      import {MyButton} from '@external/button';
+
+      MyButton.sayHello();
+
+      @Component({selector: 'my-comp', template: '<my-button>Hello</my-button>'})
+      export class MyComp {}
+    `);
+
+    writeFile('button.ts', `
+      import {Component} from '@angular/core';
+
+      @Component({selector: 'my-button', template: '<ng-content></ng-content>'})
+      export class MyButton {}
+    `);
+
+    await runMigration('convert-to-standalone');
+
+    expect(stripWhitespace(tree.readContent('comp.ts'))).toBe(stripWhitespace(`
+      import {Component} from '@angular/core';
+      import {MyButton} from '@external/button';
+      import {MyButton as MyButton_1} from './button';
+
+      MyButton.sayHello();
+
+      @Component({
+        selector: 'my-comp', template: '<my-button>Hello</my-button>',
+        standalone: true,
+        imports: [MyButton_1]
+      })
+      export class MyComp {}
+    `));
+  });
+
   it('should remove a module that only has imports and exports', async () => {
     writeFile('app.module.ts', `
       import {NgModule} from '@angular/core';
diff --git a/packages/core/schematics/utils/import_manager.ts b/packages/core/schematics/utils/import_manager.ts
@@ -170,7 +170,7 @@ export class ImportManager {
     if (symbolName) {
       const {propertyName, name} = this._getImportParts(sourceFile, symbolName, alias);
       const importMap = this.newImports.get(sourceFile)!.namedImports;
-      identifier = propertyName || name;
+      identifier = name;
 
       if (!importMap.has(moduleName)) {
         importMap.set(moduleName, []);
