@artel/artc 0.6.25216 → 0.6.25218

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

@@ -1,7 +1,6 @@
 export * from './AccessedEntities.js';
 export * from './ComputedAccess.js';
-export * from './LoweringOptions.js';
-export * from './LoweringState.js';
+export * from './EmitOptions.js';
 export * from './Nodes.js';
 export * from './SourceLocation.js';
 export * from './types.js';

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

@@ -1,9 +1,10 @@
 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.HelperMethodCallExpression | 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.OnErrorClause | 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.TypeVariableGetterDeclaration | ir.TypeVariableSetterDeclaration | ir.SwitchStatement | ir.TernaryExpression | ir.ThisExpression | ir.TryCatchFinallyStatement | ir.TypeAccessExpression | ir.ValueParameterDeclaration | ir.VariableAccessExpression | ir.VariantAccessExpression | ir.VariantDeclaration | ir.WhileStatement | ir.YieldStatement | ir.JsObjectLiteral | ir.JsObjectLiteralProperty | 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;
+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 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 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.HelperMethodCallExpression | 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.TextTemplateLiteral | ir.TernaryExpression | ir.ThisExpression | ir.TypeAccessExpression | ir.VariableAccessExpression | ir.VariantAccessExpression | 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.TypeVariableGetterDeclaration | ir.TypeVariableSetterDeclaration | ir.TypeMethodDeclaration | ir.TypeConstructorDeclaration | ir.TypeDestructorDeclaration | ir.TypeIndexedGetterDeclaration | ir.TypeIndexedSetterDeclaration | ir.TypeDereferencedVariableGetterDeclaration | ir.TypeDereferencedVariableSetterDeclaration;
+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;
+export type LocalDeclaration = ir.LocalVariableDeclaration | ir.NestedMethodDeclaration;
 export type LValueExpression = ir.VariableAccessExpression | ir.TypeVariableAccessExpression | ir.IndexedAccessExpression | ir.JsIndexedAccessExpression | ir.JsPropertyAccessExpression | ir.ThisExpression | ir.DereferenceExpression;
 export declare function isLValueExpression(node: Expression): node is LValueExpression;

package/build/types/entities/AliasTypeEntity.d.ts

