@artel/artc 0.6.25218 → 0.6.25220

package/build/types/analysis/Analyzer.d.ts

@@ -29,6 +29,7 @@ import { ImportedPackageNameTree, PackageNameTreeNode } from './ImportedPackageN
 import * as indexedAccessExpressionMeaning from './IndexedAccessExpressionMeaning.js';
 import { WithLocalization } from './Localization.js';
 import { LocalizationContext } from './LocalizationContext.js';
+import { ModifierFlags } from './ModifierFlags.js';
 import { NamedTypeSpecifierResolutionResult } from './NamedTypeSpecifierResolver.js';
 import { GetterDeclaration, MethodTypeDeclaration, PackageVariableAccessorDeclaration, SetterDeclaration, StructuredTypeDeclaration, TypeDereferencedVariableAccessorDeclaration, TypeIndexedAccessorDeclaration, TypeVariableAccessorDeclaration, VariantTypeDeclaration } from './NodeTypeUtils.js';
 import * as objectExpressionMeaning from './ObjectExpressionMeaning.js';
@@ -42,7 +43,6 @@ import * as tags from './Tags.js';
 import { TargetTypeHint } from './TargetTypeHint.js';
 import * as typeOverloadResolver from './TypeOverloadResolver.js';
 import { WellKnownDeclarations } from './index.js';
