@artel/artc 0.6.25281 → 0.6.25283

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

@@ -1,35 +1,35 @@
 import * as tree from './index.js';
 export declare class SyntaxFactory {
     static sourceFile(packageImportDirectives: readonly tree.PackageImportDirective[], declarations: readonly tree.PackageMemberDeclaration[]): tree.SourceFile;
-    static singlePackageImportDirective(alias: string | undefined, pathSegments: readonly string[]): tree.SinglePackageImportDirective;
-    static packageName(segments: readonly string[]): tree.PackageName;
-    static packageAliasTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.AliasTypeDeclarationBody): tree.PackageAliasTypeDeclaration;
+    static singlePackageImportDirective(alias: tree.Identifier | string | undefined, pathSegments: readonly string[]): tree.SinglePackageImportDirective;
+    static packageName(segments: readonly (tree.Identifier | string)[]): tree.PackageName;
+    static packageAliasTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.AliasTypeDeclarationBody): tree.PackageAliasTypeDeclaration;
     static aliasTypeDeclarationBody(aliasedTypeSpecifier: tree.TypeSpecifier, members: readonly tree.TypeMemberDeclaration[] | undefined): tree.AliasTypeDeclarationBody;
     static packageMemberGroupDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], declarations: readonly tree.PackageMemberDeclaration[]): tree.PackageMemberGroupDeclaration;
-    static packageFunctionDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, parameters: readonly tree.ParameterDeclaration[], returnTypeSpecifier: tree.TypeSpecifier | undefined, body: tree.FunctionBlock | undefined): tree.PackageFunctionDeclaration;
-    static packageFunctionTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.FunctionTypeDeclarationBody): tree.PackageFunctionTypeDeclaration;
+    static packageFunctionDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, parameters: readonly tree.ParameterDeclaration[], returnTypeSpecifier: tree.TypeSpecifier | undefined, body: tree.FunctionBlock | undefined): tree.PackageFunctionDeclaration;
+    static packageFunctionTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.FunctionTypeDeclarationBody): tree.PackageFunctionTypeDeclaration;
     static functionTypeDeclarationBody(parameters: readonly tree.ParameterDeclaration[], returnTypeSpecifier: tree.TypeSpecifier | undefined): tree.FunctionTypeDeclarationBody;
-    static packageStructuredTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.StructuredTypeDeclarationBody): tree.PackageStructuredTypeDeclaration;
+    static packageStructuredTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.StructuredTypeDeclarationBody): tree.PackageStructuredTypeDeclaration;
     static structuredTypeDeclarationBody(structuredTypeKind: tree.StructuredTypeKindKeyword['keywordKind'], baseTypes: readonly tree.NamedTypeSpecifier[] | undefined, members: readonly tree.TypeMemberDeclaration[]): tree.StructuredTypeDeclarationBody;
-    static packageVariableDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeSpecifier: tree.TypeSpecifier | undefined, initializer?: tree.Expression): tree.PackageVariableDeclaration;
-    static packageVariableGetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeSpecifier: tree.TypeSpecifier, body: tree.FunctionBlock | undefined): tree.PackageVariableGetterDeclaration;
-    static packageVariableSetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, body: tree.FunctionBlock | undefined): tree.PackageVariableSetterDeclaration;
-    static packageVariantTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.VariantTypeDeclarationBody): tree.PackageVariantTypeDeclaration;
+    static packageVariableDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeSpecifier: tree.TypeSpecifier | undefined, initializer?: tree.Expression): tree.PackageVariableDeclaration;
+    static packageVariableGetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeSpecifier: tree.TypeSpecifier, body: tree.FunctionBlock | undefined): tree.PackageVariableGetterDeclaration;
+    static packageVariableSetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, body: tree.FunctionBlock | undefined): tree.PackageVariableSetterDeclaration;
+    static packageVariantTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.VariantTypeDeclarationBody): tree.PackageVariantTypeDeclaration;
     static variantTypeDeclarationBody(members: readonly tree.TypeMemberDeclaration[]): tree.VariantTypeDeclarationBody;
