@openrewrite/recipes-angular 1.17.0 → 1.18.0

package/src/libraries/components/templates.ts

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Moderne Proprietary. Only for use by Moderne customers under the terms of a commercial contract.
+ */
+
+import {Cursor, ExecutionContext, Recipe, Tree, TreeVisitor} from "@openrewrite/rewrite";
+import {PlainText, PlainTextVisitor} from "@openrewrite/rewrite/text";
+import {JavaScriptVisitor} from "@openrewrite/rewrite/javascript";
+import {isIdentifier, isLiteral, J} from "@openrewrite/rewrite/java";
+import {create} from "mutative";
+import {escapeRegExp} from "./stylesheets";
+
+/** A directive selector or input that a major version renamed, as it appears in a template attribute. */
+export interface TemplateAttributeRename {
+    name: string;
+    newName: string;
+    /** Restricts the rename to elements with this tag name. */
+    element?: string;
+}
+
+/** A directive `exportAs` name that a major version renamed, as it appears in a template reference variable. */
+export interface TemplateExportAsRename {
+    name: string;
+    newName: string;
+}
+
+/**
+ * Renames attributes and `exportAs` references in `.html` templates and in inline `template` metadata.
+ */
+export abstract class RenameTemplateAttributes extends Recipe {
+    protected abstract readonly attributes: TemplateAttributeRename[];
+    protected readonly exportAs: TemplateExportAsRename[] = [];
+
+    async editor(): Promise<TreeVisitor<any, ExecutionContext>> {
+        const migrate = (template: string) => renameTemplateAttributes(template, this.attributes, this.exportAs);
+        const html = new class extends PlainTextVisitor<ExecutionContext> {
+            override async visitText(text: PlainText, p: ExecutionContext): Promise<PlainText | undefined> {
+                const t = await super.visitText(text, p) as PlainText;
+                if (!t || !t.sourcePath.endsWith('.html')) return t;
+                const updated = migrate(t.text);
+                return updated === t.text ? t : {...t, text: updated, snippets: []};
+            }
+        }();
+        const inline = new class extends JavaScriptVisitor<ExecutionContext> {
+            protected async visitPropertyAssignment(property: any, p: ExecutionContext): Promise<J | undefined> {
+                const prop = await super.visitPropertyAssignment(property, p) as any;
+                const name = prop?.name?.element;
+                if (!isIdentifier(name) || name.simpleName !== 'template') return prop;
+
+                const initializer = prop.initializer;
+                if (!initializer || !isLiteral(initializer) || typeof initializer.value !== 'string') return prop;
+                const valueSource = migrate(initializer.valueSource ?? '');
+                if (valueSource === initializer.valueSource) return prop;
+
+                return create(prop, (draft: any) => {
+                    draft.initializer.valueSource = valueSource;
+                    draft.initializer.value = migrate(initializer.value as string);
+                });
+            }
+        }();
+        // Each visitor returns a source file it does not accept unchanged.
+        return new class extends TreeVisitor<any, ExecutionContext> {
+            async visit<R extends Tree>(tree: Tree, p: ExecutionContext, parent?: Cursor): Promise<R | undefined> {
+                const visited = await html.visit<Tree>(tree, p, parent);
+                return visited && await inline.visit(visited, p, parent) as R | undefined;
+            }
+        }();
+    }
+}
+
+/** Renames attributes inside opening tags and `exportAs` values of reference variables. */
+export function renameTemplateAttributes(template: string, attributes: TemplateAttributeRename[],
+                                         exportAs: TemplateExportAsRename[] = []): string {
+    if (![...attributes, ...exportAs].some(r => template.includes(r.name))) return template;
+    return mapOpeningTags(template, (tagName, attrs) => {
+        let updated = attrs;
+        for (const rename of attributes) {
+            if (rename.element && rename.element !== tagName) continue;
+            updated = renameAttribute(updated, rename.name, rename.newName);
+        }
+        for (const rename of exportAs) {
+            updated = updated.replace(
+                new RegExp(`((?:^|\\s)(?:#|ref-)[\\w-]+\\s*=\\s*)(["'])${escapeRegExp(rename.name)}\\2`, 'g'),
+                `$1$2${rename.newName}$2`);
+        }
+        return updated;
+    });
+}
+
+/** Renames a plain, `[input]`, `(output)`, `[(model)]` or `*structural` attribute, leaving attribute values alone. */
+function renameAttribute(attrs: string, name: string, newName: string): string {
+    const pattern = new RegExp(`(^|\\s)(\\[\\(|\\[|\\(|\\*)?${escapeRegExp(name)}(?=[\\s=\\])/]|$)`, 'g');
+    return mapOutsideQuotes(attrs, segment => segment.replace(pattern, `$1$2${newName}`));
+}
+
+/** Calls `fn` for the attribute text of every opening tag, honoring quoted attribute values that contain `>`. */
+function mapOpeningTags(template: string, fn: (tagName: string, attrs: string) => string): string {
+    let result = '';
+    let index = 0;
+    const tagStart = /<([a-zA-Z][\w-]*)/g;
+    let match: RegExpExecArray | null;
+    while ((match = tagStart.exec(template)) !== null) {
+        const attrsStart = match.index + match[0].length;
+        let quote: string | undefined;
+        let end = attrsStart;
+        for (; end < template.length; end++) {
+            const c = template[end];
+            if (quote) {
+                if (c === quote) quote = undefined;
+            } else if (c === '"' || c === "'") {
+                quote = c;
+            } else if (c === '>') {
+                break;
+            }
+        }
+        result += template.slice(index, attrsStart) + fn(match[1], template.slice(attrsStart, end));
+        index = end;
+        tagStart.lastIndex = end;
+    }
+    return result + template.slice(index);
+}
+
+function mapOutsideQuotes(text: string, fn: (segment: string) => string): string {
+    return text.split(/("[^"]*"|'[^']*')/).map((part, i) => i % 2 === 0 ? fn(part) : part).join('');
+}

package/src/libraries/primeng/18/mark-deprecated-components.ts

@@ -77,9 +77,13 @@ export class MarkDeprecatedPrimengComponents extends Recipe {
                 const deprecation = DEPRECATED_MODULES[moduleName];
                 if (!deprecation) return imp;
 
-                // Idempotence: skip if our TODO marker is already attached.
+                // Idempotence: skip if our TODO marker is already attached. Comments leading the
+                // file's first statement are parsed into the compilation unit's prefix instead.
                 const existingComments = imp.prefix?.comments ?? [];
-                if (existingComments.some(c => (c as any).text?.includes('TODO: PrimeNG 18'))) {
+                const cu = this.cursor.firstEnclosing<JS.CompilationUnit>((o: any): o is JS.CompilationUnit => o?.kind === JS.Kind.CompilationUnit);
+                const fileLeadingComments = cu?.statements[0]?.element.id === imp.id ? cu.prefix.comments : [];
+                const todoMarker = `TODO: PrimeNG 18 — ${deprecation.todo}`;
+                if ([...existingComments, ...fileLeadingComments].some(c => (c as any).text?.includes(todoMarker))) {
                     return imp;
                 }
 
@@ -95,7 +99,7 @@ export class MarkDeprecatedPrimengComponents extends Recipe {
                 }
                 if (importedNames.length === 0) return imp;
 
-                const sourcePath = (this.cursor.firstEnclosing<any>((o: any): o is any => !!o?.sourcePath)?.sourcePath) ?? '';
+                const sourcePath = cu?.sourcePath ?? '';
                 for (const name of importedNames) {
                     dataTable.insertRow(p, {
                         sourcePath,
@@ -109,7 +113,7 @@ export class MarkDeprecatedPrimengComponents extends Recipe {
                 const todoComment = {
                     kind: J.Kind.TextComment,
                     multiline: true,
-                    text: ` TODO: PrimeNG 18 — ${deprecation.todo} (import: \`{ ${importedNames.join(', ')} } from '${moduleName}'\`) `,
+                    text: ` ${todoMarker} (import: \`{ ${importedNames.join(', ')} } from '${moduleName}'\`) `,
                     suffix: '\n',
                     markers: {kind: 'org.openrewrite.marker.Markers', id: imp.id, markers: []},
                 };

package/src/migration/add-trust-proxy-headers.ts

@@ -40,7 +40,8 @@ export class AddTrustProxyHeaders extends Recipe {
 
                 let builder = Template.builder().code(`new ${engine}({\n  ${TODO_COMMENT}\n  trustProxyHeaders: ['x-forwarded-host', 'x-forwarded-proto'],`);
                 for (const statement of existing) {
-                    builder = builder.code('\n  ').param(statement.element).code(',');
+                    // As a list, the option takes the place of the template's property rather than becoming its name
+                    builder = builder.code('\n  ').param([statement.element]).code(',');
                 }
                 const t = builder.code('\n})').build();
                 return await t.apply(n, this.cursor);

package/src/migration/replace-initial-navigation.ts

@@ -6,7 +6,7 @@
 
 import {ExecutionContext, Recipe, TreeVisitor} from "@openrewrite/rewrite";
 import {JavaScriptVisitor, JS} from "@openrewrite/rewrite/javascript";
-import {J, isIdentifier, isLiteral} from "@openrewrite/rewrite/java";
+import {J, isIdentifier, isLiteral, Type} from "@openrewrite/rewrite/java";
 import {create} from "mutative";
 
 export class ReplaceInitialNavigation extends Recipe {
@@ -52,6 +52,7 @@ export class ReplaceInitialNavigation extends Recipe {
                                 ...lit,
                                 value: 'enabledBlocking',
                                 valueSource: `'enabledBlocking'`,
+                                type: Type.Primitive.String,
                             };
                         }) as JS.PropertyAssignment;
                     }
@@ -61,6 +62,7 @@ export class ReplaceInitialNavigation extends Recipe {
                                 ...lit,
                                 value: 'disabled',
                                 valueSource: `'disabled'`,
+                                type: Type.Primitive.String,
                             };
                         }) as JS.PropertyAssignment;
                     }

package/src/migration/update-component-template-url.ts

@@ -41,7 +41,7 @@ export class UpdateComponentTemplateUrl extends Recipe {
 
     @Option({
         displayName: "Use regex pattern",
-        description: "If `true`, treats `oldTemplateUrl` as a regex pattern and supports capture groups in `newTemplateUrl`. Default: `false`",
+        description: "If `true`, treats `oldTemplateUrl` as a regex pattern and supports capture groups in `newTemplateUrl`. The pattern should not match the new URL, or every run rewrites it again. Default: `false`",
         example: "true",
         required: false
     })

package/src/migration/upgrade-to-angular-13.ts

@@ -12,6 +12,7 @@ import {RemoveIePolyfills} from "./remove-ie-polyfills";
 import {RemoveDefaultProject} from "./remove-default-project";
 import {AddTestBedTeardown} from "./add-testbed-teardown";
 import {RemoveComponentFactoryResolver} from "./remove-component-factory-resolver";
+import {UpgradeToCdk13CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular13CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular13CodeChanges";
@@ -28,6 +29,7 @@ export class UpgradeToAngular13CodeChanges extends Recipe {
             new RemoveDefaultProject(),
             new AddTestBedTeardown(),
             new RemoveComponentFactoryResolver(),
+            new UpgradeToCdk13CodeChanges(),
         ];
     }
 }

package/src/migration/upgrade-to-angular-14.ts

@@ -10,6 +10,7 @@ import {UpgradeToAngular13CodeChanges} from "./upgrade-to-angular-13";
 import {ReplaceUntypedForms} from "./replace-untyped-forms";
 import {RemoveAotSummaries} from "./remove-aot-summaries";
 import {FindPathMatchTypeUsage} from "../search/find-path-match-type-usage";
+import {UpgradeToCdk14CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular14CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular14CodeChanges";
@@ -25,6 +26,7 @@ export class UpgradeToAngular14CodeChanges extends Recipe {
             new RemoveAotSummaries(),
             // Search: type changes
             new FindPathMatchTypeUsage(),
+            new UpgradeToCdk14CodeChanges(),
         ];
     }
 }

package/src/migration/upgrade-to-angular-17.ts

@@ -10,6 +10,7 @@ import {UpgradeToAngular16CodeChanges} from "./upgrade-to-angular-16";
 import {ReplaceDeepZoneJsImports} from "./replace-deep-zone-js-imports";
 import {FindWithNoDomReuseUsage} from "../search/find-with-no-dom-reuse-usage";
 import {FindSetupTestingRouterUsage} from "../search/find-setup-testing-router-usage";
+import {UpgradeToCdk17CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular17CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular17CodeChanges";
@@ -25,6 +26,7 @@ export class UpgradeToAngular17CodeChanges extends Recipe {
             // Search: removed APIs
             new FindWithNoDomReuseUsage(),
             new FindSetupTestingRouterUsage(),
+            new UpgradeToCdk17CodeChanges(),
         ];
     }
 }

package/src/migration/upgrade-to-angular-20.ts

@@ -14,6 +14,7 @@ import {ReplaceInjectFlags} from "./replace-inject-flags";
 import {MoveDocumentImport} from "./move-document-to-core";
 import {RemoveStandaloneTrue} from "./remove-standalone-true";
 import {RemoveZoneJsPolyfill} from "./remove-zone-js-polyfill";
+import {UpgradeToCdk20CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular20CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular20CodeChanges";
@@ -32,6 +33,7 @@ export class UpgradeToAngular20CodeChanges extends Recipe {
             new MoveDocumentImport(),
             new RemoveStandaloneTrue(),
             new RemoveZoneJsPolyfill(),
+            new UpgradeToCdk20CodeChanges(),
         ];
     }
 }

