@artel/artc 0.6.25228 → 0.6.25230

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

@@ -24,6 +24,7 @@ import * as constructorOverloadResolver from './ConstructorOverloadResolver.js';
 import { DeclarationsUsageCountResult } from './DeclarationsUsageCounter.js';
 import * as dereferenceExpressionMeaning from './DereferenceExpressionMeaning.js';
 import { FoundAnonymousDeclaration } from './FoundDeclaration.js';
+import * as functionOverloadResolver from './FunctionOverloadResolver.js';
 import * as identifierExpressionResolution from './IdentifierExpressionMeaning.js';
 import { ImportedPackageNameTree, PackageNameTreeNode } from './ImportedPackageNameTree.js';
 import * as indexedAccessExpressionMeaning from './IndexedAccessExpressionMeaning.js';
@@ -34,7 +35,6 @@ import { ModifierFlags } from './ModifierFlags.js';
 import { NamedTypeSpecifierResolutionResult } from './NamedTypeSpecifierResolver.js';
 import { DereferencedVariableAccessorDeclaration, FieldAccessorDeclaration, FunctionTypeDeclaration, GetterDeclaration, IndexedElementAccessorDeclaration, PackageVariableAccessorDeclaration, SetterDeclaration, StructuredTypeDeclaration, VariantTypeDeclaration } from './NodeTypeUtils.js';
 import * as objectExpressionMeaning from './ObjectExpressionMeaning.js';
-import * as operationOverloadResolver from './OperationOverloadResolver.js';
 import { SourceFileMembers as ActualSourceFileMembers } from './SourceFileMembers.js';
 import * as tagMeaning from './TagMeaning.js';
 import * as tags from './Tags.js';