-    static fieldDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeSpecifier: tree.TypeSpecifier | undefined, initializer?: tree.Expression): tree.FieldDeclaration;
-    static fieldGetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeSpecifier: tree.TypeSpecifier, body: tree.FunctionBlock | undefined): tree.FieldGetterDeclaration;
-    static fieldSetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, body: tree.FunctionBlock | undefined): tree.FieldSetterDeclaration;
-    static methodDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, parameters: readonly tree.ParameterDeclaration[], returnTypeSpecifier: tree.TypeSpecifier | undefined, body: tree.FunctionBlock | undefined): tree.MethodDeclaration;
+    static fieldDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeSpecifier: tree.TypeSpecifier | undefined, initializer?: tree.Expression): tree.FieldDeclaration;
+    static fieldGetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeSpecifier: tree.TypeSpecifier, body: tree.FunctionBlock | undefined): tree.FieldGetterDeclaration;
+    static fieldSetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, body: tree.FunctionBlock | undefined): tree.FieldSetterDeclaration;
+    static methodDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, parameters: readonly tree.ParameterDeclaration[], returnTypeSpecifier: tree.TypeSpecifier | undefined, body: tree.FunctionBlock | undefined): tree.MethodDeclaration;
     static constructorDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], parameters: readonly tree.ParameterDeclaration[], body: tree.FunctionBlock | undefined): tree.ConstructorDeclaration;
     static destructorDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], parameters: readonly tree.ParameterDeclaration[], body: tree.FunctionBlock | undefined): tree.DestructorDeclaration;
     static indexedElementGetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], parameters: readonly tree.ParameterDeclaration[], typeSpecifier: tree.TypeSpecifier, body: tree.FunctionBlock | undefined): tree.IndexedElementGetterDeclaration;
     static indexedElementSetterDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], parameters: readonly tree.ParameterDeclaration[], body: tree.FunctionBlock | undefined): tree.IndexedElementSetterDeclaration;
     static typeMemberGroupDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], members: readonly tree.TypeMemberDeclaration[]): tree.TypeMemberGroupDeclaration;
     static typeMemberDeclarationBlock(members: readonly tree.TypeMemberDeclaration[]): tree.TypeMemberDeclarationBlock;
-    static variantDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, value?: tree.Expression): tree.VariantDeclaration;
+    static variantValueDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, value?: tree.Expression): tree.VariantValueDeclaration;
     static parameterClause(parameters: readonly tree.ParameterDeclaration[]): tree.ParameterClause;
     static indexParameterClause(indexParameters: readonly tree.ParameterDeclaration[]): tree.IndexParameterClause;
-    static namedTypeSpecifier(name: string | readonly string[], typeArguments?: readonly tree.TypeSpecifier[]): tree.NamedTypeSpecifier;
+    static namedTypeSpecifier(name: tree.Identifier | string | readonly (tree.Identifier | string)[], typeArguments?: readonly tree.TypeSpecifier[]): tree.NamedTypeSpecifier;
     static unionTypeSpecifier(typeSpecifiers: readonly tree.TypeSpecifier[]): tree.UnionTypeSpecifier;
     static intersectionTypeSpecifier(typeSpecifiers: readonly tree.TypeSpecifier[]): tree.IntersectionTypeSpecifier;
     static nullableTypeSpecifier(typeSpecifier: tree.TypeSpecifier): tree.NullableTypeSpecifier;
