@angular/core 21.0.0-next.1 → 21.0.0-next.10

package/schematics/bundles/control-flow-migration.cjs

@@ -1,21 +1,19 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.1
+ * @license Angular v21.0.0-next.10
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var schematics = require('@angular-devkit/schematics');
-var p = require('path');
-var compiler_host = require('./compiler_host-DrXTGf_7.cjs');
-var project_tsconfig_paths = require('./project_tsconfig_paths-D7xzGqRi.cjs');
+var path = require('path');
+var compiler_host = require('./compiler_host-DBwYMlTo.cjs');
+var compiler = require('@angular/compiler');
 var ts = require('typescript');
-var parse_html = require('./parse_html-CXR8hziE.cjs');
-require('os');
-require('fs');
-require('module');
-require('url');
+var parse_html = require('./parse_html-8VLCL37B.cjs');
+var project_tsconfig_paths = require('./project_tsconfig_paths-CDVxT6Ov.cjs');
+require('@angular/compiler-cli/private/migrations');
 require('@angular-devkit/core');
 
 function lookupIdentifiersInSourceFile(sourceFile, names) {
@@ -275,7 +273,7 @@ class AnalyzedFile {
     }
 }
 /** Finds all non-control flow elements from common module. */
-class CommonCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
+class CommonCollector extends compiler.RecursiveVisitor {
     count = 0;
     visitElement(el) {
         if (el.attrs.length > 0) {
@@ -314,7 +312,7 @@ class CommonCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
     }
 }
 /** Finds all elements that represent i18n blocks. */
-class i18nCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
+class i18nCollector extends compiler.RecursiveVisitor {
     elements = [];
     visitElement(el) {
         if (el.attrs.find((a) => a.name === 'i18n') !== undefined) {
@@ -324,7 +322,7 @@ class i18nCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
     }
 }
 /** Finds all elements with ngif structural directives. */
-class ElementCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
+class ElementCollector extends compiler.RecursiveVisitor {
     _attributes;
     elements = [];
     constructor(_attributes = []) {
@@ -377,7 +375,7 @@ class ElementCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
     }
 }
 /** Finds all elements with ngif structural directives. */
-class TemplateCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
+class TemplateCollector extends compiler.RecursiveVisitor {
     elements = [];
     templates = new Map();
     visitElement(el) {
@@ -410,6 +408,7 @@ const endMarkerRegex = new RegExp(endMarker, 'gm');
 const startI18nMarkerRegex = new RegExp(startI18nMarker, 'gm');
 const endI18nMarkerRegex = new RegExp(endI18nMarker, 'gm');
 const replaceMarkerRegex = new RegExp(`${startMarker}|${endMarker}`, 'gm');
+const PRIORITY_WEIGHT_TEMPLATE_REFERENCE_BY_OUTLET = 2;
 /**
  * Analyzes a source file to find file that need to be migrated and the text ranges within them.
  * @param sourceFile File to be analyzed.
@@ -549,8 +548,8 @@ function analyzeDecorators(node, sourceFile, analyzedFiles) {
             case 'templateUrl':
                 // Leave the end as undefined which means that the range is until the end of the file.
                 if (ts.isStringLiteralLike(prop.initializer)) {
-                    const path = p.join(p.dirname(sourceFile.fileName), prop.initializer.text);
-                    AnalyzedFile.addRange(path, sourceFile, analyzedFiles, {
+                    const path$1 = path.join(path.dirname(sourceFile.fileName), prop.initializer.text);
+                    AnalyzedFile.addRange(path$1, sourceFile, analyzedFiles, {
                         start: 0,
                         node: prop,
                         type: 'templateUrl',
@@ -600,7 +599,7 @@ function validateMigratedTemplate(migrated, fileName) {
 }
 function validateI18nStructure(parsed, fileName) {
     const visitor = new i18nCollector();
-    project_tsconfig_paths.visitAll$1(visitor, parsed.rootNodes);
+    compiler.visitAll(visitor, parsed.rootNodes);
     const parents = visitor.elements.filter((el) => el.children.length > 0);
     for (const p of parents) {
         for (const el of visitor.elements) {
@@ -680,7 +679,7 @@ function getTemplates(template) {
     const parsed = parse_html.parseTemplate(template);
     if (parsed.tree !== undefined) {
         const visitor = new TemplateCollector();
-        project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+        compiler.visitAll(visitor, parsed.tree.rootNodes);
         for (let [key, tmpl] of visitor.templates) {
             tmpl.count = countTemplateUsage(parsed.tree.rootNodes, key);
             tmpl.generateContents(template);
@@ -689,34 +688,6 @@ function getTemplates(template) {
     }
     return new Map();
 }
-function countTemplateUsage(nodes, templateName) {
-    let count = 0;
-    let isReferencedInTemplateOutlet = false;
-    for (const node of nodes) {
-        if (node.attrs) {
-            for (const attr of node.attrs) {
-                if (attr.name === '*ngTemplateOutlet' && attr.value === templateName.slice(1)) {
-                    isReferencedInTemplateOutlet = true;
-                    break;
-                }
-                if (attr.name.trim() === templateName) {
-                    count++;
-                }
-            }
-        }
-        if (node.children) {
-            if (node.name === 'for') {
-                for (const child of node.children) {
-                    if (child.value?.includes(templateName.slice(1))) {
-                        count++;
-                    }
-                }
-            }
-            count += countTemplateUsage(node.children, templateName);
-        }
-    }
-    return isReferencedInTemplateOutlet ? count + 2 : count;
-}
 function updateTemplates(template, templates) {
     const updatedTemplates = getTemplates(template);
     for (let [key, tmpl] of updatedTemplates) {
@@ -740,9 +711,10 @@ function processNgTemplates(template, sourceFile) {
     try {
         const templates = getTemplates(template);
         // swap placeholders and remove
-        for (const [name, t] of templates) {
-            const replaceRegex = new RegExp(getPlaceholder(name.slice(1)), 'g');
-            const forRegex = new RegExp(getPlaceholder(name.slice(1), PlaceholderKind.Alternate), 'g');
+        for (const [nameWithHash, t] of templates) {
+            const name = nameWithHash.slice(1);
+            const replaceRegex = new RegExp(getPlaceholder(name), 'g');
+            const forRegex = new RegExp(getPlaceholder(nameWithHash.slice(1), PlaceholderKind.Alternate), 'g');
             const forMatches = [...template.matchAll(forRegex)];
             const matches = [...forMatches, ...template.matchAll(replaceRegex)];
             let safeToRemove = true;
@@ -767,7 +739,12 @@ function processNgTemplates(template, sourceFile) {
                     template = template.replace(replaceRegex, t.children);
                 }
                 const dist = matches.filter((obj, index, self) => index === self.findIndex((t) => t.input === obj.input));
-                if ((t.count === dist.length || t.count - matches.length === 1) && safeToRemove) {
+                // Check if template is used by ngTemplateOutlet in addition to control flow
+                const hasTemplateOutletUsage = checkForTemplateOutletUsage(template, nameWithHash.slice(1));
+                // Only remove template if it's safe to do so AND not used by ngTemplateOutlet
+                if ((t.count === dist.length || t.count - matches.length === 1) &&
+                    safeToRemove &&
+                    !hasTemplateOutletUsage) {
                     const refsInComponentFile = getViewChildOrViewChildrenNames(sourceFile);
                     if (refsInComponentFile?.length > 0) {
                         const templateRefs = getTemplateReferences(template);
@@ -797,6 +774,59 @@ function processNgTemplates(template, sourceFile) {
         return { migrated: template, err: err };
     }
 }
+function analyzeTemplateUsage(nodes, templateName) {
+    let count = 0;
+    let isReferencedInTemplateOutlet = false;
+    const templateNameWithHash = `#${templateName}`;
+    function traverseNodes(nodeList) {
+        for (const node of nodeList) {
+            if (node.attrs) {
+                for (const attr of node.attrs) {
+                    if ((attr.name === '*ngTemplateOutlet' || attr.name === '[ngTemplateOutlet]') &&
+                        attr.value?.split(';')[0] === templateName) {
+                        isReferencedInTemplateOutlet = true;
+                    }
+                    if (attr.name.trim() === templateNameWithHash) {
+                        count++;
+                    }
+                }
+            }
+            if (node.children) {
+                if (node.name === 'for') {
+                    for (const child of node.children) {
+                        if (child.value?.includes(templateName)) {
+                            count++;
+                        }
+                    }
+                }
+                traverseNodes(node.children);
+            }
+        }
+    }
+    traverseNodes(nodes);
+    return {
+        isReferencedInTemplateOutlet,
+        totalCount: isReferencedInTemplateOutlet
+            ? count + PRIORITY_WEIGHT_TEMPLATE_REFERENCE_BY_OUTLET
+            : count,
+    };
+}
+/**
+ * Checks if a template is used by ngTemplateOutlet directive
+ */
+function checkForTemplateOutletUsage(template, templateName) {
+    const parsed = parse_html.parseTemplate(template);
+    if (parsed.tree === undefined) {
+        return false;
+    }
+    const result = analyzeTemplateUsage(parsed.tree.rootNodes, templateName);
+    return result.isReferencedInTemplateOutlet;
+}
+function countTemplateUsage(nodes, templateNameWithHash) {
+    const templateName = templateNameWithHash.slice(1);
+    const result = analyzeTemplateUsage(nodes, templateName);
+    return result.totalCount;
+}
 function getViewChildOrViewChildrenNames(sourceFile) {
     const names = [];
     function visit(node) {
@@ -821,11 +851,11 @@ function getTemplateReferences(template) {
     if (parsed.tree === undefined) {
         return [];
     }
-    const references = [];
+    const templateNameRefWithoutHash = [];
     function visitNodes(nodes) {
         for (const node of nodes) {
             if (node?.name === 'ng-template') {
-                references.push(...node.attrs?.map((ref) => ref?.name?.slice(1)));
+                templateNameRefWithoutHash.push(...node.attrs?.map((ref) => ref?.name?.slice(1)));
             }
             if (node.children) {
                 visitNodes(node.children);
@@ -833,7 +863,7 @@ function getTemplateReferences(template) {
         }
     }
     visitNodes(parsed.tree.rootNodes);
-    return references;
+    return templateNameRefWithoutHash;
 }
 function replaceRemainingPlaceholders(template) {
     const pattern = '.*';
@@ -856,7 +886,7 @@ function canRemoveCommonModule(template) {
     let removeCommonModule = false;
     if (parsed.tree !== undefined) {
         const visitor = new CommonCollector();
-        project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+        compiler.visitAll(visitor, parsed.tree.rootNodes);
         removeCommonModule = visitor.count === 0;
     }
     return removeCommonModule;
@@ -979,7 +1009,7 @@ function generateI18nMarkers(tmpl) {
     let parsed = parse_html.parseTemplate(tmpl);
     if (parsed.tree !== undefined) {
         const visitor = new i18nCollector();
-        project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+        compiler.visitAll(visitor, parsed.tree.rootNodes);
         for (const [ix, el] of visitor.elements.entries()) {
             // we only care about elements with children and i18n tags
             // elements without children have nothing to translate
@@ -1181,7 +1211,7 @@ function migrateCase(template) {
     }
     let result = template;
     const visitor = new ElementCollector(cases);
-    project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+    compiler.visitAll(visitor, parsed.tree.rootNodes);
     calculateNesting(visitor, hasLineBreaks(template));
     // this tracks the character shift from different lengths of blocks from
     // the prior directives so as to adjust for nested block replacement during
@@ -1278,7 +1308,7 @@ function migrateFor(template) {
     }
     let result = template;
     const visitor = new ElementCollector(fors);
-    project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+    compiler.visitAll(visitor, parsed.tree.rootNodes);
     calculateNesting(visitor, hasLineBreaks(template));
     // this tracks the character shift from different lengths of blocks from
     // the prior directives so as to adjust for nested block replacement during
@@ -1483,7 +1513,7 @@ function migrateIf(template) {
     }
     let result = template;
     const visitor = new ElementCollector(ifs);
-    project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+    compiler.visitAll(visitor, parsed.tree.rootNodes);
     calculateNesting(visitor, hasLineBreaks(template));
     // this tracks the character shift from different lengths of blocks from
     // the prior directives so as to adjust for nested block replacement during
@@ -1676,7 +1706,7 @@ function migrateSwitch(template) {
     }
     let result = template;
     const visitor = new ElementCollector(switches);
-    project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+    compiler.visitAll(visitor, parsed.tree.rootNodes);
     calculateNesting(visitor, hasLineBreaks(template));
     // this tracks the character shift from different lengths of blocks from
     // the prior directives so as to adjust for nested block replacement during
@@ -1707,11 +1737,11 @@ function migrateSwitch(template) {
 }
 function assertValidSwitchStructure(children) {
     for (const child of children) {
-        if (child instanceof project_tsconfig_paths.Text && child.value.trim() !== '') {
+        if (child instanceof compiler.Text && child.value.trim() !== '') {
             throw new Error(`Text node: "${child.value}" would result in invalid migrated @switch block structure. ` +
                 `@switch can only have @case or @default as children.`);
         }
-        else if (child instanceof project_tsconfig_paths.Element) {
+        else if (child instanceof compiler.Element) {
             let hasCase = false;
             for (const attr of child.attrs) {
                 if (cases.includes(attr.name)) {
@@ -1815,7 +1845,10 @@ function migrate(options) {
         const basePath = process.cwd();
         let pathToMigrate;
         if (options.path) {
-            pathToMigrate = compiler_host.normalizePath(p.join(basePath, options.path));
+            if (options.path.startsWith('..')) {
+                throw new schematics.SchematicsException('Cannot run control flow migration outside of the current project.');
+            }
+            pathToMigrate = compiler_host.normalizePath(path.join(basePath, options.path));
             if (pathToMigrate.trim() !== '') {
                 allPaths.push(pathToMigrate);
             }
@@ -1825,33 +1858,31 @@ function migrate(options) {
             allPaths = [...buildPaths, ...testPaths];
         }
         if (!allPaths.length) {
-            throw new schematics.SchematicsException('Could not find any tsconfig file. Cannot run the http providers migration.');
+            context.logger.warn('Could not find any tsconfig file. Cannot run the control flow migration.');
+            return;
         }
         let errors = [];
+        let sourceFilesCount = 0;
         for (const tsconfigPath of allPaths) {
-            const migrateErrors = runControlFlowMigration(tree, tsconfigPath, basePath, pathToMigrate, options);
+            const program = compiler_host.createMigrationProgram(tree, tsconfigPath, basePath);
+            const sourceFiles = program
+                .getSourceFiles()
+                .filter((sourceFile) => (pathToMigrate ? sourceFile.fileName.startsWith(pathToMigrate) : true) &&
+                compiler_host.canMigrateFile(basePath, sourceFile, program));
+            const migrateErrors = runControlFlowMigration(tree, sourceFiles, basePath, options);
             errors = [...errors, ...migrateErrors];
+            sourceFilesCount += sourceFiles.length;
         }
         if (errors.length > 0) {
             context.logger.warn(`WARNING: ${errors.length} errors occurred during your migration:\n`);
-            errors.forEach((err) => {
-                context.logger.warn(err);
-            });
+            errors.forEach((err) => context.logger.warn(err));
+        }
+        else if (sourceFilesCount === 0) {
+            context.logger.warn('Control flow migration did not find any files to migrate');
         }
     };
 }
-function runControlFlowMigration(tree, tsconfigPath, basePath, pathToMigrate, schematicOptions) {
-    if (schematicOptions?.path?.startsWith('..')) {
-        throw new schematics.SchematicsException('Cannot run control flow migration outside of the current project.');
-    }
-    const program = compiler_host.createMigrationProgram(tree, tsconfigPath, basePath);
-    const sourceFiles = program
-        .getSourceFiles()
-        .filter((sourceFile) => (pathToMigrate ? sourceFile.fileName.startsWith(pathToMigrate) : true) &&
-        compiler_host.canMigrateFile(basePath, sourceFile, program));
-    if (sourceFiles.length === 0) {
-        throw new schematics.SchematicsException(`Could not find any files to migrate under the path ${pathToMigrate}. Cannot run the control flow migration.`);
-    }
+function runControlFlowMigration(tree, sourceFiles, basePath, schematicOptions) {
     const analysis = new Map();
     const migrateErrors = new Map();
     for (const sourceFile of sourceFiles) {
@@ -1860,10 +1891,10 @@ function runControlFlowMigration(tree, tsconfigPath, basePath, pathToMigrate, sc
     // sort files with .html files first
     // this ensures class files know if it's safe to remove CommonModule
     const paths = sortFilePaths([...analysis.keys()]);
-    for (const path of paths) {
-        const file = analysis.get(path);
+    for (const path$1 of paths) {
+        const file = analysis.get(path$1);
         const ranges = file.getSortedRanges();
-        const relativePath = p.relative(basePath, path);
+        const relativePath = path.relative(basePath, path$1);
         const content = tree.readText(relativePath);
         const update = tree.beginUpdate(relativePath);
         for (const { start, end, node, type } of ranges) {
@@ -1875,7 +1906,7 @@ function runControlFlowMigration(tree, tsconfigPath, basePath, pathToMigrate, sc
                 update.insertLeft(start, migrated);
             }
             if (errors.length > 0) {
-                migrateErrors.set(path, errors);
+                migrateErrors.set(path$1, errors);
             }
         }
         tree.commitUpdate(update);

package/schematics/bundles/{imports-26VeX8i-.cjs → imports-DP72APSx.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.1
+ * @license Angular v21.0.0-next.10
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -49,6 +49,10 @@ function getImportOfIdentifier(typeChecker, node) {
 function getImportSpecifier(sourceFile, moduleName, specifierName) {
     return getImportSpecifiers(sourceFile, moduleName, specifierName)[0] ?? null;
 }
+/**
+ * Note: returns only matching imports specifiers,
+ * Unmatched imports will be ignored (you won't get undefined), but a shorter array.
+ */
 function getImportSpecifiers(sourceFile, moduleName, specifierOrSpecifiers) {
     const matches = [];
     for (const node of sourceFile.statements) {

package/schematics/bundles/{index-BdH2rlWJ.cjs → index-B7I9sIUx.cjs}

@@ -1,18 +1,17 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.1
+ * @license Angular v21.0.0-next.10
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-D7xzGqRi.cjs');
-var index = require('./index-jjHOgYYs.cjs');
-require('path');
+var compilerCli = require('@angular/compiler-cli');
+var migrations = require('@angular/compiler-cli/private/migrations');
 require('node:path');
-var project_paths = require('./project_paths-T_M15e2g.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var compiler = require('@angular/compiler');
 
 function getMemberName(member) {
     if (member.name === undefined) {
@@ -189,7 +188,7 @@ function lookupPropertyAccess(checker, type, path, options = {}) {
  * This resolution is important to be able to migrate references to inputs
  * that will be migrated to signal inputs.
  */
-class TemplateReferenceVisitor extends project_tsconfig_paths.RecursiveVisitor {
+class TemplateReferenceVisitor extends compiler.TmplAstRecursiveVisitor {
     result = [];
     /**
      * Whether we are currently descending into HTML AST nodes
@@ -236,21 +235,21 @@ class TemplateReferenceVisitor extends project_tsconfig_paths.RecursiveVisitor {
         // of signal calls in templates.
         // TODO: Remove with: https://github.com/angular/angular/pull/55456.
         this.templateAttributeReferencedFields = [];
-        project_tsconfig_paths.visitAll(this, template.attributes);
-        project_tsconfig_paths.visitAll(this, template.templateAttrs);
+        compiler.tmplAstVisitAll(this, template.attributes);
+        compiler.tmplAstVisitAll(this, template.templateAttrs);
         // If we are dealing with a microsyntax template, do not check
         // inputs and outputs as those are already passed to the children.
         // Template attributes may contain relevant expressions though.
         if (template.tagName === 'ng-template') {
-            project_tsconfig_paths.visitAll(this, template.inputs);
-            project_tsconfig_paths.visitAll(this, template.outputs);
+            compiler.tmplAstVisitAll(this, template.inputs);
+            compiler.tmplAstVisitAll(this, template.outputs);
         }
         const referencedInputs = this.templateAttributeReferencedFields;
         this.templateAttributeReferencedFields = null;
         this.descendAndCheckForNarrowedSimilarReferences(referencedInputs, () => {
-            project_tsconfig_paths.visitAll(this, template.children);
-            project_tsconfig_paths.visitAll(this, template.references);
-            project_tsconfig_paths.visitAll(this, template.variables);
+            compiler.tmplAstVisitAll(this, template.children);
+            compiler.tmplAstVisitAll(this, template.references);
+            compiler.tmplAstVisitAll(this, template.variables);
         });
     }
     visitIfBlockBranch(block) {
@@ -317,7 +316,7 @@ class TemplateReferenceVisitor extends project_tsconfig_paths.RecursiveVisitor {
  * This resolution is important to be able to migrate references to inputs
  * that will be migrated to signal inputs.
  */
-class TemplateExpressionReferenceVisitor extends project_tsconfig_paths.RecursiveAstVisitor {
+class TemplateExpressionReferenceVisitor extends compiler.RecursiveAstVisitor {
     typeChecker;
     templateTypeChecker;
     componentClass;
@@ -364,7 +363,7 @@ class TemplateExpressionReferenceVisitor extends project_tsconfig_paths.Recursiv
         super.visitPropertyRead(ast, context);
     }
     visitBinary(ast, context) {
-        if (ast.operation === '=' && ast.left instanceof project_tsconfig_paths.PropertyRead) {
+        if (ast.operation === '=' && ast.left instanceof compiler.PropertyRead) {
             this._inspectPropertyAccess(ast.left, true, [...context, ast, ast.left]);
         }
         else {
@@ -402,7 +401,7 @@ class TemplateExpressionReferenceVisitor extends project_tsconfig_paths.Recursiv
             return false;
         }
         const symbol = this.templateTypeChecker.getSymbolOfNode(ast, this.componentClass);
-        if (symbol?.kind !== project_tsconfig_paths.SymbolKind.Expression || symbol.tsSymbol === null) {
+        if (symbol?.kind !== migrations.SymbolKind.Expression || symbol.tsSymbol === null) {
             return false;
         }
         // Dangerous: Type checking symbol retrieval is a totally different `ts.Program`,
@@ -464,7 +463,7 @@ class TemplateExpressionReferenceVisitor extends project_tsconfig_paths.Recursiv
     _isPartOfNarrowingTernary(read) {
         // Note: We do not safe check that the reads are fully matching 1:1. This is acceptable
         // as worst case we just skip an input from being migrated. This is very unlikely too.
-        return this.insideConditionalExpressionsWithReads.some((r) => (r instanceof project_tsconfig_paths.PropertyRead || r instanceof project_tsconfig_paths.SafePropertyRead) && r.name === read.name);
+        return this.insideConditionalExpressionsWithReads.some((r) => (r instanceof compiler.PropertyRead || r instanceof compiler.SafePropertyRead) && r.name === read.name);
     }
 }
 /**
@@ -474,11 +473,11 @@ class TemplateExpressionReferenceVisitor extends project_tsconfig_paths.Recursiv
 function traverseReceiverAndLookupSymbol(readOrWrite, componentClass, checker) {
     const path = [readOrWrite.name];
     let node = readOrWrite;
-    while (node.receiver instanceof project_tsconfig_paths.PropertyRead) {
+    while (node.receiver instanceof compiler.PropertyRead) {
         node = node.receiver;
         path.unshift(node.name);
     }
-    if (!(node.receiver instanceof project_tsconfig_paths.ImplicitReceiver || node.receiver instanceof project_tsconfig_paths.ThisReceiver)) {
+    if (!(node.receiver instanceof compiler.ImplicitReceiver || node.receiver instanceof compiler.ThisReceiver)) {
         return null;
     }
     const classType = checker.getTypeAtLocation(componentClass.name);
@@ -490,8 +489,8 @@ function traverseReceiverAndLookupSymbol(readOrWrite, componentClass, checker) {
 }
 /** Whether the given node refers to a two-way binding AST node. */
 function isTwoWayBindingNode(node) {
-    return ((node instanceof project_tsconfig_paths.BoundAttribute && node.type === project_tsconfig_paths.BindingType.TwoWay) ||
-        (node instanceof project_tsconfig_paths.BoundEvent && node.type === project_tsconfig_paths.ParsedEventType.TwoWay));
+    return ((node instanceof compiler.TmplAstBoundAttribute && node.type === compiler.BindingType.TwoWay) ||
+        (node instanceof compiler.TmplAstBoundEvent && node.type === compiler.ParsedEventType.TwoWay));
 }
 
 /** Possible types of references to known fields detected. */
@@ -534,7 +533,7 @@ function identifyHostBindingReferences(node, programInfo, checker, reflector, re
     if (decorators === null) {
         return;
     }
-    const angularDecorators = project_tsconfig_paths.getAngularDecorators(decorators, ['Directive', 'Component'], 
+    const angularDecorators = migrations.getAngularDecorators(decorators, ['Directive', 'Component'], 
     /* isAngularCore */ false);
     if (angularDecorators.length === 0) {
         return;
@@ -544,15 +543,15 @@ function identifyHostBindingReferences(node, programInfo, checker, reflector, re
     if (ngDecorator.args?.length !== 1) {
         return;
     }
-    const metadataNode = project_tsconfig_paths.unwrapExpression(ngDecorator.args[0]);
+    const metadataNode = migrations.unwrapExpression(ngDecorator.args[0]);
     if (!ts.isObjectLiteralExpression(metadataNode)) {
         return;
     }
-    const metadata = project_tsconfig_paths.reflectObjectLiteral(metadataNode);
+    const metadata = migrations.reflectObjectLiteral(metadataNode);
     if (!metadata.has('host')) {
         return;
     }
-    let hostField = project_tsconfig_paths.unwrapExpression(metadata.get('host'));
+    let hostField = migrations.unwrapExpression(metadata.get('host'));
     // Special-case in case host bindings are shared via a variable.
     // e.g. Material button shares host bindings as a constant in the same target.
     if (ts.isIdentifier(hostField)) {
@@ -570,7 +569,7 @@ function identifyHostBindingReferences(node, programInfo, checker, reflector, re
     if (hostField === undefined || !ts.isObjectLiteralExpression(hostField)) {
         return;
     }
-    const hostMap = project_tsconfig_paths.reflectObjectLiteral(hostField);
+    const hostMap = migrations.reflectObjectLiteral(hostField);
     const expressionResult = [];
     const expressionVisitor = new TemplateExpressionReferenceVisitor(checker, null, node, knownFields, fieldNamesToConsiderForReferenceLookup);
     for (const [rawName, expression] of hostMap.entries()) {
@@ -583,11 +582,11 @@ function identifyHostBindingReferences(node, programInfo, checker, reflector, re
         if (!isPropertyBinding && !isEventBinding) {
             continue;
         }
-        const parser = project_tsconfig_paths.makeBindingParser();
-        const sourceSpan = new project_tsconfig_paths.ParseSourceSpan(
+        const parser = compiler.makeBindingParser();
+        const sourceSpan = new compiler.ParseSourceSpan(
         // Fake source span to keep parsing offsets zero-based.
         // We then later combine these with the expression TS node offsets.
-        new project_tsconfig_paths.ParseLocation({ content: '', url: '' }, 0, 0, 0), new project_tsconfig_paths.ParseLocation({ content: '', url: '' }, 0, 0, 0));
+        new compiler.ParseLocation({ content: '', url: '' }, 0, 0, 0), new compiler.ParseLocation({ content: '', url: '' }, 0, 0, 0));
         const name = rawName.substring(1, rawName.length - 1);
         let parsed = undefined;
         if (isEventBinding) {
@@ -630,9 +629,9 @@ function identifyHostBindingReferences(node, programInfo, checker, reflector, re
  */
 function attemptExtractTemplateDefinition(node, checker, reflector, resourceLoader) {
     const classDecorators = reflector.getDecoratorsOfDeclaration(node);
-    const evaluator = new index.PartialEvaluator(reflector, checker, null);
+    const evaluator = new migrations.PartialEvaluator(reflector, checker, null);
     const ngDecorators = classDecorators !== null
-        ? project_tsconfig_paths.getAngularDecorators(classDecorators, ['Component'], /* isAngularCore */ false)
+        ? migrations.getAngularDecorators(classDecorators, ['Component'], /* isAngularCore */ false)
         : [];
     if (ngDecorators.length === 0 ||
         ngDecorators[0].args === null ||
@@ -640,7 +639,7 @@ function attemptExtractTemplateDefinition(node, checker, reflector, resourceLoad
         !ts.isObjectLiteralExpression(ngDecorators[0].args[0])) {
         return null;
     }
-    const properties = project_tsconfig_paths.reflectObjectLiteral(ngDecorators[0].args[0]);
+    const properties = migrations.reflectObjectLiteral(ngDecorators[0].args[0]);
     const templateProp = properties.get('template');
     const templateUrlProp = properties.get('templateUrl');
     const containingFile = node.getSourceFile().fileName;
@@ -651,7 +650,6 @@ function attemptExtractTemplateDefinition(node, checker, reflector, resourceLoad
             return {
                 isInline: true,
                 expression: templateProp,
-                interpolationConfig: project_tsconfig_paths.DEFAULT_INTERPOLATION_CONFIG,
                 preserveWhitespaces: false,
                 resolvedTemplateUrl: containingFile,
                 templateUrl: containingFile,
@@ -665,7 +663,6 @@ function attemptExtractTemplateDefinition(node, checker, reflector, resourceLoad
             if (typeof templateUrl === 'string') {
                 return {
                     isInline: false,
-                    interpolationConfig: project_tsconfig_paths.DEFAULT_INTERPOLATION_CONFIG,
                     preserveWhitespaces: false,
                     templateUrlExpression: templateUrlProp,
                     templateUrl,
@@ -685,7 +682,7 @@ function attemptExtractTemplateDefinition(node, checker, reflector, resourceLoad
  * all of the references to inputs.
  */
 function identifyTemplateReferences(programInfo, node, reflector, checker, evaluator, templateTypeChecker, resourceLoader, options, result, knownFields, fieldNamesToConsiderForReferenceLookup) {
-    const template = templateTypeChecker.getTemplate(node, project_tsconfig_paths.OptimizeFor.WholeProgram) ??
+    const template = templateTypeChecker.getTemplate(node, compilerCli.OptimizeFor.WholeProgram) ??
         // If there is no template registered in the TCB or compiler, the template may
         // be skipped due to an explicit `jit: true` setting. We try to detect this case
         // and parse the template manually.
@@ -714,7 +711,7 @@ function identifyTemplateReferences(programInfo, node, reflector, checker, evalu
                     node: res.context,
                     isObjectShorthandExpression: res.isObjectShorthandExpression,
                     originatingTsFile: project_paths.projectFile(node.getSourceFile(), programInfo),
-                    templateFile: project_paths.projectFile(project_tsconfig_paths.absoluteFrom(templateFilePath), programInfo),
+                    templateFile: project_paths.projectFile(compilerCli.absoluteFrom(templateFilePath), programInfo),
                     isLikelyPartOfNarrowing: res.isLikelyNarrowed,
                     isWrite: res.isWrite,
                 },
@@ -740,14 +737,14 @@ function extractTemplateWithoutCompilerAnalysis(node, checker, reflector, resour
     if (tmplDef === null) {
         return null;
     }
-    return index.extractTemplate(node, tmplDef, evaluator, null, resourceLoader, {
+    return migrations.extractTemplate(node, tmplDef, evaluator, null, resourceLoader, {
         enableBlockSyntax: true,
         enableLetSyntax: true,
         usePoisonedData: true,
         enableI18nLegacyMessageIdFormat: options.enableI18nLegacyMessageIdFormat !== false,
         i18nNormalizeLineEndingsInICUs: options.i18nNormalizeLineEndingsInICUs === true,
         enableSelectorless: false,
-    }, project_tsconfig_paths.CompilationMode.FULL).nodes;
+    }, migrations.CompilationMode.FULL).nodes;
 }
 
 /** Gets the pattern and property name for a given binding element. */