Skip to content

Control flow migration fixes #59861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crisbeto wants to merge 2 commits into from
Closed

Control flow migration fixes #59861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13f64ec
fix(migrations): count used dependencies inside existing control flow
crisbeto Feb 5, 2025
3de969e
fix(migrations): account for let declarations in control flow migration
crisbeto Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/core/schematics/ng-generate/control-flow-migration/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
Attribute,
Block,
Element,
LetDeclaration,
ParseTreeResult,
RecursiveVisitor,
Text,
Expand Down Expand Up @@ -390,6 +391,7 @@ export class CommonCollector extends RecursiveVisitor {
this.count++;
}
}
super.visitBlock(ast, null);
}

override visitText(ast: Text) {
Expand All @@ -398,6 +400,13 @@ export class CommonCollector extends RecursiveVisitor {
}
}

override visitLetDeclaration(decl: LetDeclaration): void {
if (this.hasPipes(decl.value)) {
this.count++;
}
super.visitLetDeclaration(decl, null);
}

private hasDirectives(input: string): boolean {
return commonModuleDirectives.has(input);
}
Expand Down
66 changes: 66 additions & 0 deletions packages/core/schematics/test/control_flow_migration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6479,6 +6479,72 @@ describe('control flow migration', () => {

expect(actual).toBe(expected);
});

it('should not remove common module if symbols are used inside new control flow', async () => {
writeFile(
'/comp.ts',
[
`import {CommonModule} from '@angular/common';`,
`import {Component} from '@angular/core';\n`,
`@Component({`,
` imports: [CommonModule],`,
` template: \`@if (toggle) {<div>{{ d | date }}</div>} <span *ngIf="toggle">hi</span>\``,
`})`,
`class Comp {`,
` toggle = false;`,
`}`,
].join('\n'),
);

await runMigration();
const actual = tree.readContent('/comp.ts');
const expected = [
`import {CommonModule} from '@angular/common';`,
`import {Component} from '@angular/core';\n`,
`@Component({`,
` imports: [CommonModule],`,
` template: \`@if (toggle) {<div>{{ d | date }}</div>} @if (toggle) {<span>hi</span>}\``,
`})`,
`class Comp {`,
` toggle = false;`,
`}`,
].join('\n');

expect(actual).toBe(expected);
});

it('should not remove common module if symbols are used inside @let', async () => {
writeFile(
'/comp.ts',
[
`import {CommonModule} from '@angular/common';`,
`import {Component} from '@angular/core';\n`,
`@Component({`,
` imports: [CommonModule],`,
` template: \`@let foo = 123 | date; <span *ngIf="foo">{{foo}}</span>\``,
`})`,
`class Comp {`,
` toggle = false;`,
`}`,
].join('\n'),
);

await runMigration();
const actual = tree.readContent('/comp.ts');
const expected = [
`import {CommonModule} from '@angular/common';`,
`import {Component} from '@angular/core';\n`,
`@Component({`,
` imports: [CommonModule],`,
` template: \`@let foo = 123 | date; @if (foo) {<span>{{foo}}</span>}\``,
`})`,
`class Comp {`,
` toggle = false;`,
`}`,
].join('\n');

expect(actual).toBe(expected);
});
});

describe('no migration needed', () => {
Expand Down