package/src/migration/upgrade-to-angular-21.ts

@@ -17,6 +17,7 @@ import {MigrateInputToSignal} from "./migrate-input-to-signal";
 import {MigrateOutputToSignal} from "./migrate-output-to-signal";
 import {MigrateQueryToSignal} from "./migrate-query-to-signal";
 import {SetTsconfigModuleResolutionBundler} from "./set-tsconfig-module-resolution-bundler";
+import {UpgradeToCdk21CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular21CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular21CodeChanges";
@@ -40,6 +41,7 @@ export class UpgradeToAngular21CodeChanges extends Recipe {
             new MigrateQueryToSignal(),
             // tsconfig
             new SetTsconfigModuleResolutionBundler(),
+            new UpgradeToCdk21CodeChanges(),
         ];
     }
 }

package/src/migration/upgrade-to-angular-22.ts

@@ -25,6 +25,7 @@ import {FindTemplateSafeNavigation} from "../search/find-template-safe-navigatio
 import {ReplaceCreateNgModuleRef} from "./replace-create-ng-module-ref";
 import {RenameAngularJsGlobals} from "./rename-angular-js-globals";
 import {RenameSsrExperimentalPlatform} from "./rename-ssr-experimental-platform";
+import {UpgradeToCdk22CodeChanges} from "../libraries/cdk/upgrade-to-cdk";
 
 export class UpgradeToAngular22CodeChanges extends Recipe {
     readonly name = "org.openrewrite.angular.UpgradeToAngular22CodeChanges";
@@ -60,6 +61,7 @@ export class UpgradeToAngular22CodeChanges extends Recipe {
             new MigrateModelWithOutput(),
             new ReplaceCreateNgModuleRef(),
             new RenameAngularJsGlobals(),
+            new UpgradeToCdk22CodeChanges(),
         ];
     }
 }