@artel/artc 0.6.25282 → 0.6.25284

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

@@ -1,35 +1,37 @@
 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 packageReducedTypeDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: tree.Identifier | string, typeParameters: readonly tree.TypeParameterDeclaration[] | undefined, body: tree.ReducedTypeDeclarationBody): tree.PackageReducedTypeDeclaration;
+    static reducedTypeDeclarationBody(reductionSourceSpecifier: tree.NamedTypeSpecifier, preservedTypes: readonly tree.NamedTypeSpecifier[] | undefined, members: readonly tree.TypeMemberDeclaration[]): tree.ReducedTypeDeclarationBody;
     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 variantValueDeclaration(tags: readonly tree.Tag[], modifiers: readonly tree.Modifier[], name: string, value?: tree.Expression): tree.VariantValueDeclaration;
+    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 +39,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 +51,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;
@@ -27,6 +28,7 @@ export declare class SyntaxToCode {
     private writePackageFunctionDeclaration;
     private writePackageStructuredTypeDeclaration;
     private writePackageAliasTypeDeclaration;
+    private writePackageReducedTypeDeclaration;
     private writePackageVariantTypeDeclaration;
     private writePackageFunctionTypeDeclaration;
     private writePackageMemberGroupDeclaration;
@@ -98,6 +100,7 @@ export declare class SyntaxToCode {
     private writeSemicolonSeparatedList;
     private writeCommaSeparatedList;
     private writeKeyword;
+    private getModifierPreferredFlags;
     private writeToken;
     private writeNode;
     private writeNewLineOrWhitespace;
@@ -114,6 +117,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

@@ -18,50 +18,57 @@ export declare enum TokenKind {
     BackQuote = 16,
     Bar = 17,
     BarBar = 18,
-    Caret = 19,
-    CloseBrace = 20,
-    CloseParenthesis = 21,
-    CloseSquareBracket = 22,
-    Colon = 23,
-    Comma = 24,
-    CommercialAt = 25,
-    Dot = 26,
-    DoublePeriod = 27,
-    Ellipsis = 28,
-    EqualsEquals = 29,
-    EqualsGreaterThan = 30,
-    Exclamation = 31,
-    ExclamationEquals = 32,
-    GreaterThan = 33,
-    GreaterThanOrEqual = 34,
-    HashSign = 35,
-    LessThan = 36,
-    LessThanOrEqual = 37,
-    LessThanMinus = 38,
-    Minus = 39,
-    MinusMinus = 40,
-    MinusEquals = 41,
-    MinusGreaterThan = 42,
-    OpenBrace = 43,
-    OpenParenthesis = 44,
-    OpenSquareBracket = 45,
-    Plus = 46,
-    PlusPlus = 47,
-    PlusEquals = 48,
-    Question = 49,
-    QuestionQuestion = 50,
-    Semicolon = 51,
-    Slash = 52,
-    SlashEquals = 53,
-    Tilde = 54,
-    TildeTilde = 55,
-    Underscore = 56,
-    Equals = 57,
-    Percent = 58,
-    PercentPercent = 59,
-    Backslash = 60,
-    BackslashEquals = 61,
-    BackslashBackslash = 62
+    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,
+    GreaterThanOrEqual = 35,
+    HashSign = 36,
+    LessThan = 37,
+    LessThanOrEqual = 38,
+    LessThanMinus = 39,
+    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;
@@ -127,4 +134,11 @@ export declare const tokenKindValues: {
     60: string;
     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

@@ -3,8 +3,8 @@ import { Tag } from '../analysis/Tag.js';
 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 type { EntityContainingParameter, EntityContainingTypeParameter, EntityOwningGetter, PackageEntity, PreservedReducedTypeEntityMemberInfo, ReducedTypeEntity, TextTranslationPackageEntityInfo, TypeEntityWithMembers, VariantTypeEntity } 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';
@@ -46,6 +46,7 @@ export declare class SourcePackageLoadedFromDtsEntity implements PackageEntity {
     getImplementedInterfacePackage(): PackageEntity | undefined;
     getSupportedPlatforms(): readonly PlatformKind[];
     getPackageAliasTypeDeclarationEntity(node: tree.PackageAliasTypeDeclaration): AliasTypeEntity;
+    getPackageReducedTypeDeclarationEntity(node: tree.PackageReducedTypeDeclaration): ReducedTypeEntity;
     getPackageFunctionDeclarationEntity(node: tree.PackageFunctionDeclaration): PackageFunctionEntity;
     getPackageFunctionTypeDeclarationEntity(node: tree.PackageFunctionTypeDeclaration): PackageFunctionTypeEntity;
     getPackageStructuredTypeDeclarationEntity(node: tree.PackageStructuredTypeDeclaration): PackageStructuredTypeEntity;
@@ -189,7 +190,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 +223,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 +253,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 +291,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 +322,6 @@ export declare class SourceAndTsNamedTypeLiteralMergeEntity implements PackageSt
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -359,6 +355,7 @@ export declare class TsPropertyEntity implements FieldEntity {
     isOverride(): boolean;
     markedAbstract(): boolean;
     getOverriddenMembers(): readonly types.Field[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Field> | undefined;
     isVariant(): boolean;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
@@ -395,6 +392,7 @@ export declare class TsAccessorEntity implements FieldEntity {
     isOverride(): boolean;
     markedAbstract(): boolean;
     getOverriddenMembers(): readonly types.Field[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Field> | undefined;
     isVariant(): boolean;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
@@ -477,6 +475,7 @@ export declare class TsMethodEntity implements MethodEntity {
     isFunctionTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Method> | undefined;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -511,6 +510,7 @@ export declare class TsIteratorFunctionEntity implements MethodEntity {
     isFunctionTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Method> | undefined;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -565,7 +565,6 @@ export declare class TsTypeParameterEntity implements TypeParameterEntity {
     getContainingPackage(): PackageEntity;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -600,6 +599,7 @@ export declare class TsIndexSignatureEntity implements IndexerEntity {
     markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Indexer[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Indexer> | undefined;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -622,6 +622,7 @@ export declare class TsConstructorEntity implements ConstructorEntity {
     isHidden(): EntityHidingLevel | undefined;
     markedAbstract(): boolean;
     getTags(): readonly Tag[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Constructor> | undefined;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -642,6 +643,7 @@ export declare class TsSignatureBasedDefaultConstructorEntity implements Constru
     isHidden(): EntityHidingLevel | undefined;
     markedAbstract(): boolean;
     getTags(): readonly Tag[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Constructor> | undefined;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -672,7 +674,6 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -694,6 +695,7 @@ export declare class TsEnumMemberEntity implements FieldEntity {
     isOverride(): boolean;
     markedAbstract(): boolean;
     getOverriddenMembers(): readonly types.Field[];
+    isPreservedReducedTypeMember(): PreservedReducedTypeEntityMemberInfo<types.Field> | undefined;
     isVariant(): boolean;
     getType(): types.Type;
     getGetter(): GetterEntity | undefined;
@@ -730,7 +732,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 +764,6 @@ export declare class TsAnonymousFunctionTypeEntity implements AnonymousFunctionT
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getContainingPackage(): PackageEntity;
     getBaseObjectType(): BaseObjectType;
-    getContext(): EntityContext;
     getTranslation(): Translation | undefined;
     getLocale(): PackageLocale;
     getDialect(): PackageDialect;
@@ -814,7 +814,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/ts-interop/TsPackageMembersCreator.d.ts

@@ -58,7 +58,7 @@ export declare class TsPackageMembersCreator {
     private createReplacementSourceEntities;
     private getSourceEntity;
 }
-export type NamedPackageMemberDeclaration = tree.PackageAliasTypeDeclaration | tree.PackageFunctionDeclaration | tree.PackageFunctionTypeDeclaration | tree.PackageStructuredTypeDeclaration | tree.PackageVariableDeclaration | tree.PackageVariableGetterDeclaration | tree.PackageVariableSetterDeclaration | tree.PackageVariantTypeDeclaration;
+export type NamedPackageMemberDeclaration = tree.PackageAliasTypeDeclaration | tree.PackageReducedTypeDeclaration | tree.PackageFunctionDeclaration | tree.PackageFunctionTypeDeclaration | tree.PackageStructuredTypeDeclaration | tree.PackageVariableDeclaration | tree.PackageVariableGetterDeclaration | tree.PackageVariableSetterDeclaration | tree.PackageVariantTypeDeclaration;
 export declare class TsPackageMembersCreationResult {
     readonly members: PackageEntityMembers;
     readonly typeEntityBySymbol: ReadonlyMap<ts.Symbol, TypeEntity>;

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

@@ -16,6 +16,5 @@ export declare class AliasType implements IType {
     applySubstitutions(substitutions: Substitutions): Type;
     equals(other: Type, considerLocale?: boolean): boolean;
     getEntity(): AliasTypeEntity;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
 }

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

@@ -19,6 +19,5 @@ export declare class FunctionType implements IType {
     getReturnType(): Type;
     getParameters(): readonly Parameter[];
     getBaseType(): Type | undefined;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
 }

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

@@ -15,7 +15,6 @@ export declare class IntersectionType implements IType {
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): Type;
     getEntity(): TypeEntity | undefined;
-    getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
     private unaliasAndFlattenTypes;
 }

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

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

package/build/types/types/ReducedType.d.ts

@@ -0,0 +1,24 @@
+import { Analyzer } from '../analysis/index.js';
+import { ReducedTypeEntity, TypeParameterEntity } from '../entities/index.js';
+import { IType, Substitutions, Type } from './index.js';
+export declare class ReducedType implements IType {
+    private readonly analyzer;
+    private readonly entity;
+    private readonly substitutions;
+    readonly kind = "reduced";
+    private readonly reductionSource;
+    private readonly baseObjectType;
+    private readonly baseAspectTypes;
+    get isNullType(): boolean;
+    get debuggerDisplay(): string;
+    constructor(analyzer: Analyzer, entity: ReducedTypeEntity, substitutions: Substitutions);
+    getReductionSource(): Type;
+    getBaseObjectType(): Type | undefined;
+    getBaseAspectTypes(): readonly Type[];
+    getTypeParameters(): readonly TypeParameterEntity[];
+    getSubstitutions(): Substitutions;
+    applySubstitutions(substitutions: Substitutions): Type;
+    equals(other: Type, considerLocale?: boolean): boolean;
+    getEntity(): ReducedTypeEntity;
+    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/Type.d.ts

@@ -3,16 +3,18 @@ import { AliasType } from './AliasType.js';
 import { FunctionType } from './FunctionType.js';
 import { IntersectionType } from './IntersectionType.js';
 import { ParameterType } from './ParameterType.js';
+import { ReducedType } from './ReducedType.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 | ReducedType;
 export interface IType {
     readonly isNullType: boolean;
     getSubstitutions(): Substitutions;
     applySubstitutions(substitutions: Substitutions): Type;
     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 { AliasTypeEntity, FunctionTypeEntity, ReducedTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from '../entities/index.js';
+import { AliasType, FunctionType, ParameterType, ReducedType, StructuredType, Substitutions, SubstitutionStubType, Type, UnresolvedType, VariantType } from './index.js';
 export declare class TypeFactory {
     readonly analyzer: Analyzer;
     constructor(analyzer: Analyzer);
@@ -9,8 +9,10 @@ export declare class TypeFactory {
     getVariantType(entity: VariantTypeEntity, substitutions: Substitutions): VariantType;
     getFunctionType(entity: FunctionTypeEntity, substitutions: Substitutions): FunctionType;
     getAliasType(entity: AliasTypeEntity, substitutions: Substitutions): AliasType;
+    getReducedType(entity: ReducedTypeEntity, substitutions: Substitutions): ReducedType;
     getUnionType(types: readonly Type[], reduce?: boolean): Type;
     getIntersectionType(types: readonly Type[], reduce?: boolean): Type;
     getUnresolvedType(): UnresolvedType;
+    getSubstitutionStubType(index: number): SubstitutionStubType;
     private flattenAndExcludeDuplicateTypes;
 }