-import { ModifierFlags } from './ModifierFlags.js';
 export declare class Analyzer {
     static readonly enumeratorMethodName = "\u043F\u0435\u0440\u0435\u0431\u043E\u0440";
     static readonly methodTypeInvokeMethodName = "\u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C";
@@ -387,6 +387,9 @@ declare class Entity {
     private createTypeIndexerEntities;
     private areTypeIndexedAccessorDeclarationsEqual;
 }
+type EntityClassMembers = Entity[keyof Entity];
+type GetNodesFromMethodsParameter<T> = T extends (node: infer TNode) => e.Entity ? (TNode extends tree.Node ? TNode : never) : never;
+export type NodeCorrespondingToEntity = GetNodesFromMethodsParameter<EntityClassMembers>;
 declare class ResultLocalVariableEntity {
     private readonly _analyzer;
     private readonly _entities;

package/build/types/analysis/ArgumentToParameterMatchResult.d.ts

@@ -1,5 +1,5 @@
 import { Diagnostic } from '../diagnostic/Diagnostic.js';
-import { VariableEntity } from '../entities/index.js';
+import { ParameterVariableEntity } from '../entities/index.js';
 import { Argument, AutotypeCallExpression, CallExpression, IndexedAccessExpression, Tag } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { LocalizedName } from './Localization.js';
@@ -22,8 +22,8 @@ export declare class MatchResult {
     constructor(parameterByArgument: ReadonlyMap<Argument, MatchResultValueParameter>, unmatchedParameters: readonly MatchResultValueParameter[], diagnostics: readonly Diagnostic[]);
 }
 export declare class MatchResultValueParameter {
-    readonly entity: VariableEntity;
+    readonly entity: ParameterVariableEntity;
     readonly type: types.Type;
     readonly name: LocalizedName;
-    constructor(entity: VariableEntity, type: types.Type, name: LocalizedName);
+    constructor(entity: ParameterVariableEntity, type: types.Type, name: LocalizedName);
 }

package/build/types/analysis/SemanticContext.d.ts

@@ -21,7 +21,7 @@ export interface SemanticContext {
     getContainingSourceFile(): SourceFile;
     getContainingPackage(): PackageEntity;
     getLocalizationContext(): LocalizationContext;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
     getScopeLookup(): Lookup;
     getHidingMatcher(): IEntityHidingMatcher;
@@ -143,7 +143,7 @@ export declare namespace TypeOrTypeExtension {
     }
     export {};
 }
-export declare class RunStatementClausesInfo {
+export declare class TryStatementClausesInfo {
     readonly hasCatchClause: boolean;
     readonly hasFinallyClause: boolean;
     constructor(hasCatchClause: boolean, hasFinallyClause: boolean);
@@ -157,7 +157,7 @@ declare abstract class SemanticContextWithParent implements SemanticContext {
     getContainingSourceFile(): SourceFile;
     getContainingPackage(): PackageEntity;
     getLocalizationContext(): LocalizationContext;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
     getScopeLookup(): Lookup;
     getHidingMatcher(): IEntityHidingMatcher;
@@ -173,7 +173,7 @@ export declare class SourceFileSemanticContext implements SemanticContext {
     getContainingTypeOrTypeExtension(): TypeOrTypeExtension | undefined;
     getContainingSourceFile(): SourceFile;
     getContainingPackage(): PackageEntity;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
     getScopeLookup(): Lookup;
     getLocalizationContext(): LocalizationContext;
@@ -190,7 +190,7 @@ export declare class LastSemanticContextOfType extends SemanticContextWithParent
     constructor(analyzer: Analyzer, node: TypeDeclarationCreatingSemanticContext, parentContext: SemanticContext);
     getContainingTypeOrTypeExtension(): TypeOrTypeExtension | undefined;
     getContainingSubprogram(): SubprogramInfo | undefined;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
     private getContainingType;
 }
@@ -229,7 +229,7 @@ export declare class LastSemanticContextOfMethod extends SemanticContextWithPare
     private readonly _subprogramInfo;
     constructor(analyzer: Analyzer, node: MethodDeclaration, parentContext: SemanticContext);
     getContainingSubprogram(): SubprogramInfo | undefined;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
 }
 export declare class MethodTypeParameterSemanticContext extends SemanticContextWithParent {
@@ -317,7 +317,7 @@ export declare class StatementBlockSemanticContext extends SemanticContextWithPa
     private readonly _scopeChain;
     constructor(analyzer: Analyzer, node: tree.StatementBlock, parentContext: SemanticContext);
     getScopeChain(): ScopeChain;
-    isInRunStatementWithClauses(): RunStatementClausesInfo | undefined;
+    isInTryStatement(): TryStatementClausesInfo | undefined;
     isInFinallyClause(): boolean;
 }
 export type RegularOrBlockMethodLiteral = tree.MethodLiteral | tree.MethodBlockLiteral;

package/build/types/analysis/Tags.d.ts

@@ -1,12 +1,23 @@
-import { VariableEntity } from '../entities/index.js';
+import { ParameterVariableEntity } from '../entities/index.js';
 import * as types from '../types/index.js';
-export declare class Tag {
-    readonly type: types.Type;
-    readonly constructor_: types.Constructor;
-    readonly argumentByParameter: ReadonlyMap<VariableEntity, TagArgument>;
+import { AccessedMethod } from './AccessedMethod.js';
+export type Tag = TagType | TagMethod;
+declare abstract class TagBase {
+    readonly argumentByParameter: ReadonlyMap<ParameterVariableEntity, TagArgument>;
     private readonly _argumentByName;
     get argumentByName(): ReadonlyMap<string, TagArgument>;
-    constructor(type: types.Type, constructor_: types.Constructor, argumentByParameter: ReadonlyMap<VariableEntity, TagArgument>);
+    constructor(argumentByParameter: ReadonlyMap<ParameterVariableEntity, TagArgument>);
+}
+export declare class TagType extends TagBase {
+    readonly kind = "type";
+    readonly type: types.Type;
+    readonly constructor_: types.Constructor;
+    constructor(type: types.Type, constructor_: types.Constructor, argumentByParameter: ReadonlyMap<ParameterVariableEntity, TagArgument>);
+}
+export declare class TagMethod extends TagBase {
+    readonly kind = "method";
+    readonly method: AccessedMethod;
+    constructor(method: AccessedMethod, argumentByParameter: ReadonlyMap<ParameterVariableEntity, TagArgument>);
 }
 export type TagArgument = TagArgument_string | TagArgument_numeric | TagArgument_boolean | TagArgument_invalid;
 export declare class TagArgument_string {
@@ -27,3 +38,4 @@ export declare class TagArgument_boolean {
 export declare class TagArgument_invalid {
     readonly kind = "invalid";
 }
+export {};

package/build/types/analysis/Utils.d.ts

@@ -1,7 +1,7 @@
-import { Entity, PackageEntity, StructuredTypeEntity, TypeParameterEntity, VariableEntity } from '../entities/index.js';
+import { Entity, MethodEntity, PackageEntity, StructuredTypeEntity, TypeParameterEntity, VariableEntity } from '../entities/index.js';
 import * as tree from '../tree/index.js';
 import * as types from '../types/index.js';
-import { Tag } from './Tags.js';
+import { Tag, TagMethod, TagType } from './Tags.js';
 type TextToken = tree.Token<tree.TokenKind.TextLiteral> | tree.Token<tree.TokenKind.TextTemplateHead> | tree.Token<tree.TokenKind.TextTemplatePart> | tree.Token<tree.TokenKind.TextTemplateTail>;
 export declare function getUnescapedTextFromTextToken(token: TextToken): string;
 export declare function unwrapParenthesizedExpressions(expression: tree.Expression): tree.Expression;
@@ -9,7 +9,8 @@ export declare function getParentSkippingParenthesizedExpressions(expression: tr
 export declare function unaliasType(type: types.Type): types.Type;
 export declare function unaliasType(type: types.Type | undefined): types.Type | undefined;
 export declare function getPackageContainingEntity(entity: Entity): PackageEntity;
-export declare function findTag(tagTypeEntity: StructuredTypeEntity, tags: readonly Tag[]): Tag | undefined;
+export declare function findTag(tagTypeEntity: StructuredTypeEntity, tags: readonly Tag[]): TagType | undefined;
+export declare function findTag(tagMethodEntity: MethodEntity, tags: readonly Tag[]): TagMethod | undefined;
 export declare function getRequiredTypeParameterCount(typeParameters: readonly TypeParameterEntity[]): number;
 export declare function flattenPackageMemberDeclarationList(list: tree.PackageMemberDeclarationList): Iterable<Exclude<tree.PackageMemberDeclaration, tree.PackageMemberGroupDeclaration>>;
 export declare function flattenTypeMemberDeclarationList(list: tree.TypeMemberDeclarationList): Iterable<Exclude<tree.TypeMemberDeclaration, tree.TypeMemberGroupDeclaration>>;

package/build/types/diagnostic/DiagnosticCode.d.ts

@@ -23,7 +23,7 @@ export declare enum DiagnosticCode {
     TranslationExpected = 21,
     Expected0But1Found = 22,
     InvalidTextTemplateLiteral = 23,
-    RunKeywordOnCreateKeywordOrModifierListExpected = 24,
+    RunKeywordCreationKeywordOrModifierListExpected = 24,
     ModifierListExpected = 25,
     HidingLevelExpected = 26,
     ParameterNameCanContainOnlyOneBackQuote = 27,
@@ -89,7 +89,7 @@ export declare enum DiagnosticCode {
     YieldStatementCanNotBeUsedInAnonymousMethods = 87,
     YieldStatementCanNotBeUsedHere = 88,
     MethodsUsingYieldStatementMustHaveEnumerableAsReturnType = 89,
-    YieldStatementCanNotBeUsedInRunStatementThatHasCatchClause = 90,
+    YieldStatementCanNotBeUsedInTryStatementThatHasCatchClause = 90,
     YieldStatementCanNotBeUsedInFinallyClause = 91,
     SubprogramMustReturnValue = 92,
     ResultVariableCanNotBeUsedInMethodsUsingYieldStatement = 93,

package/build/types/emitter/IrToJs.d.ts

@@ -89,6 +89,7 @@ export declare class IrToJs {
     private convertJsPropertyAccessExpression;
     private convertStatements;
     private convertStatement;
+    private convertTryStatement;
     private convertAssignmentStatement;
     private convertBreakLoopStatement;
     private convertContinueLoopStatement;
@@ -104,7 +105,6 @@ export declare class IrToJs {
     private convertSwitchStatement;
     private convertWhileStatement;
     private convertYieldStatement;
-    private convertTryCatchFinallyStatement;
     private convertAssignmentOperator;
     private convertTypeConstructorDeclaration;
     private convertTypeMethodDeclaration;

package/build/types/emitter/Transformer.d.ts

@@ -20,6 +20,7 @@ export declare class Transformer {
     transformContinueLoopStatementChildren(_statement: ir.ContinueLoopStatement): void;
     transformDisposeStatementChildren(statement: ir.DisposeStatement): void;
     transformRunStatementChildren(statement: ir.RunStatement): void;
+    transformTryStatementChildren(statement: ir.TryStatement): void;
     transformEmptyStatementChildren(_statement: ir.EmptyStatement): void;
     transformErrorStatementChildren(statement: ir.ErrorStatement): void;
     transformExpressionStatementChildren(statement: ir.ExpressionStatement): void;
@@ -40,7 +41,6 @@ export declare class Transformer {
     transformCaseClause(caseClause: ir.CaseClause): ir.CaseClause;
     transformWhileStatementChildren(statement: ir.WhileStatement): void;
     transformYieldStatementChildren(statement: ir.YieldStatement): void;
-    transformTryCatchFinallyStatementChildren(statement: ir.TryCatchFinallyStatement): void;
     transformEsModuleImportDirectiveStatementChildren(_statement: ir.EsModuleImportDirectiveStatement): void;
     transformCjsModuleImportDirectiveStatementChildren(_statement: ir.CjsModuleImportDirectiveStatement): void;
     transformJsNamespaceDestructuringStatementChildren(_statement: ir.JsNamespaceDestructuringStatement): void;
@@ -165,6 +165,7 @@ export interface TransformationConfig {
     transformContinueLoopStatement?(statement: ir.ContinueLoopStatement): StatementTransformationResult;
     transformDisposeStatement?(statement: ir.DisposeStatement): StatementTransformationResult;
     transformRunStatement?(statement: ir.RunStatement): StatementTransformationResult;
+    transformTryStatement?(statement: ir.TryStatement): StatementTransformationResult;
     transformEmptyStatement?(statement: ir.EmptyStatement): StatementTransformationResult;
     transformErrorStatement?(statement: ir.ErrorStatement): StatementTransformationResult;
     transformExpressionStatement?(statement: ir.ExpressionStatement): StatementTransformationResult;
@@ -178,7 +179,6 @@ export interface TransformationConfig {
     transformWhileStatement?(statement: ir.WhileStatement): StatementTransformationResult;
     transformYieldStatement?(statement: ir.YieldStatement): StatementTransformationResult;
     transformAssignmentStatement?(statement: ir.AssignmentStatement): StatementTransformationResult;
-    transformTryCatchFinallyStatement?(statement: ir.TryCatchFinallyStatement): StatementTransformationResult;
     transformEsModuleImportDirectiveStatement?(statement: ir.EsModuleImportDirectiveStatement): StatementTransformationResult;
     transformCjsModuleImportDirectiveStatement?(statement: ir.CjsModuleImportDirectiveStatement): StatementTransformationResult;
     transformJsNamespaceDestructuringStatement?(statement: ir.JsNamespaceDestructuringStatement): StatementTransformationResult;

package/build/types/emitter/ir/Nodes.d.ts

@@ -614,13 +614,20 @@ export declare class ReturnStatement {
 }
 export declare class RunStatement {
     body: BlockStatement;
-    catchClauses: readonly CatchClause[];
-    finallyClause: FinallyClause | undefined;
     sourceLocation: SourceLocation | undefined;
     readonly kind = NodeKind.RunStatement;
-    constructor(body: BlockStatement, catchClauses: readonly CatchClause[], finallyClause: FinallyClause | undefined, sourceLocation: SourceLocation | undefined);
+    constructor(body: BlockStatement, sourceLocation: SourceLocation | undefined);
     clone(): RunStatement;
 }
+export declare class TryStatement {
+    body: BlockStatement;
+    catchClause: CatchClause | undefined;
+    finallyClause: FinallyClause | undefined;
+    sourceLocation: SourceLocation | undefined;
+    readonly kind = NodeKind.TryStatement;
+    constructor(body: BlockStatement, catchClause: CatchClause | undefined, finallyClause: FinallyClause | undefined, sourceLocation: SourceLocation | undefined);
+    clone(): TryStatement;
+}
 export declare class Package {
     leadingStatements: readonly Statement[];
     declarations: readonly PackageMemberDeclaration[];
@@ -690,16 +697,6 @@ export declare class ThisExpression {
     constructor(type: Type, sourceLocation: SourceLocation | undefined);
     clone(): ThisExpression;
 }
-export declare class TryCatchFinallyStatement {
-    body: BlockStatement;
-    errorParameter: VariableEntity | undefined;
-    catchClauseBody: BlockStatement | undefined;
-    finallyClauseBody: BlockStatement | undefined;
-    sourceLocation: SourceLocation | undefined;
-    readonly kind = NodeKind.TryCatchFinallyStatement;
-    constructor(body: BlockStatement, errorParameter: VariableEntity | undefined, catchClauseBody: BlockStatement | undefined, finallyClauseBody: BlockStatement | undefined, sourceLocation: SourceLocation | undefined);
-    clone(): TryCatchFinallyStatement;
-}
 export declare class TypeAccessExpression {
     entity: TypeOrExtensionEntity;
     sourceLocation: SourceLocation | undefined;
@@ -912,62 +909,62 @@ export declare const enum NodeKind {
     ContinueLoopStatement = 12,
     DisposeStatement = 13,
     RunStatement = 14,
-    NoneLiteral = 15,
-    EmptyStatement = 16,
-    ErrorStatement = 17,
-    ExpressionStatement = 18,
-    FinallyClause = 19,
-    ForStatement = 20,
-    PackageMethodDeclaration = 21,
-    PackageTypeDeclaration = 22,
-    PackageVariableDeclaration = 23,
-    PackageVariableGetterDeclaration = 24,
-    PackageVariableSetterDeclaration = 25,
-    PackageVariantTypeDeclaration = 26,
-    IfStatement = 27,
-    IndexedAccessExpression = 28,
-    IntegerLiteral = 29,
-    IsExpression = 30,
-    NestedMethodDeclaration = 31,
-    NestedMethodDeclarationStatement = 32,
-    LocalVariableDeclaration = 33,
-    LocalVariableDeclarationStatement = 34,
-    NumericLiteral = 35,
-    CatchClause = 36,
-    MethodLiteral = 37,
-    PrefixUnaryExpression = 38,
-    MeasureLiteral = 39,
-    ReferenceExpression = 40,
-    LoopStatement = 41,
-    ReturnStatement = 42,
-    Package = 43,
-    TextLiteral = 44,
-    TextTemplateLiteral = 45,
-    TypeConstructorDeclaration = 46,
-    TypeDestructorDeclaration = 47,
-    TypeIndexedGetterDeclaration = 48,
-    TypeIndexedSetterDeclaration = 49,
-    TypeMethodDeclaration = 50,
-    TypeVariableDeclaration = 51,
-    TypeVariableGetterDeclaration = 52,
-    TypeVariableSetterDeclaration = 53,
-    SwitchStatement = 54,
-    TernaryExpression = 55,
-    ThisExpression = 56,
-    ValueParameterDeclaration = 57,
-    VariantDeclaration = 58,
-    WhileStatement = 59,
-    YieldStatement = 60,
-    ArrayLiteral = 61,
-    TypeAccessExpression = 62,
-    VariableAccessExpression = 63,
-    MethodAccessExpression = 64,
-    ImplicitVariantAccessExpression = 65,
-    VariantAccessExpression = 66,
-    TypeVariableAccessExpression = 67,
-    TypeMethodAccessExpression = 68,
-    ConstructorCallExpression = 69,
-    TryCatchFinallyStatement = 70,
+    TryStatement = 15,
+    NoneLiteral = 16,
+    EmptyStatement = 17,
+    ErrorStatement = 18,
+    ExpressionStatement = 19,
+    FinallyClause = 20,
+    ForStatement = 21,
+    PackageMethodDeclaration = 22,
+    PackageTypeDeclaration = 23,
+    PackageVariableDeclaration = 24,
+    PackageVariableGetterDeclaration = 25,
+    PackageVariableSetterDeclaration = 26,
+    PackageVariantTypeDeclaration = 27,
+    IfStatement = 28,
+    IndexedAccessExpression = 29,
+    IntegerLiteral = 30,
+    IsExpression = 31,
+    NestedMethodDeclaration = 32,
+    NestedMethodDeclarationStatement = 33,
+    LocalVariableDeclaration = 34,
+    LocalVariableDeclarationStatement = 35,
+    NumericLiteral = 36,
+    CatchClause = 37,
+    MethodLiteral = 38,
+    PrefixUnaryExpression = 39,
+    MeasureLiteral = 40,
+    ReferenceExpression = 41,
+    LoopStatement = 42,
+    ReturnStatement = 43,
+    Package = 44,
+    TextLiteral = 45,
+    TextTemplateLiteral = 46,
+    TypeConstructorDeclaration = 47,
+    TypeDestructorDeclaration = 48,
+    TypeIndexedGetterDeclaration = 49,
+    TypeIndexedSetterDeclaration = 50,
+    TypeMethodDeclaration = 51,
+    TypeVariableDeclaration = 52,
+    TypeVariableGetterDeclaration = 53,
+    TypeVariableSetterDeclaration = 54,
+    SwitchStatement = 55,
+    TernaryExpression = 56,
+    ThisExpression = 57,
+    ValueParameterDeclaration = 58,
+    VariantDeclaration = 59,
+    WhileStatement = 60,
+    YieldStatement = 61,
+    ArrayLiteral = 62,
+    TypeAccessExpression = 63,
+    VariableAccessExpression = 64,
+    MethodAccessExpression = 65,
+    ImplicitVariantAccessExpression = 66,
+    VariantAccessExpression = 67,
+    TypeVariableAccessExpression = 68,
+    TypeMethodAccessExpression = 69,
+    ConstructorCallExpression = 70,
     InlineJsExpression = 71,
     AssignmentExpression = 72,
     CommaExpression = 73,

package/build/types/emitter/ir/types.d.ts

@@ -1,7 +1,7 @@
 import * as ir from './Nodes.js';
-export type Node = ir.ArrayLiteral | ir.AsExpression | ir.AssertionExpression | ir.AssumptionExpression | ir.AssignmentExpression | ir.AssignmentStatement | ir.BaseConstructorCallExpression | ir.BinaryExpression | ir.BlockStatement | ir.BooleanLiteral | ir.BreakLoopStatement | ir.CallExpression | ir.CharLiteral | ir.CommaExpression | ir.ConstructorCallExpression | ir.ContinueLoopStatement | ir.DisposeStatement | ir.RunStatement | ir.NoneLiteral | ir.EmptyStatement | ir.ErrorStatement | ir.ExpressionStatement | ir.FinallyClause | ir.ForStatement | ir.PackageMethodDeclaration | ir.PackageTypeDeclaration | ir.PackageVariableDeclaration | ir.PackageVariableGetterDeclaration | ir.PackageVariableSetterDeclaration | ir.PackageVariantTypeDeclaration | ir.IfStatement | ir.IndexedAccessExpression | ir.InlineJsExpression | ir.TypeMethodAccessExpression | ir.TypeVariableAccessExpression | ir.IntegerLiteral | ir.IsExpression | ir.JsIndexedAccessExpression | ir.NestedMethodDeclaration | ir.NestedMethodDeclarationStatement | ir.LocalVariableDeclaration | ir.LocalVariableDeclarationStatement | ir.NumericLiteral | ir.CatchClause | ir.MethodAccessExpression | ir.MethodLiteral | ir.PrefixUnaryExpression | ir.MeasureLiteral | ir.ReferenceExpression | ir.LoopStatement | ir.Package | ir.ReturnStatement | ir.TextLiteral | ir.TextTemplateLiteral | ir.TypeConstructorDeclaration | ir.TypeDestructorDeclaration | ir.TypeIndexedGetterDeclaration | ir.TypeIndexedSetterDeclaration | ir.TypeMethodDeclaration | ir.TypeVariableDeclaration | ir.ComputedTypeVariableDeclaration | ir.TypeVariableGetterDeclaration | ir.TypeVariableSetterDeclaration | ir.SwitchStatement | ir.TernaryExpression | ir.ThisExpression | ir.TryCatchFinallyStatement | ir.TypeAccessExpression | ir.ValueParameterDeclaration | ir.VariableAccessExpression | ir.VariantDeclaration | ir.WhileStatement | ir.YieldStatement | ir.JsObjectLiteral | ir.NamedJsObjectLiteralProperty | ir.SpreadJsObjectLiteralProperty | ir.JsPropertyAccessExpression | ir.JsFunctionLiteral | ir.JsTypeOfExpression | ir.JsInstanceOfExpression | ir.JsIdentifierExpression | ir.DereferenceExpression | ir.BaseExpression | ir.OwnConstructorCallExpression | ir.EsModuleImportDirectiveStatement | ir.CjsModuleImportDirectiveStatement | ir.JsNamespaceDestructuringStatement | ir.TypeDereferencedVariableGetterDeclaration | ir.TypeDereferencedVariableSetterDeclaration | ir.TextWithEntityName | ir.Argument | ir.Arguments | ir.Decorator;
+export type Node = ir.ArrayLiteral | ir.AsExpression | ir.AssertionExpression | ir.AssumptionExpression | ir.AssignmentExpression | ir.AssignmentStatement | ir.BaseConstructorCallExpression | ir.BinaryExpression | ir.BlockStatement | ir.BooleanLiteral | ir.BreakLoopStatement | ir.CallExpression | ir.CharLiteral | ir.CommaExpression | ir.ConstructorCallExpression | ir.ContinueLoopStatement | ir.DisposeStatement | ir.RunStatement | ir.TryStatement | ir.NoneLiteral | ir.EmptyStatement | ir.ErrorStatement | ir.ExpressionStatement | ir.FinallyClause | ir.ForStatement | ir.PackageMethodDeclaration | ir.PackageTypeDeclaration | ir.PackageVariableDeclaration | ir.PackageVariableGetterDeclaration | ir.PackageVariableSetterDeclaration | ir.PackageVariantTypeDeclaration | ir.IfStatement | ir.IndexedAccessExpression | ir.InlineJsExpression | ir.TypeMethodAccessExpression | ir.TypeVariableAccessExpression | ir.IntegerLiteral | ir.IsExpression | ir.JsIndexedAccessExpression | ir.NestedMethodDeclaration | ir.NestedMethodDeclarationStatement | ir.LocalVariableDeclaration | ir.LocalVariableDeclarationStatement | ir.NumericLiteral | ir.CatchClause | ir.MethodAccessExpression | ir.MethodLiteral | ir.PrefixUnaryExpression | ir.MeasureLiteral | ir.ReferenceExpression | ir.LoopStatement | ir.Package | ir.ReturnStatement | ir.TextLiteral | ir.TextTemplateLiteral | ir.TypeConstructorDeclaration | ir.TypeDestructorDeclaration | ir.TypeIndexedGetterDeclaration | ir.TypeIndexedSetterDeclaration | ir.TypeMethodDeclaration | ir.TypeVariableDeclaration | ir.ComputedTypeVariableDeclaration | ir.TypeVariableGetterDeclaration | ir.TypeVariableSetterDeclaration | ir.SwitchStatement | ir.TernaryExpression | ir.ThisExpression | ir.TypeAccessExpression | ir.ValueParameterDeclaration | ir.VariableAccessExpression | ir.VariantDeclaration | ir.WhileStatement | ir.YieldStatement | ir.JsObjectLiteral | ir.NamedJsObjectLiteralProperty | ir.SpreadJsObjectLiteralProperty | ir.JsPropertyAccessExpression | ir.JsFunctionLiteral | ir.JsTypeOfExpression | ir.JsInstanceOfExpression | ir.JsIdentifierExpression | ir.DereferenceExpression | ir.BaseExpression | ir.OwnConstructorCallExpression | ir.EsModuleImportDirectiveStatement | ir.CjsModuleImportDirectiveStatement | ir.JsNamespaceDestructuringStatement | ir.TypeDereferencedVariableGetterDeclaration | ir.TypeDereferencedVariableSetterDeclaration | ir.TextWithEntityName | ir.Argument | ir.Arguments | ir.Decorator;
 export type Declaration = ir.PackageMethodDeclaration | ir.PackageTypeDeclaration | ir.PackageVariableDeclaration | ir.PackageVariableGetterDeclaration | ir.PackageVariableSetterDeclaration | ir.PackageVariantTypeDeclaration | ir.NestedMethodDeclaration | ir.LocalVariableDeclaration | ir.TypeConstructorDeclaration | ir.TypeDestructorDeclaration | ir.TypeIndexedGetterDeclaration | ir.TypeIndexedSetterDeclaration | ir.TypeMethodDeclaration | ir.TypeVariableDeclaration | ir.TypeVariableGetterDeclaration | ir.TypeVariableSetterDeclaration | ir.ValueParameterDeclaration | ir.VariantDeclaration | ir.TypeDereferencedVariableGetterDeclaration | ir.TypeDereferencedVariableSetterDeclaration;
-export type Statement = ir.AssignmentStatement | ir.BlockStatement | ir.BreakLoopStatement | ir.ContinueLoopStatement | ir.DisposeStatement | ir.RunStatement | ir.EmptyStatement | ir.ErrorStatement | ir.ExpressionStatement | ir.ForStatement | ir.IfStatement | ir.NestedMethodDeclarationStatement | ir.LocalVariableDeclarationStatement | ir.LoopStatement | ir.ReturnStatement | ir.SwitchStatement | ir.TryCatchFinallyStatement | ir.WhileStatement | ir.YieldStatement | ir.EsModuleImportDirectiveStatement | ir.CjsModuleImportDirectiveStatement | ir.JsNamespaceDestructuringStatement;
+export type Statement = ir.AssignmentStatement | ir.BlockStatement | ir.BreakLoopStatement | ir.ContinueLoopStatement | ir.DisposeStatement | ir.RunStatement | ir.TryStatement | ir.EmptyStatement | ir.ErrorStatement | ir.ExpressionStatement | ir.ForStatement | ir.IfStatement | ir.NestedMethodDeclarationStatement | ir.LocalVariableDeclarationStatement | ir.LoopStatement | ir.ReturnStatement | ir.SwitchStatement | ir.WhileStatement | ir.YieldStatement | ir.EsModuleImportDirectiveStatement | ir.CjsModuleImportDirectiveStatement | ir.JsNamespaceDestructuringStatement;
 export type Expression = ir.ArrayLiteral | ir.AsExpression | ir.AssertionExpression | ir.AssumptionExpression | ir.AssignmentExpression | ir.BinaryExpression | ir.BooleanLiteral | ir.CallExpression | ir.CharLiteral | ir.CommaExpression | ir.ConstructorCallExpression | ir.NoneLiteral | ir.IndexedAccessExpression | ir.InlineJsExpression | ir.TypeMethodAccessExpression | ir.TypeVariableAccessExpression | ir.IntegerLiteral | ir.IsExpression | ir.NumericLiteral | ir.MethodAccessExpression | ir.MethodLiteral | ir.PrefixUnaryExpression | ir.MeasureLiteral | ir.ReferenceExpression | ir.DereferenceExpression | ir.TextLiteral | ir.TextWithEntityName | ir.TextTemplateLiteral | ir.TernaryExpression | ir.ThisExpression | ir.TypeAccessExpression | ir.VariableAccessExpression | ir.BaseConstructorCallExpression | ir.JsIndexedAccessExpression | ir.JsObjectLiteral | ir.JsPropertyAccessExpression | ir.JsFunctionLiteral | ir.JsTypeOfExpression | ir.JsInstanceOfExpression | ir.JsIdentifierExpression | ir.BaseExpression | ir.OwnConstructorCallExpression;
 export type TypeMemberDeclaration = ir.TypeVariableDeclaration | ir.ComputedTypeVariableDeclaration | ir.TypeMethodDeclaration | ir.TypeConstructorDeclaration | ir.TypeDestructorDeclaration | ir.TypeIndexedGetterDeclaration | ir.TypeIndexedSetterDeclaration | ir.TypeDereferencedVariableGetterDeclaration | ir.TypeDereferencedVariableSetterDeclaration;
 export type PackageMemberDeclaration = ir.PackageMethodDeclaration | ir.PackageTypeDeclaration | ir.PackageVariableDeclaration | ir.PackageVariableGetterDeclaration | ir.PackageVariableSetterDeclaration | ir.PackageVariantTypeDeclaration;

package/build/types/tree/NodeKind.d.ts

@@ -96,62 +96,61 @@ export declare enum NodeKind {
     BreakLoopStatement = 94,
     ContinueLoopStatement = 95,
     DisposeStatement = 96,
-    RunStatementClauseList = 97,
-    RunStatement = 98,
-    TryStatement = 99,
-    CatchClause = 100,
-    ErrorVariableDeclaration = 101,
-    FinallyClause = 102,
-    EmptyStatement = 103,
-    ErrorStatement = 104,
-    ExpressionStatement = 105,
-    EnumerationVariableList = 106,
-    ForStatement = 107,
-    IfStatement = 108,
-    ElseIfClauseList = 109,
-    ElseIfClause = 110,
-    InvalidStatement = 111,
-    NestedMethodDeclarationStatement = 112,
-    LocalVariableDeclarationStatement = 113,
-    LoopStatement = 114,
-    ReturnStatement = 115,
-    CaseClauseList = 116,
-    SwitchStatement = 117,
-    MatchExpressionList = 118,
-    SwitchStatementCaseClause = 119,
-    WhileStatement = 120,
-    YieldStatement = 121,
-    TranslationParameterList = 122,
-    TranslationParameterClause = 123,
-    ConstructorTranslation = 124,
-    IndexerTranslationParameterClause = 125,
-    IndexerTranslation = 126,
-    TranslationTypeParameterList = 127,
-    TranslationTypeParameterClause = 128,
-    PackageMethodTranslation = 129,
-    TypeMethodTranslation = 130,
-    MethodTypeTranslation = 131,
-    PackageImportTranslation = 132,
-    QualifiedName = 133,
-    PackageVariableTranslation = 134,
-    TypeVariableOrVariantTranslation = 135,
-    TypeMemberTranslationList = 136,
-    TypeTranslation = 137,
-    TextLiteralTranslation = 138,
-    TextTemplateLiteralTranslation = 139,
-    VariantDeclaration = 140,
-    TypeParameterDeclaration = 141,
-    ParameterDeclaration = 142,
-    Argument = 143,
-    TagList = 144,
-    Tag = 145,
-    ModifierList = 146,
-    Modifier = 147,
-    ParameterClause = 148,
-    ParameterList = 149,
-    TypeArgumentClause = 150,
-    TypeArgumentList = 151,
-    TypeParameterClause = 152,
-    TypeParameterList = 153,
-    TypeAnnotation = 154
+    RunStatement = 97,
+    TryStatement = 98,
+    CatchClause = 99,
+    ErrorVariableDeclaration = 100,
+    FinallyClause = 101,
+    EmptyStatement = 102,
+    ErrorStatement = 103,
+    ExpressionStatement = 104,
+    EnumerationVariableList = 105,
+    ForStatement = 106,
+    IfStatement = 107,
+    ElseIfClauseList = 108,
+    ElseIfClause = 109,
+    InvalidStatement = 110,
+    NestedMethodDeclarationStatement = 111,
+    LocalVariableDeclarationStatement = 112,
+    LoopStatement = 113,
+    ReturnStatement = 114,
+    CaseClauseList = 115,
+    SwitchStatement = 116,
+    MatchExpressionList = 117,
+    SwitchStatementCaseClause = 118,
+    WhileStatement = 119,
+    YieldStatement = 120,
+    TranslationParameterList = 121,
+    TranslationParameterClause = 122,
+    ConstructorTranslation = 123,
+    IndexerTranslationParameterClause = 124,
+    IndexerTranslation = 125,
+    TranslationTypeParameterList = 126,
+    TranslationTypeParameterClause = 127,
+    PackageMethodTranslation = 128,
+    TypeMethodTranslation = 129,
+    MethodTypeTranslation = 130,
+    PackageImportTranslation = 131,
+    QualifiedName = 132,
+    PackageVariableTranslation = 133,
+    TypeVariableOrVariantTranslation = 134,
+    TypeMemberTranslationList = 135,
+    TypeTranslation = 136,
+    TextLiteralTranslation = 137,
+    TextTemplateLiteralTranslation = 138,
+    VariantDeclaration = 139,
+    TypeParameterDeclaration = 140,
+    ParameterDeclaration = 141,
+    Argument = 142,
+    TagList = 143,
+    Tag = 144,
+    ModifierList = 145,
+    Modifier = 146,
+    ParameterClause = 147,
+    ParameterList = 148,
+    TypeArgumentClause = 149,
+    TypeArgumentList = 150,
+    TypeParameterClause = 151,
+    TypeParameterList = 152,
+    TypeAnnotation = 153
 }

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

@@ -1370,27 +1370,17 @@ export declare class DisposeStatement extends BaseNode {
     constructor(disposeKeyword: Keyword<KeywordKind.Dispose>, expression: Expression);
     toRed(rangeStart: number, parent: red.StatementParent): red.DisposeStatement;
 }
-export declare class RunStatementClauseList extends BaseNode {
-    readonly kind = NodeKind.RunStatementClauseList;
-    readonly children: readonly RunStatementClause[];
-    get clauses(): readonly RunStatementClause[];
-    protected get thisAsNode(): Node;
-    constructor(clauses: readonly RunStatementClause[]);
-    toRed(rangeStart: number, parent: red.RunStatementClauseListParent): red.RunStatementClauseList;
-}
 export declare class RunStatement extends BaseNode {
     readonly kind = NodeKind.RunStatement;
     readonly children: readonly [
         Keyword<KeywordKind.Run>,
-        StatementBlock,
-        RunStatementClauseList
+        StatementBlock
     ];
     get runKeyword(): Keyword<KeywordKind.Run>;
     get body(): StatementBlock;
-    get clauseList(): RunStatementClauseList;
     protected get thisAsNode(): Node;
-    constructor(runKeyword: Keyword<KeywordKind.Run>, body: StatementBlock, clauseList: RunStatementClauseList);
-    toRed(rangeStart: number, parent: red.RunStatementParent): red.RunStatement;
+    constructor(runKeyword: Keyword<KeywordKind.Run>, body: StatementBlock);
+    toRed(rangeStart: number, parent: red.StatementParent): red.RunStatement;
 }
 export declare class TryStatement extends BaseNode {
     readonly kind = NodeKind.TryStatement;
@@ -1398,19 +1388,16 @@ export declare class TryStatement extends BaseNode {
         Keyword<KeywordKind.Try>,
         StatementBlock,
         CatchClause | undefined,
-        Keyword<KeywordKind.Finally> | undefined,
-        StatementBlock | undefined
+        FinallyClause | undefined
     ];
     get tryKeyword(): Keyword<KeywordKind.Try>;
     get body(): StatementBlock;
     get catchClause(): CatchClause | undefined;
-    get finallyKeyword(): Keyword<KeywordKind.Finally> | undefined;
-    get finallyBlock(): StatementBlock | undefined;
+    get finallyClause(): FinallyClause | undefined;
     protected get thisAsNode(): Node;
-    constructor(tryKeyword: Keyword<KeywordKind.Try>, body: StatementBlock, catchClause: CatchClause | undefined, finallyKeyword: Keyword<KeywordKind.Finally> | undefined, finallyBlock: StatementBlock | undefined);
+    constructor(tryKeyword: Keyword<KeywordKind.Try>, body: StatementBlock, catchClause: CatchClause | undefined, finallyClause: FinallyClause | undefined);
     toRed(rangeStart: number, parent: red.TryStatementParent): red.TryStatement;
 }
-export type RunStatementClause = CatchClause | FinallyClause;
 export declare class CatchClause extends BaseNode {
     readonly kind = NodeKind.CatchClause;
     readonly children: readonly [
@@ -2160,4 +2147,4 @@ export declare class TypeAnnotation extends BaseNode {
     constructor(colonToken: Token<TokenKind.Colon>, typeSpecifier: TypeSpecifier);
     toRed(rangeStart: number, parent: red.TypeAnnotationParent): red.TypeAnnotation;
 }
-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 | RunStatementClauseList | 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;
+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;