From f52eee8eb2a5eeb3e276df89bc8d964d5b061532 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Thu, 12 Oct 2023 12:16:07 +0200 Subject: [PATCH] Revert "refactor(compiler-cli): remove `MethodIdentifier` type (#49611)" (#52174) This reverts commit c2b1a242e8db0ef8e03f7ee85ffa1f82562fd735. PR Close #52174 --- packages/compiler-cli/src/ngtsc/indexer/src/api.ts | 11 ++++++++++- .../compiler-cli/src/ngtsc/indexer/src/template.ts | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/compiler-cli/src/ngtsc/indexer/src/api.ts b/packages/compiler-cli/src/ngtsc/indexer/src/api.ts index 2fb2fac4355..fc166ac33a2 100644 --- a/packages/compiler-cli/src/ngtsc/indexer/src/api.ts +++ b/packages/compiler-cli/src/ngtsc/indexer/src/api.ts @@ -15,6 +15,7 @@ import {ClassDeclaration, DeclarationNode} from '../../reflection'; */ export enum IdentifierKind { Property, + Method, // TODO: No longer being used. To be removed together with `MethodIdentifier`. Element, Template, Attribute, @@ -46,6 +47,14 @@ export interface PropertyIdentifier extends ExpressionIdentifier { kind: IdentifierKind.Property; } +/** + * Describes a method accessed in a template. + * @deprecated No longer being used. To be removed. + */ +export interface MethodIdentifier extends ExpressionIdentifier { + kind: IdentifierKind.Method; +} + /** Describes an element attribute in a template. */ export interface AttributeIdentifier extends TemplateIdentifier { kind: IdentifierKind.Attribute; @@ -105,7 +114,7 @@ export interface VariableIdentifier extends TemplateIdentifier { * they were discovered in. */ export type TopLevelIdentifier = PropertyIdentifier|ElementIdentifier|TemplateNodeIdentifier| - ReferenceIdentifier|VariableIdentifier; + ReferenceIdentifier|VariableIdentifier|MethodIdentifier; /** * Describes the absolute byte offsets of a text anchor in a source code. diff --git a/packages/compiler-cli/src/ngtsc/indexer/src/template.ts b/packages/compiler-cli/src/ngtsc/indexer/src/template.ts index 6a16a25ddd9..b4278875f1d 100644 --- a/packages/compiler-cli/src/ngtsc/indexer/src/template.ts +++ b/packages/compiler-cli/src/ngtsc/indexer/src/template.ts @@ -9,7 +9,7 @@ import {AST, ASTWithSource, BoundTarget, ImplicitReceiver, ParseSourceSpan, Prop import {ClassDeclaration, DeclarationNode} from '../../reflection'; -import {AbsoluteSourceSpan, AttributeIdentifier, ElementIdentifier, IdentifierKind, PropertyIdentifier, ReferenceIdentifier, TemplateNodeIdentifier, TopLevelIdentifier, VariableIdentifier} from './api'; +import {AbsoluteSourceSpan, AttributeIdentifier, ElementIdentifier, IdentifierKind, MethodIdentifier, PropertyIdentifier, ReferenceIdentifier, TemplateNodeIdentifier, TopLevelIdentifier, VariableIdentifier} from './api'; import {ComponentMeta} from './context'; /** @@ -21,7 +21,7 @@ interface HTMLNode extends TmplAstNode { name?: string; } -type ExpressionIdentifier = PropertyIdentifier; +type ExpressionIdentifier = PropertyIdentifier|MethodIdentifier; type TmplTarget = TmplAstReference|TmplAstVariable; type TargetIdentifier = ReferenceIdentifier|VariableIdentifier; type TargetIdentifierMap = Map;