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

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

@@ -1,233 +1,34 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.0
+ * @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-CS-eSeHC.cjs');
-require('./index-esqfDjNB.cjs');
-require('path');
+require('@angular/compiler-cli');
+require('@angular/compiler-cli/private/migrations');
 require('node:path');
-var project_paths = require('./project_paths-DcaODbky.cjs');
-var ng_decorators = require('./ng_decorators-B5HCqr20.cjs');
-var property_name = require('./property_name-BBwFuqMe.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var ng_component_template = require('./ng_component_template-Dsuq1Lw7.cjs');
+var compiler = require('@angular/compiler');
+var parse_html = require('./parse_html-8VLCL37B.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
-require('fs');
-require('module');
-require('url');
 require('@angular-devkit/schematics');
-require('./imports-CIX-JgAN.cjs');
-
-/**
- * Unwraps a given expression TypeScript node. Expressions can be wrapped within multiple
- * parentheses or as expression. e.g. "(((({exp}))))()". The function should return the
- * TypeScript node referring to the inner expression. e.g "exp".
- */
-function unwrapExpression(node) {
-    if (ts.isParenthesizedExpression(node) || ts.isAsExpression(node)) {
-        return unwrapExpression(node.expression);
-    }
-    else {
-        return node;
-    }
-}
-
-/** Extracts `@Directive` or `@Component` metadata from the given class. */
-function extractAngularClassMetadata(typeChecker, node) {
-    const decorators = ts.getDecorators(node);
-    if (!decorators || !decorators.length) {
-        return null;
-    }
-    const ngDecorators = ng_decorators.getAngularDecorators(typeChecker, decorators);
-    const componentDecorator = ngDecorators.find((dec) => dec.name === 'Component');
-    const directiveDecorator = ngDecorators.find((dec) => dec.name === 'Directive');
-    const decorator = componentDecorator ?? directiveDecorator;
-    // In case no decorator could be found on the current class, skip.
-    if (!decorator) {
-        return null;
-    }
-    const decoratorCall = decorator.node.expression;
-    // In case the decorator call is not valid, skip this class declaration.
-    if (decoratorCall.arguments.length !== 1) {
-        return null;
-    }
-    const metadata = unwrapExpression(decoratorCall.arguments[0]);
-    // Ensure that the metadata is an object literal expression.
-    if (!ts.isObjectLiteralExpression(metadata)) {
-        return null;
-    }
-    return {
-        type: componentDecorator ? 'component' : 'directive',
-        node: metadata,
-    };
-}
-
-const LF_CHAR = 10;
-const CR_CHAR = 13;
-const LINE_SEP_CHAR = 8232;
-const PARAGRAPH_CHAR = 8233;
-/** Gets the line and character for the given position from the line starts map. */
-function getLineAndCharacterFromPosition(lineStartsMap, position) {
-    const lineIndex = findClosestLineStartPosition(lineStartsMap, position);
-    return { character: position - lineStartsMap[lineIndex], line: lineIndex };
-}
-/**
- * Computes the line start map of the given text. This can be used in order to
- * retrieve the line and character of a given text position index.
- */
-function computeLineStartsMap(text) {
-    const result = [0];
-    let pos = 0;
-    while (pos < text.length) {
-        const char = text.charCodeAt(pos++);
-        // Handles the "CRLF" line break. In that case we peek the character
-        // after the "CR" and check if it is a line feed.
-        if (char === CR_CHAR) {
-            if (text.charCodeAt(pos) === LF_CHAR) {
-                pos++;
-            }
-            result.push(pos);
-        }
-        else if (char === LF_CHAR || char === LINE_SEP_CHAR || char === PARAGRAPH_CHAR) {
-            result.push(pos);
-        }
-    }
-    result.push(pos);
-    return result;
-}
-/** Finds the closest line start for the given position. */
-function findClosestLineStartPosition(linesMap, position, low = 0, high = linesMap.length - 1) {
-    while (low <= high) {
-        const pivotIdx = Math.floor((low + high) / 2);
-        const pivotEl = linesMap[pivotIdx];
-        if (pivotEl === position) {
-            return pivotIdx;
-        }
-        else if (position > pivotEl) {
-            low = pivotIdx + 1;
-        }
-        else {
-            high = pivotIdx - 1;
-        }
-    }
-    // In case there was no exact match, return the closest "lower" line index. We also
-    // subtract the index by one because want the index of the previous line start.
-    return low - 1;
-}
-
-/**
- * Visitor that can be used to determine Angular templates referenced within given
- * TypeScript source files (inline templates or external referenced templates)
- */
-class NgComponentTemplateVisitor {
-    typeChecker;
-    resolvedTemplates = [];
-    fs = project_tsconfig_paths.getFileSystem();
-    constructor(typeChecker) {
-        this.typeChecker = typeChecker;
-    }
-    visitNode(node) {
-        if (node.kind === ts.SyntaxKind.ClassDeclaration) {
-            this.visitClassDeclaration(node);
-        }
-        ts.forEachChild(node, (n) => this.visitNode(n));
-    }
-    visitClassDeclaration(node) {
-        const metadata = extractAngularClassMetadata(this.typeChecker, node);
-        if (metadata === null || metadata.type !== 'component') {
-            return;
-        }
-        const sourceFile = node.getSourceFile();
-        const sourceFileName = sourceFile.fileName;
-        // Walk through all component metadata properties and determine the referenced
-        // HTML templates (either external or inline)
-        metadata.node.properties.forEach((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.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.
-                // We could have used the `text` property, but if the template is defined as a backtick
-                // string then the `text` property contains a "cooked" version of the string. Such cooked
-                // strings will have converted CRLF characters to only LF. This messes up string
-                // replacements in template migrations.
-                // The raw text returned by `getText()` includes the enclosing quotes so we change the
-                // `content` and `start` values accordingly.
-                const content = property.initializer.getText().slice(1, -1);
-                const start = property.initializer.getStart() + 1;
-                this.resolvedTemplates.push({
-                    filePath: sourceFileName,
-                    container: node,
-                    content,
-                    inline: true,
-                    start: start,
-                    getCharacterAndLineOfPosition: (pos) => ts.getLineAndCharacterOfPosition(sourceFile, pos + start),
-                });
-            }
-            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;
-                }
-                const fileContent = this.fs.readFile(absolutePath);
-                const lineStartsMap = computeLineStartsMap(fileContent);
-                this.resolvedTemplates.push({
-                    filePath: absolutePath,
-                    container: node,
-                    content: fileContent,
-                    inline: false,
-                    start: 0,
-                    getCharacterAndLineOfPosition: (pos) => getLineAndCharacterFromPosition(lineStartsMap, pos),
-                });
-            }
-        });
-    }
-}
-
-function parseTemplate(template) {
-    let parsed;
-    try {
-        // Note: we use the HtmlParser here, instead of the `parseTemplate` function, because the
-        // latter returns an Ivy AST, not an HTML AST. The HTML AST has the advantage of preserving
-        // interpolated text as text nodes containing a mixture of interpolation tokens and text tokens,
-        // rather than turning them into `BoundText` nodes like the Ivy AST does. This allows us to
-        // easily get the text-only ranges without having to reconstruct the original text.
-        parsed = new project_tsconfig_paths.HtmlParser().parse(template, '', {
-            // Allows for ICUs to be parsed.
-            tokenizeExpansionForms: true,
-            // Explicitly disable blocks so that their characters are treated as plain text.
-            tokenizeBlocks: true,
-            preserveLineEndings: true,
-        });
-        // Don't migrate invalid templates.
-        if (parsed.errors && parsed.errors.length > 0) {
-            const errors = parsed.errors.map((e) => ({ type: 'parse', error: e }));
-            return { tree: undefined, errors };
-        }
-    }
-    catch (e) {
-        return { tree: undefined, errors: [{ type: 'parse', error: e }] };
-    }
-    return { tree: parsed, errors: [] };
-}
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
+require('./ng_decorators-DSFlWYQY.cjs');
+require('./imports-DP72APSx.cjs');
+require('./property_name-BBwFuqMe.cjs');
 
 function migrateTemplateToSelfClosingTags(template) {
-    let parsed = parseTemplate(template);
+    let parsed = parse_html.parseTemplate(template);
     if (parsed.tree === undefined) {
         return { migrated: template, changed: false, replacementCount: 0 };
     }
     const visitor = new AngularElementCollector();
-    project_tsconfig_paths.visitAll$1(visitor, parsed.tree.rootNodes);
+    compiler.visitAll(visitor, parsed.tree.rootNodes);
     let newTemplate = template;
     let changedOffset = 0;
     let replacementCount = 0;
@@ -255,8 +56,8 @@ function replaceWithSelfClosingTag(html, tagName) {
 function replaceTemplate(template, replaceValue, start, end, offset) {
     return template.slice(0, start + offset) + replaceValue + template.slice(end + offset);
 }
-const ALL_HTML_TAGS = new project_tsconfig_paths.DomElementSchemaRegistry().allKnownElementNames();
-class AngularElementCollector extends project_tsconfig_paths.RecursiveVisitor$1 {
+const ALL_HTML_TAGS = new compiler.DomElementSchemaRegistry().allKnownElementNames();
+class AngularElementCollector extends compiler.RecursiveVisitor {
     elements = [];
     constructor() {
         super();
@@ -279,7 +80,7 @@ class AngularElementCollector extends project_tsconfig_paths.RecursiveVisitor$1
         }
         if (element.children.length === 1) {
             const child = element.children[0];
-            return child instanceof project_tsconfig_paths.Text && /^\s*$/.test(child.value);
+            return child instanceof compiler.Text && /^\s*$/.test(child.value);
         }
         return false;
     }
@@ -305,7 +106,7 @@ class SelfClosingTagsMigration extends project_paths.TsurgeFunnelMigration {
                 if (this.config.shouldMigrate && this.config.shouldMigrate(file) === false) {
                     return;
                 }
-                const templateVisitor = new NgComponentTemplateVisitor(typeChecker);
+                const templateVisitor = new ng_component_template.NgComponentTemplateVisitor(typeChecker);
                 templateVisitor.visitNode(node);
                 templateVisitor.resolvedTemplates.forEach((template) => {
                     const { migrated, changed, replacementCount } = migrateTemplateToSelfClosingTags(template.content);

package/schematics/bundles/signal-input-migration.cjs

@@ -1,29 +1,26 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.0
+ * @license Angular v21.0.0-next.10
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var migrate_ts_type_references = require('./migrate_ts_type_references-6NtAj-Wk.cjs');
+var migrate_ts_type_references = require('./migrate_ts_type_references-UGIUl7En.cjs');
 var ts = require('typescript');
-require('os');
-var project_tsconfig_paths = require('./project_tsconfig_paths-CS-eSeHC.cjs');
-var index$1 = require('./index-esqfDjNB.cjs');
-require('path');
+require('@angular/compiler-cli');
+var migrations = require('@angular/compiler-cli/private/migrations');
 require('node:path');
-var project_paths = require('./project_paths-DcaODbky.cjs');
-var index = require('./index-CfTQUOiz.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var index = require('./index-B7I9sIUx.cjs');
 var assert = require('assert');
-var apply_import_manager = require('./apply_import_manager-DR9xXCle.cjs');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
 require('@angular-devkit/core');
 require('node:path/posix');
 require('./leading_space-D9nQ8UQC.cjs');
-require('fs');
-require('module');
-require('url');
 require('@angular-devkit/schematics');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
+require('@angular/compiler');
 
 /**
  * Class that holds information about a given directive and its input fields.
@@ -274,9 +271,9 @@ function prepareAnalysisInfo(userProgram, compiler, programAbsoluteRootPaths) {
         state.templateTypeChecker.generateAllTypeCheckBlocks();
     }
     const typeChecker = userProgram.getTypeChecker();
-    const reflector = new project_tsconfig_paths.TypeScriptReflectionHost(typeChecker);
-    const evaluator = new index$1.PartialEvaluator(reflector, typeChecker, null);
-    const dtsMetadataReader = new index$1.DtsMetadataReader(typeChecker, reflector);
+    const reflector = new migrations.TypeScriptReflectionHost(typeChecker);
+    const evaluator = new migrations.PartialEvaluator(reflector, typeChecker, null);
+    const dtsMetadataReader = new migrations.DtsMetadataReader(typeChecker, reflector);
     return {
         metaRegistry: metaReader,
         dtsMetadataReader,
@@ -337,7 +334,7 @@ function extractDtsInput(node, metadataReader) {
     // in the `.d.ts` aren't resolvable. This seems to be unexpected and shouldn't
     // result in the entire migration to be failing.
     try {
-        directiveMetadata = metadataReader.getDirectiveMetadata(new project_tsconfig_paths.Reference(node.parent));
+        directiveMetadata = metadataReader.getDirectiveMetadata(new migrations.Reference(node.parent));
     }
     catch (e) {
         console.error('Unexpected error. Gracefully ignoring.');
@@ -373,7 +370,7 @@ function extractSourceCodeInput(node, host, reflector, evaluator) {
     if (decorators === null) {
         return null;
     }
-    const ngDecorators = project_tsconfig_paths.getAngularDecorators(decorators, ['Input'], host.isMigratingCore);
+    const ngDecorators = migrations.getAngularDecorators(decorators, ['Input'], host.isMigratingCore);
     if (ngDecorators.length === 0) {
         return null;
     }
@@ -396,7 +393,15 @@ function extractSourceCodeInput(node, host, reflector, evaluator) {
                 isRequired = !!evaluatedInputOpts.get('required');
             }
             if (evaluatedInputOpts.has('transform') && evaluatedInputOpts.get('transform') != null) {
-                transformResult = parseTransformOfInput(evaluatedInputOpts, node, reflector);
+                const result = parseTransformOfInput(evaluatedInputOpts, node, reflector);
+                if (result === 'parsingError') {
+                    if (!host.config.bestEffortMode) {
+                        return null;
+                    }
+                }
+                else {
+                    transformResult = result;
+                }
             }
         }
     }
@@ -417,33 +422,33 @@ function extractSourceCodeInput(node, host, reflector, evaluator) {
  */
 function parseTransformOfInput(evaluatedInputOpts, node, reflector) {
     const transformValue = evaluatedInputOpts.get('transform');
-    if (!(transformValue instanceof project_tsconfig_paths.DynamicValue) && !(transformValue instanceof project_tsconfig_paths.Reference)) {
+    if (!(transformValue instanceof migrations.DynamicValue) && !(transformValue instanceof migrations.Reference)) {
         return null;
     }
     // For parsing the transform, we don't need a real reference emitter, as
     // the emitter is only used for verifying that the transform type could be
     // copied into e.g. an `ngInputAccept` class member.
-    const noopRefEmitter = new project_tsconfig_paths.ReferenceEmitter([
+    const noopRefEmitter = new migrations.ReferenceEmitter([
         {
             emit: () => ({
-                kind: project_tsconfig_paths.ReferenceEmitKind.Success,
-                expression: project_tsconfig_paths.NULL_EXPR,
+                kind: migrations.ReferenceEmitKind.Success,
+                expression: migrate_ts_type_references.NULL_EXPR,
                 importedFile: null,
             }),
         },
     ]);
     try {
-        return project_tsconfig_paths.parseDecoratorInputTransformFunction(node.parent, node.name.text, transformValue, reflector, noopRefEmitter, project_tsconfig_paths.CompilationMode.FULL, 
+        return migrations.parseDecoratorInputTransformFunction(node.parent, node.name.text, transformValue, reflector, noopRefEmitter, migrations.CompilationMode.FULL, 
         /* emitDeclarationOnly */ false);
     }
     catch (e) {
-        if (!(e instanceof project_tsconfig_paths.FatalDiagnosticError)) {
+        if (!(e instanceof migrations.FatalDiagnosticError)) {
             throw e;
         }
         // TODO: implement error handling.
         // See failing case: e.g. inherit_definition_feature_spec.ts
         console.error(`${e.node.getSourceFile().fileName}: ${e.toString()}`);
-        return null;
+        return 'parsingError';
     }
 }
 
@@ -648,7 +653,7 @@ function pass1__IdentifySourceFileAndDeclarationInputs(sf, host, checker, reflec
 function pass3__checkIncompatiblePatterns(host, inheritanceGraph, checker, groupedTsAstVisitor, knownInputs) {
     migrate_ts_type_references.checkIncompatiblePatterns(inheritanceGraph, checker, groupedTsAstVisitor, knownInputs, () => knownInputs.getAllInputContainingClasses());
     for (const input of knownInputs.knownInputIds.values()) {
-        const hostBindingDecorators = project_tsconfig_paths.getAngularDecorators(input.metadata.fieldDecorators, ['HostBinding'], host.isMigratingCore);
+        const hostBindingDecorators = migrations.getAngularDecorators(input.metadata.fieldDecorators, ['HostBinding'], host.isMigratingCore);
         if (hostBindingDecorators.length > 0) {
             knownInputs.markFieldIncompatible(input.descriptor, {
                 context: hostBindingDecorators[0].node,
@@ -686,7 +691,7 @@ function executeAnalysisPhase(host, knownInputs, result, { sourceFiles, fullProg
     fullProgramSourceFiles.forEach((sf) => 
     // Shim shim files. Those are unnecessary and might cause unexpected slowness.
     // e.g. `ngtypecheck` files.
-    !project_tsconfig_paths.isShim(sf) &&
+    !migrations.isShim(sf) &&
         pass1__IdentifySourceFileAndDeclarationInputs(sf, host, typeChecker, reflector, dtsMetadataReader, evaluator, knownInputs, result));
     const fieldNamesToConsiderForReferenceLookup = new Set();
     for (const input of knownInputs.knownInputIds.values()) {
@@ -961,6 +966,12 @@ function populateKnownInputsFromGlobalData(knownInputs, globalData) {
  * @returns Replacements for converting the input.
  */
 function convertToSignalInput(node, { resolvedMetadata: metadata, resolvedType, preferShorthandIfPossible, originalInputDecorator, initialValue, leadingTodoText, }, info, checker, importManager, result) {
+    // Check for 'this' references in initializer before doing anything else
+    if (node.initializer &&
+        (ts.isArrowFunction(node.initializer) || ts.isFunctionExpression(node.initializer)) &&
+        containsThisReferences(node.initializer)) {
+        return []; // Skip migration for this input by returning empty replacements
+    }
     let optionsLiteral = null;
     // We need an options array for the input because:
     //   - the input is either aliased,
@@ -1030,7 +1041,23 @@ function convertToSignalInput(node, { resolvedMetadata: metadata, resolvedType,
     if (!modifiersWithoutInputDecorator?.some((s) => s.kind === ts.SyntaxKind.ReadonlyKeyword)) {
         modifiersWithoutInputDecorator.push(ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword));
     }
-    const newNode = ts.factory.createPropertyDeclaration(modifiersWithoutInputDecorator, node.name, undefined, undefined, inputInitializer);
+    // Skip migration if the input is a function that references class members via 'this'
+    if (inputInitializer &&
+        (ts.isArrowFunction(inputInitializer) || ts.isFunctionExpression(inputInitializer))) {
+        if (containsThisReferences(inputInitializer)) {
+            return []; // Skip migration for this input by returning empty replacements
+        }
+    }
+    let finalInitializer = inputInitializer;
+    if (inputInitializer === undefined) {
+        if (preferShorthandIfPossible === null) {
+            finalInitializer = ts.factory.createIdentifier('undefined');
+        }
+        else {
+            resolvedType = preferShorthandIfPossible.originalType;
+        }
+    }
+    const newNode = ts.factory.createPropertyDeclaration(modifiersWithoutInputDecorator, node.name, undefined, undefined, finalInitializer);
     const newPropertyText = result.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());
     const replacements = [];
     if (leadingTodoText !== null) {
@@ -1074,6 +1101,43 @@ function extractTransformOfInput(transform, resolvedType, checker) {
         leadingTodoText,
     };
 }
+/**
+ * Checks if a function node contains any references to 'this'.
+ * This is used to skip migration for functions that reference class members.
+ */
+function containsThisReferences(node) {
+    let hasThis = false;
+    const visit = (node) => {
+        if (hasThis)
+            return;
+        if (node.kind === ts.SyntaxKind.ThisKeyword) {
+            hasThis = true;
+            return;
+        }
+        if (ts.isPropertyAccessExpression(node)) {
+            const expr = node.expression;
+            if (ts.isIdentifier(expr) && expr.text === 'this') {
+                hasThis = true;
+                return;
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
+        if (node.body) {
+            if (node.body.kind === ts.SyntaxKind.Block) {
+                node.body.statements.forEach(visit);
+            }
+            else {
+                visit(node.body);
+            }
+        }
+    }
+    else {
+        ts.forEachChild(node, visit);
+    }
+    return hasThis;
+}
 
 /**
  * Phase that migrates `@Input()` declarations to signal inputs and
@@ -1234,7 +1298,7 @@ function pass9__migrateTypeScriptTypeReferences(host, references, importManager,
  */
 function executeMigrationPhase(host, knownInputs, result, info) {
     const { typeChecker, sourceFiles } = info;
-    const importManager = new project_tsconfig_paths.ImportManager({
+    const importManager = new migrations.ImportManager({
         // For the purpose of this migration, we always use `input` and don't alias
         // it to e.g. `input_1`.
         generateUniqueIdentifier: () => null,

package/schematics/bundles/signal-queries-migration.cjs

@@ -1,28 +1,25 @@
 'use strict';
 /**
- * @license Angular v21.0.0-next.0
+ * @license Angular v21.0.0-next.10
  * (c) 2010-2025 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var project_tsconfig_paths = require('./project_tsconfig_paths-CS-eSeHC.cjs');
+var migrations = require('@angular/compiler-cli/private/migrations');
 var ts = require('typescript');
-require('os');
-var index$1 = require('./index-esqfDjNB.cjs');
-require('path');
+require('@angular/compiler-cli');
 require('node:path');
-var project_paths = require('./project_paths-DcaODbky.cjs');
-var apply_import_manager = require('./apply_import_manager-DR9xXCle.cjs');
-var migrate_ts_type_references = require('./migrate_ts_type_references-6NtAj-Wk.cjs');
+var project_paths = require('./project_paths-DvD50ouC.cjs');
+var apply_import_manager = require('./apply_import_manager-1Zs_gpB6.cjs');
+var migrate_ts_type_references = require('./migrate_ts_type_references-UGIUl7En.cjs');
 var assert = require('assert');
-var index = require('./index-CfTQUOiz.cjs');
+var index = require('./index-B7I9sIUx.cjs');
+var compiler = require('@angular/compiler');
 require('@angular-devkit/core');
 require('node:path/posix');
-require('fs');
-require('module');
-require('url');
 require('@angular-devkit/schematics');
+require('./project_tsconfig_paths-CDVxT6Ov.cjs');
 require('./leading_space-D9nQ8UQC.cjs');
 
 /**
@@ -159,7 +156,7 @@ function computeReplacementsToMigrateQuery(node, metadata, importManager, info,
         }
     }
     if (metadata.queryInfo.read !== null) {
-        assert(metadata.queryInfo.read instanceof project_tsconfig_paths.WrappedNodeExpr);
+        assert(metadata.queryInfo.read instanceof compiler.WrappedNodeExpr);
         optionProperties.push(ts.factory.createPropertyAssignment('read', metadata.queryInfo.read.node));
     }
     if (metadata.queryInfo.descendants !== defaultDescendants) {
@@ -203,7 +200,7 @@ function computeReplacementsToMigrateQuery(node, metadata, importManager, info,
     // If the original property type and the read type are matching, we can rely
     // on the TS inference, instead of repeating types, like in `viewChild<Button>(Button)`.
     if (type !== undefined &&
-        resolvedReadType instanceof project_tsconfig_paths.WrappedNodeExpr &&
+        resolvedReadType instanceof compiler.WrappedNodeExpr &&
         ts.isIdentifier(resolvedReadType.node) &&
         ts.isTypeReferenceNode(type) &&
         ts.isIdentifier(type.typeName) &&
@@ -291,7 +288,7 @@ function extractSourceQueryDefinition(node, reflector, evaluator, info) {
         return null;
     }
     const decorators = reflector.getDecoratorsOfDeclaration(node) ?? [];
-    const ngDecorators = project_tsconfig_paths.getAngularDecorators(decorators, project_tsconfig_paths.queryDecoratorNames, /* isCore */ false);
+    const ngDecorators = migrations.getAngularDecorators(decorators, migrations.queryDecoratorNames, /* isCore */ false);
     if (ngDecorators.length === 0) {
         return null;
     }
@@ -318,10 +315,10 @@ function extractSourceQueryDefinition(node, reflector, evaluator, info) {
     }
     let queryInfo = null;
     try {
-        queryInfo = project_tsconfig_paths.extractDecoratorQueryMetadata(node, decorator.name, decorator.args ?? [], node.name.text, reflector, evaluator);
+        queryInfo = migrations.extractDecoratorQueryMetadata(node, decorator.name, decorator.args ?? [], node.name.text, reflector, evaluator);
     }
     catch (e) {
-        if (!(e instanceof project_tsconfig_paths.FatalDiagnosticError)) {
+        if (!(e instanceof migrations.FatalDiagnosticError)) {
             throw e;
         }
         console.error(`Skipping query: ${e.node.getSourceFile().fileName}: ${e.toString()}`);
@@ -532,7 +529,7 @@ function checkNonTsReferenceAccessesField(ref, fieldName) {
     if (ref.from.read !== readFromPath) {
         return null;
     }
-    if (!(parentRead instanceof project_tsconfig_paths.PropertyRead) || parentRead.name !== fieldName) {
+    if (!(parentRead instanceof compiler.PropertyRead) || parentRead.name !== fieldName) {
         return null;
     }
     return parentRead;
@@ -570,7 +567,7 @@ function checkNonTsReferenceCallsField(ref, fieldName) {
         return null;
     }
     const potentialCall = ref.from.readAstPath[accessIdx - 1];
-    if (potentialCall === undefined || !(potentialCall instanceof project_tsconfig_paths.Call)) {
+    if (potentialCall === undefined || !(potentialCall instanceof compiler.Call)) {
         return null;
     }
     return potentialCall;
@@ -740,8 +737,8 @@ class SignalQueriesMigration extends project_paths.TsurgeComplexMigration {
         }
         const { sourceFiles, program } = info;
         const checker = program.getTypeChecker();
-        const reflector = new project_tsconfig_paths.TypeScriptReflectionHost(checker);
-        const evaluator = new index$1.PartialEvaluator(reflector, checker, null);
+        const reflector = new migrations.TypeScriptReflectionHost(checker);
+        const evaluator = new migrations.PartialEvaluator(reflector, checker, null);
         const res = {
             knownQueryFields: {},
             potentialProblematicQueries: {},
@@ -789,7 +786,7 @@ class SignalQueriesMigration extends project_paths.TsurgeComplexMigration {
                 }
                 // Migrating fields with `@HostBinding` is incompatible as
                 // the host binding decorator does not invoke the signal.
-                const hostBindingDecorators = project_tsconfig_paths.getAngularDecorators(extractedQuery.fieldDecorators, ['HostBinding'], 
+                const hostBindingDecorators = migrations.getAngularDecorators(extractedQuery.fieldDecorators, ['HostBinding'], 
                 /* isCore */ false);
                 if (hostBindingDecorators.length > 0) {
                     markFieldIncompatibleInMetadata(res.potentialProblematicQueries, extractedQuery.id, migrate_ts_type_references.FieldIncompatibilityReason.SignalIncompatibleWithHostBinding);
@@ -928,10 +925,10 @@ class SignalQueriesMigration extends project_paths.TsurgeComplexMigration {
         const resourceLoader = info.ngCompiler?.['resourceManager'] ?? null;
         const { program, sourceFiles } = info;
         const checker = program.getTypeChecker();
-        const reflector = new project_tsconfig_paths.TypeScriptReflectionHost(checker);
-        const evaluator = new index$1.PartialEvaluator(reflector, checker, null);
+        const reflector = new migrations.TypeScriptReflectionHost(checker);
+        const evaluator = new migrations.PartialEvaluator(reflector, checker, null);
         const replacements = [];
-        const importManager = new project_tsconfig_paths.ImportManager();
+        const importManager = new migrations.ImportManager();
         const printer = ts.createPrinter();
         const filesWithSourceQueries = new Map();
         const filesWithIncompleteMigration = new Map();