@@ -4,13 +4,14 @@ import { Name } from '../common/index.js';
 import { PackageAliasTypeDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { OriginalTypeEntityMembers } from './TypeEntityMembers.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, PackageEntity, SubstitutionApplicationMode, TypeParameterEntity } from './index.js';
-export interface AliasTypeEntity {
-    readonly kind: EntityKind.AliasType;
+import { DefinitionKind, EntityHidingLevel, EntityKind, ITypeEntity, PackageEntity, SubstitutionApplicationMode, TypeEntityKind, TypeParameterEntity } from './index.js';
+export interface AliasTypeEntity extends ITypeEntity {
+    readonly kind: EntityKind.Type;
+    readonly typeEntityKind: TypeEntityKind.Alias;
     getName(): Name;
     getContainingPackage(): PackageEntity;
     /**
-     * При повторных вызовах метод должен возвращать один и тот же экземпляр класса AliasedType.
+     * При каждом вызове метод должен возвращать один и тот же экземпляр класса AliasedType.
      */
     getAliasedType(): AliasedType;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -66,10 +67,13 @@ export declare class AliasedType {
 export declare class PackageAliasTypeDeclarationEntity implements AliasTypeEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.AliasType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Alias;
     private readonly _aliasedType;
     private readonly _typeParameters;
     private readonly _members;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageAliasTypeDeclaration);
     getName(): Name;
     getContainingPackage(): PackageEntity;

package/build/types/entities/ConstructorEntity.d.ts

@@ -45,6 +45,8 @@ export declare class TypeConstructorDeclarationEntity implements ConstructorEnti
     private readonly _node;
     readonly kind = EntityKind.Constructor;
     private readonly _valueParameters;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeConstructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
     getDefinition(): ConstructorEntityDefinition;

package/build/types/entities/DereferenceOperatorEntity.d.ts

@@ -12,8 +12,11 @@ export interface DereferenceOperatorEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
+    isRedefinable(): boolean;
+    isRedefined(): boolean;
     isAbstract(): boolean;
     getTags(): readonly Tag[];
+    getOverriddenMembers(): readonly types.DereferenceOperator[];
 }
 export type DereferenceOperatorEntityDefinition = {
     kind: DefinitionKind.Source;
@@ -27,6 +30,9 @@ export declare class TypeDereferenceOperatorDeclarationEntity implements Derefer
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
+    private readonly _overriddenMembers;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: TypeDereferencedVariableGetterDeclaration | undefined, setterDeclaration: TypeDereferencedVariableSetterDeclaration | undefined);
     getType(): types.Type;
     getGetter(): GetterEntity | undefined;
@@ -35,6 +41,9 @@ export declare class TypeDereferenceOperatorDeclarationEntity implements Derefer
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
+    isRedefinable(): boolean;
+    isRedefined(): boolean;
     isAbstract(): boolean;
     getTags(): readonly Tag[];
+    getOverriddenMembers(): readonly types.DereferenceOperator[];
 }

package/build/types/entities/DestructorEntity.d.ts

@@ -20,6 +20,8 @@ export declare class TypeDestructorDeclarationEntity implements DestructorEntity
     private readonly _node;
     readonly kind = EntityKind.Destructor;
     private readonly _valueParameters;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeDestructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
     getContainer(): TypeMemberEntityContainer;

package/build/types/entities/GetterEntity.d.ts

@@ -26,6 +26,8 @@ export declare class PackageVariableGetterDeclarationEntity implements GetterEnt
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariableGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
@@ -38,6 +40,8 @@ export declare class TypeVariableGetterDeclarationEntity implements GetterEntity
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeVariableGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
@@ -50,6 +54,8 @@ export declare class TypeIndexedGetterDeclarationEntity implements GetterEntity
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeIndexedGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
@@ -62,6 +68,8 @@ export declare class TypeDereferencedVariableGetterDeclarationEntity implements
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeDereferencedVariableGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;

package/build/types/entities/IndexerEntity.d.ts

@@ -13,8 +13,11 @@ export interface IndexerEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
+    isRedefinable(): boolean;
+    isRedefined(): boolean;
     isAbstract(): boolean;
     getTags(): readonly Tag[];
+    getOverriddenMembers(): readonly types.Indexer[];
 }
 export type IndexerEntityDefinition = {
     kind: DefinitionKind.Source;
@@ -34,7 +37,10 @@ export declare class TypeIndexerDeclarationEntity implements SourceIndexerEntity
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
     private readonly _parameters;
+    private readonly _overriddenMembers;
+    private readonly _modifierFlags;
     private get parameters();
+    private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: TypeIndexedGetterDeclaration | undefined, setterDeclaration: TypeIndexedSetterDeclaration | undefined);
     getParameter(node: ParameterDeclaration): ParameterVariableEntity;
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -45,7 +51,10 @@ export declare class TypeIndexerDeclarationEntity implements SourceIndexerEntity
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
+    isRedefinable(): boolean;
+    isRedefined(): boolean;
     isAbstract(): boolean;
     getTags(): readonly Tag[];
+    getOverriddenMembers(): readonly types.Indexer[];
     private createParameters;
 }

package/build/types/entities/MethodEntity.d.ts

@@ -19,7 +19,7 @@ export interface TypeMethodEntity extends IMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isMethodTypeInvokeMethod(): boolean;
-    getOverriddenMember(): types.Method | undefined;
+    getOverriddenMembers(): readonly types.Method[];
 }
 export interface NestedMethodEntity extends IMethodEntity {
     readonly subkind: 'nested';
@@ -53,6 +53,8 @@ export declare class PackageMethodDeclarationEntity implements PackageMethodEnti
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageMethodDeclaration);
     getName(): Name;
     getContainingPackage(): PackageEntity;
@@ -74,6 +76,8 @@ export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _overriddenMember;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeMethodDeclaration);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -92,7 +96,7 @@ export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getOverriddenMember(): types.Method | undefined;
+    getOverriddenMembers(): readonly types.Method[];
 }
 export declare class NestedMethodDeclarationEntity implements NestedMethodEntity {
     private readonly _analyzer;
@@ -153,10 +157,10 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     private readonly _isRedefined;
     private readonly _isAbstract;
     private readonly _isModifyingOwningPlainObject;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
     readonly kind = EntityKind.Method;
     readonly subkind = "type";
-    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isMethodTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMember: types.Method | undefined);
+    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isMethodTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMembers: readonly types.Method[]);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -174,6 +178,6 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
-    getOverriddenMember(): types.Method | undefined;
+    getOverriddenMembers(): readonly types.Method[];
 }
 export {};

package/build/types/entities/MethodTypeEntity.d.ts