@@ -68,6 +68,7 @@ export declare class Analyzer {
     readonly owningPlainObjectModificationCheck: OwningPlainObjectModificationCheck;
     readonly packageImports: PackageImports;
     readonly typeUtils: TypeUtils;
+    readonly conflictsCheck: ConflictsCheck;
     private readonly _tsInteropInputs;
     private readonly _targetType;
     private readonly _typeAssignabilityCheck;
@@ -117,8 +118,8 @@ export declare class Analyzer {
     getUnambiguousTargetFunctionType(targetType: types.Type | undefined): types.FunctionType | undefined;
     getUnambiguousTargetArrayType(targetType: types.Type | undefined): types.Type | undefined;
     getEnumeratorElementType(node: tree.Node): types.Type | undefined;
-    resolveFunctionOverloadByCallExpression<TCandidate extends operationOverloadResolver.ICandidate<TValueParameter>, TValueParameter extends operationOverloadResolver.IValueParameter>(candidates: readonly TCandidate[], node: tree.CallExpression): readonly TCandidate[];
-    resolveFunctionOverloadByTargetType<TCandidate extends operationOverloadResolver.ICandidate<TValueParameter>, TValueParameter extends operationOverloadResolver.IValueParameter>(candidates: readonly TCandidate[], targetType: types.FunctionType): readonly TCandidate[];
+    resolveFunctionOverloadByCallExpression<TCandidate extends functionOverloadResolver.ICandidate<TValueParameter>, TValueParameter extends functionOverloadResolver.IValueParameter>(candidates: readonly TCandidate[], node: tree.CallExpression): readonly TCandidate[];
+    resolveFunctionOverloadByTargetType<TCandidate extends functionOverloadResolver.ICandidate<TValueParameter>, TValueParameter extends functionOverloadResolver.IValueParameter>(candidates: readonly TCandidate[], targetType: types.FunctionType): readonly TCandidate[];
     resolveConstructorOverload<TCandidate extends constructorOverloadResolver.ICandidate<TValueParameter>, TValueParameter extends constructorOverloadResolver.IValueParameter>(candidates: readonly TCandidate[], args: readonly tree.Argument[]): readonly TCandidate[];
     resolveTypeOverloadByArgumentCount<TCandidate extends typeOverloadResolver.ICandidate>(candidates: readonly TCandidate[], argumentCount: number): readonly TCandidate[];
     resolveMemberAccessExpression(node: tree.MemberAccessExpression, targetTypeHint?: TargetTypeHint): memberAccessExpressionResolution.ResolutionResult;
@@ -261,9 +262,9 @@ export declare class Analyzer {
     createDiagnostic(code: DiagnosticCode, location: DiagnosticLocation | undefined, formatArguments?: readonly string[], kind?: DiagnosticKind, flags?: DiagnosticFlags): Diagnostic;
     createNodeDiagnosticLocation(node: tree.Node): DiagnosticLocation;
     getDeclaredTypeMemberEntities(node: tree.TypeMemberDeclarationBlock): DeclaredTypeMemberEntities;
-    getRedefinableMethodOfOriginalTypeForRedefinableMethodOfAliasType(entity: e.MethodEntity): e.MethodEntity | undefined;
-    checkBodyOfRedefinableAliasTypeMethod(node: tree.MethodDeclaration, diagnostics?: DiagnosticAcceptor): {
-        redefinableMethodOfOriginalType: e.MethodEntity;
+    getBasicMethodOfOriginalTypeForBasicMethodOfAliasType(entity: e.MethodEntity): e.MethodEntity | undefined;
+    checkBodyOfBasicAliasTypeMethod(node: tree.MethodDeclaration, diagnostics?: DiagnosticAcceptor): {
+        basicMethodOfOriginalType: e.MethodEntity;
     } | undefined;
     getControlFlowGraph(sourceFile: project.SourceFile): controlFlow.GraphBuildResult;
     createAmbiguousEntityAccessDiagnostic(entities: readonly WithLocalization<e.Entity>[], lctx: LocalizationContext, node: tree.Node): Diagnostic;
@@ -482,17 +483,17 @@ declare class DefaultConstructors {
 declare class OverriddenMember {
     private readonly _analyzer;
     constructor(_analyzer: Analyzer);
-    getOverriddenVariables(node: tree.FieldDeclaration | FieldAccessorDeclaration): types.Variable[];
+    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 findOverriddenVariableInType;
+    private findOverriddenFieldInType;
     private findOverriddenMethodInType;
     private findOverriddenOperatorInType;
     private findOverriddenIndexerInType;
     private findOverriddenDereferenceOperatorInType;
-    private checkVariableOverridesVariable;
+    private checkFieldOverridesField;
     private checkMethodOverridesMethod;
     private checkOperatorOverridesOperator;
     private checkIndexerOverridesIndexer;
@@ -560,7 +561,7 @@ export declare class LinkedTypeWithMembers {
     private readonly _memberLookup;
     private get memberLookup();
     constructor(analyzer: Analyzer, externalType: e.TypeEntityWithMembers, targetType: e.TypeEntityWithMembers, linkedPackage: LinkedMultiPlatformPackage);
-    getLinkedVariable(entity: e.FieldEntity): e.FieldEntity | undefined;
+    getLinkedField(entity: e.FieldEntity): e.FieldEntity | undefined;
     getLinkedMethod(entity: e.MethodEntity): e.MethodEntity | undefined;
     getLinkedOperator(entity: e.OperatorEntity): e.OperatorEntity | undefined;
     getLinkedConstructor(entity: e.ConstructorEntity): e.ConstructorEntity | undefined;
@@ -616,7 +617,7 @@ export declare class PackageImportInfo {
     readonly isAliasedImport: e.PackageAliasEntity | undefined;
     constructor(entity: e.PackageEntity, translationPackage: AnalyzedTranslationPackage | undefined, isAliasedImport: e.PackageAliasEntity | undefined);
 }
-export declare class TypeUtils {
+declare class TypeUtils {
     private readonly _analyzer;
     constructor(_analyzer: Analyzer);
     getCommonObjectAndAspectTypesOfUnion(unionType: types.UnionType): readonly types.StructuredType[];
@@ -628,6 +629,44 @@ export declare class TypeUtils {
     private getFlattenedConstituentTypesForCommonTypesSearch;
     private flattenTypeParameterConstraint;
 }
+declare class ConflictsCheck {
+    private readonly _analyzer;
+    private _stubParameterTypes;
+    constructor(_analyzer: Analyzer);
+    /**
+     * Проверяет, конфликтуют ли две функции, т.е. могут ли такие функции находиться в одной области видимости.
+     * Метод не сравнивает имена.
+     *
+     * Отношение "функции конфликтуют" не является транзитивным, т.е. из того, что функция 1 конфликтует с функцией 2 и
+     * функция 2 конфликтует с функцией 3 не следует, что функция 1 конфликтует с функцией 3.
+     *
+     * Пример:
+     * ```artel
+     * 1. функция ф<Т1>()
+     * 2. функция ф<Т1, Т2>()
+     * 3. функция ф<Т1, Т2 = Объект>()
+     * ```
+     *
+     * Функции 1 и 2 не конфликтуют между собой, поскольку имеют разное количество количество параметров типа, однако
+     * каждая из них конфликтует с функций 3, которая может принимать от 1 до 2 параметров типа.
+     */
+    doFunctionSignaturesConflict(function1: e.FunctionEntity, function2: e.FunctionEntity): boolean;
+    /**
+     * Проверяет, конфликтуют две сущности, имеющие параметры, но не имеющие параметры типа.
+     */
+    doSignaturesWithoutTypeParametersConflict(entity1: EntityWithoutTypeParametersInSignature, entity2: EntityWithoutTypeParametersInSignature): boolean;
+    /**
+     * Проверяет, конфликтуют ли два типа, т.е. могут ли такие типы находиться в одном пакете. Метод не сравнивает имена.
+     *
+     * Отношение "типы конфликтуют" не является транзитивным (см. комментарий у метода
+     * {@link doFunctionSignaturesConflict}).
+     */
+    doPackageTypesConflict(type1: e.PackageTypeEntity, type2: e.PackageTypeEntity): boolean;
+    doTypeArgumentCountsIntersect(typeParameters1: readonly e.TypeParameterEntity[], typeParameters2: readonly e.TypeParameterEntity[]): boolean;
+    private doParametersConflict;
+    private createSubstitutionMapWithStubTypes;
+}
+export type EntityWithoutTypeParametersInSignature = e.ConstructorEntity | e.DestructorEntity | e.OperatorEntity | e.IndexerEntity;
 export declare class ExpressionDenotesFunctionCheckResult {
     readonly candidates: readonly WithLocalization<AccessedFunction>[];
     readonly suitableFunctions: readonly WithLocalization<AccessedFunction>[];

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

@@ -5,7 +5,7 @@ import { Analyzer } from './Analyzer.js';
 import { FoundAnonymousDeclaration } from './FoundDeclaration.js';
 /**
  * "основа" не является самостоятельным выражением и может использоваться только в следующих конструкциях:
- * 1. основа() - в конструкторе для вызова базового конструктора или в методе для вызова заменённого метода.
+ * 1. основа() - в конструкторе для вызова базового конструктора или в методе для вызова базового метода.
  * 2. основа.поле (основа.метод) - в любом выражении в контексте типа, имеющего базовый тип.
  * 3. основа[] - аналогично п. 2.
  */

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

@@ -50,7 +50,6 @@ export declare class DiagnosticCollector {
     private getPackageMemberBodyRequirementReason;
     private checkTypeMemberBodyPresence;
     private getTypeMemberBodyRequirementReason;
-    private isRedefinableEntity;
     private checkIdentifierExpression;
     private checkLocalVariableUsedBeforeDeclaration;
     private checkLocalVariableIsUsedBeforeBeingAssigned;

package/build/types/analysis/{OperationOverloadResolver.d.ts → FunctionOverloadResolver.d.ts}

@@ -11,6 +11,8 @@ export declare class Resolver<TCandidate extends ICandidate<TValueParameter>, TV
 export interface ICandidate<TValueParameter extends IValueParameter> {
     getValueParameters(): readonly TValueParameter[];
     getSignatureType(): types.Type;
+    getTypeParameterCount(): number;
+    getRequiredTypeParameterCount(): number;
 }
 export interface IValueParameter {
     getName(): Name | undefined;

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

@@ -90,9 +90,9 @@ export declare class AccessedVariable_entity implements IAccessedVariable {
     getType(): types.Type;
 }
 export declare class AccessedVariable_typeMember implements IAccessedVariable {
-    readonly value: types.Variable;
+    readonly value: types.Field;
     readonly kind = "type-member";
-    constructor(value: types.Variable);
+    constructor(value: types.Field);
     getEntity(): VariableEntity;
     getName(): Name;
     getType(): types.Type;

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

@@ -70,10 +70,10 @@ declare class Meaning_packageNameSegmentAccess {
 }
 declare class Meaning_staticFieldAccess {
     readonly type: types.Type;
-    readonly variable: FoundNamedDeclaration<types.Variable>;
+    readonly field: FoundNamedDeclaration<types.Field>;
     readonly accessKind: AccessKind;
     readonly kind = "static-field-access";
-    constructor(type: types.Type, variable: FoundNamedDeclaration<types.Variable>, accessKind: AccessKind);
+    constructor(type: types.Type, field: FoundNamedDeclaration<types.Field>, accessKind: AccessKind);
 }
 declare class Meaning_staticMethodAccess {
     readonly type: types.Type;
@@ -84,10 +84,10 @@ declare class Meaning_staticMethodAccess {
     constructor(type: types.Type, candidates: readonly FoundNamedDeclaration<AccessedFunction>[], suitableFunctions: readonly FoundNamedDeclaration<AccessedFunction>[]);
 }
 declare class Meaning_instanceFieldAccess {
-    readonly variable: FoundNamedDeclaration<types.Variable>;
+    readonly field: FoundNamedDeclaration<types.Field>;
     readonly accessKind: AccessKind;
     readonly kind = "instance-field-access";
-    constructor(variable: FoundNamedDeclaration<types.Variable>, accessKind: AccessKind);
+    constructor(field: FoundNamedDeclaration<types.Field>, accessKind: AccessKind);
 }
 declare class Meaning_instanceMethodAccess {
     readonly candidates: readonly FoundNamedDeclaration<AccessedFunction>[];

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

@@ -7,10 +7,9 @@ export declare enum ModifierFlags {
     HiddenInPackage = 16,
     Basic = 32,
     Static = 64,
-    Redefinable = 128,
-    Abstract = 256,
-    Redefined = 512,
-    Async = 1024,
-    Const = 2048,
-    NotComputed = 4096
+    Abstract = 128,
+    Override = 256,
+    Async = 512,
+    Const = 1024,
+    NotComputed = 2048
 }

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

@@ -9,11 +9,10 @@ export declare class PackageMemberNameConflictsValidator {
     constructor(_analyzer: Analyzer, _members: OriginalPackageMembers);
     validate(): readonly Diagnostic[];
     private validateFunctionNameConflicts;
-    private areFunctionSignaturesEqual;
     private validateTypeNameConflicts;
-    private typeParameterCountsIntersect;
     private createAndAddNameConflictDiagnosticsForAllEntities;
-    private createAndAddNameConflictDiagnostic;
+    private shouldReportConflictWithMemberBasedOnHiding;
+    private reportNameConflictDiagnostic;
     private getDiagnosticLocation;
 }
 export declare class SourcePackageMemberConflictsValidator {

package/build/types/analysis/control-flow/NarrowableReference.d.ts

@@ -27,10 +27,10 @@ export declare namespace NarrowableReference {
     }
     export class InstanceField implements INarrowableReference {
         private readonly _analyzer;
-        readonly variable: types.Variable;
+        readonly field: types.Field;
         readonly receiver: NarrowableReference;
         readonly kind = "instance-field";
-        constructor(_analyzer: Analyzer, variable: types.Variable, receiver: NarrowableReference);
+        constructor(_analyzer: Analyzer, field: types.Field, receiver: NarrowableReference);
         equals(other: NarrowableReference): boolean;
         contains(other: NarrowableReference): boolean;
         equalsExpression(expression: NarrowableReferenceExpression): boolean;
@@ -38,9 +38,9 @@ export declare namespace NarrowableReference {
     }
     export class StaticField implements INarrowableReference {
         private readonly _analyzer;
-        readonly variable: types.Variable;
+        readonly field: types.Field;
         readonly kind = "static-field";
-        constructor(_analyzer: Analyzer, variable: types.Variable);
+        constructor(_analyzer: Analyzer, field: types.Field);
         equals(other: NarrowableReference): boolean;
         contains(_other: NarrowableReference): boolean;
         equalsExpression(expression: NarrowableReferenceExpression): boolean;

package/build/types/analysis/control-flow/Nodes.d.ts

@@ -45,7 +45,7 @@ export declare class AssignmentNode extends ControlFlowNodeBase {
 }
 /**
  * Создаётся в местах объявления локальных переменных. Если переменной присваивается начальное значение, её тип будет
- * заменён на тип присваиваемого выражения.
+ * взят как тип присваиваемого выражения.
  */
 export declare class LocalVariableDeclarationNode extends ControlFlowNodeBase {
     readonly predecessor: Node;

package/build/types/analysis/semantic-context/Declarations.d.ts

@@ -77,9 +77,9 @@ export declare class NamedDeclarationVariable_entity implements INamedDeclaratio
     isHidden(): EntityHidingLevel | undefined;
 }
 export declare class NamedDeclarationVariable_typeMember implements INamedDeclarationVariable {
-    readonly value: types.Variable;
+    readonly value: types.Field;
     readonly kind = "type-member";
-    constructor(value: types.Variable);
+    constructor(value: types.Field);
     getName(): Name;
     getEntity(): VariableEntity;
     isHidden(): EntityHidingLevel | undefined;

package/build/types/analysis/semantic-context/SemanticContextValidatingNameConflicts.d.ts

@@ -33,7 +33,6 @@ export declare abstract class SemanticContextValidatingNameConflictsBase extends
     validateNameConflicts(diagnostics: DiagnosticAcceptor): void;
     private getMemberEntityDictionary;
     private validateNestedFunctionsConflicts;
-    private areNestedFunctionSignaturesEqual;
     private createNamedDeclarations;
     private createTypesOrContainerWithTypes;
 }

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

@@ -111,39 +111,38 @@ export declare enum DiagnosticCode {
     FunctionIsDeclaredButNotUsed = 273,
     TypeParameterIsDeclaredButNotUsed = 274,
     DefaultConstructorArgumentsMustBeNamed = 275,
-    IncorrectBodyOfRedefinableAliasTypeMethod = 276,
+    IncorrectBodyOfBasicAliasTypeMethod = 276,
     TheFollowingDeclarationsAreNotTranslated0 = 277,
     TheFollowingDeclarationAreNotTranslated0And1More = 278,
     OperatorFunctionMustNotBeStatic = 279,
     OperatorFunction0MustNotHaveParameters = 280,
     OperatorFunction0MustHaveOneParameter = 281,
     OperatorFunction0MustHaveNoMoreThanOneParameter = 282,
-    CorrespondingRedefinableTypeMemberNotFound = 283,
+    CorrespondingBasicTypeMemberNotFound = 283,
     ConstructorCannotBeDeclaredAsBasic = 284,
-    ConstructorCannotBeDeclaredAsRedefinable = 285,
-    ConstructorCannotBeDeclaredAsOverridden = 286,
-    AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier = 287,
-    TagNotFound = 288,
-    TypeOrFunctionNameExpected = 289,
-    PackageNameOrAliasExpected = 290,
-    ExpressionCanBeNone = 291,
-    TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator = 292,
-    UnreachableCode = 293,
-    RecursionOccurredWhileCalculatingTheTypeOfTheExpression = 294,
-    RecursionOccurredWhileInferringTheTypeOfTheVariable = 295,
-    ScopeAlreadyContainsDeclarationWithTheSameName = 296,
-    ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 297,
-    ParameterName0ConflictsWithAutomaticallyGeneratedVariableName = 298,
-    PackageAlreadyContainsDeclarationWithTheSameName = 299,
-    PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 300,
-    PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount = 301,
-    PackageAliasWithTheSameNameAlreadyExits = 302,
-    PackageCanHaveOnlyEntryPoint = 303,
-    PackageCanHaveOnlyOneConstructor = 304,
-    VariableIsUsedBeforeItsDeclaration = 305,
-    VariableMayNotHasBeenAssignedBeforeUsage = 306,
-    NotAllCodePathsReturnAValueAndResultLocalVariableMayNotHasBeenAssigned = 307,
-    WriteFunctionHasNoCorrespondingReadFunction = 308,
+    ConstructorCannotBeDeclaredAsOverridden = 285,
+    AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier = 286,
+    TagNotFound = 287,
+    TypeOrFunctionNameExpected = 288,
+    PackageNameOrAliasExpected = 289,
+    ExpressionCanBeNone = 290,
+    TargetVariableExpressionInTheAssignmentStatementCannotContainQuestionOperator = 291,
+    UnreachableCode = 292,
+    RecursionOccurredWhileCalculatingTheTypeOfTheExpression = 293,
+    RecursionOccurredWhileInferringTheTypeOfTheVariable = 294,
+    ScopeAlreadyContainsDeclarationWithTheSameName = 295,
+    ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 296,
+    ParameterName0ConflictsWithAutomaticallyGeneratedVariableName = 297,
+    PackageAlreadyContainsDeclarationWithTheSameName = 298,
+    PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes = 299,
+    PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount = 300,
+    PackageAliasWithTheSameNameAlreadyExits = 301,
+    PackageCanHaveOnlyEntryPoint = 302,
+    PackageCanHaveOnlyOneConstructor = 303,
+    VariableIsUsedBeforeItsDeclaration = 304,
+    VariableMayNotHasBeenAssignedBeforeUsage = 305,
+    NotAllCodePathsReturnAValueAndResultLocalVariableMayNotHasBeenAssigned = 306,
+    WriteFunctionHasNoCorrespondingReadFunction = 307,
     CannotFindTsLibDirectoryBaseSearchPaths0 = 401,
     SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 402,
     ProgramWithoutMainPackageCannotBeCompiled = 403,

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

@@ -23,12 +23,12 @@ export declare class FunctionEntityDetails implements TypeMemberEntityDetails {
     isPackageConstructor: boolean;
     isPackageEntryPoint: boolean;
     overriddenMembers: readonly FunctionEntity[];
-    ifRedefinableAliasTypeMethodThenRealMethod: FunctionEntity | undefined;
+    ifBasicAliasTypeMethodThenRealMethod: FunctionEntity | undefined;
     isDefaultExport: boolean;
     isAliasTypeOrExtensionMemberThatRequiresLowering: boolean;
     isBuiltInOperator: boolean;
     hasComputedName: ComputedNameInfo | undefined;
-    isRedefinable: boolean;
+    isBasic: boolean;
     isTypeExtensionMemberAddedToPrototype: boolean;
     isAbstract: boolean;
     isStatic: boolean;
@@ -44,7 +44,7 @@ export interface ComputedNameInfo {
      */
     readonly affectsDeclaration: boolean;
     /**
-     * Должны ли члены типы, заменяющие этот член, использовать указанный символ в качестве ключа?
+     * Должны ли расширенные (override-) члены производных типов использовать указанный символ в качестве ключа?
      */
     readonly affectsDerivedMembers: boolean;
 }
@@ -65,7 +65,7 @@ export declare class VariableEntityDetails implements TypeMemberEntityDetails {
     isProxiedField: ProxiedFieldInfo | undefined;
     isDefaultExport: boolean;
     hasComputedName: ComputedNameInfo | undefined;
-    isRedefinable: boolean;
+    isBasic: boolean;
     isAbstract: boolean;
     isTypeExtensionMemberAddedToPrototype: boolean;
     isStatic: boolean;
@@ -78,7 +78,7 @@ export type TypeMemberEntity = FunctionEntity | VariableEntity;
 interface TypeMemberEntityDetails {
     isStatic: boolean;
     isAbstract: boolean;
-    isRedefinable: boolean;
+    isBasic: boolean;
     overriddenMembers: readonly TypeMemberEntity[];
     hasComputedName: ComputedNameInfo | undefined;
     isTypeExtensionMemberAddedToPrototype: boolean;
@@ -105,9 +105,9 @@ export declare class TypeOrExtensionEntityDetails {
     isDefaultExport: boolean;
     extendedType: TypeOrExtensionEntity | undefined;
     /**
-     * Является ли имя члена типа вычисляемым (`details.hasComputedName`) может зависеть от заменённых членов типа.
+     * Является ли имя члена типа вычисляемым (`details.hasComputedName`) может зависеть от переопределённых членов типа.
      * Если `areOwnComputedNamesOfMembersResolved` === `true`, поля `details.hasComputedName` членов типа хранят
-     * актуальную для них самих информацию, и анализ заменённых членов типа не требуется.
+     * актуальную для них самих информацию, и анализ переопределённых членов типа не требуется.
      */
     areOwnComputedNamesOfMembersResolved: boolean;
 }

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

@@ -72,7 +72,7 @@ export declare class PackageAliasTypeDeclarationEntity implements AliasTypeEntit
     private readonly _aliasedType;
     private readonly _typeParameters;
     private readonly _members;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageAliasTypeDeclaration);
     getName(): Name;

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

@@ -4,7 +4,7 @@ import { Analyzer } from '../analysis/index.js';
 import { ConstructorDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import type { TypeEntityWithMembers } from './index.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterVariableEntity, TypeMemberEntityContainer, FieldEntity } from './index.js';
+import { DefinitionKind, EntityHidingLevel, EntityKind, FieldEntity, ParameterVariableEntity, TypeMemberEntityContainer } from './index.js';
 export interface ConstructorEntity {
     readonly kind: EntityKind.Constructor;
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -12,7 +12,7 @@ export interface ConstructorEntity {
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class DefaultConstructorEntityInfo {
@@ -45,7 +45,7 @@ export declare class ConstructorDeclarationEntity implements ConstructorEntity {
     private readonly _node;
     readonly kind = EntityKind.Constructor;
     private readonly _valueParameters;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: ConstructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -53,7 +53,7 @@ export declare class ConstructorDeclarationEntity implements ConstructorEntity {
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class IntrinsicConstructorEntity implements ConstructorEntity {
@@ -61,15 +61,15 @@ export declare class IntrinsicConstructorEntity implements ConstructorEntity {
     private readonly _containingEntity;
     private readonly _isDefault;
     private readonly _isHidden;
-    private readonly _isAbstract;
+    private readonly _markedAbstract;
     readonly kind = EntityKind.Constructor;
-    constructor(_valueParameters: readonly ParameterVariableEntity[], _containingEntity: TypeEntityWithMembers, _isDefault: DefaultConstructorEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _isAbstract: boolean);
+    constructor(_valueParameters: readonly ParameterVariableEntity[], _containingEntity: TypeEntityWithMembers, _isDefault: DefaultConstructorEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _markedAbstract: boolean);
     getValueParameters(): readonly ParameterVariableEntity[];
     getDefinition(): ConstructorEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class DefaultConstructorEntity implements ConstructorEntity {
@@ -85,7 +85,7 @@ export declare class DefaultConstructorEntity implements ConstructorEntity {
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     private getParametersInfo;
     private createOrderedParametersForBaseConstructor;

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

@@ -12,9 +12,9 @@ export interface DereferenceOperatorEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.DereferenceOperator[];
 }
@@ -31,7 +31,7 @@ export declare class DereferenceOperatorDeclarationEntity implements Dereference
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: DereferencedVariableGetterDeclaration | undefined, setterDeclaration: DereferencedVariableSetterDeclaration | undefined);
     getType(): types.Type;
@@ -41,9 +41,9 @@ export declare class DereferenceOperatorDeclarationEntity implements Dereference
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.DereferenceOperator[];
 }

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

@@ -8,7 +8,7 @@ export interface DestructorEntity {
     getContainer(): TypeMemberEntityContainer;
     getDefinition(): DestructorEntityDefinition;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 type DestructorEntityDefinition = {
@@ -20,14 +20,14 @@ export declare class DestructorDeclarationEntity implements DestructorEntity {
     private readonly _node;
     readonly kind = EntityKind.Destructor;
     private readonly _valueParameters;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: DestructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
     getContainer(): TypeMemberEntityContainer;
     getDefinition(): DestructorEntityDefinition;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export {};

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

@@ -1,7 +1,7 @@
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
 import { Name } from '../common/index.js';
-import { NestedFunctionDeclaration, PackageFunctionDeclaration, MethodDeclaration } from '../tree/index.js';
+import { MethodDeclaration, NestedFunctionDeclaration, PackageFunctionDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import type { PackageEntity } from './index.js';
 import { DefinitionKind, Entity, EntityHidingLevel, EntityKind, ParameterVariableEntity, SubstitutionApplicationMode, TypeMemberEntityContainer, TypeParameterEntity } from './index.js';
@@ -14,9 +14,9 @@ export interface MethodEntity extends IFunctionEntity {
     readonly subkind: 'method';
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isFunctionTypeInvokeMethod(): boolean;
     getOverriddenMembers(): readonly types.Method[];
@@ -53,7 +53,7 @@ export declare class PackageFunctionDeclarationEntity implements PackageFunction
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageFunctionDeclaration);
     getName(): Name;
@@ -76,7 +76,7 @@ export declare class MethodDeclarationEntity implements MethodEntity {
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _overriddenMember;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: MethodDeclaration);
     getName(): Name;
@@ -91,9 +91,9 @@ export declare class MethodDeclarationEntity implements MethodEntity {
     isFunctionTypeInvokeMethod(): boolean;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
@@ -153,14 +153,14 @@ export declare class IntrinsicMethodEntity implements MethodEntity {
     private readonly _isFunctionTypeInvokeMethod;
     private readonly _container;
     private readonly _isStatic;
-    private readonly _isRedefinable;
-    private readonly _isRedefined;
+    private readonly _isBasic;
+    private readonly _isOverride;
     private readonly _isAbstract;
     private readonly _isModifyingOwningPlainObject;
     private readonly _overriddenMembers;
     readonly kind = EntityKind.Function;
     readonly subkind = "method";
-    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isFunctionTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMembers: readonly types.Method[]);
+    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isFunctionTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isBasic: boolean, _isOverride: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMembers: readonly types.Method[]);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -173,9 +173,9 @@ export declare class IntrinsicMethodEntity implements MethodEntity {
     isFunctionTypeInvokeMethod(): boolean;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];