@artel/artc 0.6.25231 → 0.6.25233

package/build/{chunk-BG2YEIQO.js → chunk-YA4OCEDT.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-VQ5GGKF7.js";
+} from "./chunk-SCSDVK4I.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-S7CAJWX2.js";
+} from "./chunk-T4JAN46C.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

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

@@ -98,6 +98,7 @@ export declare class Analyzer {
     private readonly _diagnosticsComputedLazily;
     private readonly _diagnosticsComputedLazilyAcceptor;
     private readonly _sourcePackageMemberConflictsDiagnostics;
+    private readonly _notImplementedAbstractTypeMembers;
     get tsInterop(): TsInteropContext;
     constructor(compilation: project.Compilation, tsInteropInputs: TsInteropInputs);
     getProjectSourceFile(node: tree.SourceFile): project.SourceFile;
@@ -278,6 +279,7 @@ export declare class Analyzer {
     getSourceFileDiagnosticsComputedLazily(sourceFile: project.SourceFile): readonly Diagnostic[];
     getDiagnosticsWithoutLocationComputedLazily(): readonly Diagnostic[];
     validateSourcePackageMemberConflicts(pkg: project.ProgramPackage): readonly Diagnostic[];
+    getNotImplementedAbstractMembers(typeEntity: e.TypeEntityWithMembers): readonly types.TypeMember[];
     private createTsInterop;
 }
 export declare class TsInteropInputs {
@@ -481,28 +483,60 @@ declare class DefaultConstructors {
 }
 declare class OverriddenMember {
     private readonly _analyzer;
+    private readonly _namedMemberFinder;
+    private readonly _operatorFinder;
+    private readonly _indexerFinder;
+    private readonly _dereferenceOperatorFinder;
+    private readonly _isField;
+    private readonly _isMethod;
+    private readonly _isOperator;
+    private readonly _isIndexer;
+    private readonly _isDereferenceOperator;
+    private readonly _overriddenAndShadowedFields;
+    private readonly _overriddenAndShadowedMethods;
+    private readonly _overriddenAndShadowedOperators;
+    private readonly _overriddenAndShadowedIndexers;
+    private readonly _overriddenAndShadowedDereferenceOperators;
     constructor(_analyzer: Analyzer);
-    getOverriddenFields(node: tree.FieldDeclaration | FieldAccessorDeclaration): types.Field[];
-    getOverriddenMethods(node: tree.MethodDeclaration): types.Method[];
-    getOverriddenOperators(node: tree.OperatorDeclaration): types.Operator[];
-    getOverriddenIndexers(node: IndexedElementAccessorDeclaration): types.Indexer[];
-    getOverriddenDereferenceOperators(node: DereferencedVariableAccessorDeclaration): types.DereferenceOperator[];
-    private findOverriddenFieldInType;
-    private findOverriddenMethodInType;
-    private findOverriddenOperatorInType;
-    private findOverriddenIndexerInType;
-    private findOverriddenDereferenceOperatorInType;
-    private checkFieldOverridesField;
-    private checkMethodOverridesMethod;
-    private checkOperatorOverridesOperator;
-    private checkIndexerOverridesIndexer;
-    private checkDereferenceOperatorOverridesDereferenceOperator;
-    private enumerateTypeMemberLookupsForOverriddenMember;
+    getOverriddenAndShadowedFields(node: tree.FieldDeclaration | FieldAccessorDeclaration): OverriddenAndShadowedMembers<types.Field, types.NamedTypeMember>;
+    getOverriddenAndShadowedMethods(node: tree.MethodDeclaration): OverriddenAndShadowedMembers<types.Method, types.NamedTypeMember>;
+    getOverriddenAndShadowedOperators(node: tree.OperatorDeclaration): OverriddenAndShadowedMembers<types.Operator>;
+    getOverriddenAndShadowedIndexers(node: IndexedElementAccessorDeclaration): OverriddenAndShadowedMembers<types.Indexer>;
+    getOverriddenAndShadowedDereferenceOperators(node: DereferencedVariableAccessorDeclaration): OverriddenAndShadowedMembers<types.DereferenceOperator>;
+    entityCanBeOverridden(entity: OverridableTypeMemberEntity): boolean;
+    getEntityTypeOrReturnType(entity: OverridableTypeMemberEntity): types.Type;
+    getMemberTypeOrReturnType(member: OverridableTypeMember): types.Type;
+    private findOverriddenMembers;
+    private findOverriddenOrShadowedNamedMemberInType;
+    private findOverriddenOrShadowedOperatorInType;
+    private findOverriddenOrShadowedIndexerInType;
+    private findOverriddenOrShadowedDereferenceOperatorInType;
+    private checkMethodOverridesOrShadowsMethod;
+    private checkOperatorOverridesOrShadowsOperator;
+    private checkIndexerOverridesOrShadowsIndexer;
+    private enumerateTypeMemberLookups;
     private enumerateTypesForOverriddenMemberLookup;
-    private entityCanOverride;
-    private entityCanBeOverridden;
-    private addTypeMemberIfUnique;
+    private entityCanOverrideOrShadow;
 }
+export declare enum ShadowReason {
+    BaseMemberHasDifferentKind = 0,
+    BaseMemberCanNotBeOverridden = 1,
+    NoOverrideModifier = 2,
+    NoOverrideModifierAndTypeOrReturnTypeMismatch = 3,
+    TypeOrReturnTypeMismatch = 4
+}
+export declare class ShadowedMemberInfo<T extends OverridableTypeMember = OverridableTypeMember> {
+    readonly value: T;
+    readonly shadowReason: ShadowReason;
+    constructor(value: T, shadowReason: ShadowReason);
+}
+export declare class OverriddenAndShadowedMembers<TOverriddenMember extends OverridableTypeMember = OverridableTypeMember, TShadowedMember extends OverridableTypeMember = TOverriddenMember> {
+    readonly overriddenMembers: readonly TOverriddenMember[];
+    readonly shadowedMembers: readonly ShadowedMemberInfo<TShadowedMember>[];
+    constructor(overriddenMembers: readonly TOverriddenMember[], shadowedMembers: readonly ShadowedMemberInfo<TShadowedMember>[]);
+}
+export type OverridableTypeMemberEntity = e.FieldEntity | e.MethodEntity | e.OperatorEntity | e.IndexerEntity | e.DereferenceOperatorEntity;
+export type OverridableTypeMember = types.Field | types.Method | types.Operator | types.Indexer | types.DereferenceOperator;
 declare class Tags {
     readonly _analyzer: Analyzer;
     private readonly _tags;
@@ -577,13 +611,17 @@ declare class OwningPlainObjectModificationCheck {
     private nodeBelongsToPlainObjectDeclaration;
 }
 export declare enum TypeAssignabilityFlags {
-    NotAssignable = 0,
-    Identity = 1,
-    DerivedToBase = 2,
-    FunctionTypes = 4,
-    ImplicitConversion = 8,
+    None = 0,
+    /**
+     * Если флаг NotAssignable установлен, никакие другие флаги не могут быть установлены.
+     */
+    NotAssignable = 1,
+    Identity = 2,
+    DerivedToBase = 4,
+    FunctionTypes = 8,
+    ImplicitConversion = 16,
     First = 1,
-    Last = 8
+    Last = 16
 }
 declare class PackageImports {
     private readonly _analyzer;
@@ -622,6 +660,9 @@ declare class TypeUtils {
     getCommonObjectAndAspectTypesOfUnion(unionType: types.UnionType): readonly types.StructuredType[];
     removeBaseTypesInPlace(types: types.Type[]): void;
     removeDerivedTypesInPlace(types: types.Type[]): void;
+    getBaseTypes(type: types.Type): readonly types.Type[];
+    getBaseTypesRecursively(type: types.Type): readonly types.Type[];
+    private collectBaseTypesRecursively;
     private getBaseTypesForCommonTypesSearch;
     private addTypeAndCollectAllBaseTypes;
     private addTypeIfUnique;

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

@@ -5,9 +5,12 @@ import { Analyzer } from './Analyzer.js';
 import { FoundAnonymousDeclaration } from './FoundDeclaration.js';
 /**
  * "основа" не является самостоятельным выражением и может использоваться только в следующих конструкциях:
- * 1. основа() - в конструкторе для вызова базового конструктора или в методе для вызова базового метода.
- * 2. основа.поле (основа.метод) - в любом выражении в контексте типа, имеющего базовый тип.
- * 3. основа[] - аналогично п. 2.
+ * 1. `основа()` - в конструкторе для вызова базового конструктора или в методе для вызова базового метода.
+ * 2. `основа.поле` (`основа.метод`) - в любом выражении в контексте типа, имеющего базовый тип.
+ * 3. `основа[]` - аналогично п. 2.
+ * 4. `основа^` - аналогично п. 2.
+ * 5. `(основа как БазовыйАспект).поле`, `(основа как БазовыйАспект)[]`, `(основа как БазовыйАспект)^` - для доступа к
+ *    реализации по умолчанию члена базового аспекта.
  */
 export declare class Resolver {
     private readonly _analyzer;

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

@@ -48,9 +48,7 @@ export declare class DiagnosticCollector {
     private checkReturnStatement;
     private checkYieldStatement;
     private checkPackageMemberBodyPresence;
-    private getPackageMemberBodyRequirementReason;
     private checkTypeMemberBodyPresence;
-    private getTypeMemberBodyRequirementReason;
     private checkIdentifierExpression;
     private checkLocalVariableUsedBeforeDeclaration;
     private checkLocalVariableIsUsedBeforeBeingAssigned;
@@ -81,6 +79,9 @@ export declare class DiagnosticCollector {
     private checkIfNestedFunctionIsUnused;
     private checkIfTypeParameterIsUnused;
     private checkAllCodePathsReturnOrResultVariableIsAssigned;
+    private checkTypeMemberIncorrectlyOverridesOrShadowsBaseMember;
+    private isReceiverBaseAutoVariableAccess;
+    private overridingMemberHasCorrectHiding;
     private addDiagnostic;
     private addDiagnostics;
     private addMaybeLazyDiagnostic;

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

@@ -5,9 +5,9 @@ export declare enum ModifierFlags {
     HiddenInHierarchy = 4,
     HiddenInFile = 8,
     HiddenInPackage = 16,
-    Basic = 32,
-    Static = 64,
-    Abstract = 128,
+    Static = 32,
+    Abstract = 64,
+    Basic = 128,
     Override = 256,
     Async = 512,
     Const = 1024,

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

@@ -45,13 +45,14 @@ export declare class ModifierValidator {
     static readonly allowedModifiersByTypeMemberDeclarationKind: {
         [T in TypeMemberDeclarationKind]: ModifierFlags;
     };
+    private effectiveModifiers;
     constructor(_analyzer: Analyzer, _diagnostics: DiagnosticAcceptor, _locale: PackageLocale, _dialect: PackageDialect);
     static validatePackageVariableAccessorsHaveConsistentModifiers(analyzer: Analyzer, getterModifiers: ModifierFlags, setterModifiers: ModifierFlags, nodeForDiagnostic: tree.Node, diagnostics: DiagnosticAcceptor): void;
     static validateFieldAccessorsHaveConsistentModifiers(analyzer: Analyzer, getterModifiers: ModifierFlags, setterModifiers: ModifierFlags, nodeForDiagnostic: tree.Node, diagnostics: DiagnosticAcceptor): void;
     static validateIndexedElementAccessorsHaveConsistentModifiers(analyzer: Analyzer, getterModifiers: ModifierFlags, setterModifiers: ModifierFlags, nodeForDiagnostic: tree.Node, diagnostics: DiagnosticAcceptor): void;
     static validateDereferencedVariableAccessorsHaveConsistentModifiers(analyzer: Analyzer, getterModifiers: ModifierFlags, setterModifiers: ModifierFlags, nodeForDiagnostic: tree.Node, diagnostics: DiagnosticAcceptor): void;
     validateTopLevelPackageMembers(list: tree.PackageMemberDeclarationList): void;
-    validateTopLevelTypeMembers(list: tree.TypeMemberDeclarationList, declarationWithMembersKind: DeclarationWithTypeMembersKind, isTypeMarkedAbstract: boolean, isTypeMarkedBasic: boolean): void;
+    validateTopLevelTypeMembers(memberList: tree.TypeMemberDeclarationList, declarationWithMembersKind: DeclarationWithTypeMembersKind, isTypeMarkedAbstract: boolean, isTypeMarkedBasic: boolean): void;
     private static validateTypeMemberAccessorsHaveConsistentModifiers;
     private static validatePackageMemberSetterHasMoreRestrictiveHidingLevel;
     private static validateTypeMemberSetterHasMoreRestrictiveHidingLevel;
@@ -66,6 +67,7 @@ export declare class ModifierValidator {
     private validateTypeMembers;
     private validateTypeMemberModifierList;
     private validateTypeMemberCanBePlacedInGroupWithModifiers;
+    private validateFieldCanBePlacedInGroupWithModifiers;
     private typeMemberAllowsAbstractModifier;
     private typeMemberAllowsBasicModifier;
     private typeMemberAllowsOverrideModifier;
@@ -75,9 +77,8 @@ export declare class ModifierValidator {
     private reportDeclarationCanNotBePlacedInGroupWithModifier;
     private reportModifierCanNotBeUsedWithAnotherModifier;
     private reportModifierIsNotAllowedHere;
+    private findModifier;
     private displayModifierNode;
-    private displayModifierFlag;
-    private displayModifier;
     private forEachModifierFlag;
 }
 export {};

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

@@ -0,0 +1,13 @@
+import { DiagnosticAcceptor } from '../diagnostic/Diagnostic.js';
+import { TypeEntityWithMembers } from '../entities/index.js';
+import { DisplayService } from '../services/DisplayService.js';
+import { Analyzer } from './Analyzer.js';
+export declare class TypeMemberImplementationValidator {
+    private readonly _analyzer;
+    private readonly _typeEntity;
+    private readonly _displayService;
+    private readonly _diagnostics;
+    constructor(_analyzer: Analyzer, _typeEntity: TypeEntityWithMembers, _displayService: DisplayService, _diagnostics: DiagnosticAcceptor);
+    validate(): void;
+    private getDiagnosticLocation;
+}

package/build/types/common/ArrayUtils.d.ts

@@ -5,4 +5,9 @@ export declare class ArrayUtils {
      * Работает быстрее, чем `array.splice(index, 1)`, и не выделяет память для массива удалённых элементов.
      */
     static removeElement<T>(array: T[], index: number): void;
+    static pushElementIfUniqueComparingWithEquals<T extends WithEqualsMethod<T>>(array: T[], element: T): void;
+    static pushElementsIfUniqueComparingWithEquals<T extends WithEqualsMethod<T>>(array: T[], elements: readonly T[]): void;
 }
+export type WithEqualsMethod<T> = {
+    equals(t: T): boolean;
+};

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

@@ -88,89 +88,102 @@ export declare enum DiagnosticCode {
     BodyIsMissing = 250,
     AbstractTypeMembersMustNotHaveBody = 251,
     MembersOfAspectTypeMustNotHaveBody = 252,
-    DeclarationsMarkedWithBuiltIntoPlatformTagMustNotHaveBody = 253,
-    AbstractVariablesMustNotHaveInitializers = 254,
-    PackageIsAlreadyImportedInAnotherLanguage = 255,
-    OnlySubprogramsWithReturnTypeCanReturnValue = 256,
-    FunctionsUsingYieldStatementCannotReturnValue = 257,
-    YieldStatementCannotBeUsedInAnonymousFunctions = 258,
-    YieldStatementCannotBeUsedHere = 259,
-    FunctionsUsingYieldStatementMustHaveEnumerableAsReturnType = 260,
-    YieldStatementCannotBeUsedInTryStatementThatHasCatchClause = 261,
-    YieldStatementCannotBeUsedInFinallyClause = 262,
-    SubprogramMustReturnValue = 263,
-    ResultVariableCannotBeUsedInFunctionsUsingYieldStatement = 264,
-    TypeAliasReferencesItself = 265,
-    TypeParameterHasCircularConstraint = 266,
-    BaseTypeCausesInheritanceCycle = 267,
-    OnlyGenericTypesAndFunctionsCanBeSpecialized = 268,
-    Expected0TypeArguments = 269,
-    ExpectedFrom0To1TypeArguments = 270,
-    Type0IsNotAssignableToConstraint1 = 271,
-    VariableIsDeclaredButItsValueIsNeverRead = 272,
-    FunctionIsDeclaredButNotUsed = 273,
-    TypeParameterIsDeclaredButNotUsed = 274,
-    DefaultConstructorArgumentsMustBeNamed = 275,
-    IncorrectBodyOfBasicAliasTypeMethod = 276,
-    TheFollowingDeclarationsAreNotTranslated0 = 277,
-    TheFollowingDeclarationAreNotTranslated0And1More = 278,
-    OperatorFunction0MustNotHaveParameters = 279,
-    OperatorFunction0MustHaveOneParameter = 280,
-    OperatorFunction0MustHaveNoMoreThanOneParameter = 281,
-    CorrespondingBasicTypeMemberNotFound = 282,
-    AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier = 283,
-    TagNotFound = 284,
-    TypeOrFunctionNameExpected = 285,
-    PackageNameOrAliasExpected = 286,
-    ExpressionCanBeNone = 287,
-    TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator = 288,
-    UnreachableCode = 289,
-    RecursionOccurredWhileCalculatingTheTypeOfTheExpression = 290,
-    RecursionOccurredWhileInferringTheTypeOfTheVariable = 291,
-    ScopeAlreadyContainsDeclarationWithTheSameName = 292,
-    ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 293,
-    ParameterName0ConflictsWithAutomaticallyGeneratedVariableName = 294,
-    PackageAlreadyContainsDeclarationWithTheSameName = 295,
-    PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 296,
-    PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount = 297,
-    PackageAliasWithTheSameNameAlreadyExits = 298,
-    PackageCanHaveOnlyEntryPoint = 299,
-    PackageCanHaveOnlyOneConstructor = 300,
-    TypeAlreadyContainsDeclarationWithTheSameName = 301,
-    TypeAlreadyContainsMethodWithTheSameNameAndParameterTypes = 302,
-    TypeAlreadyContainsConstructorWithTheSameParameterTypes = 303,
-    TypeAlreadyContainsOperatorFunctionWithTheSameParameterTypes = 304,
-    TypeAlreadyContainsIndexerWithTheSameParameterTypes = 305,
-    TypeCanHaveOnlyOneDestructor = 306,
-    TypeCanHaveOnlyOneDereferenceOperator = 307,
-    VariableIsUsedBeforeItsDeclaration = 308,
-    VariableMayNotHasBeenAssignedBeforeUsage = 309,
-    NotAllCodePathsReturnAValueAndResultLocalVariableMayNotHasBeenAssigned = 310,
-    WriteFunctionHasNoCorrespondingReadFunction = 311,
-    TypeCanNotHaveMultipleBaseObjectTypes = 312,
-    TypeThatIsNotMarkedAsBasicCanNotBeUsedAsBaseType = 313,
-    PlainObjectTypeCanNotBeUsedAsBaseType = 314,
-    ThisTypeIsAlreadyListedInBaseTypeList = 315,
-    OnlyObjectAndAspectTypesCanBeUsedAsBaseTypes = 316,
-    PlainObjectTypeCanHaveOnlyAspectsAsBaseTypes = 317,
-    AspectTypeCanHaveOnlyAspectsAsBaseTypes = 318,
-    ModifierListAlreadyContains0Modifier = 319,
-    ModifierListOfOuterDeclarationGroupAlreadyContains0Modifier = 320,
-    _0ModifierIsNotAllowedHere = 321,
-    DeclarationCanNotBePlacedInGroupHaving0Modifier = 322,
-    PackageConstructorDeclarationCanNotHaveModifiers = 323,
-    PackageEntryPointDeclarationCanNotHaveModifiers = 324,
-    TranslationsCanNotHaveModifiers = 325,
-    AbstractModifierCanOnlyBeUsedInAbstractObjectTypes = 326,
-    BasicModifierCanOnlyBeUsedInObjectTypesAspectTypesAndTypeAliases = 327,
-    OverrideModifierCanOnlyBeUsedInObjectAndAspectTypes = 328,
-    _0ModifierCanNotBeUsedWith1Modifier = 329,
-    VariantDeclarationCanNotHaveHiddenModifier = 330,
-    BasicModifierCanOnlyBeAppliedToObjectTypes = 331,
-    AbstractModifierCanOnlyBeAppliedToObjectTypes = 332,
-    NotBasicObjectTypesCanNotHaveBasicMembers = 333,
-    WriteFunctionMustHaveTheSameModifiersAsReadFunction = 334,
-    WriteFunctionMustHaveTheSameOrMoreRestrictiveHidingLevelThenReadFunction = 335,
+    AspectTypeFieldsMustBeAbstract = 253,
+    DeclarationsMarkedWithBuiltIntoPlatformTagMustNotHaveBody = 254,
+    AbstractFieldsMustNotHaveInitializers = 255,
+    PackageIsAlreadyImportedInAnotherLanguage = 256,
+    OnlySubprogramsWithReturnTypeCanReturnValue = 257,
+    FunctionsUsingYieldStatementCannotReturnValue = 258,
+    YieldStatementCannotBeUsedInAnonymousFunctions = 259,
+    YieldStatementCannotBeUsedHere = 260,
+    FunctionsUsingYieldStatementMustHaveEnumerableAsReturnType = 261,
+    YieldStatementCannotBeUsedInTryStatementThatHasCatchClause = 262,
+    YieldStatementCannotBeUsedInFinallyClause = 263,
+    SubprogramMustReturnValue = 264,
+    ResultVariableCannotBeUsedInFunctionsUsingYieldStatement = 265,
+    TypeAliasReferencesItself = 266,
+    TypeParameterHasCircularConstraint = 267,
+    BaseTypeCausesInheritanceCycle = 268,
+    OnlyGenericTypesAndFunctionsCanBeSpecialized = 269,
+    Expected0TypeArguments = 270,
+    ExpectedFrom0To1TypeArguments = 271,
+    Type0IsNotAssignableToConstraint1 = 272,
+    VariableIsDeclaredButItsValueIsNeverRead = 273,
+    FunctionIsDeclaredButNotUsed = 274,
+    TypeParameterIsDeclaredButNotUsed = 275,
+    DefaultConstructorArgumentsMustBeNamed = 276,
+    IncorrectBodyOfBasicAliasTypeMethod = 277,
+    TheFollowingDeclarationsAreNotTranslated0 = 278,
+    TheFollowingDeclarationAreNotTranslated0And1More = 279,
+    OperatorFunction0MustNotHaveParameters = 280,
+    OperatorFunction0MustHaveOneParameter = 281,
+    OperatorFunction0MustHaveNoMoreThanOneParameter = 282,
+    CorrespondingBasicTypeMemberNotFound = 283,
+    AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier = 284,
+    TagNotFound = 285,
+    TypeOrFunctionNameExpected = 286,
+    PackageNameOrAliasExpected = 287,
+    ExpressionCanBeNone = 288,
+    TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator = 289,
+    UnreachableCode = 290,
+    RecursionOccurredWhileCalculatingTheTypeOfTheExpression = 291,
+    RecursionOccurredWhileInferringTheTypeOfTheVariable = 292,
+    ScopeAlreadyContainsDeclarationWithTheSameName = 293,
+    ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 294,
+    ParameterName0ConflictsWithAutomaticallyGeneratedVariableName = 295,
+    PackageAlreadyContainsDeclarationWithTheSameName = 296,
+    PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 297,
+    PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount = 298,
+    PackageAliasWithTheSameNameAlreadyExits = 299,
+    PackageCanHaveOnlyEntryPoint = 300,
+    PackageCanHaveOnlyOneConstructor = 301,
+    TypeAlreadyContainsDeclarationWithTheSameName = 302,
+    TypeAlreadyContainsMethodWithTheSameNameAndParameterTypes = 303,
+    TypeAlreadyContainsConstructorWithTheSameParameterTypes = 304,
+    TypeAlreadyContainsOperatorFunctionWithTheSameParameterTypes = 305,
+    TypeAlreadyContainsIndexerWithTheSameParameterTypes = 306,
+    TypeCanHaveOnlyOneDestructor = 307,
+    TypeCanHaveOnlyOneDereferenceOperator = 308,
+    VariableIsUsedBeforeItsDeclaration = 309,
+    VariableMayNotHasBeenAssignedBeforeUsage = 310,
+    NotAllCodePathsReturnAValueAndResultLocalVariableMayNotHasBeenAssigned = 311,
+    WriteFunctionHasNoCorrespondingReadFunction = 312,
+    TypeCanNotHaveMultipleBaseObjectTypes = 313,
+    TypeThatIsNotMarkedAsBasicCanNotBeUsedAsBaseType = 314,
+    PlainObjectTypeCanNotBeUsedAsBaseType = 315,
+    ThisTypeIsAlreadyListedInBaseTypeList = 316,
+    OnlyObjectAndAspectTypesCanBeUsedAsBaseTypes = 317,
+    PlainObjectTypeCanHaveOnlyAspectsAsBaseTypes = 318,
+    AspectTypeCanHaveOnlyAspectsAsBaseTypes = 319,
+    ModifierListAlreadyContains0Modifier = 320,
+    ModifierListOfOuterDeclarationGroupAlreadyContains0Modifier = 321,
+    _0ModifierIsNotAllowedHere = 322,
+    DeclarationCanNotBePlacedInGroupHaving0Modifier = 323,
+    PackageConstructorDeclarationCanNotHaveModifiers = 324,
+    PackageEntryPointDeclarationCanNotHaveModifiers = 325,
+    TranslationsCanNotHaveModifiers = 326,
+    AbstractModifierCanOnlyBeUsedInAbstractObjectTypes = 327,
+    BasicModifierCanOnlyBeUsedInObjectTypesAspectTypesAndTypeAliases = 328,
+    OverrideModifierCanOnlyBeUsedInObjectAndAspectTypes = 329,
+    _0ModifierCanNotBeUsedWith1Modifier = 330,
+    VariantDeclarationCanNotHaveHiddenModifier = 331,
+    BasicModifierCanOnlyBeAppliedToObjectTypes = 332,
+    AbstractModifierCanOnlyBeAppliedToObjectTypes = 333,
+    NotBasicObjectTypesCanNotHaveBasicMembers = 334,
+    BasicModifierCanNotBeAppliedToAspectTypeFields = 335,
+    WriteFunctionMustHaveTheSameModifiersAsReadFunction = 336,
+    WriteFunctionMustHaveTheSameOrMoreRestrictiveHidingLevelThenReadFunction = 337,
+    DeclarationConflictsWithBaseTypeMember0 = 338,
+    DeclarationConflictsWithBaseTypeMember0AddOverrideModifier = 339,
+    DeclarationConflictsWithBaseTypeMember0ThisMemberCanNotBeOverridden = 340,
+    DeclarationConflictsWithBaseTypeMember0ToOverrideTypeMustBeAssignableTo1 = 341,
+    DeclarationConflictsWithBaseTypeMember0ToOverrideReturnTypeMustBeAssignableTo1 = 342,
+    OverridingMemberMustHaveTheSameHidingLevelAsBaseMember0 = 343,
+    OverridingMethodMustBeAsyncBecauseBaseMethod0IsAsync = 344,
+    OverridingMethodMustNotBeAsyncBecauseBaseMethod0IsNotAsync = 345,
+    OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0 = 346,
+    TypeDoesNotImplementMember0 = 347,
+    CanNotAccessAbstractMemberOfBaseType = 348,
     CannotFindTsLibDirectoryBaseSearchPaths0 = 401,
     SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 402,
     ProgramWithoutMainPackageCannotBeCompiled = 403,

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

@@ -805,15 +805,15 @@ export declare class MethodDeclaration {
 export declare class FieldAccessExpression {
     expression: Expression;
     isOptionalAccess: boolean;
-    variable: AccessedVariable;
+    field: AccessedVariable;
     accessKind: AccessKind;
     ifComputedThenKey: Expression | undefined;
     sourceLocation: SourceLocation | undefined;
     options: FieldAccessExpressionEmitOptions;
     readonly kind = NodeKind.FieldAccessExpression;
-    constructor(expression: Expression, isOptionalAccess: boolean, variable: AccessedVariable, accessKind: AccessKind, ifComputedThenKey: Expression | undefined, sourceLocation: SourceLocation | undefined, options?: FieldAccessExpressionEmitOptions);
-    static get(expression: Expression, isOptionalAccess: boolean, variable: AccessedVariable | VariableEntity, ifComputedThenKey?: Expression, sourceLocation?: SourceLocation): FieldAccessExpression;
-    static set(expression: Expression, isOptionalAccess: boolean, variable: AccessedVariable | VariableEntity, ifComputedThenKey?: Expression, sourceLocation?: SourceLocation): FieldAccessExpression;
+    constructor(expression: Expression, isOptionalAccess: boolean, field: AccessedVariable, accessKind: AccessKind, ifComputedThenKey: Expression | undefined, sourceLocation: SourceLocation | undefined, options?: FieldAccessExpressionEmitOptions);
+    static get(expression: Expression, isOptionalAccess: boolean, field: AccessedVariable | VariableEntity, ifComputedThenKey?: Expression, sourceLocation?: SourceLocation): FieldAccessExpression;
+    static set(expression: Expression, isOptionalAccess: boolean, field: AccessedVariable | VariableEntity, ifComputedThenKey?: Expression, sourceLocation?: SourceLocation): FieldAccessExpression;
     clone(): FieldAccessExpression;
 }
 export declare class FieldDeclaration {

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

@@ -31,7 +31,6 @@ export declare class DereferenceOperatorDeclarationEntity implements Dereference
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
-    private readonly _overriddenMembers;
     private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();

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

@@ -75,7 +75,6 @@ export declare class MethodDeclarationEntity implements MethodEntity {
     readonly subkind = "method";
     private readonly _typeParameters;
     private readonly _valueParameters;
-    private readonly _overriddenMember;
     private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: MethodDeclaration);

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

@@ -38,7 +38,6 @@ export declare class IndexerDeclarationEntity implements SourceIndexerEntity {
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
     private readonly _parameters;
-    private readonly _overriddenMembers;
     private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get parameters();

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

@@ -28,7 +28,6 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     readonly kind = EntityKind.Operator;
     private readonly _operatorKind;
     private readonly _valueParameters;
-    private readonly _overriddenMembers;
     private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: tree.OperatorDeclaration);

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

@@ -2,23 +2,24 @@ import { Name } from '../common/index.js';
 import { ConstructorEntity } from './ConstructorEntity.js';
 import { DereferenceOperatorEntity } from './DereferenceOperatorEntity.js';
 import { DestructorEntity } from './DestructorEntity.js';
-import { IndexerEntity } from './IndexerEntity.js';
 import { MethodEntity } from './FunctionEntity.js';
+import { IndexerEntity } from './IndexerEntity.js';
 import { OperatorEntity } from './OperatorEntity.js';
 import { OperatorKind } from './OperatorKind.js';
 import { FieldEntity } from './VariableEntity.js';
+import { TypeMemberEntity } from './index.js';
 export declare class OriginalTypeEntityMembers {
     private readonly _namedMembers;
     private readonly _operators;
     private readonly _constructors;
     private readonly _destructors;
     private readonly _indexers;
-    private readonly _referenceOperators;
+    private readonly _dereferenceOperators;
     private readonly _membersByNameKey;
     private readonly _operatorsByKind;
     private get membersByNameKey();
     private get operatorByKind();
-    constructor(_namedMembers: readonly NamedTypeMemberEntity[], _operators: readonly OperatorEntity[], _constructors: readonly ConstructorEntity[], _destructors: readonly DestructorEntity[], _indexers: readonly IndexerEntity[], _referenceOperators: readonly DereferenceOperatorEntity[]);
+    constructor(_namedMembers: readonly NamedTypeMemberEntity[], _operators: readonly OperatorEntity[], _constructors: readonly ConstructorEntity[], _destructors: readonly DestructorEntity[], _indexers: readonly IndexerEntity[], _dereferenceOperators: readonly DereferenceOperatorEntity[]);
     getNamedMembers(): readonly NamedTypeMemberEntity[];
     getNamedMembersByName(name: Name): readonly NamedTypeMemberEntity[];
     getOperators(): readonly OperatorEntity[];
@@ -27,5 +28,6 @@ export declare class OriginalTypeEntityMembers {
     getDereferenceOperators(): readonly DereferenceOperatorEntity[];
     getConstructors(): readonly ConstructorEntity[];
     getDestructors(): readonly DestructorEntity[];
+    getAll(): readonly TypeMemberEntity[];
 }
 export type NamedTypeMemberEntity = FieldEntity | MethodEntity;

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

@@ -154,7 +154,6 @@ export declare class FieldDeclarationEntity implements FieldEntity {
     private readonly _analyzer;
     private readonly _node;
     private readonly _typeInferrer;
-    private readonly _overriddenMembers;
     private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();
@@ -184,7 +183,6 @@ export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
-    private readonly _overriddenMembers;
     private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();

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

@@ -1,11 +1,13 @@
+import { Analyzer } from '../analysis/Analyzer.js';
+import * as types from '../types/index.js';
 import { AliasTypeEntity } from './AliasTypeEntity.js';
 import { ConstructorEntity } from './ConstructorEntity.js';
 import { DereferenceOperatorEntity } from './DereferenceOperatorEntity.js';
 import { DestructorEntity } from './DestructorEntity.js';
-import { GetterEntity } from './GetterEntity.js';
-import { IndexerEntity } from './IndexerEntity.js';
 import { FunctionEntity, MethodEntity, PackageFunctionEntity } from './FunctionEntity.js';
 import { FunctionTypeEntity, PackageFunctionTypeEntity } from './FunctionTypeEntity.js';
+import { GetterEntity } from './GetterEntity.js';
+import { IndexerEntity } from './IndexerEntity.js';
 import { OperatorEntity } from './OperatorEntity.js';
 import { PackageAliasEntity } from './PackageAliasEntity.js';
 import { PackageEntity } from './PackageEntity.js';
@@ -14,7 +16,7 @@ import { PackageStructuredTypeEntity, StructuredTypeEntity } from './StructuredT
 import { TypeEntity } from './TypeEntity.js';
 import { TypeExtensionEntity } from './TypeExtensionEntity.js';
 import { TypeParameterEntity } from './TypeParameterEntity.js';
-import { PackageVariableEntity, FieldEntity, VariableEntity } from './VariableEntity.js';
+import { FieldEntity, PackageVariableEntity, VariableEntity } from './VariableEntity.js';
 import { PackageVariantTypeEntity, VariantTypeEntity } from './VariantTypeEntity.js';
 export * from './AliasTypeEntity.js';
 export * from './ConstructorEntity.js';
@@ -22,10 +24,10 @@ export * from './DereferenceOperatorEntity.js';
 export * from './DestructorEntity.js';
 export * from './EntityHiding.js';
 export * from './EntityNaming.js';
-export * from './GetterEntity.js';
-export * from './IndexerEntity.js';
 export * from './FunctionEntity.js';
 export * from './FunctionTypeEntity.js';
+export * from './GetterEntity.js';
+export * from './IndexerEntity.js';
 export * from './OperatorEntity.js';
 export * from './OperatorKind.js';
 export * from './PackageAliasEntity.js';
@@ -96,19 +98,11 @@ export declare namespace TypeMemberEntity {
      * Объявление можно заменить в производном типе, если оно не всеобщее, и выполняется одно из условий:
      * - объявление помечено модификатором "базовое"
      * - объявление помечено модификатором "абстрактное"
-     * - объявление помечено модификатором "расширенное"
-     * - объявление является членом аспектного типа
      */
     function isBasic(entity: TypeMemberEntity): boolean;
-    /**
-     * Возвращает `true`, если объявление не имеет реализации.
-     *
-     * Объявление не имеет реализации, если выполняется одно из условий:
-     * - объявление помечено модификатором "абстрактное"
-     * - объявление является является членом аспекта, не помечено модификатором "базовое", не является всеобщим и не
-     *   скрыто в типе.
-     */
     function isAbstract(entity: TypeMemberEntity): boolean;
+    function getOverriddenMembers(entity: TypeMemberEntity): readonly types.TypeMember[];
+    function instantiate(analyzer: Analyzer, entity: TypeMemberEntity, substitutions: types.Substitutions): types.TypeMember;
 }
 export declare function entityToStringDecorator<T extends {
     new (...args: any[]): Entity;

package/build/types/services/DisplayService.d.ts

@@ -45,6 +45,7 @@ export declare class DisplayService {
     displayTypeExtensionEntity(entity: e.TypeExtensionEntity): string;
     displayEntity(entity: e.Entity, localization?: Localization): string;
     displayTypeEntity(entity: e.TypeEntity, localization?: Localization): string;
+    displayTypeMember(member: types.TypeMember, localization?: Localization): string;
     displayKeyword(kind: KeywordKind): string;
     displayHelperPhrase(kind: HelperPhraseKind): string;
     displayEntityName(entity: NamedEntity, localization: Localization | undefined): string;