@artel/artc 0.6.25233 → 0.6.25234

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

@@ -536,7 +536,9 @@ export declare class OverriddenAndShadowedMembers<TOverriddenMember extends Over
     constructor(overriddenMembers: readonly TOverriddenMember[], shadowedMembers: readonly ShadowedMemberInfo<TShadowedMember>[]);
 }
 export type OverridableTypeMemberEntity = e.FieldEntity | e.MethodEntity | e.OperatorEntity | e.IndexerEntity | e.DereferenceOperatorEntity;
+export declare function isOverridableTypeMemberEntity(entity: e.TypeMemberEntity): entity is OverridableTypeMemberEntity;
 export type OverridableTypeMember = types.Field | types.Method | types.Operator | types.Indexer | types.DereferenceOperator;
+export declare function isOverridableTypeMember(entity: types.TypeMember): entity is OverridableTypeMember;
 declare class Tags {
     readonly _analyzer: Analyzer;
     private readonly _tags;
@@ -660,9 +662,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;
+    getBaseOrAliasedTypes(type: types.Type): readonly types.Type[];
+    getBaseAndAliasedTypesRecursively(type: types.Type): readonly types.Type[];
+    private collectBaseAndAliasedTypesRecursively;
     private getBaseTypesForCommonTypesSearch;
     private addTypeAndCollectAllBaseTypes;
     private addTypeIfUnique;
@@ -691,12 +693,17 @@ declare class ConflictsCheck {
      * каждая из них конфликтует с функций 3, которая может принимать от 1 до 2 параметров типа.
      */
     doFunctionSignaturesConflict(function1: e.FunctionEntity, function2: e.FunctionEntity): boolean;
+    /**
+     * Метод аналогичен методу {@link doFunctionSignaturesConflict}.
+     */
+    doMethodSignaturesConflict(method1: types.Method, method2: types.Method): boolean;
     /**
      * Проверяет, конфликтуют две сущности, имеющие параметры, но не имеющие параметры типа.
      *
      * Отношение "сущности, имеющие только параметры, конфликтуют" является транзитивным.
      */
     doSignaturesWithoutTypeParametersConflict(entity1: EntityWithoutTypeParametersInSignature, entity2: EntityWithoutTypeParametersInSignature): boolean;
+    doTypeMemberSignaturesWithoutTypeParametersConflict(member1: TypeMemberWithoutTypeParametersInSignature, member2: TypeMemberWithoutTypeParametersInSignature): boolean;
     /**
      * Проверяет, конфликтуют ли два типа, т.е. могут ли такие типы находиться в одном пакете. Метод не сравнивает имена.
      *
@@ -706,9 +713,11 @@ declare class ConflictsCheck {
     doPackageTypesConflict(type1: e.PackageTypeEntity, type2: e.PackageTypeEntity): boolean;
     doTypeArgumentCountsIntersect(typeParameters1: readonly e.TypeParameterEntity[], typeParameters2: readonly e.TypeParameterEntity[]): boolean;
     private doParametersConflict;
+    private doTypeMemberParametersConflict;
     private createSubstitutionMapWithStubTypes;
 }
 export type EntityWithoutTypeParametersInSignature = e.ConstructorEntity | e.DestructorEntity | e.OperatorEntity | e.IndexerEntity;
+export type TypeMemberWithoutTypeParametersInSignature = types.Constructor | types.Destructor | types.Operator | types.Indexer;
 export declare class ExpressionDenotesFunctionCheckResult {
     readonly candidates: readonly WithLocalization<AccessedFunction>[];
     readonly suitableFunctions: readonly WithLocalization<AccessedFunction>[];

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

@@ -0,0 +1,28 @@
+import { PackageDialect } from '../common/index.js';
+import { DiagnosticAcceptor } from '../diagnostic/Diagnostic.js';
+import { IEntityHidingMatcher, TypeEntityWithMembers } from '../entities/index.js';
+import { Node } from '../tree/index.js';
+import { Analyzer } from './Analyzer.js';
+import { LocalizationContext } from './LocalizationContext.js';
+export declare class BaseMemberConflictsValidator {
+    private readonly _analyzer;
+    private readonly _typeEntity;
+    private readonly _hidingMatcher;
+    private readonly _localizationContext;
+    private readonly _dialect;
+    private readonly _diagnostics;
+    private readonly _nodeForDiagnostic;
+    private _displayService;
+    private get displayService();
+    constructor(_analyzer: Analyzer, _typeEntity: TypeEntityWithMembers, _hidingMatcher: IEntityHidingMatcher, _localizationContext: LocalizationContext, _dialect: PackageDialect | undefined, _diagnostics: DiagnosticAcceptor, _nodeForDiagnostic: Node);
+    validate(): void;
+    private getAllNotShadowedNotOverriddenMembers;
+    private validateMemberConflictsMutatingMap;
+    private validateNamedMemberConflictsUsingOriginalNames;
+    private doTypeMembersConflict;
+    private reportMembersConflictDiagnostic;
+    private reportMembersOriginalNameConflictConflictDiagnostic;
+    private addOverriddenMembersRecursively;
+    private typeMemberMatchesHiding;
+    private getOriginalNameOfLeastOverriddenMember;
+}

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

@@ -1,6 +1,7 @@
-import { Name, PackageLocale } from '../common/index.js';
+import { PackageLocale } from '../common/index.js';
 import { AliasTypeEntity, FunctionEntity, PackageAliasEntity, PackageEntity, PackageFunctionTypeEntity, PackageStructuredTypeEntity, PackageVariantTypeEntity, TypeOrExtensionEntity, TypeParameterEntity, VariableEntity } from '../entities/index.js';
 import { AnalyzedTranslationPackage, TranslatedTypeEntityMembers } from './AnalyzedTranslationPackage.js';
+import { LocalizedName } from './Localization.js';
 export declare class LocalizationContext {
     readonly originalLocale: PackageLocale;
     private readonly _translationPackageByTranslated;
@@ -9,6 +10,6 @@ export declare class LocalizationContext {
     getTranslationPackage(packageEntity: PackageEntity): AnalyzedTranslationPackage | undefined;
     getTranslationLocale(packageEntity: PackageEntity): PackageLocale;
     getTranslatedTypeOrExtensionEntityMembers(entity: TypeOrExtensionEntity): TranslatedTypeEntityMembers | undefined;
-    getEntityName(entity: NamedEntity): Name;
+    getEntityName(entity: NamedEntity): LocalizedName;
 }
 export type NamedEntity = VariableEntity | PackageVariantTypeEntity | FunctionEntity | TypeParameterEntity | PackageFunctionTypeEntity | PackageStructuredTypeEntity | PackageAliasEntity | AliasTypeEntity;

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

@@ -1,4 +1,3 @@
-import { PackageDialect, PackageLocale } from '../common/index.js';
 import { DiagnosticAcceptor } from '../diagnostic/Diagnostic.js';
 import * as tree from '../tree/index.js';
 import { Analyzer } from './Analyzer.js';
@@ -33,8 +32,6 @@ export declare enum DeclarationWithTypeMembersKind {
 export declare class ModifierValidator {
     private readonly _analyzer;
     private readonly _diagnostics;
-    private readonly _locale;
-    private readonly _dialect;
     static readonly allowedPackageMemberHidingModifiers: number;
     static readonly allowedPackageMemberModifiers: number;
     static readonly allowedModifiersByPackageMemberDeclarationKind: {
@@ -46,7 +43,7 @@ export declare class ModifierValidator {
         [T in TypeMemberDeclarationKind]: ModifierFlags;
     };
     private effectiveModifiers;
-    constructor(_analyzer: Analyzer, _diagnostics: DiagnosticAcceptor, _locale: PackageLocale, _dialect: PackageDialect);
+    constructor(_analyzer: Analyzer, _diagnostics: DiagnosticAcceptor);
     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;

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

@@ -5,7 +5,7 @@ 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 pushElementIfUniqueComparingWithEquals<T extends WithEqualsMethod<T>>(array: T[], element: T): boolean;
     static pushElementsIfUniqueComparingWithEquals<T extends WithEqualsMethod<T>>(array: T[], elements: readonly T[]): void;
 }
 export type WithEqualsMethod<T> = {

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

@@ -13,6 +13,7 @@ export declare abstract class Query<T> implements Iterable<T> {
     first<K extends T>(fn: (t: T) => t is K): K | undefined;
     first(fn: (t: T) => boolean): T | undefined;
     toMap<K, V>(keySelector: (t: T) => K, valueSelector: (t: T) => V): Map<K, V>;
+    toMap(): T extends readonly [infer K, infer V] ? Map<K, V> : never;
     flatMap<K>(fn: (t: T) => Iterable<K>): Query<K>;
     toArray(): T[];
     count(fn?: (t: T) => boolean): number;

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

@@ -184,6 +184,8 @@ export declare enum DiagnosticCode {
     OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0 = 346,
     TypeDoesNotImplementMember0 = 347,
     CanNotAccessAbstractMemberOfBaseType = 348,
+    TheFollowingBaseTypeMembersConflictAndMustBeOverridden0 = 349,
+    TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1 = 350,
     CannotFindTsLibDirectoryBaseSearchPaths0 = 401,
     SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 402,
     ProgramWithoutMainPackageCannotBeCompiled = 403,

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

@@ -0,0 +1,2 @@
+import { TokenKind } from '../tree/index.js';
+export declare function getTokenName(tokenKind: TokenKind): string;

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

@@ -1,6 +1,9 @@
 import { Tag } from '../analysis/Tags.js';
 import { AliasTypeEntity, EntityKind, FunctionTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from './index.js';
 export type TypeEntity = StructuredTypeEntity | FunctionTypeEntity | VariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
+export declare namespace TypeEntity {
+    function isAbstract(entity: TypeEntity): boolean;
+}
 export interface ITypeEntity {
     readonly kind: EntityKind.Type;
     readonly typeEntityKind: TypeEntityKind;

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

@@ -15,59 +15,59 @@ export declare enum TokenKind {
     TextTemplateTail = 13,
     LocalizableTextLiteral = 14,
     LocalizableTextTemplateHead = 15,
-    Ampersand = 16,
-    AmpersandAmpersand = 17,
-    AmpersandEquals = 18,
-    Asterisk = 19,
-    AsteriskAsterisk = 20,
-    AsteriskEquals = 21,
-    BackQuote = 22,
-    Bar = 23,
-    BarBar = 24,
-    Caret = 25,
-    RightBrace = 26,
-    RightParenthesis = 27,
-    RightSquareBracket = 28,
-    Colon = 29,
-    Comma = 30,
-    CommercialAt = 31,
-    Dot = 32,
-    DoublePeriod = 33,
-    Ellipsis = 34,
-    EqualsEquals = 35,
-    EqualsRightAngle = 36,
-    Exclamation = 37,
-    ExclamationEquals = 38,
-    RightAngle = 39,
-    RightAngleEquals = 40,
-    HashSign = 41,
-    LeftAngle = 42,
-    LeftAngleEquals = 43,
-    LeftAngleMinus = 44,
-    Minus = 45,
-    MinusMinus = 46,
-    MinusEquals = 47,
-    MinusRightAngle = 48,
-    LeftBrace = 49,
-    LeftParenthesis = 50,
-    LeftSquareBracket = 51,
-    Plus = 52,
-    PlusPlus = 53,
-    PlusEquals = 54,
-    Question = 55,
-    QuestionQuestion = 56,
-    Semicolon = 57,
-    Slash = 58,
-    SlashEquals = 59,
-    Tilde = 60,
-    TildeTilde = 61,
-    Underscore = 62,
-    Equals = 63,
-    Percent = 64,
-    PercentPercent = 65,
-    BackSlash = 66,
-    BackSlashEquals = 67,
-    BackSlashBackSlash = 68,
-    Identifier = 69,
-    QuotedIdentifier = 70
+    Identifier = 16,
+    QuotedIdentifier = 17,
+    Ampersand = 18,
+    AmpersandAmpersand = 19,
+    AmpersandEquals = 20,
+    Asterisk = 21,
+    AsteriskAsterisk = 22,
+    AsteriskEquals = 23,
+    BackQuote = 24,
+    Bar = 25,
+    BarBar = 26,
+    Caret = 27,
+    RightBrace = 28,
+    RightParenthesis = 29,
+    RightSquareBracket = 30,
+    Colon = 31,
+    Comma = 32,
+    CommercialAt = 33,
+    Dot = 34,
+    DoublePeriod = 35,
+    Ellipsis = 36,
+    EqualsEquals = 37,
+    EqualsRightAngle = 38,
+    Exclamation = 39,
+    ExclamationEquals = 40,
+    RightAngle = 41,
+    RightAngleEquals = 42,
+    HashSign = 43,
+    LeftAngle = 44,
+    LeftAngleEquals = 45,
+    LeftAngleMinus = 46,
+    Minus = 47,
+    MinusMinus = 48,
+    MinusEquals = 49,
+    MinusRightAngle = 50,
+    LeftBrace = 51,
+    LeftParenthesis = 52,
+    LeftSquareBracket = 53,
+    Plus = 54,
+    PlusPlus = 55,
+    PlusEquals = 56,
+    Question = 57,
+    QuestionQuestion = 58,
+    Semicolon = 59,
+    Slash = 60,
+    SlashEquals = 61,
+    Tilde = 62,
+    TildeTilde = 63,
+    Underscore = 64,
+    Equals = 65,
+    Percent = 66,
+    PercentPercent = 67,
+    BackSlash = 68,
+    BackSlashEquals = 69,
+    BackSlashBackSlash = 70
 }

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

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

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

@@ -6,6 +6,8 @@ import { Substitutions } from './Substitutions.js';
 import { Type } from './Type.js';
 export type TypeMember = Field | Method | Operator | Constructor | Destructor | Indexer | DereferenceOperator;
 export type NamedTypeMember = Field | Method;
+export declare function isNamedTypeMember(member: TypeMember): member is NamedTypeMember;
+export type AnonymousTypeMember = Exclude<TypeMember, NamedTypeMember>;
 export declare class Method implements ITypeMember {
     private readonly _analyzer;
     private readonly _entity;
@@ -13,6 +15,7 @@ export declare class Method implements ITypeMember {
     readonly kind = "method";
     private readonly _valueParameters;
     private readonly _signatureEntity;
+    get debuggerDisplay(): string;
     constructor(_analyzer: Analyzer, _entity: MethodEntity, _substitutions: Substitutions);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -27,6 +30,7 @@ export declare class Method implements ITypeMember {
     applySubstitutions(substitutions: Substitutions): Method;
     getTypeParametersArity(): number;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export declare class ValueParameter {
     private readonly _entity;
@@ -43,6 +47,7 @@ export declare class Field implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
     readonly kind = "field";
+    get debuggerDisplay(): string;
     constructor(_entity: FieldEntity, _substitutions: Substitutions);
     getName(): Name;
     getType(): Type;
@@ -54,6 +59,7 @@ export declare class Field implements ITypeMember {
     isVariant(): boolean;
     applySubstitutions(substitutions: Substitutions): Field;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export declare class Operator implements ITypeMember {
     private readonly _analyzer;
@@ -62,6 +68,7 @@ export declare class Operator implements ITypeMember {
     readonly kind = "operator";
     private readonly _valueParameters;
     private readonly _signatureEntity;
+    get debuggerDisplay(): string;
     constructor(_analyzer: Analyzer, _entity: OperatorEntity, _substitutions: Substitutions);
     getOperatorKind(): OperatorKind;
     getValueParameters(): readonly ValueParameter[];
@@ -79,6 +86,7 @@ export declare class Constructor implements ITypeMember {
     private readonly _substitutions;
     readonly kind = "constructor";
     private readonly _valueParameters;
+    get debuggerDisplay(): string;
     constructor(_entity: ConstructorEntity, _substitutions: Substitutions);
     getValueParameters(): readonly ValueParameter[];
     getEntity(): ConstructorEntity;
@@ -87,12 +95,14 @@ export declare class Constructor implements ITypeMember {
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): TypeMember;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export declare class Destructor implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
     readonly kind = "destructor";
     private readonly _valueParameters;
+    get debuggerDisplay(): string;
     constructor(_entity: DestructorEntity, _substitutions: Substitutions);
     getValueParameters(): readonly ValueParameter[];
     getEntity(): DestructorEntity;
@@ -101,12 +111,14 @@ export declare class Destructor implements ITypeMember {
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): Destructor;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export declare class Indexer implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
     readonly kind = "indexer";
     private readonly _valueParameters;
+    get debuggerDisplay(): string;
     constructor(_entity: IndexerEntity, _substitutions: Substitutions);
     getValueParameters(): readonly ValueParameter[];
     getType(): Type;
@@ -116,11 +128,13 @@ export declare class Indexer implements ITypeMember {
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): Indexer;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export declare class DereferenceOperator implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
     readonly kind = "dereference-operator";
+    get debuggerDisplay(): string;
     constructor(_entity: DereferenceOperatorEntity, _substitutions: Substitutions);
     getType(): Type;
     getEntity(): DereferenceOperatorEntity;
@@ -129,6 +143,7 @@ export declare class DereferenceOperator implements ITypeMember {
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): DereferenceOperator;
     equals(other: TypeMember): boolean;
+    toString(): string;
 }
 export interface ITypeMember {
     isHidden(): EntityHidingLevel | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.25233",
+  "version": "0.6.25234",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "LGPL-3.0-or-later",