fix(migrations): properly bundle shared compiler code into migrations (#58515)

devversion · pkozlowski-opensource · commit e85ac5c7cb06 · 2024-11-06T13:04:22.000+01:00
The use of relative imports vs. module imports and the existing mismatch can cause symbols to be duplicated in migrations. This is problematic as it breaks migration logic or compiler logic in the worst case. Long-term we will solve this by having a better Bazel toolchain where both relative and module imports can point to the same files; but in practice this is not the case right now. This commit fixes the fallback template logic in the signal input/queries migration; in case no type check block information is available. PR Close #58515
diff --git a/packages/core/schematics/migrations/output-migration/output-migration.spec.ts b/packages/core/schematics/migrations/output-migration/output-migration.spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {initMockFileSystem} from '../../../../compiler-cli/src/ngtsc/file_system/testing';
+import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {runTsurgeMigration} from '../../utils/tsurge/testing';
 import {diffText} from '../../utils/tsurge/testing/diff';
 import {absoluteFrom} from '@angular/compiler-cli';
diff --git a/packages/core/schematics/migrations/output-migration/output-migration.ts b/packages/core/schematics/migrations/output-migration/output-migration.ts
@@ -20,8 +20,8 @@ import {
   TsurgeFunnelMigration,
 } from '../../utils/tsurge';
 
-import {DtsMetadataReader} from '../../../../compiler-cli/src/ngtsc/metadata';
-import {TypeScriptReflectionHost} from '../../../../compiler-cli/src/ngtsc/reflection';
+import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata';
+import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';
 import {PartialEvaluator} from '@angular/compiler-cli/private/migrations';
 import {
   getUniqueIdForProperty,
diff --git a/packages/core/schematics/migrations/output-migration/output-replacements.ts b/packages/core/schematics/migrations/output-migration/output-replacements.ts
@@ -8,7 +8,7 @@
 
 import ts from 'typescript';
 
-import {ImportManager, PartialEvaluator} from '../../../../compiler-cli/private/migrations';
+import {ImportManager, PartialEvaluator} from '@angular/compiler-cli/private/migrations';
 import {
   ProgramInfo,
   ProjectFile,
diff --git a/packages/core/schematics/migrations/output-migration/output_helpers.ts b/packages/core/schematics/migrations/output-migration/output_helpers.ts
@@ -11,10 +11,10 @@ import {
   ReflectionHost,
   ClassDeclaration,
   Decorator,
-} from '../../../../compiler-cli/src/ngtsc/reflection';
-import {DtsMetadataReader} from '../../../../compiler-cli/src/ngtsc/metadata';
-import {Reference} from '../../../../compiler-cli/src/ngtsc/imports';
-import {getAngularDecorators} from '../../../../compiler-cli/src/ngtsc/annotations';
+} from '@angular/compiler-cli/src/ngtsc/reflection';
+import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata';
+import {Reference} from '@angular/compiler-cli/src/ngtsc/imports';
+import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations';
 
 import {ProgramInfo, projectFile} from '../../utils/tsurge';
 import {
diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts
@@ -17,7 +17,7 @@ import {
   ParsedEvent,
   ParsedProperty,
   makeBindingParser,
-} from '../../../../../../../compiler/public_api';
+} from '@angular/compiler';
 import {ProgramInfo, projectFile} from '../../../../../utils/tsurge';
 import {
   TemplateExpressionReferenceVisitor,
diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts
@@ -33,8 +33,7 @@ import {
   TmplAstSwitchBlockCase,
   TmplAstTemplate,
   tmplAstVisitAll,
-} from '../../../../../../../compiler';
-import {BoundAttribute, BoundEvent} from '../../../../../../../compiler/src/render3/r3_ast';
+} from '@angular/compiler';
 import {lookupPropertyAccess} from '../../../../../utils/tsurge/helpers/ast/lookup_property_access';
 import {ClassFieldDescriptor, KnownFields} from './known_fields';
 
@@ -462,7 +461,7 @@ function traverseReceiverAndLookupSymbol(
 /** Whether the given node refers to a two-way binding AST node. */
 function isTwoWayBindingNode(node: unknown): boolean {
   return (
-    (node instanceof BoundAttribute && node.type === BindingType.TwoWay) ||
-    (node instanceof BoundEvent && node.type === ParsedEventType.TwoWay)
+    (node instanceof TmplAstBoundAttribute && node.type === BindingType.TwoWay) ||
+    (node instanceof TmplAstBoundEvent && node.type === ParsedEventType.TwoWay)
   );
 }
diff --git a/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts b/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts
@@ -14,7 +14,7 @@ import {
 import {extractDecoratorQueryMetadata} from '@angular/compiler-cli/src/ngtsc/annotations/directive';
 import {Decorator, ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';
 import ts from 'typescript';
-import {R3QueryMetadata} from '../../../../compiler';
+import {R3QueryMetadata} from '@angular/compiler';
 import {ProgramInfo} from '../../utils/tsurge';
 import {ClassFieldUniqueKey} from '../signal-migration/src/passes/reference_resolution/known_fields';
 import {getUniqueIDForClassProperty} from './field_tracking';