@@ -6,7 +6,7 @@ import * as types from '../types/index.js';
 import { EntityNaming } from './EntityNaming.js';
 import { OriginalTypeEntityMembers } from './TypeEntityMembers.js';
 import type { PackageEntity } from './index.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterVariableEntity, SubstitutionApplicationMode, TypeParameterEntity } from './index.js';
+import { BaseObjectType, DefinitionKind, EntityHidingLevel, EntityKind, ITypeEntity, ParameterVariableEntity, SubstitutionApplicationMode, TypeEntityKind, TypeParameterEntity } from './index.js';
 export type MethodTypeEntity = PackageMethodTypeEntity | AnonymousMethodTypeEntity;
 export interface PackageMethodTypeEntity extends IMethodTypeEntity {
     readonly subkind: 'package';
@@ -17,8 +17,9 @@ export interface AnonymousMethodTypeEntity extends IMethodTypeEntity {
     readonly subkind: 'anonymous';
     getContainingPackage(): PackageEntity;
 }
-interface IMethodTypeEntity {
-    readonly kind: EntityKind.MethodType;
+interface IMethodTypeEntity extends ITypeEntity {
+    readonly kind: EntityKind.Type;
+    readonly typeEntityKind: TypeEntityKind.Method;
     getNaming(): EntityNaming;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -30,6 +31,10 @@ interface IMethodTypeEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
+    /**
+     * При каждом вызове метод должен возвращать один и тот же экземпляр класса BaseObjectType.
+     */
+    getBaseObjectType(): BaseObjectType;
 }
 export type MethodTypeEntityDefinition = {
     kind: DefinitionKind.Source;
@@ -42,11 +47,15 @@ export type MethodTypeEntityDefinition = {
 export declare class PackageMethodTypeDeclarationEntity implements PackageMethodTypeEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.MethodType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Method;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _members;
+    private readonly _baseObjectType;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageMethodTypeDeclaration);
     getNaming(): EntityNaming;
     getName(): Name;
@@ -61,14 +70,17 @@ export declare class PackageMethodTypeDeclarationEntity implements PackageMethod
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
+    getBaseObjectType(): BaseObjectType;
 }
 export declare class AnonymousMethodTypeDeclarationEntity implements AnonymousMethodTypeEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.MethodType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Method;
     readonly subkind = "anonymous";
     private readonly _valueParameters;
     private readonly _members;
+    private readonly _baseObjectType;
     constructor(_analyzer: Analyzer, _node: AnonymousMethodTypeDeclaration);
     getNaming(): EntityNaming;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -82,6 +94,7 @@ export declare class AnonymousMethodTypeDeclarationEntity implements AnonymousMe
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getContainingPackage(): PackageEntity;
+    getBaseObjectType(): BaseObjectType;
 }
 export declare class UnfinishedIntrinsicAnonymousMethodTypeEntity {
     private readonly _unfinishedValue;

package/build/types/entities/OperatorEntity.d.ts

@@ -16,7 +16,7 @@ export interface OperatorEntity {
     isAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
-    getOverriddenMember(): types.Operator | undefined;
+    getOverriddenMembers(): readonly types.Operator[];
 }
 export type OperatorDefinition = {
     kind: DefinitionKind.Source;
@@ -28,7 +28,9 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     readonly kind = EntityKind.Operator;
     private readonly _operatorKind;
     private readonly _valueParameters;
-    private readonly _overriddenMember;
+    private readonly _overriddenMembers;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: tree.OperatorDeclaration);
     getOperatorKind(): OperatorKind;
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -41,6 +43,6 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     isAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
-    getOverriddenMember(): types.Operator | undefined;
+    getOverriddenMembers(): readonly types.Operator[];
     private convertSyntaxOperatorKind;
 }

package/build/types/entities/PackageEntity.d.ts

@@ -1,14 +1,14 @@
 import { Analyzer } from '../analysis/index.js';
 import { PackageLocale } from '../common/index.js';
-import * as packageMembers from '../entities/PackageMembers.js';
 import type { JavaScriptImplementationConfig, SourcePackage } from '../project/index.js';
 import { PackageName, PlatformKind } from '../project/index.js';
 import { DefinitionKind, EntityKind } from './index.js';
+import { OriginalPackageMembers } from './PackageMembers.js';
 export interface PackageEntity {
     readonly kind: EntityKind.Package;
     getName(): PackageName;
     getLocale(): PackageLocale;
-    getMembers(): packageMembers.OriginalPackageMembers;
+    getMembers(): OriginalPackageMembers;
     isInterface(): InterfacePackageEntityInfo | undefined;
     getImplementedInterfacePackage(): PackageEntity | undefined;
     getSupportedPlatforms(): readonly PlatformKind[];
@@ -48,7 +48,7 @@ export declare class SourcePackageEntity implements PackageEntity {
     constructor(_analyzer: Analyzer, _package: SourcePackage);
     getName(): PackageName;
     getLocale(): PackageLocale;
-    getMembers(): packageMembers.OriginalPackageMembers;
+    getMembers(): OriginalPackageMembers;
     isInterface(): InterfacePackageEntityInfo | undefined;
     getImplementedInterfacePackage(): PackageEntity | undefined;
     getSupportedPlatforms(): readonly PlatformKind[];

package/build/types/entities/PackageMembers.d.ts

@@ -1,98 +1,12 @@
-import { Analyzer } from '../analysis/index.js';
 import { Name } from '../common/index.js';
-import { AliasTypeEntity, EntityHidingLevel, PackageMethodEntity, PackageMethodTypeEntity, PackageStructuredTypeEntity, PackageTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, TypeEntity, TypeExtensionEntity, TypeParameterEntity } from '../entities/index.js';
-import * as types from '../types/index.js';
+import { NamedPackageMemberEntity, TypeEntity, TypeExtensionEntity } from '../entities/index.js';
 export declare class OriginalPackageMembers {
     private readonly _namedMembers;
     private readonly _typeExtensions;
     private readonly _membersByNameKey;
     private get membersByNameKey();
-    constructor(_namedMembers: readonly NamedMember[], _typeExtensions: readonly TypeExtensionEntity[]);
-    getNamedMembers(): readonly NamedMember[];
-    getNamedMembersByName(name: Name): readonly NamedMember[];
+    constructor(_namedMembers: readonly NamedPackageMemberEntity[], _typeExtensions: readonly TypeExtensionEntity[]);
+    getNamedMembers(): readonly NamedPackageMemberEntity[];
+    getNamedMembersByName(name: Name): readonly NamedPackageMemberEntity[];
     getTypeExtensions(type: TypeEntity): readonly TypeExtensionEntity[];
 }
-export type TypeDeclaration = TypeDeclaration_structured | TypeDeclaration_variant | TypeDeclaration_method | TypeDeclaration_alias;
-export declare class TypeDeclaration_structured implements ITypeDeclaration {
-    readonly value: PackageStructuredTypeEntity;
-    readonly kind = "structured";
-    constructor(value: PackageStructuredTypeEntity);
-    getName(): Name;
-    getArity(): number;
-    getTypeParameters(): readonly TypeParameterEntity[];
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-    instantiate(analyzer: Analyzer, typeArguments: readonly types.Type[]): types.Type;
-}
-export declare class TypeDeclaration_variant implements ITypeDeclaration {
-    readonly value: PackageVariantTypeEntity;
-    readonly kind = "variant";
-    constructor(value: PackageVariantTypeEntity);
-    getName(): Name;
-    getArity(): number;
-    getTypeParameters(): readonly TypeParameterEntity[];
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-    instantiate(analyzer: Analyzer, typeArguments: readonly types.Type[]): types.Type;
-}
-export declare class TypeDeclaration_method implements ITypeDeclaration {
-    readonly value: PackageMethodTypeEntity;
-    readonly kind = "method";
-    constructor(value: PackageMethodTypeEntity);
-    getName(): Name;
-    getArity(): number;
-    getTypeParameters(): readonly TypeParameterEntity[];
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-    instantiate(analyzer: Analyzer, typeArguments: readonly types.Type[]): types.Type;
-}
-export declare class TypeDeclaration_alias implements ITypeDeclaration {
-    readonly value: AliasTypeEntity;
-    readonly kind = "alias";
-    constructor(value: AliasTypeEntity);
-    getName(): Name;
-    getArity(): number;
-    getTypeParameters(): readonly TypeParameterEntity[];
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-    instantiate(analyzer: Analyzer, typeArguments: readonly types.Type[]): types.Type;
-}
-interface ITypeDeclaration {
-    getName(): Name;
-    getTypeParameters(): readonly TypeParameterEntity[];
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-    instantiate(analyzer: Analyzer, typeArguments: readonly types.Type[]): types.Type;
-}
-export type NamedMember = NamedMember_variable | NamedMember_method | NamedMember_type;
-export declare class NamedMember_variable implements INamedMember {
-    readonly value: PackageVariableEntity;
-    readonly kind = "variable";
-    constructor(value: PackageVariableEntity);
-    getName(): Name;
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageVariableEntity;
-}
-export declare class NamedMember_method implements INamedMember {
-    readonly value: PackageMethodEntity;
-    readonly kind = "method";
-    constructor(value: PackageMethodEntity);
-    getName(): Name;
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageMethodEntity;
-}
-export declare class NamedMember_type implements INamedMember {
-    readonly value: TypeDeclaration;
-    readonly kind = "type";
-    constructor(value: TypeDeclaration);
-    getName(): Name;
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): PackageTypeEntity;
-}
-interface INamedMember {
-    getName(): Name;
-    isHidden(): EntityHidingLevel | undefined;
-    getEntity(): NamedPackageMemberEntity;
-}
-export type NamedPackageMemberEntity = PackageVariableEntity | PackageMethodEntity | PackageTypeEntity;
-export {};

package/build/types/entities/SetterEntity.d.ts

@@ -24,6 +24,8 @@ export declare class PackageVariableSetterDeclarationEntity implements SetterEnt
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
@@ -35,6 +37,8 @@ export declare class TypeVariableSetterDeclarationEntity implements SetterEntity
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
@@ -46,6 +50,8 @@ export declare class TypeIndexedSetterDeclarationEntity implements SetterEntity
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeIndexedSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
@@ -57,6 +63,8 @@ export declare class TypeDereferencedVariableSetterDeclarationEntity implements
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: TypeDereferencedVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;

package/build/types/entities/StructuredTypeEntity.d.ts

@@ -5,8 +5,8 @@ import { AnonymousStructuredTypeDeclaration, PackageStructuredTypeDeclaration }
 import * as types from '../types/index.js';
 import { EntityNaming } from './EntityNaming.js';
 import { NamedTypeMemberEntity, OriginalTypeEntityMembers } from './TypeEntityMembers.js';
-import type { DereferenceOperatorEntity, OperatorEntity, PackageEntity } from './index.js';
-import { ConstructorEntity, DefinitionKind, DestructorEntity, EntityHidingLevel, EntityKind, IndexerEntity, SubstitutionApplicationMode, TypeParameterEntity } from './index.js';
+import type { PackageEntity } from './index.js';
+import { ConstructorEntity, DefinitionKind, DereferenceOperatorEntity, DestructorEntity, EntityHidingLevel, EntityKind, IndexerEntity, ITypeEntity, OperatorEntity, SubstitutionApplicationMode, TypeEntityKind, TypeParameterEntity } from './index.js';
 export type StructuredTypeEntity = PackageStructuredTypeEntity | AnonymousStructuredTypeEntity;
 export interface PackageStructuredTypeEntity extends IStructuredTypeEntity {
     readonly subkind: 'package';
@@ -17,22 +17,25 @@ export interface AnonymousStructuredTypeEntity extends IStructuredTypeEntity {
     readonly subkind: 'anonymous';
     getContainingPackage(): PackageEntity;
 }
-interface IStructuredTypeEntity {
-    readonly kind: EntityKind.StructuredType;
+interface IStructuredTypeEntity extends ITypeEntity {
+    readonly kind: EntityKind.Type;
+    readonly typeEntityKind: TypeEntityKind.Structured;
     getNaming(): EntityNaming;
     getTypeParameters(): readonly TypeParameterEntity[];
     getMembers(): OriginalTypeEntityMembers;
     getDefinition(): StructuredTypeEntityDefinition;
+    isBasic(): boolean;
+    isAbstract(): boolean;
     isAspect(): boolean;
     isRefObject(): boolean;
     isPlainObject(): boolean;
     getArity(): number;
     /**
-     * При повторных вызовах метод должен возвращать один и тот же экземпляр класса BaseObjectType.
+     * При каждом вызове метод должен возвращать один и тот же экземпляр класса BaseObjectType.
      */
     getBaseObjectType(): BaseObjectType;
     /**
-     * При повторных вызовах метод должен возвращать один и тот же экземпляр класса BaseAspectTypes.
+     * При каждом вызове метод должен возвращать один и тот же экземпляр класса BaseAspectTypes.
      */
     getBaseAspectTypes(): BaseAspectTypes;
     isHidden(): EntityHidingLevel | undefined;
@@ -113,7 +116,8 @@ export declare class BaseAspectTypes {
     private resolveBaseAspectTypes;
 }
 export declare class PackageStructuredTypeDeclarationEntity implements PackageStructuredTypeEntity {
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "package";
     private readonly _analyzer;
     private readonly _node;
@@ -125,6 +129,8 @@ export declare class PackageStructuredTypeDeclarationEntity implements PackageSt
     getTypeParameters(): readonly TypeParameterEntity[];
     getMembers(): OriginalTypeEntityMembers;
     getDefinition(): StructuredTypeEntityDefinition;
+    isBasic(): boolean;
+    isAbstract(): boolean;
     isAspect(): boolean;
     isRefObject(): boolean;
     isPlainObject(): boolean;
@@ -143,6 +149,8 @@ export declare class SourcePackageStructuredTypeDeclarationData {
     private readonly _baseObjectType;
     private readonly _baseAspectTypes;
     private readonly _members;
+    private readonly _modifierFlags;
+    private get modifierFlags();
     constructor(analyzer: Analyzer, node: PackageStructuredTypeDeclaration, entity: PackageStructuredTypeEntity);
     getNaming(): EntityNaming;
     getName(): Name;
@@ -150,6 +158,8 @@ export declare class SourcePackageStructuredTypeDeclarationData {
     getTypeParameters(): readonly TypeParameterEntity[];
     getMembers(): OriginalTypeEntityMembers;
     getDefinition(): StructuredTypeEntityDefinition;
+    isBasic(): boolean;
+    isAbstract(): boolean;
     isAspect(): boolean;
     isRefObject(): boolean;
     isPlainObject(): boolean;
@@ -163,7 +173,8 @@ export declare class SourcePackageStructuredTypeDeclarationData {
 export declare class AnonymousStructuredTypeDeclarationEntity implements AnonymousStructuredTypeEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.StructuredType;
+    readonly kind = EntityKind.Type;
+    readonly typeEntityKind = TypeEntityKind.Structured;
     readonly subkind = "anonymous";
     private readonly _baseObjectType;
     private readonly _baseAspectTypes;
@@ -173,6 +184,8 @@ export declare class AnonymousStructuredTypeDeclarationEntity implements Anonymo
     getTypeParameters(): readonly TypeParameterEntity[];
     getMembers(): OriginalTypeEntityMembers;
     getDefinition(): StructuredTypeEntityDefinition;
+    isBasic(): boolean;
+    isAbstract(): boolean;
     isAspect(): boolean;
     isRefObject(): boolean;
     isPlainObject(): boolean;
@@ -187,7 +200,7 @@ export declare class AnonymousStructuredTypeDeclarationEntity implements Anonymo
 export declare class UnfinishedIntrinsicPackageStructuredTypeEntity {
     private readonly _unfinishedValue;
     get unfinishedValue(): PackageStructuredTypeEntity;
-    constructor(analyzer: Analyzer, name: Name, containingPackage: PackageEntity, typeParameters: readonly TypeParameterEntity[], isAspect: boolean, isRefObject: boolean, baseObjectType: types.StructuredType | undefined, baseAspectTypes: readonly types.StructuredType[], isHidden: EntityHidingLevel | undefined, substitutionApplicationMode: SubstitutionApplicationMode);
+    constructor(analyzer: Analyzer, name: Name, containingPackage: PackageEntity, typeParameters: readonly TypeParameterEntity[], isBasic: boolean, isAbstract: boolean, isAspect: boolean, isRefObject: boolean, baseObjectType: types.StructuredType | undefined, baseAspectTypes: readonly types.StructuredType[], isHidden: EntityHidingLevel | undefined, substitutionApplicationMode: SubstitutionApplicationMode);
     finish(ownNamedMembers: readonly NamedTypeMemberEntity[], ownOperators: readonly OperatorEntity[], ownConstructors: readonly ConstructorEntity[], ownDestructors: readonly DestructorEntity[], ownIndexers: readonly IndexerEntity[], ownDereferenceOperators: readonly DereferenceOperatorEntity[]): PackageStructuredTypeEntity;
 }
 export declare class UnfinishedIntrinsicAnonymousStructuredTypeEntity {

package/build/types/entities/TypeEntity.d.ts

@@ -0,0 +1,15 @@
+import { Tag } from '../analysis/Tags.js';
+import { AliasTypeEntity, EntityKind, MethodTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from './index.js';
+export type TypeEntity = StructuredTypeEntity | MethodTypeEntity | VariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
+export interface ITypeEntity {
+    readonly kind: EntityKind.Type;
+    readonly typeEntityKind: TypeEntityKind;
+    getTags(): readonly Tag[];
+}
+export declare enum TypeEntityKind {
+    Method = 0,
+    Structured = 1,
+    Parameter = 2,
+    Variant = 3,
+    Alias = 4
+}