@artel/artc 0.6.25217 → 0.6.25219

package/build/types/tree/green/SyntaxToCode.d.ts

@@ -55,7 +55,6 @@ export declare class SyntaxToCode {
     private writeParameterClause;
     private writeParameterList;
     private writeParameterDeclaration;
-    private writeSetterParameterClause;
     private writeDeclarationTags;
     private writeTag;
     private writeDeclarationModifiers;
@@ -74,7 +73,7 @@ export declare class SyntaxToCode {
     private doesTypeMadeNullableRequireParenthesis;
     private writeQualifiedName;
     private writeTypeArgumentClause;
-    private writeCallArgument;
+    private writeArgument;
     private writeExpression;
     private writeDeclarationBody;
     private writeStatementBlock;

package/build/types/tree/red/Nodes.d.ts

@@ -32,7 +32,7 @@ export declare class PackageMemberDeclarationList extends BaseNode {
     constructor(green: green.PackageMemberDeclarationList, rangeStart: number, parent: PackageMemberDeclarationListParent);
     private createChildren;
 }
-export type IdentifierParent = PackageImport | PackagePath | PackageAliasTypeDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | PackageStructuredTypeDeclaration | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ErrorVariableDeclaration | PropertyAccessExpression | IdentifierExpression | TranslationParameterList | TranslationTypeParameterList | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | SetterParameterDeclaration | CallArgument | Keyword;
+export type IdentifierParent = PackageImport | PackagePath | PackageAliasTypeDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | PackageStructuredTypeDeclaration | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ErrorVariableDeclaration | PropertyAccessExpression | IdentifierExpression | TranslationParameterList | TranslationTypeParameterList | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | Keyword;
 export type Identifier = Token<TokenKind.Identifier>;
 export type Comma = Token<TokenKind.Comma>;
 export type Semicolon = Token<TokenKind.Semicolon>;
@@ -134,7 +134,7 @@ export declare class PackagePath extends BaseNode {
     private createChildren;
 }
 export type TypeSpecifier = NamedTypeSpecifier | AnonymousTypeSpecifier | UnionTypeSpecifier | ParenthesizedTypeSpecifier | NullableTypeSpecifier | InvalidTypeSpecifier;
-export type NamedTypeSpecifierParent = BaseTypeList | Tag | NonNamedTypeSpecifierParent;
+export type NamedTypeSpecifierParent = BaseTypeList | NonNamedTypeSpecifierParent;
 export type NonNamedTypeSpecifierParent = AliasTypeDeclarationBody | AsExpression | IsExpression | TypeParameterDeclaration | TypeArgumentList | TypeAnnotation | ParenthesizedTypeSpecifier | NullableTypeSpecifier | UnionTypeSpecifierTypeList;
 export declare class NamedTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.NamedTypeSpecifier;
@@ -518,12 +518,11 @@ export declare class PackageVariableSetterDeclaration extends BaseNode {
     readonly green: green.PackageVariableSetterDeclaration;
     readonly parent: PackageMemberDeclarationParent;
     private _children;
-    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Identifier, SetterParameterClause | undefined, StatementBlock | undefined];
+    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Identifier, StatementBlock | undefined];
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get name(): Identifier;
-    get setterParameterClause(): SetterParameterClause | undefined;
     get body(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
     constructor(green: green.PackageVariableSetterDeclaration, rangeStart: number, parent: PackageMemberDeclarationParent);
@@ -682,12 +681,11 @@ export declare class TypeIndexedSetterDeclaration extends BaseNode {
     readonly green: green.TypeIndexedSetterDeclaration;
     readonly parent: TypeMemberDeclarationParent;
     private _children;
-    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, TypeIndexerParameterClause, SetterParameterClause | undefined, StatementBlock | undefined];
+    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, TypeIndexerParameterClause, StatementBlock | undefined];
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get parameterClause(): TypeIndexerParameterClause;
-    get setterParameterClause(): SetterParameterClause | undefined;
     get body(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
     constructor(green: green.TypeIndexedSetterDeclaration, rangeStart: number, parent: TypeMemberDeclarationParent);
@@ -728,12 +726,11 @@ export declare class TypeDereferencedVariableSetterDeclaration extends BaseNode
     readonly green: green.TypeDereferencedVariableSetterDeclaration;
     readonly parent: TypeMemberDeclarationParent;
     private _children;
-    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Token<green.TokenKind.Caret>, SetterParameterClause | undefined, StatementBlock | undefined];
+    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Token<green.TokenKind.Caret>, StatementBlock | undefined];
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get caretToken(): Token<TokenKind.Caret>;
-    get setterParameterClause(): SetterParameterClause | undefined;
     get body(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
     constructor(green: green.TypeDereferencedVariableSetterDeclaration, rangeStart: number, parent: TypeMemberDeclarationParent);
@@ -812,12 +809,11 @@ export declare class TypeVariableSetterDeclaration extends BaseNode {
     readonly green: green.TypeVariableSetterDeclaration;
     readonly parent: TypeMemberDeclarationParent;
     private _children;
-    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Identifier, SetterParameterClause | undefined, StatementBlock | undefined];
+    get children(): readonly [TagList, ModifierList, Keyword<green.KeywordKind.Set>, Identifier, StatementBlock | undefined];
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get name(): Identifier;
-    get setterParameterClause(): SetterParameterClause | undefined;
     get body(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
     constructor(green: green.TypeVariableSetterDeclaration, rangeStart: number, parent: TypeMemberDeclarationParent);
@@ -882,7 +878,7 @@ export declare class EnumerationVariableDeclaration extends BaseNode {
     private createChildren;
 }
 export type Expression = ArrayLiteral | AsExpression | AssertionExpression | AssumptionExpression | BinaryExpression | MethodBlockLiteral | CallExpression | IdentifierExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | GenericSpecializationExpression | DefaultMatchExpression | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression;
-export type ExpressionParent = ArrayLiteralElementList | AsExpression | AssertionExpression | AssumptionExpression | AssignmentStatement | BinaryExpression | CallArgument | CallExpression | DisposeStatement | ErrorStatement | ExpressionStatement | ForStatement | PackageVariableDeclaration | IfStatement | IndexedAccessExpression | IsExpression | LocalVariableDeclaration | MatchExpressionList | ParameterDeclaration | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | LoopStatement | ReturnStatement | TextTemplateSpan | TypeVariableDeclaration | SwitchStatement | VariantDeclaration | WhileStatement | YieldStatement | GenericSpecializationExpression | ElseIfClause | TextTemplateLiteralTranslation;
+export type ExpressionParent = ArrayLiteralElementList | AsExpression | AssertionExpression | AssumptionExpression | AssignmentStatement | BinaryExpression | Argument | CallExpression | DisposeStatement | ErrorStatement | ExpressionStatement | ForStatement | PackageVariableDeclaration | IfStatement | IndexedAccessExpression | IsExpression | LocalVariableDeclaration | MatchExpressionList | ParameterDeclaration | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | LoopStatement | ReturnStatement | TextTemplateSpan | TypeVariableDeclaration | SwitchStatement | VariantDeclaration | WhileStatement | YieldStatement | GenericSpecializationExpression | ElseIfClause | TextTemplateLiteralTranslation;
 export declare class ArrayLiteral extends BaseNode {
     readonly kind = NodeKind.ArrayLiteral;
     readonly green: green.ArrayLiteral;
@@ -972,18 +968,18 @@ export declare class MethodBlockLiteral extends BaseNode {
     constructor(green: green.MethodBlockLiteral, rangeStart: number, parent: ExpressionParent);
     private createChildren;
 }
-export type CallArgumentListElement = CallArgument | Comma;
-export type CallArgumentListParent = CallExpression | AutotypeCallExpression | Tag | IndexedAccessExpression;
-export declare class CallArgumentList extends BaseNode {
-    readonly kind = NodeKind.CallArgumentList;
-    readonly green: green.CallArgumentList;
-    readonly parent: CallArgumentListParent;
+export type ArgumentListElement = Argument | Comma;
+export type ArgumentListParent = CallExpression | AutotypeCallExpression | Tag | IndexedAccessExpression;
+export declare class ArgumentList extends BaseNode {
+    readonly kind = NodeKind.ArgumentList;
+    readonly green: green.ArgumentList;
+    readonly parent: ArgumentListParent;
     private _children;
-    get children(): readonly CallArgumentListElement[];
-    get elements(): readonly CallArgumentListElement[];
-    get callArguments(): Query<CallArgument>;
+    get children(): readonly ArgumentListElement[];
+    get elements(): readonly ArgumentListElement[];
+    get arguments(): Query<Argument>;
     protected get thisAsNode(): Node;
-    constructor(green: green.CallArgumentList, rangeStart: number, parent: CallArgumentListParent);
+    constructor(green: green.ArgumentList, rangeStart: number, parent: ArgumentListParent);
     private createChildren;
 }
 export declare class CallExpression extends BaseNode {
@@ -991,10 +987,10 @@ export declare class CallExpression extends BaseNode {
     readonly green: green.CallExpression;
     readonly parent: ExpressionParent;
     private _children;
-    get children(): readonly [Expression, Token<green.TokenKind.OpenParenthesis>, CallArgumentList, Token<green.TokenKind.CloseParenthesis>];
+    get children(): readonly [Expression, Token<green.TokenKind.OpenParenthesis>, ArgumentList, Token<green.TokenKind.CloseParenthesis>];
     get expression(): Expression;
     get openParenthesisToken(): Token<TokenKind.OpenParenthesis>;
-    get callArgumentList(): CallArgumentList;
+    get argumentList(): ArgumentList;
     get closeParenthesisToken(): Token<TokenKind.CloseParenthesis>;
     protected get thisAsNode(): Node;
     constructor(green: green.CallExpression, rangeStart: number, parent: ExpressionParent);
@@ -1005,10 +1001,10 @@ export declare class AutotypeCallExpression extends BaseNode {
     readonly green: green.AutotypeCallExpression;
     readonly parent: ExpressionParent;
     private _children;
-    get children(): readonly [Keyword<green.KeywordKind.Autotype>, Token<green.TokenKind.OpenParenthesis>, CallArgumentList, Token<green.TokenKind.CloseParenthesis>];
+    get children(): readonly [Keyword<green.KeywordKind.Autotype>, Token<green.TokenKind.OpenParenthesis>, ArgumentList, Token<green.TokenKind.CloseParenthesis>];
     get autotypeKeyword(): Keyword<KeywordKind.Autotype>;
     get openParenthesisToken(): Token<TokenKind.OpenParenthesis>;
-    get callArgumentList(): CallArgumentList;
+    get argumentList(): ArgumentList;
     get closeParenthesisToken(): Token<TokenKind.CloseParenthesis>;
     protected get thisAsNode(): Node;
     constructor(green: green.AutotypeCallExpression, rangeStart: number, parent: ExpressionParent);
@@ -1019,10 +1015,10 @@ export declare class IndexedAccessExpression extends BaseNode {
     readonly green: green.IndexedAccessExpression;
     readonly parent: ExpressionParent;
     private _children;
-    get children(): readonly [Expression, Token<green.TokenKind.OpenSquareBracket>, CallArgumentList, Token<green.TokenKind.CloseSquareBracket>];
+    get children(): readonly [Expression, Token<green.TokenKind.OpenSquareBracket>, ArgumentList, Token<green.TokenKind.CloseSquareBracket>];
     get expression(): Expression;
     get openSquareBracketToken(): Token<TokenKind.OpenSquareBracket>;
-    get argumentsList(): CallArgumentList;
+    get argumentList(): ArgumentList;
     get closeSquareBracketToken(): Token<TokenKind.CloseSquareBracket>;
     protected get thisAsNode(): Node;
     constructor(green: green.IndexedAccessExpression, rangeStart: number, parent: ExpressionParent);
@@ -1265,7 +1261,7 @@ export declare class DefaultMatchExpression extends BaseNode {
     constructor(green: green.DefaultMatchExpression, rangeStart: number, parent: ExpressionParent);
     private createChildren;
 }
-export type Statement = RunStatement | EmptyStatement | IfStatement | ForStatement | WhileStatement | LoopStatement | ReturnStatement | ErrorStatement | LocalVariableDeclarationStatement | AssignmentStatement | YieldStatement | InvalidStatement | ExpressionStatement | SwitchStatement | BreakLoopStatement | ContinueLoopStatement | NestedMethodDeclarationStatement | DisposeStatement;
+export type Statement = RunStatement | TryStatement | EmptyStatement | IfStatement | ForStatement | WhileStatement | LoopStatement | ReturnStatement | ErrorStatement | LocalVariableDeclarationStatement | AssignmentStatement | YieldStatement | InvalidStatement | ExpressionStatement | SwitchStatement | BreakLoopStatement | ContinueLoopStatement | NestedMethodDeclarationStatement | DisposeStatement;
 export type StatementParent = StatementList;
 export declare class AssignmentStatement extends BaseNode {
     readonly kind = NodeKind.AssignmentStatement;
@@ -1295,7 +1291,7 @@ export declare class StatementList extends BaseNode {
     constructor(green: green.StatementList, rangeStart: number, parent: StatementListParent);
     private createChildren;
 }
-export type StatementBlockParent = PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageMethodDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | NestedMethodDeclaration | MethodLiteral | MethodBlockLiteral | PackageConstructorDeclaration | PackageEntryPointDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | IfStatement | ElseIfClause | RunStatement | OnErrorClause | FinallyClause | ForStatement | LoopStatement | SwitchStatementCaseClause | WhileStatement;
+export type StatementBlockParent = PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageMethodDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | NestedMethodDeclaration | MethodLiteral | MethodBlockLiteral | PackageConstructorDeclaration | PackageEntryPointDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | IfStatement | ElseIfClause | RunStatement | TryStatement | CatchClause | FinallyClause | ForStatement | LoopStatement | SwitchStatementCaseClause | WhileStatement;
 export declare class StatementBlock extends BaseNode {
     readonly kind = NodeKind.StatementBlock;
     readonly green: green.StatementBlock;
@@ -1343,48 +1339,48 @@ export declare class DisposeStatement extends BaseNode {
     constructor(green: green.DisposeStatement, rangeStart: number, parent: StatementParent);
     private createChildren;
 }
-export type RunStatementClauseListParent = RunStatement;
-export declare class RunStatementClauseList extends BaseNode {
-    readonly kind = NodeKind.RunStatementClauseList;
-    readonly green: green.RunStatementClauseList;
-    readonly parent: RunStatementClauseListParent;
-    private _children;
-    get children(): readonly RunStatementClause[];
-    get clauses(): readonly RunStatementClause[];
-    protected get thisAsNode(): Node;
-    constructor(green: green.RunStatementClauseList, rangeStart: number, parent: RunStatementClauseListParent);
-    private createChildren;
-}
-export type RunStatementParent = StatementParent;
 export declare class RunStatement extends BaseNode {
     readonly kind = NodeKind.RunStatement;
     readonly green: green.RunStatement;
-    readonly parent: RunStatementParent;
+    readonly parent: StatementParent;
     private _children;
-    get children(): readonly [Keyword<green.KeywordKind.Run>, StatementBlock, RunStatementClauseList];
+    get children(): readonly [Keyword<green.KeywordKind.Run>, StatementBlock];
     get runKeyword(): Keyword<KeywordKind.Run>;
     get body(): StatementBlock;
-    get clauseList(): RunStatementClauseList;
     protected get thisAsNode(): Node;
-    constructor(green: green.RunStatement, rangeStart: number, parent: RunStatementParent);
+    constructor(green: green.RunStatement, rangeStart: number, parent: StatementParent);
+    private createChildren;
+}
+export type TryStatementParent = StatementParent;
+export declare class TryStatement extends BaseNode {
+    readonly kind = NodeKind.TryStatement;
+    readonly green: green.TryStatement;
+    readonly parent: TryStatementParent;
+    private _children;
+    get children(): readonly [Keyword<green.KeywordKind.Try>, StatementBlock, CatchClause | undefined, FinallyClause | undefined];
+    get tryKeyword(): Keyword<KeywordKind.Try>;
+    get body(): StatementBlock;
+    get catchClause(): CatchClause | undefined;
+    get finallyClause(): FinallyClause | undefined;
+    protected get thisAsNode(): Node;
+    constructor(green: green.TryStatement, rangeStart: number, parent: TryStatementParent);
     private createChildren;
 }
-export type RunStatementClause = OnErrorClause | FinallyClause;
-export type OnErrorClauseParent = RunStatementClauseList;
-export declare class OnErrorClause extends BaseNode {
-    readonly kind = NodeKind.OnErrorClause;
-    readonly green: green.OnErrorClause;
-    readonly parent: OnErrorClauseParent;
+export type CatchClauseParent = TryStatement;
+export declare class CatchClause extends BaseNode {
+    readonly kind = NodeKind.CatchClause;
+    readonly green: green.CatchClause;
+    readonly parent: CatchClauseParent;
     private _children;
-    get children(): readonly [Keyword<green.KeywordKind.OnError>, ErrorVariableDeclaration | undefined, StatementBlock];
-    get onErrorKeyword(): Keyword<KeywordKind.OnError>;
+    get children(): readonly [Keyword<green.KeywordKind.Catch>, ErrorVariableDeclaration | undefined, StatementBlock];
+    get catchKeyword(): Keyword<KeywordKind.Catch>;
     get errorVariable(): ErrorVariableDeclaration | undefined;
     get body(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(green: green.OnErrorClause, rangeStart: number, parent: OnErrorClauseParent);
+    constructor(green: green.CatchClause, rangeStart: number, parent: CatchClauseParent);
     private createChildren;
 }
-export type ErrorVariableDeclarationParent = OnErrorClause;
+export type ErrorVariableDeclarationParent = CatchClause;
 export declare class ErrorVariableDeclaration extends BaseNode {
     readonly kind = NodeKind.ErrorVariableDeclaration;
     readonly green: green.ErrorVariableDeclaration;
@@ -1397,7 +1393,7 @@ export declare class ErrorVariableDeclaration extends BaseNode {
     constructor(green: green.ErrorVariableDeclaration, rangeStart: number, parent: ErrorVariableDeclarationParent);
     private createChildren;
 }
-export type FinallyClauseParent = RunStatementClauseList;
+export type FinallyClauseParent = TryStatement;
 export declare class FinallyClause extends BaseNode {
     readonly kind = NodeKind.FinallyClause;
     readonly green: green.FinallyClause;
@@ -1824,7 +1820,7 @@ export declare class PackageImportTranslation extends BaseNode {
     private createChildren;
 }
 export type QualifiedNamePart = Identifier | Token<TokenKind.Dot>;
-export type QualifiedNameParent = PackageImportTranslation | NamedTypeSpecifier | ExtendedTypeClause;
+export type QualifiedNameParent = PackageImportTranslation | NamedTypeSpecifier | ExtendedTypeClause | Tag;
 export declare class QualifiedName extends BaseNode {
     readonly kind = NodeKind.QualifiedName;
     readonly green: green.QualifiedName;
@@ -1976,18 +1972,18 @@ export declare class ParameterDeclaration extends BaseNode {
     constructor(green: green.ParameterDeclaration, rangeStart: number, parent: ParameterDeclarationParent);
     private createChildren;
 }
-export type CallArgumentParent = CallArgumentList;
-export declare class CallArgument extends BaseNode {
-    readonly kind = NodeKind.CallArgument;
-    readonly green: green.CallArgument;
-    readonly parent: CallArgumentParent;
+export type ArgumentParent = ArgumentList;
+export declare class Argument extends BaseNode {
+    readonly kind = NodeKind.Argument;
+    readonly green: green.Argument;
+    readonly parent: ArgumentParent;
     private _children;
     get children(): readonly [Identifier | undefined, Token<green.TokenKind.Equals> | undefined, Expression];
     get name(): Identifier | undefined;
     get equalsToken(): Token<TokenKind.Equals> | undefined;
     get value(): Expression;
     protected get thisAsNode(): Node;
-    constructor(green: green.CallArgument, rangeStart: number, parent: CallArgumentParent);
+    constructor(green: green.Argument, rangeStart: number, parent: ArgumentParent);
     private createChildren;
 }
 export type TagListParent = PackageMemberDeclaration | TypeMemberDeclaration | ParameterDeclaration;
@@ -2008,11 +2004,12 @@ export declare class Tag extends BaseNode {
     readonly green: green.Tag;
     readonly parent: TagParent;
     private _children;
-    get children(): readonly [Token<green.TokenKind.HashSign>, NamedTypeSpecifier, Token<green.TokenKind.OpenParenthesis> | undefined, CallArgumentList | undefined, Token<green.TokenKind.CloseParenthesis> | undefined];
+    get children(): readonly [Token<green.TokenKind.HashSign>, QualifiedName, TypeArgumentClause | undefined, Token<green.TokenKind.OpenParenthesis> | undefined, ArgumentList | undefined, Token<green.TokenKind.CloseParenthesis> | undefined];
     get hashSignToken(): Token<TokenKind.HashSign>;
-    get typeSpecifier(): NamedTypeSpecifier;
+    get name(): QualifiedName;
+    get typeArgumentClause(): TypeArgumentClause | undefined;
     get openParenthesisToken(): Token<TokenKind.OpenParenthesis> | undefined;
-    get callArgumentList(): CallArgumentList | undefined;
+    get argumentList(): ArgumentList | undefined;
     get closeParenthesisToken(): Token<TokenKind.CloseParenthesis> | undefined;
     protected get thisAsNode(): Node;
     constructor(green: green.Tag, rangeStart: number, parent: TagParent);
@@ -2076,34 +2073,7 @@ export declare class ParameterList extends BaseNode {
     constructor(green: green.ParameterList, rangeStart: number, parent: ParameterListParent);
     private createChildren;
 }
-export type SetterParameterClauseParent = PackageVariableSetterDeclaration | TypeVariableSetterDeclaration | TypeIndexedSetterDeclaration | TypeDereferencedVariableSetterDeclaration;
-export declare class SetterParameterClause extends BaseNode {
-    readonly kind = NodeKind.SetterParameterClause;
-    readonly green: green.SetterParameterClause;
-    readonly parent: SetterParameterClauseParent;
-    private _children;
-    get children(): readonly [Token<green.TokenKind.OpenParenthesis>, SetterParameterDeclaration, Token<green.TokenKind.CloseParenthesis>];
-    get openParenthesisToken(): Token<TokenKind.OpenParenthesis>;
-    get parameterDeclaration(): SetterParameterDeclaration;
-    get closeParenthesisToken(): Token<TokenKind.CloseParenthesis>;
-    protected get thisAsNode(): Node;
-    constructor(green: green.SetterParameterClause, rangeStart: number, parent: SetterParameterClauseParent);
-    private createChildren;
-}
-export type SetterParameterDeclarationParent = SetterParameterClause;
-export declare class SetterParameterDeclaration extends BaseNode {
-    readonly kind = NodeKind.SetterParameterDeclaration;
-    readonly green: green.SetterParameterDeclaration;
-    readonly parent: SetterParameterDeclarationParent;
-    private _children;
-    get children(): readonly [Identifier, TypeAnnotation];
-    get name(): Identifier;
-    get typeAnnotation(): TypeAnnotation;
-    protected get thisAsNode(): Node;
-    constructor(green: green.SetterParameterDeclaration, rangeStart: number, parent: SetterParameterDeclarationParent);
-    private createChildren;
-}
-export type TypeArgumentClauseParent = NamedTypeSpecifier | GenericSpecializationExpression;
+export type TypeArgumentClauseParent = NamedTypeSpecifier | GenericSpecializationExpression | Tag;
 export declare class TypeArgumentClause extends BaseNode {
     readonly kind = NodeKind.TypeArgumentClause;
     readonly green: green.TypeArgumentClause;
@@ -2159,7 +2129,7 @@ export declare class TypeParameterList extends BaseNode {
     constructor(green: green.TypeParameterList, rangeStart: number, parent: TypeParameterListParent);
     private createChildren;
 }
-export type TypeAnnotationParent = PackageMethodDeclaration | MethodTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | MethodLiteral | ParameterDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | ErrorVariableDeclaration | SetterParameterDeclaration;
+export type TypeAnnotationParent = PackageMethodDeclaration | MethodTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | MethodLiteral | ParameterDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | ErrorVariableDeclaration;
 export declare class TypeAnnotation extends BaseNode {
     readonly kind = NodeKind.TypeAnnotation;
     readonly green: green.TypeAnnotation;
@@ -2172,4 +2142,4 @@ export declare class TypeAnnotation extends BaseNode {
     constructor(green: green.TypeAnnotation, rangeStart: number, parent: TypeAnnotationParent);
     private createChildren;
 }
-export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | CallArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatementClauseList | RunStatement | OnErrorClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | SwitchStatementCaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | CallArgument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | SetterParameterClause | SetterParameterDeclaration | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;
+export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | SwitchStatementCaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;

package/build/types/ts-interop/Entities.d.ts

@@ -5,9 +5,8 @@ import type { PackageEntity } from '../entities/PackageEntity.js';
 import { PackageEntityDefinition } from '../entities/PackageEntity.js';
 import { OriginalPackageMembers } from '../entities/PackageMembers.js';
 import { OriginalTypeEntityMembers } from '../entities/TypeEntityMembers.js';
-import { OriginalVariants } from '../entities/Variants.js';
 import type { EntityContainingTypeParameter, EntityContainingValueParameter, EntityOwningGetter, TypeEntityWithMembers, VariantTypeEntity } from '../entities/index.js';
-import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousMethodTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntityDefinition, MethodTypeEntityDefinition, PackageMethodEntity, PackageMethodTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterVariableEntity, ParameterVariableEntityContainer, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, SubstitutionApplicationMode, TypeMemberEntityContainer, TypeMethodEntity, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, TypeVariableEntity, VariableEntityDefinition, VariantEntity, VariantEntityDefinition, VariantTypeEntityDefinition } from '../entities/index.js';
+import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousMethodTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntityDefinition, MethodTypeEntityDefinition, PackageMethodEntity, PackageMethodTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterVariableEntity, ParameterVariableEntityContainer, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, SubstitutionApplicationMode, TypeEntityKind, TypeMemberEntityContainer, TypeMethodEntity, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, TypeVariableEntity, VariableEntityDefinition, VariantTypeEntityDefinition } from '../entities/index.js';
 import { JavaScriptImplementationConfig, PackageName, PlatformKind, ProgramPackage } from '../project/index.js';
 import * as tree from '../tree/index.js';
 import * as types from '../types/index.js';
@@ -142,7 +141,8 @@ export declare class TsGlobalClassOrInterfaceEntity implements PackageStructured
     private readonly _isDefaultExport;
     private readonly _containingPackage;
     private readonly _forceHiddenInPackage;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _members;
@@ -174,7 +174,8 @@ export declare class SourceAndTsGlobalClassOrInterfaceMergeEntity implements Pac
     private readonly _symbol;
     private readonly _isDefaultExport;
     private readonly _node;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "package";
     private readonly _sourceData;
     private readonly _members;
@@ -201,7 +202,8 @@ export declare class TsTypeLiteralEntity implements AnonymousStructuredTypeEntit
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _containingPackage;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "anonymous";
     private readonly _baseObjectType;
     private readonly _baseAspectTypes;
@@ -232,7 +234,8 @@ export declare class TsNamedTypeLiteralEntity implements PackageStructuredTypeEn
     private readonly _owningDeclarationWithTypeParameters;
     private readonly _containingPackage;
     private readonly _forceHiddenInPackage;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _baseObjectType;
@@ -262,7 +265,8 @@ export declare class SourceAndTsNamedTypeLiteralMergeEntity implements PackageSt
     private readonly _symbol;
     private readonly _isDefaultExport;
     private readonly _node;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "package";
     private readonly _sourceData;
     private readonly _members;
@@ -293,7 +297,7 @@ export declare class TsPropertyEntity implements TypeVariableEntity {
     readonly kind = EntityKind.Variable;
     readonly subkind = "type";
     private readonly _type;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingType: TypeEntityWithMembers, _forceStatic: boolean);
     getName(): Name;
     getType(): types.Type;
@@ -309,7 +313,8 @@ export declare class TsPropertyEntity implements TypeVariableEntity {
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
-    getOverriddenMember(): types.Variable | undefined;
+    getOverriddenMembers(): readonly types.Variable[];
+    isVariant(): boolean;
     private getDeclaration;
 }
 export declare class TsAccessorEntity implements TypeVariableEntity {
@@ -322,7 +327,7 @@ export declare class TsAccessorEntity implements TypeVariableEntity {
     private readonly _type;
     private readonly _getter;
     private readonly _setter;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingType: TypeEntityWithMembers, _forceStatic: boolean);
     getName(): Name;
     getType(): types.Type;
@@ -338,7 +343,8 @@ export declare class TsAccessorEntity implements TypeVariableEntity {
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
-    getOverriddenMember(): types.Variable | undefined;
+    getOverriddenMembers(): readonly types.Variable[];
+    isVariant(): boolean;
     private getGetAccessorDeclaration;
 }
 export declare class TsGetAccessorEntity implements GetterEntity {
@@ -380,7 +386,7 @@ export declare class TsMethodEntity implements TypeMethodEntity {
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _returnType;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _declaration: ts.MethodDeclaration | ts.MethodSignature, _containingType: TypeEntityWithMembers, _forceStatic: boolean);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -399,7 +405,7 @@ export declare class TsMethodEntity implements TypeMethodEntity {
     getTypeParametersArity(): number;
     isMethodTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getOverriddenMember(): types.Method | undefined;
+    getOverriddenMembers(): readonly types.Method[];
 }
 export declare class TsIteratorMethodEntity implements TypeMethodEntity {
     private readonly _tsctx;
@@ -408,7 +414,7 @@ export declare class TsIteratorMethodEntity implements TypeMethodEntity {
     readonly kind = EntityKind.Method;
     readonly subkind = "type";
     private readonly _returnType;
-    private readonly _overriddenMethod;
+    private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingType: TypeEntityWithMembers);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -427,7 +433,7 @@ export declare class TsIteratorMethodEntity implements TypeMethodEntity {
     getTypeParametersArity(): number;
     isMethodTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getOverriddenMember(): types.Method | undefined;
+    getOverriddenMembers(): readonly types.Method[];
     private getFirstDeclaration;
 }
 export declare class TsParameterEntity implements ParameterVariableEntity {
@@ -456,7 +462,8 @@ export declare class TsTypeParameterEntity implements TypeParameterEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _containingEntity;
-    readonly kind = EntityKind.TypeParameter;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Parameter;
     private readonly _constraint;
     private readonly _defaultType;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingEntity: EntityContainingTypeParameter);
@@ -468,6 +475,7 @@ export declare class TsTypeParameterEntity implements TypeParameterEntity {
     getTypeParameters(): readonly TypeParameterEntity[];
     getContainingEntity(): EntityContainingTypeParameter;
     isHidden(): EntityHidingLevel | undefined;
+    getTags(): readonly Tag[];
     private getDeclaration;
 }
 export declare class TsIndexSignatureEntity implements IndexerEntity {
@@ -481,7 +489,7 @@ export declare class TsIndexSignatureEntity implements IndexerEntity {
     private readonly _type;
     private readonly _getter;
     private readonly _setter;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _declaration: ts.IndexSignatureDeclaration, _containingType: TypeEntityWithMembers, _forceStatic: boolean);
     getValueParameters(): readonly ParameterVariableEntity[];
     getType(): types.Type;
@@ -495,7 +503,7 @@ export declare class TsIndexSignatureEntity implements IndexerEntity {
     isRedefined(): boolean;
     isAbstract(): boolean;
     getTags(): readonly Tag[];
-    getOverriddenMember(): types.Indexer | undefined;
+    getOverriddenMembers(): readonly types.Indexer[];
 }
 export declare class TsConstructorEntity implements ConstructorEntity {
     private readonly _tsctx;
@@ -533,9 +541,9 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     private readonly _symbol;
     private readonly _isDefaultExport;
     private readonly _containingPackage;
-    readonly kind = EntityKind.VariantType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Variant;
     readonly subkind = "package";
-    private readonly _variants;
     private readonly _members;
     private readonly _underlyingType;
     private readonly _baseObjectType;
@@ -543,7 +551,6 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     getNaming(): EntityNaming;
     getName(): Name;
     getContainingPackage(): PackageEntity;
-    getVariants(): OriginalVariants;
     getMembers(): OriginalTypeEntityMembers;
     getUnderlyingType(): types.Type;
     getDefinition(): VariantTypeEntityDefinition;
@@ -554,15 +561,28 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
 }
-export declare class TsEnumMemberEntity implements VariantEntity {
+export declare class TsEnumMemberEntity implements TypeVariableEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _variantTypeEntity;
-    readonly kind = EntityKind.Variant;
+    readonly kind = EntityKind.Variable;
+    readonly subkind = "type";
+    private readonly _type;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _variantTypeEntity: VariantTypeEntity);
+    getContainer(): TypeMemberEntityContainer;
+    isStatic(): boolean;
+    isRedefinable(): boolean;
+    isRedefined(): boolean;
+    isAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Variable[];
+    isVariant(): boolean;
+    getType(): types.Type;
+    getGetter(): GetterEntity | undefined;
+    getSetter(): SetterEntity | undefined;
+    isConstant(): boolean;
+    isSpecial(): SpecialVariableEntityInfo | undefined;
     getName(): Name;
-    getDefinition(): VariantEntityDefinition;
-    getContainingEntity(): VariantTypeEntity;
+    getDefinition(): VariableEntityDefinition;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
@@ -571,7 +591,8 @@ export declare class TsTypeAliasEntity implements AliasTypeEntity {
     private readonly _symbol;
     private readonly _isDefaultExport;
     private readonly _containingPackage;
-    readonly kind = EntityKind.AliasType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Alias;
     private readonly _aliasedType;
     private readonly _typeParameters;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _isDefaultExport: boolean, _containingPackage: PackageEntity);
@@ -592,7 +613,8 @@ export declare class TsAnonymousFunctionTypeEntity implements AnonymousMethodTyp
     private readonly _symbol;
     private readonly _declaration;
     private readonly _containingPackage;
-    readonly kind = EntityKind.MethodType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Method;
     readonly subkind = "anonymous";
     private readonly _valueParameters;
     private readonly _returnType;
@@ -633,7 +655,8 @@ export declare class TsNamedFunctionTypeEntity implements PackageMethodTypeEntit
     private readonly _owningDeclarationWithTypeParameters;
     private readonly _containingPackage;
     private readonly _forceHiddenInPackage;
-    readonly kind = EntityKind.MethodType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Method;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;