@@ -37,9 +37,9 @@ export declare class SyntaxFactory {
     static anonymousStructuredTypeSpecifier(body: tree.StructuredTypeDeclarationBody): tree.AnonymousTypeSpecifier;
     static anonymousFunctionTypeSpecifier(body: tree.FunctionTypeDeclarationBody): tree.AnonymousTypeSpecifier;
     static anonymousVariantTypeSpecifier(body: tree.VariantTypeDeclarationBody): tree.AnonymousTypeSpecifier;
-    static typeParameterDeclaration(name: string, constraint?: tree.TypeSpecifier, defaultType?: tree.TypeSpecifier): tree.TypeParameterDeclaration;
-    static parameterDeclaration(tags: readonly tree.Tag[], name: string, typeSpecifier: tree.TypeSpecifier | undefined, defaultValue?: tree.Expression): tree.ParameterDeclaration;
-    static tag(name: string | readonly string[], typeArguments?: readonly tree.TypeSpecifier[], args?: readonly tree.Argument[]): tree.Tag;
+    static typeParameterDeclaration(name: tree.Identifier | string, constraint?: tree.TypeSpecifier, defaultType?: tree.TypeSpecifier): tree.TypeParameterDeclaration;
+    static parameterDeclaration(tags: readonly tree.Tag[], name: tree.Identifier | string, typeSpecifier: tree.TypeSpecifier | undefined, defaultValue?: tree.Expression): tree.ParameterDeclaration;
+    static tag(name: tree.Identifier | string | readonly (tree.Identifier | string)[], typeArguments?: readonly tree.TypeSpecifier[], args?: readonly tree.Argument[]): tree.Tag;
     static modifier(value: tree.ModifierKeywordKind, level?: tree.ModifierLevelKeyword['keywordKind']): tree.Modifier;
     static typeArgumentClause(typeArguments: readonly tree.TypeSpecifier[]): tree.TypeArgumentClause;
     static typeAnnotation(typeSpecifier: tree.TypeSpecifier): tree.TypeAnnotation;
@@ -49,21 +49,23 @@ export declare class SyntaxFactory {
     static nullLiteral(): tree.KeywordExpression;
     static integerLiteral(value: number | string): tree.TokenExpression;
     static translationsDeclaration(translations: readonly tree.TranslationDeclaration[]): tree.TranslationsDeclaration;
-    static packageVariableTranslation(sourceName: string, translatedName: string): tree.PackageVariableTranslationDeclaration;
-    static packageFunctionTranslation(sourceName: string, sourceTypeParameters: readonly string[] | undefined, sourceParameters: readonly string[], translatedName: string, translatedTypeParameters: readonly string[] | undefined, translatedParameters: readonly string[]): tree.PackageFunctionTranslationDeclaration;
-    static typeTranslation(sourceName: string, sourceTypeParameters: readonly string[] | undefined, translatedName: string, translatedTypeParameters: readonly string[] | undefined, members?: readonly tree.TypeMemberTranslation[]): tree.TypeTranslationDeclaration;
-    static functionTypeTranslation(sourceName: string, sourceTypeParameters: readonly string[] | undefined, sourceParameters: readonly string[], translatedName: string, translatedTypeParameters: readonly string[] | undefined, translatedParameters: readonly string[]): tree.FunctionTypeTranslationDeclaration;
-    static fieldOrVariantTranslation(sourceName: string, translatedName: string): tree.FieldOrVariantTranslation;
-    static methodTranslation(sourceName: string, sourceTypeParameters: readonly string[] | undefined, sourceParameters: readonly string[], translatedName: string, translatedTypeParameters: readonly string[] | undefined, translatedParameters: readonly string[]): tree.MethodTranslation;
+    static packageVariableTranslation(sourceName: tree.Identifier | string, translatedName: tree.Identifier | string): tree.PackageVariableTranslationDeclaration;
+    static packageFunctionTranslation(sourceName: tree.Identifier | string, sourceTypeParameters: readonly (tree.Identifier | string)[] | undefined, sourceParameters: readonly (tree.Identifier | string)[], translatedName: tree.Identifier | string, translatedTypeParameters: readonly (tree.Identifier | string)[] | undefined, translatedParameters: readonly (tree.Identifier | string)[]): tree.PackageFunctionTranslationDeclaration;
+    static typeTranslation(sourceName: tree.Identifier | string, sourceTypeParameters: readonly (tree.Identifier | string)[] | undefined, translatedName: tree.Identifier | string, translatedTypeParameters: readonly (tree.Identifier | string)[] | undefined, members?: readonly tree.TypeMemberTranslation[]): tree.TypeTranslationDeclaration;
+    static functionTypeTranslation(sourceName: tree.Identifier | string, sourceTypeParameters: readonly (tree.Identifier | string)[] | undefined, sourceParameters: readonly (tree.Identifier | string)[], translatedName: tree.Identifier | string, translatedTypeParameters: readonly (tree.Identifier | string)[] | undefined, translatedParameters: readonly (tree.Identifier | string)[]): tree.FunctionTypeTranslationDeclaration;
+    static fieldOrVariantTranslation(sourceName: tree.Identifier | string, translatedName: tree.Identifier | string): tree.FieldOrVariantTranslation;
+    static methodTranslation(sourceName: tree.Identifier | string, sourceTypeParameters: readonly (tree.Identifier | string)[] | undefined, sourceParameters: readonly (tree.Identifier | string)[], translatedName: tree.Identifier | string, translatedTypeParameters: readonly (tree.Identifier | string)[] | undefined, translatedParameters: readonly (tree.Identifier | string)[]): tree.MethodTranslation;
     static constructorTranslation(sourceParameters: readonly string[], translatedParameters: readonly string[]): tree.ConstructorTranslation;
     static indexerTranslation(sourceParameters: readonly string[], translatedParameters: readonly string[]): tree.IndexerTranslation;
-    static translationParameterClause(parameters: readonly string[]): tree.TranslationParameterClause;
-    static indexParameterTranslationClause(parameters: readonly string[]): tree.IndexParameterTranslationClause;
+    static translationParameterClause(parameters: readonly (tree.Identifier | string)[]): tree.TranslationParameterClause;
+    static indexParameterTranslationClause(parameters: readonly (tree.Identifier | string)[]): tree.IndexParameterTranslationClause;
+    static identifier(value: tree.Identifier | string): tree.Identifier;
     static token<T extends tree.TokenKind>(kind: T, value?: string): tree.Token<T>;
     static keyword<T extends tree.KeywordKind>(kind: T): tree.Keyword<T>;
+    private static createToken;
+    private static createKeyword;
     private static createTypeParameterClause;
     private static createTranslationTypeParameterClause;
     private static createTypeAnnotation;
-    private static createIdentifier;
-    private static createTokenSeparatedElements;
+    private static createSeparatedElements;
 }

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

@@ -5,6 +5,7 @@ export declare class SyntaxToCode {
     private readonly node;
     private readonly newLine;
     private readonly indentationStep;
+    private readonly modifiersOnSeparateLine;
     private readonly keywordsLocale;
     private readonly keywordsDialect;
     private readonly singleWordKeywordValues;
@@ -48,7 +49,7 @@ export declare class SyntaxToCode {
     private writeIndexedElementSetterDeclaration;
     private writeDereferencedVariableGetterDeclaration;
     private writeDereferencedVariableSetterDeclaration;
-    private writeVariantDeclaration;
+    private writeVariantValueDeclaration;
     private writeTypeMemberGroupDeclaration;
     private writeTypeParameterClause;
     private writeTypeParameterDeclaration;
@@ -98,6 +99,7 @@ export declare class SyntaxToCode {
     private writeSemicolonSeparatedList;
     private writeCommaSeparatedList;
     private writeKeyword;
+    private getModifierPreferredFlags;
     private writeToken;
     private writeNode;
     private writeNewLineOrWhitespace;
@@ -114,6 +116,7 @@ export interface SyntaxToCodeOptions {
     newLine?: '\n' | '\r\n';
     indentationStep?: string;
     initialIndentation?: string;
+    modifiersOnSeparateLine?: boolean;
     keywordsLocale?: PackageLocale;
     keywordsDialect?: PackageDialect;
 }

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

@@ -0,0 +1,15 @@
+export declare const enum TokenFlags {
+    None = 0,// обычная лексема
+    Missing = 1,// лексема отсутствует в исходном тексте, но требуется по грамматике.
+    CompoundAngle = 2,// составная лексема с угловой скобкой: <<, <<=, >>, >>>, >>=
+    QuotedName = 4,// 'имя', 'имя с пробелами', '+'
+    RequiresQuotes = 8,// 'имя с пробелами', '+'
+    EscapedKeyword = 16,// 'выполнить'
+    HasBackQuotes = 32,// имя с любым количеством апострофов: имя`, имя```
+    ConflictResolvingParameterName = 64,// имя с одним апострофом: имя`, выполнить`
+    BackingVariableName = 128,// имя с двумя апострофами: имя``, выполнить``
+    SingleCharText = 256,// текст из одного символа: "а", "\/", "ю000А"
+    StartsWithTilde = 512,// переводимый текст: ~"текст", ~"текст{
+    EndsWithTilde = 1024,// переводимый текст: "текст"~, }текст"~
+    LocalizableText = 1536
+}

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

@@ -4,33 +4,33 @@ export declare enum TokenKind {
     IntegerLiteral = 2,
     RealLiteral = 3,
     MeasureLiteral = 4,
-    CharLiteral = 5,
-    TextLiteral = 6,
-    TextTemplateHead = 7,
-    TextTemplatePart = 8,
-    TextTemplateTail = 9,
-    Identifier = 10,
-    Ampersand = 11,
-    AmpersandAmpersand = 12,
-    AmpersandEquals = 13,
-    Asterisk = 14,
-    AsteriskAsterisk = 15,
-    AsteriskEquals = 16,
-    BackQuote = 17,
-    Bar = 18,
-    BarBar = 19,
-    Caret = 20,
-    CloseBrace = 21,
-    CloseParenthesis = 22,
-    CloseSquareBracket = 23,
-    Colon = 24,
-    Comma = 25,
-    CommercialAt = 26,
-    Dot = 27,
-    DoublePeriod = 28,
-    Ellipsis = 29,
-    EqualsEquals = 30,
-    EqualsGreaterThan = 31,
+    TextLiteral = 5,
+    TextTemplateHead = 6,
+    TextTemplatePart = 7,
+    TextTemplateTail = 8,
+    Identifier = 9,
+    Ampersand = 10,
+    AmpersandAmpersand = 11,
+    AmpersandEquals = 12,
+    Asterisk = 13,
+    AsteriskAsterisk = 14,
+    AsteriskEquals = 15,
+    BackQuote = 16,
+    Bar = 17,
+    BarBar = 18,
+    BarEquals = 19,
+    BarBarEquals = 20,
+    Caret = 21,
+    CloseBrace = 22,
+    CloseParenthesis = 23,
+    CloseSquareBracket = 24,
+    Colon = 25,
+    Comma = 26,
+    CommercialAt = 27,
+    Dot = 28,
+    DoublePeriod = 29,
+    Ellipsis = 30,
+    EqualsEquals = 31,
     Exclamation = 32,
     ExclamationEquals = 33,
     GreaterThan = 34,
@@ -39,30 +39,36 @@ export declare enum TokenKind {
     LessThan = 37,
     LessThanOrEqual = 38,
     LessThanMinus = 39,
-    Minus = 40,
-    MinusMinus = 41,
-    MinusEquals = 42,
-    MinusGreaterThan = 43,
-    OpenBrace = 44,
-    OpenParenthesis = 45,
-    OpenSquareBracket = 46,
-    Plus = 47,
-    PlusPlus = 48,
-    PlusEquals = 49,
-    Question = 50,
-    QuestionQuestion = 51,
-    Semicolon = 52,
-    Slash = 53,
-    SlashEquals = 54,
-    Tilde = 55,
-    TildeTilde = 56,
-    Underscore = 57,
-    Equals = 58,
-    Percent = 59,
-    PercentPercent = 60,
-    Backslash = 61,
-    BackslashEquals = 62,
-    BackslashBackslash = 63
+    LessThanLessThan = 40,
+    LessThanLessThanEquals = 41,
+    Minus = 42,
+    MinusMinus = 43,
+    MinusEquals = 44,
+    MinusGreaterThan = 45,
+    OpenBrace = 46,
+    OpenParenthesis = 47,
+    OpenSquareBracket = 48,
+    Plus = 49,
+    PlusPlus = 50,
+    PlusEquals = 51,
+    Question = 52,
+    QuestionQuestion = 53,
+    GreaterThanGreaterThan = 54,
+    GreaterThanGreaterThanEquals = 55,
+    GreaterThanGreaterThanGreaterThan = 56,
+    GreaterThanGreaterThanGreaterThanEquals = 57,
+    Semicolon = 58,
+    Slash = 59,
+    SlashEquals = 60,
+    Tilde = 61,
+    TildeTilde = 62,
+    Underscore = 63,
+    Equals = 64,
+    Percent = 65,
+    PercentPercent = 66,
+    Backslash = 67,
+    BackslashEquals = 68,
+    BackslashBackslash = 69
 }
 export declare const tokenKindValues: {
     0: string;
@@ -129,4 +135,10 @@ export declare const tokenKindValues: {
     61: string;
     62: string;
     63: string;
+    64: string;
+    65: string;
+    66: string;
+    67: string;
+    68: string;
+    69: string;
 };

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

@@ -1,7 +1,7 @@
 import { TokenKind } from './TokenKind.js';
 import { KeywordKind } from './KeywordKind.js';
-import { Token } from './Token.js';
-import { Identifier, Keyword, Node } from './Nodes.js';
+import { Keyword, Token } from './BaseNode.js';
+import { Identifier, Node } from './Nodes.js';
 export declare function isIdentifier(node: Node): node is Identifier;
 export declare function isToken<T extends TokenKind>(node: Node, kind?: T): node is Token<T>;
 export declare function isKeyword<T extends KeywordKind>(node: Node, kind?: T): node is Keyword<T>;

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

@@ -3,8 +3,9 @@ export * from './NodeKind.js';
 export * from './OperatorKind.js';
 export * from './TokenKind.js';
 export * from './TriviaKind.js';
+export * from './TokenFlags.js';
+export * from './KeywordFlags.js';
 export * from './BaseNode.js';
 export * from './Nodes.js';
-export * from './Token.js';
 export * from './Utils.js';
 export * from './NodePath.js';

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

@@ -4,7 +4,7 @@ import { Translation } from '../analysis/Translation.js';
 import { Lazy, Name, PackageDialect, PackageLocale } from '../common/index.js';
 import { TypeEntityMembers } from '../entities/TypeEntityMembers.js';
 import type { EntityContainingParameter, EntityContainingTypeParameter, EntityOwningGetter, PackageEntity, TextTranslationPackageEntityInfo, TypeEntityWithMembers, VariantTypeEntity } from '../entities/index.js';
-import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousFunctionTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityContext, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, FieldEntity, FunctionEntityDefinition, FunctionTypeEntityDefinition, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntity, PackageEntityDefinition, PackageEntityMembers, PackageFunctionEntity, PackageFunctionTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterEntity, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, StructuredTypeKind, SubstitutionApplicationMode, TypeEntityKind, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, TypeWithMembersOrExtensionEntity, VariableEntityDefinition, VariantTypeEntityDefinition } from '../entities/index.js';
+import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousFunctionTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, FieldEntity, FunctionEntityDefinition, FunctionTypeEntityDefinition, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntity, PackageEntityDefinition, PackageEntityMembers, PackageFunctionEntity, PackageFunctionTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterEntity, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, StructuredTypeKind, SubstitutionApplicationMode, TypeEntityKind, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, TypeWithMembersOrExtensionEntity, 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';
@@ -189,7 +189,6 @@ export declare class TsGlobalClassOrInterfaceEntity implements PackageStructured
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -223,7 +222,6 @@ export declare class SourceAndTsGlobalClassOrInterfaceMergeEntity implements Pac
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -254,7 +252,6 @@ export declare class TsTypeLiteralEntity implements AnonymousStructuredTypeEntit
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getContainingPackage(): PackageEntity;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -293,7 +290,6 @@ export declare class TsNamedTypeLiteralEntity implements PackageStructuredTypeEn
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -325,7 +321,6 @@ export declare class SourceAndTsNamedTypeLiteralMergeEntity implements PackageSt
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -565,7 +560,6 @@ export declare class TsTypeParameterEntity implements TypeParameterEntity {
     getContainingPackage(): PackageEntity;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -672,7 +666,6 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -730,7 +723,6 @@ export declare class TsTypeAliasEntity implements AliasTypeEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -763,7 +755,6 @@ export declare class TsAnonymousFunctionTypeEntity implements AnonymousFunctionT
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getContainingPackage(): PackageEntity;
     getBaseObjectType(): BaseObjectType;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -814,7 +805,6 @@ export declare class TsNamedFunctionTypeEntity implements PackageFunctionTypeEnt
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;

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

@@ -3,7 +3,7 @@ import { Analyzer, WellKnownDeclarations } from '../analysis/index.js';
 import { Tag } from '../analysis/Tag.js';
 import { Translation } from '../analysis/Translation.js';
 import { Name, PackageDialect, PackageLocale } from '../common/index.js';
-import { EntityContext, EntityHidingLevel, EntityKind, InterfacePackageEntityInfo, PackageEntity, PackageEntityDefinition, PackageEntityMembers, TextTranslationPackageEntityInfo, TypeEntity, TypeEntityWithMembers } from '../entities/index.js';
+import { EntityHidingLevel, EntityKind, InterfacePackageEntityInfo, PackageEntity, PackageEntityDefinition, PackageEntityMembers, TextTranslationPackageEntityInfo, TypeEntity, TypeEntityWithMembers } from '../entities/index.js';
 import { JavaScriptImplementationConfig, PackageName, PlatformKind, ProgramPackage } from '../project/index.js';
 import * as types from '../types/index.js';
 import { SourcePackageLoadedFromDtsEntity, TsPackageEntity } from './Entities.js';
@@ -43,7 +43,6 @@ export declare class TsInteropContext {
     ifTypeCanBeExpressedByFunctionTypeThenCallSignature(symbol: ts.Symbol): ts.Symbol | undefined;
     createName(original: string, ownerKind: 'type' | 'variable' | 'method'): Name;
     createDefaultExportTag(): Tag;
-    createTypeEntityContext(entity: TypeEntity): EntityContext;
     private getPackagesCreationResult;
     private createPackages;
     private collectSubModulesInFilesRecursively;

package/build/types/types/AliasType.d.ts

@@ -14,8 +14,7 @@ export declare class AliasType implements IType {
     getTypeParameters(): readonly TypeParameterEntity[];
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): Type;
-    equals(other: Type): boolean;
+    equals(other: Type, considerLocale?: boolean): boolean;
     getEntity(): AliasTypeEntity;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
 }

package/build/types/types/FunctionType.d.ts

@@ -1,6 +1,6 @@
 import { Analyzer } from '../analysis/index.js';
 import { FunctionTypeEntity, TypeParameterEntity } from '../entities/index.js';
-import { IType, Substitutions, Type, Parameter } from './index.js';
+import { IType, Parameter, Substitutions, Type } from './index.js';
 export declare class FunctionType implements IType {
     private readonly analyzer;
     private readonly entity;
@@ -13,12 +13,11 @@ export declare class FunctionType implements IType {
     getTypeParameters(): readonly TypeParameterEntity[];
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): FunctionType;
-    equals(other: Type): boolean;
+    equals(other: Type, considerLocale?: boolean): boolean;
     getEntity(): FunctionTypeEntity;
     isAsync(): boolean;
     getReturnType(): Type;
     getParameters(): readonly Parameter[];
     getBaseType(): Type | undefined;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
 }

package/build/types/types/IntersectionType.d.ts

@@ -11,11 +11,10 @@ export declare class IntersectionType implements IType {
     get unaliasedFlattenedTypes(): readonly Type[];
     get debuggerDisplay(): string;
     constructor(analyzer: Analyzer, originalTypes: readonly Type[]);
-    equals(other: Type): boolean;
+    equals(other: Type, considerLocale?: boolean): boolean;
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): Type;
     getEntity(): TypeEntity | undefined;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
     private unaliasAndFlattenTypes;
 }

package/build/types/types/ParameterType.d.ts

@@ -17,7 +17,6 @@ export declare class ParameterType implements IType {
     getSubstitutions(): Substitutions;
     getEntity(): TypeParameterEntity;
     applySubstitutions(substitutions: Substitutions): Type;
-    equals(other: Type): boolean;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
+    equals(other: Type, considerLocale?: boolean): boolean;
     toString(): string;
 }

package/build/types/types/StructuredType.d.ts

@@ -17,10 +17,9 @@ export declare class StructuredType implements IType {
     getStructuredTypeKind(): StructuredTypeKind;
     markedBasic(): boolean;
     isAbstract(): boolean;
-    equals(other: Type): boolean;
+    equals(other: Type, considerLocale?: boolean): boolean;
     getEntity(): StructuredTypeEntity;
     getBaseObjectType(): Type | undefined;
     getBaseAspectTypes(): readonly Type[];
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
 }

package/build/types/types/SubstitutionStubType.d.ts

@@ -0,0 +1,21 @@
+import { Analyzer } from '../analysis/index.js';
+import { TypeEntity } from '../entities/index.js';
+import { Substitutions } from './Substitutions.js';
+import { IType, Type } from './Type.js';
+/**
+ * Специальный тип, используемый при сравнении заголовков функций, имеющих параметры типа. При сравнении заголовков
+ * параметры типа считаются равными, если они находятся на одинаковых позициях.
+ */
+export declare class SubstitutionStubType implements IType {
+    private readonly analyzer;
+    readonly index: number;
+    readonly kind = "substitution-stub";
+    get isNullType(): boolean;
+    get debuggerDisplay(): string;
+    constructor(analyzer: Analyzer, index: number);
+    equals(other: Type, _considerLocale?: boolean): boolean;
+    getSubstitutions(): Substitutions;
+    applySubstitutions(_substitutions: Substitutions): Type;
+    getEntity(): TypeEntity | undefined;
+    toString(): string;
+}

package/build/types/types/Substitutions.d.ts

@@ -28,6 +28,6 @@ export declare class Substitutions {
     getTypes(): Iterable<Type>;
     substituteTypes(substitutions: Substitutions): Substitutions;
     substituteTypesAndMerge(substitutions: Substitutions): Substitutions;
-    equals(other: Substitutions): boolean;
+    equals(other: Substitutions, considerLocale?: boolean): boolean;
 }
 export type SubstitutionMap = ReadonlyMap<TypeParameterEntity, Type>;

package/build/types/types/Type.d.ts

@@ -4,18 +4,16 @@ import { FunctionType } from './FunctionType.js';
 import { IntersectionType } from './IntersectionType.js';
 import { ParameterType } from './ParameterType.js';
 import { StructuredType } from './StructuredType.js';
+import { Substitutions } from './Substitutions.js';
+import { SubstitutionStubType } from './SubstitutionStubType.js';
+import { UnionType } from './UnionType.js';
 import { UnresolvedType } from './UnresolvedType.js';
 import { VariantType } from './VariantType.js';
-import { Substitutions, UnionType } from './index.js';
-export type Type = StructuredType | VariantType | FunctionType | AliasType | UnresolvedType | ParameterType | UnionType | IntersectionType;
+export type Type = StructuredType | VariantType | FunctionType | AliasType | UnresolvedType | ParameterType | UnionType | IntersectionType | SubstitutionStubType;
 export interface IType {
     readonly isNullType: boolean;
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): Type;
-    /**
-     * Сравнивает типы без учёта языка.
-     */
-    equals(other: Type): boolean;
+    equals(other: Type, considerLocale: boolean): boolean;
     getEntity(): TypeEntity | undefined;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
 }

package/build/types/types/TypeFactory.d.ts

@@ -1,6 +1,6 @@
 import { Analyzer } from '../analysis/index.js';
 import { AliasTypeEntity, FunctionTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from '../entities/index.js';
-import { AliasType, FunctionType, ParameterType, StructuredType, Substitutions, Type, UnresolvedType, VariantType } from './index.js';
+import { AliasType, FunctionType, ParameterType, StructuredType, Substitutions, SubstitutionStubType, Type, UnresolvedType, VariantType } from './index.js';
 export declare class TypeFactory {
     readonly analyzer: Analyzer;
     constructor(analyzer: Analyzer);
@@ -12,5 +12,6 @@ export declare class TypeFactory {
     getUnionType(types: readonly Type[], reduce?: boolean): Type;
     getIntersectionType(types: readonly Type[], reduce?: boolean): Type;
     getUnresolvedType(): UnresolvedType;
+    getSubstitutionStubType(index: number): SubstitutionStubType;
     private flattenAndExcludeDuplicateTypes;
 }

package/build/types/types/TypeMembers.d.ts

@@ -30,7 +30,7 @@ export declare class Method implements ITypeMember {
     isOverride(): boolean;
     applySubstitutions(substitutions: Substitutions): Method;
     getTypeParametersArity(): number;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class Parameter {
@@ -60,7 +60,7 @@ export declare class Field implements ITypeMember {
     isOverride(): boolean;
     isVariant(): boolean;
     applySubstitutions(substitutions: Substitutions): Field;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class Operator implements ITypeMember {
@@ -82,7 +82,7 @@ export declare class Operator implements ITypeMember {
     isStatic(): boolean;
     isOverride(): boolean;
     applySubstitutions(substitutions: Substitutions): Operator;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class Constructor implements ITypeMember {
@@ -100,7 +100,7 @@ export declare class Constructor implements ITypeMember {
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): TypeMember;
     getConstructedType(): Type;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class Destructor implements ITypeMember {
@@ -116,7 +116,7 @@ export declare class Destructor implements ITypeMember {
     isHidden(): EntityHidingLevel | undefined;
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): Destructor;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class Indexer implements ITypeMember {
@@ -134,7 +134,7 @@ export declare class Indexer implements ITypeMember {
     isStatic(): boolean;
     isOverride(): boolean;
     applySubstitutions(substitutions: Substitutions): Indexer;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export declare class DereferenceOperator implements ITypeMember {
@@ -150,13 +150,13 @@ export declare class DereferenceOperator implements ITypeMember {
     isStatic(): boolean;
     isOverride(): boolean;
     applySubstitutions(substitutions: Substitutions): DereferenceOperator;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale?: boolean): boolean;
     toString(): string;
 }
 export interface ITypeMember {
     isHidden(): EntityHidingLevel | undefined;
     isStatic(): boolean;
     getSubstitutions(): Substitutions;
-    equals(other: TypeMember): boolean;
+    equals(other: TypeMember, considerLocale: boolean): boolean;
     applySubstitutions(substitutions: Substitutions): TypeMember;
 }