@angular/core 20.0.0-next.0 → 20.0.0-next.2

package/schematics/bundles/{project_paths-7d2daa1e.js → project_paths-Jtbi76Bs.js}

@@ -1,7 +1,7 @@
 'use strict';
 /**
- * @license Angular v20.0.0-next.0
- * (c) 2010-2024 Google LLC. https://angular.io/
+ * @license Angular v20.0.0-next.2
+ * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
@@ -10,14 +10,11 @@ var core = require('@angular-devkit/core');
 var posixPath = require('node:path/posix');
 var os = require('os');
 var ts = require('typescript');
-var checker = require('./checker-cf6f7980.js');
-var program = require('./program-362689f0.js');
+var checker = require('./checker-DF8ZaFW5.js');
+var program = require('./program-BZk27Ndu.js');
 require('path');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
+function _interopNamespaceDefault(e) {
     var n = Object.create(null);
     if (e) {
         Object.keys(e).forEach(function (k) {
@@ -30,13 +27,12 @@ function _interopNamespace(e) {
             }
         });
     }
-    n["default"] = e;
+    n.default = e;
     return Object.freeze(n);
 }
 
-var posixPath__namespace = /*#__PURE__*/_interopNamespace(posixPath);
-var os__namespace = /*#__PURE__*/_interopNamespace(os);
-var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
+var posixPath__namespace = /*#__PURE__*/_interopNamespaceDefault(posixPath);
+var os__namespace = /*#__PURE__*/_interopNamespaceDefault(os);
 
 /// <reference types="node" />
 class NgtscCompilerHost {
@@ -49,11 +45,11 @@ class NgtscCompilerHost {
     getSourceFile(fileName, languageVersion) {
         const text = this.readFile(fileName);
         return text !== undefined
-            ? ts__default["default"].createSourceFile(fileName, text, languageVersion, true)
+            ? ts.createSourceFile(fileName, text, languageVersion, true)
             : undefined;
     }
     getDefaultLibFileName(options) {
-        return this.fs.join(this.getDefaultLibLocation(), ts__default["default"].getDefaultLibFileName(options));
+        return this.fs.join(this.getDefaultLibLocation(), ts.getDefaultLibFileName(options));
     }
     getDefaultLibLocation() {
         return this.fs.getDefaultLibLocation();
@@ -74,9 +70,9 @@ class NgtscCompilerHost {
     }
     getNewLine() {
         switch (this.options.newLine) {
-            case ts__default["default"].NewLineKind.CarriageReturnLineFeed:
+            case ts.NewLineKind.CarriageReturnLineFeed:
                 return '\r\n';
-            case ts__default["default"].NewLineKind.LineFeed:
+            case ts.NewLineKind.LineFeed:
                 return '\n';
             default:
                 return os__namespace.EOL;
@@ -99,17 +95,23 @@ class NgtscCompilerHost {
 }
 
 // We use TypeScript's native `ts.matchFiles` utility for the virtual file systems
+// and their TypeScript compiler host `readDirectory` implementation. TypeScript's
+// function implements complex logic for matching files with respect to root
+// directory, extensions, excludes, includes etc. The function is currently
+// internal but we can use it as the API most likely will not change any time soon,
+// nor does it seem like this is being made public any time soon.
+// Related issue for tracking: https://github.com/microsoft/TypeScript/issues/13793.
 /**
  * Creates a {@link ts.CompilerHost#readDirectory} implementation function,
  * that leverages the specified file system (that may be e.g. virtual).
  */
 function createFileSystemTsReadDirectoryFn(fs) {
-    if (ts__default["default"].matchFiles === undefined) {
+    if (ts.matchFiles === undefined) {
         throw Error('Unable to read directory in configured file system. This means that ' +
             'TypeScript changed its file matching internals.\n\nPlease consider downgrading your ' +
             'TypeScript version, and report an issue in the Angular framework repository.');
     }
-    const matchFilesFn = ts__default["default"].matchFiles.bind(ts__default["default"]);
+    const matchFilesFn = ts.matchFiles.bind(ts);
     return (rootDir, extensions, excludes, includes, depth) => {
         const directoryExists = (p) => {
             const resolvedPath = fs.resolve(p);
@@ -148,7 +150,7 @@ function calcProjectFileAndBasePath(project, host = checker.getFileSystem()) {
 function readConfiguration(project, existingOptions, host = checker.getFileSystem()) {
     try {
         const fs = checker.getFileSystem();
-        const readConfigFile = (configFile) => ts__default["default"].readConfigFile(configFile, (file) => host.readFile(host.resolve(file)));
+        const readConfigFile = (configFile) => ts.readConfigFile(configFile, (file) => host.readFile(host.resolve(file)));
         const readAngularCompilerOptions = (configFile, parentOptions = {}) => {
             const { config, error } = readConfigFile(configFile);
             if (error) {
@@ -195,7 +197,7 @@ function readConfiguration(project, existingOptions, host = checker.getFileSyste
             ...existingOptions,
         };
         const parseConfigHost = createParseConfigHost(host, fs);
-        const { options, errors, fileNames: rootNames, projectReferences, } = ts__default["default"].parseJsonConfigFileContent(config, parseConfigHost, basePath, existingCompilerOptions, configFileName);
+        const { options, errors, fileNames: rootNames, projectReferences, } = ts.parseJsonConfigFileContent(config, parseConfigHost, basePath, existingCompilerOptions, configFileName);
         let emitFlags = program.EmitFlags.Default;
         if (!(options['skipMetadataEmit'] || options['flatModuleOutFile'])) {
             emitFlags |= program.EmitFlags.Metadata;
@@ -208,7 +210,7 @@ function readConfiguration(project, existingOptions, host = checker.getFileSyste
     catch (e) {
         const errors = [
             {
-                category: ts__default["default"].DiagnosticCategory.Error,
+                category: ts.DiagnosticCategory.Error,
                 messageText: e.stack ?? e.message,
                 file: undefined,
                 start: undefined,
@@ -248,7 +250,7 @@ function getExtendedConfigPathWorker(configFile, extendsValue, host, fs) {
     else {
         const parseConfigHost = createParseConfigHost(host, fs);
         // Path isn't a rooted or relative path, resolve like a module.
-        const { resolvedModule } = ts__default["default"].nodeModuleNameResolver(extendsValue, configFile, { moduleResolution: ts__default["default"].ModuleResolutionKind.Node10, resolveJsonModule: true }, parseConfigHost);
+        const { resolvedModule } = ts.nodeModuleNameResolver(extendsValue, configFile, { moduleResolution: ts.ModuleResolutionKind.Node10, resolveJsonModule: true }, parseConfigHost);
         if (resolvedModule) {
             return checker.absoluteFrom(resolvedModule.resolvedFileName);
         }
@@ -464,7 +466,7 @@ const defaultMigrationTsOptions = {
  * Creates an instance of a TypeScript program for the given project.
  */
 function createPlainTsProgram(tsHost, tsconfig, optionOverrides) {
-    const program = ts__default["default"].createProgram({
+    const program = ts.createProgram({
         rootNames: tsconfig.rootNames,
         options: {
             ...tsconfig.options,
@@ -493,7 +495,7 @@ function createNgtscProgram(tsHost, tsconfig, optionOverrides) {
     }, tsHost);
     // Expose an easy way to debug-print ng semantic diagnostics.
     if (process.env['DEBUG_NG_SEMANTIC_DIAGNOSTICS'] === '1') {
-        console.error(ts__default["default"].formatDiagnosticsWithColorAndContext(ngtscProgram.getNgSemanticDiagnostics(), tsHost));
+        console.error(ts.formatDiagnosticsWithColorAndContext(ngtscProgram.getNgSemanticDiagnostics(), tsHost));
     }
     return {
         ngCompiler: ngtscProgram.compiler,

package/schematics/bundles/{project_tsconfig_paths-6c9cde78.js → project_tsconfig_paths-CDVxT6Ov.js}

@@ -1,7 +1,7 @@
 'use strict';
 /**
- * @license Angular v20.0.0-next.0
- * (c) 2010-2024 Google LLC. https://angular.io/
+ * @license Angular v20.0.0-next.2
+ * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';

package/schematics/bundles/{property_name-42030525.js → property_name-BBwFuqMe.js}

@@ -1,30 +1,26 @@
 'use strict';
 /**
- * @license Angular v20.0.0-next.0
- * (c) 2010-2024 Google LLC. https://angular.io/
+ * @license Angular v20.0.0-next.2
+ * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
-
 /**
  * Gets the text of the given property name. Returns null if the property
  * name couldn't be determined statically.
  */
 function getPropertyNameText(node) {
-    if (ts__default["default"].isIdentifier(node) || ts__default["default"].isStringLiteralLike(node)) {
+    if (ts.isIdentifier(node) || ts.isStringLiteralLike(node)) {
         return node.text;
     }
     return null;
 }
 /** Finds a property with a specific name in an object literal expression. */
 function findLiteralProperty(literal, name) {
-    return literal.properties.find((prop) => prop.name && ts__default["default"].isIdentifier(prop.name) && prop.name.text === name);
+    return literal.properties.find((prop) => prop.name && ts.isIdentifier(prop.name) && prop.name.text === name);
 }
 
 exports.findLiteralProperty = findLiteralProperty;

package/schematics/bundles/route-lazy-loading.js

@@ -1,30 +1,24 @@
 'use strict';
 /**
- * @license Angular v20.0.0-next.0
- * (c) 2010-2024 Google LLC. https://angular.io/
+ * @license Angular v20.0.0-next.2
+ * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var schematics = require('@angular-devkit/schematics');
 var fs = require('fs');
 var p = require('path');
-var compiler_host = require('./compiler_host-cc1379e9.js');
-var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var compiler_host = require('./compiler_host-Da636uJ8.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-CDVxT6Ov.js');
 var ts = require('typescript');
-var checker = require('./checker-cf6f7980.js');
-var property_name = require('./property_name-42030525.js');
+var checker = require('./checker-DF8ZaFW5.js');
+var property_name = require('./property_name-BBwFuqMe.js');
 require('os');
 require('@angular-devkit/core');
 require('module');
 require('url');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
-
 /**
  * Finds the class declaration that is being referred to by a node.
  * @param reference Node referring to a class declaration.
@@ -34,7 +28,7 @@ function findClassDeclaration(reference, typeChecker) {
     return (typeChecker
         .getTypeAtLocation(reference)
         .getSymbol()
-        ?.declarations?.find(ts__default["default"].isClassDeclaration) || null);
+        ?.declarations?.find(ts.isClassDeclaration) || null);
 }
 
 /*!
@@ -59,7 +53,7 @@ function isStandaloneComponent(node, reflector) {
         return false;
     }
     const arg = decorator.args[0];
-    if (ts__default["default"].isObjectLiteralExpression(arg)) {
+    if (ts.isObjectLiteralExpression(arg)) {
         const property = property_name.findLiteralProperty(arg, 'standalone');
         if (property) {
             return property.initializer.getText() === 'true';
@@ -76,7 +70,7 @@ function isStandaloneComponent(node, reflector) {
  * @param typeChecker
  */
 function isAngularRoutesArray(node, typeChecker) {
-    if (ts__default["default"].isVariableDeclaration(node)) {
+    if (ts.isVariableDeclaration(node)) {
         const type = typeChecker.getTypeAtLocation(node);
         if (type && typeChecker.isArrayType(type)) {
             // Route[] is an array type
@@ -97,7 +91,7 @@ function isAngularRoutesArray(node, typeChecker) {
  * - RouterModule.forChild(routes)
  */
 function isRouterModuleCallExpression(node, typeChecker) {
-    if (ts__default["default"].isPropertyAccessExpression(node.expression)) {
+    if (ts.isPropertyAccessExpression(node.expression)) {
         const propAccess = node.expression;
         const moduleSymbol = typeChecker.getSymbolAtLocation(propAccess.expression);
         return (moduleSymbol?.name === 'RouterModule' &&
@@ -110,8 +104,8 @@ function isRouterModuleCallExpression(node, typeChecker) {
  * Example: this.router.resetConfig(routes)
  */
 function isRouterCallExpression(node, typeChecker) {
-    if (ts__default["default"].isCallExpression(node) &&
-        ts__default["default"].isPropertyAccessExpression(node.expression) &&
+    if (ts.isCallExpression(node) &&
+        ts.isPropertyAccessExpression(node.expression) &&
         node.expression.name.text === 'resetConfig') {
         const calleeExpression = node.expression.expression;
         const symbol = typeChecker.getSymbolAtLocation(calleeExpression);
@@ -128,7 +122,7 @@ function isRouterCallExpression(node, typeChecker) {
  * Example: provideRoutes(routes)
  */
 function isRouterProviderCallExpression(node, typeChecker) {
-    if (ts__default["default"].isIdentifier(node.expression)) {
+    if (ts.isIdentifier(node.expression)) {
         const moduleSymbol = typeChecker.getSymbolAtLocation(node.expression);
         return moduleSymbol && moduleSymbol.name === 'provideRoutes';
     }
@@ -139,7 +133,7 @@ function isRouterProviderCallExpression(node, typeChecker) {
  * Example: provideRouter(routes)
  */
 function isProvideRoutesCallExpression(node, typeChecker) {
-    if (ts__default["default"].isIdentifier(node.expression)) {
+    if (ts.isIdentifier(node.expression)) {
         const moduleSymbol = typeChecker.getSymbolAtLocation(node.expression);
         return moduleSymbol && moduleSymbol.name === 'provideRouter';
     }
@@ -161,7 +155,7 @@ function isProvideRoutesCallExpression(node, typeChecker) {
 function migrateFileToLazyRoutes(sourceFile, program) {
     const typeChecker = program.getTypeChecker();
     const reflector = new checker.TypeScriptReflectionHost(typeChecker);
-    const printer = ts__default["default"].createPrinter();
+    const printer = ts.createPrinter();
     const tracker = new compiler_host.ChangeTracker(printer);
     const routeArraysToMigrate = findRoutesArrayToMigrate(sourceFile, typeChecker);
     if (routeArraysToMigrate.length === 0) {
@@ -178,14 +172,14 @@ function migrateFileToLazyRoutes(sourceFile, program) {
 function findRoutesArrayToMigrate(sourceFile, typeChecker) {
     const routesArrays = [];
     sourceFile.forEachChild(function walk(node) {
-        if (ts__default["default"].isCallExpression(node)) {
+        if (ts.isCallExpression(node)) {
             if (isRouterModuleCallExpression(node, typeChecker) ||
                 isRouterProviderCallExpression(node, typeChecker) ||
                 isRouterCallExpression(node, typeChecker) ||
                 isProvideRoutesCallExpression(node, typeChecker)) {
                 const arg = node.arguments[0]; // ex: RouterModule.forRoot(routes) or provideRouter(routes)
-                const routeFileImports = sourceFile.statements.filter(ts__default["default"].isImportDeclaration);
-                if (ts__default["default"].isArrayLiteralExpression(arg) && arg.elements.length > 0) {
+                const routeFileImports = sourceFile.statements.filter(ts.isImportDeclaration);
+                if (ts.isArrayLiteralExpression(arg) && arg.elements.length > 0) {
                     // ex: inline routes array: RouterModule.forRoot([{ path: 'test', component: TestComponent }])
                     routesArrays.push({
                         routeFilePath: sourceFile.fileName,
@@ -193,16 +187,16 @@ function findRoutesArrayToMigrate(sourceFile, typeChecker) {
                         routeFileImports,
                     });
                 }
-                else if (ts__default["default"].isIdentifier(arg)) {
+                else if (ts.isIdentifier(arg)) {
                     // ex: reference to routes array: RouterModule.forRoot(routes)
                     // RouterModule.forRoot(routes), provideRouter(routes), provideRoutes(routes)
                     const symbol = typeChecker.getSymbolAtLocation(arg);
                     if (!symbol?.declarations)
                         return;
                     for (const declaration of symbol.declarations) {
-                        if (ts__default["default"].isVariableDeclaration(declaration)) {
+                        if (ts.isVariableDeclaration(declaration)) {
                             const initializer = declaration.initializer;
-                            if (initializer && ts__default["default"].isArrayLiteralExpression(initializer)) {
+                            if (initializer && ts.isArrayLiteralExpression(initializer)) {
                                 // ex: const routes = [{ path: 'test', component: TestComponent }];
                                 routesArrays.push({
                                     routeFilePath: sourceFile.fileName,
@@ -215,11 +209,11 @@ function findRoutesArrayToMigrate(sourceFile, typeChecker) {
                 }
             }
         }
-        if (ts__default["default"].isVariableDeclaration(node)) {
+        if (ts.isVariableDeclaration(node)) {
             if (isAngularRoutesArray(node, typeChecker)) {
                 const initializer = node.initializer;
                 if (initializer &&
-                    ts__default["default"].isArrayLiteralExpression(initializer) &&
+                    ts.isArrayLiteralExpression(initializer) &&
                     initializer.elements.length > 0) {
                     // ex: const routes: Routes = [{ path: 'test', component: TestComponent }];
                     if (routesArrays.find((x) => x.array === initializer)) {
@@ -229,7 +223,7 @@ function findRoutesArrayToMigrate(sourceFile, typeChecker) {
                     routesArrays.push({
                         routeFilePath: sourceFile.fileName,
                         array: initializer,
-                        routeFileImports: sourceFile.statements.filter(ts__default["default"].isImportDeclaration),
+                        routeFileImports: sourceFile.statements.filter(ts.isImportDeclaration),
                     });
                 }
             }
@@ -245,7 +239,7 @@ function migrateRoutesArray(routesArray, typeChecker, reflector, tracker) {
     const importsToRemove = [];
     for (const route of routesArray) {
         route.array.elements.forEach((element) => {
-            if (ts__default["default"].isObjectLiteralExpression(element)) {
+            if (ts.isObjectLiteralExpression(element)) {
                 const { migratedRoutes: migrated, skippedRoutes: toBeSkipped, importsToRemove: toBeRemoved, } = migrateRoute(element, route, typeChecker, reflector, tracker);
                 migratedRoutes.push(...migrated);
                 skippedRoutes.push(...toBeSkipped);
@@ -271,9 +265,9 @@ function migrateRoute(element, route, typeChecker, reflector, tracker) {
     const routePath = property_name.findLiteralProperty(element, 'path')?.getText() ?? '';
     const children = property_name.findLiteralProperty(element, 'children');
     // recursively migrate children routes first if they exist
-    if (children && ts__default["default"].isArrayLiteralExpression(children.initializer)) {
+    if (children && ts.isArrayLiteralExpression(children.initializer)) {
         for (const childRoute of children.initializer.elements) {
-            if (ts__default["default"].isObjectLiteralExpression(childRoute)) {
+            if (ts.isObjectLiteralExpression(childRoute)) {
                 const { migratedRoutes: migrated, skippedRoutes: toBeSkipped, importsToRemove: toBeRemoved, } = migrateRoute(childRoute, route, typeChecker, reflector, tracker);
                 migratedRoutes.push(...migrated);
                 skippedRoutes.push(...toBeSkipped);
@@ -294,7 +288,7 @@ function migrateRoute(element, route, typeChecker, reflector, tracker) {
         skippedRoutes.push({ path: routePath, file: route.routeFilePath });
         return routeMigrationResults;
     }
-    const componentClassName = componentDeclaration.name && ts__default["default"].isIdentifier(componentDeclaration.name)
+    const componentClassName = componentDeclaration.name && ts.isIdentifier(componentDeclaration.name)
         ? componentDeclaration.name.text
         : null;
     if (!componentClassName) {
@@ -306,7 +300,7 @@ function migrateRoute(element, route, typeChecker, reflector, tracker) {
     }
     const componentImport = route.routeFileImports.find((importDecl) => importDecl.importClause?.getText().includes(componentClassName));
     // remove single and double quotes from the import path
-    let componentImportPath = ts__default["default"].isStringLiteral(componentImport?.moduleSpecifier)
+    let componentImportPath = ts.isStringLiteral(componentImport?.moduleSpecifier)
         ? componentImport.moduleSpecifier.text
         : null;
     // if the import path is not a string literal, skip it
@@ -314,7 +308,7 @@ function migrateRoute(element, route, typeChecker, reflector, tracker) {
         skippedRoutes.push({ path: routePath, file: route.routeFilePath });
         return routeMigrationResults;
     }
-    const isDefaultExport = componentDeclaration.modifiers?.some((x) => x.kind === ts__default["default"].SyntaxKind.DefaultKeyword) ?? false;
+    const isDefaultExport = componentDeclaration.modifiers?.some((x) => x.kind === ts.SyntaxKind.DefaultKeyword) ?? false;
     const loadComponent = createLoadComponentPropertyAssignment(componentImportPath, componentClassName, isDefaultExport);
     tracker.replaceNode(component, loadComponent);
     // Add the import statement for the standalone component
@@ -334,18 +328,18 @@ function migrateRoute(element, route, typeChecker, reflector, tracker) {
  * loadComponent: () => import('./path') // when isDefaultExport is true
  */
 function createLoadComponentPropertyAssignment(componentImportPath, componentDeclarationName, isDefaultExport) {
-    return ts__default["default"].factory.createPropertyAssignment('loadComponent', ts__default["default"].factory.createArrowFunction(undefined, undefined, [], undefined, ts__default["default"].factory.createToken(ts__default["default"].SyntaxKind.EqualsGreaterThanToken), isDefaultExport
+    return ts.factory.createPropertyAssignment('loadComponent', ts.factory.createArrowFunction(undefined, undefined, [], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), isDefaultExport
         ? createImportCallExpression(componentImportPath) // will generate import('./path) and will skip the then() call
-        : ts__default["default"].factory.createCallExpression(
+        : ts.factory.createCallExpression(
         // will generate import('./path).then(m => m.componentName)
-        ts__default["default"].factory.createPropertyAccessExpression(createImportCallExpression(componentImportPath), 'then'), undefined, [createImportThenCallExpression(componentDeclarationName)])));
+        ts.factory.createPropertyAccessExpression(createImportCallExpression(componentImportPath), 'then'), undefined, [createImportThenCallExpression(componentDeclarationName)])));
 }
 // import('./path)
-const createImportCallExpression = (componentImportPath) => ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createIdentifier('import'), undefined, [
-    ts__default["default"].factory.createStringLiteral(componentImportPath, true),
+const createImportCallExpression = (componentImportPath) => ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [
+    ts.factory.createStringLiteral(componentImportPath, true),
 ]);
 // m => m.componentName
-const createImportThenCallExpression = (componentDeclarationName) => ts__default["default"].factory.createArrowFunction(undefined, undefined, [ts__default["default"].factory.createParameterDeclaration(undefined, undefined, 'm', undefined, undefined)], undefined, ts__default["default"].factory.createToken(ts__default["default"].SyntaxKind.EqualsGreaterThanToken), ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier('m'), componentDeclarationName));
+const createImportThenCallExpression = (componentDeclarationName) => ts.factory.createArrowFunction(undefined, undefined, [ts.factory.createParameterDeclaration(undefined, undefined, 'm', undefined, undefined)], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('m'), componentDeclarationName));
 
 function migrate(options) {
     return async (tree, context) => {

package/schematics/bundles/self-closing-tags-migration.js

@@ -1,33 +1,27 @@
 'use strict';
 /**
- * @license Angular v20.0.0-next.0
- * (c) 2010-2024 Google LLC. https://angular.io/
+ * @license Angular v20.0.0-next.2
+ * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var schematics = require('@angular-devkit/schematics');
-var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
-var project_paths = require('./project_paths-7d2daa1e.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-CDVxT6Ov.js');
+var project_paths = require('./project_paths-Jtbi76Bs.js');
 require('os');
 var ts = require('typescript');
-var checker = require('./checker-cf6f7980.js');
-require('./program-362689f0.js');
+var checker = require('./checker-DF8ZaFW5.js');
+require('./program-BZk27Ndu.js');
 require('path');
-var ng_decorators = require('./ng_decorators-6878e227.js');
-var property_name = require('./property_name-42030525.js');
+var ng_decorators = require('./ng_decorators-DznZ5jMl.js');
+var property_name = require('./property_name-BBwFuqMe.js');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('fs');
 require('module');
 require('url');
-require('./imports-31a38653.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
+require('./imports-CIX-JgAN.js');
 
 /**
  * Unwraps a given expression TypeScript node. Expressions can be wrapped within multiple
@@ -35,7 +29,7 @@ var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
  * TypeScript node referring to the inner expression. e.g "exp".
  */
 function unwrapExpression(node) {
-    if (ts__default["default"].isParenthesizedExpression(node) || ts__default["default"].isAsExpression(node)) {
+    if (ts.isParenthesizedExpression(node) || ts.isAsExpression(node)) {
         return unwrapExpression(node.expression);
     }
     else {
@@ -45,7 +39,7 @@ function unwrapExpression(node) {
 
 /** Extracts `@Directive` or `@Component` metadata from the given class. */
 function extractAngularClassMetadata(typeChecker, node) {
-    const decorators = ts__default["default"].getDecorators(node);
+    const decorators = ts.getDecorators(node);
     if (!decorators || !decorators.length) {
         return null;
     }
@@ -64,7 +58,7 @@ function extractAngularClassMetadata(typeChecker, node) {
     }
     const metadata = unwrapExpression(decoratorCall.arguments[0]);
     // Ensure that the metadata is an object literal expression.
-    if (!ts__default["default"].isObjectLiteralExpression(metadata)) {
+    if (!ts.isObjectLiteralExpression(metadata)) {
         return null;
     }
     return {
@@ -138,10 +132,10 @@ class NgComponentTemplateVisitor {
         this.typeChecker = typeChecker;
     }
     visitNode(node) {
-        if (node.kind === ts__default["default"].SyntaxKind.ClassDeclaration) {
+        if (node.kind === ts.SyntaxKind.ClassDeclaration) {
             this.visitClassDeclaration(node);
         }
-        ts__default["default"].forEachChild(node, (n) => this.visitNode(n));
+        ts.forEachChild(node, (n) => this.visitNode(n));
     }
     visitClassDeclaration(node) {
         const metadata = extractAngularClassMetadata(this.typeChecker, node);
@@ -153,13 +147,13 @@ class NgComponentTemplateVisitor {
         // Walk through all component metadata properties and determine the referenced
         // HTML templates (either external or inline)
         metadata.node.properties.forEach((property) => {
-            if (!ts__default["default"].isPropertyAssignment(property)) {
+            if (!ts.isPropertyAssignment(property)) {
                 return;
             }
             const propertyName = property_name.getPropertyNameText(property.name);
             // In case there is an inline template specified, ensure that the value is statically
             // analyzable by checking if the initializer is a string literal-like node.
-            if (propertyName === 'template' && ts__default["default"].isStringLiteralLike(property.initializer)) {
+            if (propertyName === 'template' && ts.isStringLiteralLike(property.initializer)) {
                 // Need to add an offset of one to the start because the template quotes are
                 // not part of the template content.
                 // The `getText()` method gives us the original raw text.
@@ -177,10 +171,10 @@ class NgComponentTemplateVisitor {
                     content,
                     inline: true,
                     start: start,
-                    getCharacterAndLineOfPosition: (pos) => ts__default["default"].getLineAndCharacterOfPosition(sourceFile, pos + start),
+                    getCharacterAndLineOfPosition: (pos) => ts.getLineAndCharacterOfPosition(sourceFile, pos + start),
                 });
             }
-            if (propertyName === 'templateUrl' && ts__default["default"].isStringLiteralLike(property.initializer)) {
+            if (propertyName === 'templateUrl' && ts.isStringLiteralLike(property.initializer)) {
                 const absolutePath = this.fs.resolve(this.fs.dirname(sourceFileName), property.initializer.text);
                 if (!this.fs.exists(absolutePath)) {
                     return;
@@ -314,8 +308,9 @@ class SelfClosingTagsMigration extends project_paths.TsurgeFunnelMigration {
         const typeChecker = program.getTypeChecker();
         const tagReplacements = [];
         for (const sf of sourceFiles) {
-            ts__default["default"].forEachChild(sf, (node) => {
-                if (!ts__default["default"].isClassDeclaration(node)) {
+            ts.forEachChild(sf, (node) => {
+                // Skipping any non component declarations
+                if (!ts.isClassDeclaration(node)) {
                     return;
                 }
                 const file = project_paths.projectFile(node.getSourceFile(), info);
@@ -326,22 +321,23 @@ class SelfClosingTagsMigration extends project_paths.TsurgeFunnelMigration {
                 templateVisitor.visitNode(node);
                 templateVisitor.resolvedTemplates.forEach((template) => {
                     const { migrated, changed, replacementCount } = migrateTemplateToSelfClosingTags(template.content);
-                    if (changed) {
-                        const fileToMigrate = template.inline
-                            ? file
-                            : project_paths.projectFile(template.filePath, info);
-                        const end = template.start + template.content.length;
-                        const replacements = [
-                            prepareTextReplacement(fileToMigrate, migrated, template.start, end),
-                        ];
-                        const fileReplacements = tagReplacements.find((tagReplacement) => tagReplacement.file === file);
-                        if (fileReplacements) {
-                            fileReplacements.replacements.push(...replacements);
-                            fileReplacements.replacementCount += replacementCount;
-                        }
-                        else {
-                            tagReplacements.push({ file, replacements, replacementCount });
-                        }
+                    if (!changed) {
+                        return;
+                    }
+                    const fileToMigrate = template.inline
+                        ? file
+                        : project_paths.projectFile(template.filePath, info);
+                    const end = template.start + template.content.length;
+                    const replacements = [
+                        prepareTextReplacement(fileToMigrate, migrated, template.start, end),
+                    ];
+                    const fileReplacements = tagReplacements.find((tagReplacement) => tagReplacement.file === file);
+                    if (fileReplacements) {
+                        fileReplacements.replacements.push(...replacements);
+                        fileReplacements.replacementCount += replacementCount;
+                    }
+                    else {
+                        tagReplacements.push({ file, replacements, replacementCount });
                     }
                 });
             });
@@ -349,9 +345,11 @@ class SelfClosingTagsMigration extends project_paths.TsurgeFunnelMigration {
         return project_paths.confirmAsSerializable({ tagReplacements });
     }
     async combine(unitA, unitB) {
-        return project_paths.confirmAsSerializable({
-            tagReplacements: unitA.tagReplacements.concat(unitB.tagReplacements),
-        });
+        const uniqueReplacements = removeDuplicateReplacements([
+            ...unitA.tagReplacements,
+            ...unitB.tagReplacements,
+        ]);
+        return project_paths.confirmAsSerializable({ tagReplacements: uniqueReplacements });
     }
     async globalMeta(combinedData) {
         const globalMeta = {
@@ -380,6 +378,18 @@ function prepareTextReplacement(file, replacement, start, end) {
         toInsert: replacement,
     }));
 }
+function removeDuplicateReplacements(replacements) {
+    const uniqueFiles = new Set();
+    const result = [];
+    for (const replacement of replacements) {
+        const fileId = replacement.file.id;
+        if (!uniqueFiles.has(fileId)) {
+            uniqueFiles.add(fileId);
+            result.push(replacement);
+        }
+    }
+    return result;
+}
 
 function migrate(options) {
     return async (tree, context) => {