refactor(compiler-cli): move ClassPropertyMapping into compiler

crisbeto · atscott · commit d15ceff6170c · 2026-04-03T09:44:39.000-07:00
Moves the `ClassPropertyMapping` into the compiler, rather than having to pass around the limited `InputOutputPropertySet` interface that is only implemented by `ClassPropertyMapping`.
diff --git a/packages/compiler-cli/private/hybrid_analysis.ts b/packages/compiler-cli/private/hybrid_analysis.ts
@@ -28,7 +28,6 @@ export {TcbGenericContextBehavior} from '../src/ngtsc/typecheck/src/ops/context'
 export {ImportManager} from '../src/ngtsc/translator';
 export type {ReferenceEmitter} from '../src/ngtsc/imports';
 export type {ReflectionHost, ClassDeclaration} from '../src/ngtsc/reflection';
-export {ClassPropertyMapping} from '../src/ngtsc/metadata/src/property_mapping';
 export type {TypeCheckSourceResolver} from '../src/ngtsc/typecheck/src/tcb_util';
 export {
   createHostElement,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/common/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/annotations/common/src/diagnostics.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {ClassPropertyName} from '@angular/compiler';
 import ts from 'typescript';
 
 import {
@@ -16,7 +17,6 @@ import {
 } from '../../../diagnostics';
 import {Reference} from '../../../imports';
 import {
-  ClassPropertyName,
   DirectiveMeta,
   flattenInheritedDirectiveMetadata,
   HostDirectiveMeta,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/common/src/input_transforms.ts b/packages/compiler-cli/src/ngtsc/annotations/common/src/input_transforms.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {outputAst} from '@angular/compiler';
+import {ClassPropertyMapping, outputAst} from '@angular/compiler';
 
-import {ClassPropertyMapping, InputMapping} from '../../../metadata';
+import {InputMapping} from '../../../metadata';
 import {CompileResult} from '../../../transform';
 
 /** Generates additional fields to be added to a class that has inputs with transform functions. */
diff --git a/packages/compiler-cli/src/ngtsc/annotations/component/src/metadata.ts b/packages/compiler-cli/src/ngtsc/annotations/component/src/metadata.ts
@@ -18,12 +18,12 @@ import {
   R3TemplateDependencyMetadata,
   SchemaMetadata,
   TmplAstDeferredBlock,
+  ClassPropertyMapping,
 } from '@angular/compiler';
 import ts from 'typescript';
 
 import {Reference} from '../../../imports';
 import {
-  ClassPropertyMapping,
   DirectiveResources,
   DirectiveTypeCheckMeta,
   HostDirectiveMeta,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/directive/src/handler.ts b/packages/compiler-cli/src/ngtsc/annotations/directive/src/handler.ts
@@ -7,6 +7,7 @@
  */
 
 import {
+  ClassPropertyMapping,
   compileClassMetadata,
   compileDeclareClassMetadata,
   compileDeclareDirectiveFromMetadata,
@@ -28,7 +29,6 @@ import {
   SemanticDepGraphUpdater,
 } from '../../../incremental/semantic_graph';
 import {
-  ClassPropertyMapping,
   DirectiveResources,
   DirectiveTypeCheckMeta,
   extractDirectiveTypeCheckMeta,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/directive/src/output_function.ts b/packages/compiler-cli/src/ngtsc/annotations/directive/src/output_function.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {InputOrOutput} from '@angular/compiler';
 import ts from 'typescript';
 
 import {ErrorCode, FatalDiagnosticError} from '../../../diagnostics';
 import {ImportedSymbolsTracker} from '../../../imports';
-import {InputOrOutput} from '../../../metadata';
 import {ClassMember, ClassMemberAccessLevel, ReflectionHost} from '../../../reflection';
 
 import {validateAccessOfInitializerApiMember} from './initializer_function_access';
diff --git a/packages/compiler-cli/src/ngtsc/annotations/directive/src/shared.ts b/packages/compiler-cli/src/ngtsc/annotations/directive/src/shared.ts
@@ -30,6 +30,8 @@ import {
   ArrowFunctionExpr,
   WrappedNodeExpr,
   literal,
+  ClassPropertyMapping,
+  InputOrOutput,
 } from '@angular/compiler';
 import ts from 'typescript';
 
@@ -42,11 +44,9 @@ import {
   ReferenceEmitter,
 } from '../../../imports';
 import {
-  ClassPropertyMapping,
   DecoratorInputTransform,
   HostDirectiveMeta,
   InputMapping,
-  InputOrOutput,
   isHostDirectiveMetaForGlobalMode,
   Resource,
 } from '../../../metadata';
diff --git a/packages/compiler-cli/src/ngtsc/annotations/directive/src/symbol.ts b/packages/compiler-cli/src/ngtsc/annotations/directive/src/symbol.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {ClassPropertyMapping, InputOrOutput} from '@angular/compiler';
 import {
   areTypeParametersEqual,
   isArrayEqual,
@@ -14,13 +15,7 @@ import {
   SemanticSymbol,
   SemanticTypeParameter,
 } from '../../../incremental/semantic_graph';
-import {
-  ClassPropertyMapping,
-  DirectiveTypeCheckMeta,
-  InputMapping,
-  InputOrOutput,
-  TemplateGuardMeta,
-} from '../../../metadata';
+import {DirectiveTypeCheckMeta, InputMapping, TemplateGuardMeta} from '../../../metadata';
 import {ClassDeclaration} from '../../../reflection';
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/docs/src/class_extractor.ts b/packages/compiler-cli/src/ngtsc/docs/src/class_extractor.ts
@@ -6,17 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {InputOrOutput} from '@angular/compiler';
 import ts from 'typescript';
 
 import {Reference} from '../../imports';
-import {
-  DirectiveMeta,
-  InputMapping,
-  InputOrOutput,
-  MetadataReader,
-  NgModuleMeta,
-  PipeMeta,
-} from '../../metadata';
+import {DirectiveMeta, InputMapping, MetadataReader, PipeMeta} from '../../metadata';
 
 import {
   ClassEntry,
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -23,11 +23,5 @@ export {
   CompoundMetadataReader,
   isHostDirectiveMetaForGlobalMode,
 } from './src/util';
-export {
-  BindingPropertyName,
-  ClassPropertyMapping,
-  ClassPropertyName,
-  InputOrOutput,
-} from './src/property_mapping';
 export {ExportedProviderStatusResolver} from './src/providers';
 export {HostDirectivesResolver} from './src/host_directives_resolver';
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
@@ -12,14 +12,15 @@ import {
   SchemaMetadata,
   ExternalReference,
   MatchSource,
+  ClassPropertyName,
+  InputOrOutput,
+  ClassPropertyMapping,
 } from '@angular/compiler';
 import ts from 'typescript';
 
 import {Reference} from '../../imports';
 import {ClassDeclaration} from '../../reflection';
 
-import {ClassPropertyMapping, ClassPropertyName, InputOrOutput} from './property_mapping';
-
 /**
  * Metadata collected for an `NgModule`.
  */
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts b/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {MatchSource} from '@angular/compiler';
+import {ClassPropertyMapping, MatchSource} from '@angular/compiler';
 import ts from 'typescript';
 
 import {OwningModule, Reference} from '../../imports';
@@ -27,7 +27,6 @@ import {
   NgModuleMeta,
   PipeMeta,
 } from './api';
-import {ClassPropertyMapping} from './property_mapping';
 import {
   extractDirectiveTypeCheckMeta,
   extractReferencesFromType,
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/host_directives_resolver.ts b/packages/compiler-cli/src/ngtsc/metadata/src/host_directives_resolver.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {MatchSource} from '@angular/compiler';
+import {ClassPropertyMapping, InputOrOutput, MatchSource} from '@angular/compiler';
 import {DirectiveMeta, InputMapping, MetadataReader} from '../../metadata/src/api';
 import {ClassDeclaration} from '../../reflection';
-import {ClassPropertyMapping, InputOrOutput} from '../src/property_mapping';
 
 import {flattenInheritedDirectiveMetadata} from './inheritance';
 import {isHostDirectiveMetaForGlobalMode} from './util';
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts b/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {ClassPropertyMapping, ClassPropertyName} from '@angular/compiler';
 import {Reference} from '../../imports';
 import {ClassDeclaration} from '../../reflection';
 
 import {DirectiveMeta, HostDirectiveMeta, InputMapping, MetadataReader} from './api';
-import {ClassPropertyMapping, ClassPropertyName} from './property_mapping';
 
 /**
  * Given a reference to a directive, return a flattened version of its `DirectiveMeta` metadata
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
@@ -31,8 +31,8 @@ import {
   PipeMeta,
   TemplateGuardMeta,
 } from './api';
-import {ClassPropertyMapping, ClassPropertyName} from './property_mapping';
 import {TypeEntityToDeclarationError} from '../../reflection/src/typescript';
+import {ClassPropertyMapping, ClassPropertyName} from '@angular/compiler';
 
 export function extractReferencesFromType(
   checker: ts.TypeChecker,
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts
@@ -9,7 +9,10 @@
 import {
   AbsoluteSourceSpan,
   BoundTarget,
+  ClassPropertyMapping,
+  ClassPropertyName,
   DirectiveMeta,
+  InputOrOutput,
   LegacyAnimationTriggerNames,
   MatchSource,
   ParseSourceSpan,
@@ -20,12 +23,9 @@ import ts from 'typescript';
 import {ErrorCode} from '../../diagnostics';
 import {Reference} from '../../imports';
 import {
-  ClassPropertyMapping,
-  ClassPropertyName,
   DirectiveTypeCheckMeta,
   HostDirectiveMeta,
   InputMapping,
-  InputOrOutput,
   PipeMeta,
   TemplateGuardMeta,
 } from '../../metadata';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts
@@ -7,7 +7,7 @@
  */
 import ts from 'typescript';
 
-import {TemplateDiagnostic, TypeCheckId} from '../api';
+import {TemplateDiagnostic} from '../api';
 import {makeTemplateDiagnostic} from '../diagnostics';
 
 import {getSourceMapping, TypeCheckSourceResolver} from './tcb_util';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/ops/bindings.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/ops/bindings.ts
@@ -9,6 +9,7 @@
 import {
   AST,
   BindingType,
+  ClassPropertyName,
   LiteralArray,
   LiteralMap,
   ParseSourceSpan,
@@ -20,10 +21,7 @@ import {
   TmplAstTemplate,
   TmplAstTextAttribute,
 } from '@angular/compiler';
-import ts from 'typescript';
 import {TcbDirectiveMetadata} from '../../api';
-import {ClassPropertyName} from '../../../metadata';
-import {Reference} from '../../../imports';
 import {Context} from './context';
 import {TcbExpr} from './codegen';
 
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/ops/inputs.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/ops/inputs.ts
@@ -8,7 +8,9 @@
 
 import {
   AST,
+  BindingPropertyName,
   BindingType,
+  ClassPropertyName,
   R3Identifiers,
   TmplAstBoundAttribute,
   TmplAstComponent,
@@ -21,7 +23,6 @@ import type {Scope} from './scope';
 import {TcbDirectiveMetadata} from '../../api';
 import {TcbOp} from './base';
 import {declareVariable, quoteAndEscape, TcbExpr} from './codegen';
-import {BindingPropertyName, ClassPropertyName} from '../../../metadata';
 import {REGISTRY} from '../dom';
 import {tcbExpression, unwrapWritableSignal} from './expression';
 import {
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/ops/scope.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/ops/scope.ts
@@ -8,7 +8,6 @@
 
 import {
   DirectiveOwner,
-  ExternalExpr,
   TmplAstBoundAttribute,
   TmplAstBoundEvent,
   TmplAstBoundText,
@@ -34,7 +33,6 @@ import {
   TmplAstVariable,
   TmplAstViewportDeferredTrigger,
 } from '@angular/compiler';
-import ts from 'typescript';
 import {TcbOp} from './base';
 import {TcbExpr} from './codegen';
 import {TcbDirectiveMetadata} from '../../api';
@@ -60,13 +58,10 @@ import {
   TcbNativeFieldOp,
   TcbNativeRadioButtonFieldOp,
 } from './signal_forms';
-import {ImportFlags, Reference, ReferenceEmitKind} from '../../../imports';
-import {ClassDeclaration} from '../../../reflection';
 import {
   TcbGenericDirectiveTypeWithAnyParamsOp,
   TcbNonGenericDirectiveTypeOp,
 } from './directive_type';
-import {requiresInlineTypeCtor} from '../type_constructor';
 import {TcbDirectiveCtorOp} from './directive_constructor';
 import {TcbControlFlowContentProjectionOp} from './content_projection';
 import {TcbComponentNodeOp} from './selectorless';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_adapter.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_adapter.ts
@@ -29,8 +29,9 @@ import {
   TmplAstElement,
   TmplAstTemplate,
   WrappedNodeExpr,
+  ClassPropertyMapping,
 } from '@angular/compiler';
-import {ClassPropertyMapping, InputMapping} from '../../metadata';
+import {InputMapping} from '../../metadata';
 import {requiresInlineTypeCtor} from './type_constructor';
 import {tempPrint} from './ops/codegen';
 import {generateTcbTypeParameters} from './tcb_util';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import ts from 'typescript';
+import {ClassPropertyMapping} from '@angular/compiler';
 
 import {
   absoluteFrom,
@@ -23,7 +24,7 @@ import {
   Reference,
   ReferenceEmitter,
 } from '../../imports';
-import {ClassPropertyMapping, InputMapping} from '../../metadata';
+import {InputMapping} from '../../metadata';
 import {NOOP_PERF_RECORDER} from '../../perf';
 import {TsCreateProgramDriver, UpdateMode} from '../../program_driver';
 import {isNamedClassDeclaration, TypeScriptReflectionHost} from '../../reflection';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts
@@ -9,6 +9,7 @@
 import {
   AST,
   BindingPipe,
+  ClassPropertyMapping,
   CssSelector,
   MatchSource,
   ParseSourceFile,
@@ -55,7 +56,6 @@ import {
 } from '../../imports';
 import {NOOP_INCREMENTAL_BUILD, NoopIncrementalBuildStrategy} from '../../incremental';
 import {
-  ClassPropertyMapping,
   CompoundMetadataReader,
   DecoratorInputTransform,
   DirectiveMeta,
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
@@ -52,6 +52,7 @@ export {publishFacade} from './jit_compiler_facade';
 export * from './ml_parser/ast';
 export * from './ml_parser/html_parser';
 export * from './ml_parser/html_tags';
+export * from './property_mapping';
 export {LexerRange} from './ml_parser/lexer';
 export {ParseTreeResult, TreeError} from './ml_parser/parser';
 export * from './ml_parser/tags';
diff --git a/packages/compiler/src/property_mapping.ts b/packages/compiler/src/property_mapping.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {InputOutputPropertySet} from '@angular/compiler';
-
 /**
  * The name of a class property that backs an input or output declared by a directive or component.
  *
@@ -53,9 +51,7 @@ export interface InputOrOutput {
  * Allows bidirectional querying of the mapping - looking up all inputs/outputs with a given
  * property name, or mapping from a specific class property to its binding property name.
  */
-export class ClassPropertyMapping<T extends InputOrOutput = InputOrOutput>
-  implements InputOutputPropertySet
-{
+export class ClassPropertyMapping<T extends InputOrOutput = InputOrOutput> {
   /**
    * Mapping from class property names to the single `InputOrOutput` for that class property.
    */
diff --git a/packages/compiler/src/render3/view/t2_api.ts b/packages/compiler/src/render3/view/t2_api.ts
diff --git a/packages/compiler/test/render3/view/binding_spec.ts b/packages/compiler/test/render3/view/binding_spec.ts
