@artel/artc 0.6.25232 → 0.6.25233

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

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

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

@@ -483,19 +483,23 @@ declare class DefaultConstructors {
 }
 declare class OverriddenMember {
     private readonly _analyzer;
-    private readonly _fieldFinder;
-    private readonly _methodFinder;
+    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);
-    getOverriddenAndShadowedFields(node: tree.FieldDeclaration | FieldAccessorDeclaration): OverriddenAndShadowedMembers<types.Field>;
-    getOverriddenAndShadowedMethods(node: tree.MethodDeclaration): OverriddenAndShadowedMembers<types.Method>;
+    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>;
@@ -503,8 +507,7 @@ declare class OverriddenMember {
     getEntityTypeOrReturnType(entity: OverridableTypeMemberEntity): types.Type;
     getMemberTypeOrReturnType(member: OverridableTypeMember): types.Type;
     private findOverriddenMembers;
-    private findOverriddenOrShadowedFieldInType;
-    private findOverriddenOrShadowedMethodInType;
+    private findOverriddenOrShadowedNamedMemberInType;
     private findOverriddenOrShadowedOperatorInType;
     private findOverriddenOrShadowedIndexerInType;
     private findOverriddenOrShadowedDereferenceOperatorInType;
@@ -516,20 +519,21 @@ declare class OverriddenMember {
     private entityCanOverrideOrShadow;
 }
 export declare enum ShadowReason {
-    BaseMemberCanNotBeOverridden = 0,
-    NoOverrideModifier = 1,
-    NoOverrideModifierAndTypeOrReturnTypeMismatch = 2,
-    TypeOrReturnTypeMismatch = 3
+    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<T extends OverridableTypeMember = OverridableTypeMember> {
-    readonly overriddenMembers: readonly T[];
-    readonly shadowedMembers: readonly ShadowedMemberInfo<T>[];
-    constructor(overriddenMembers: readonly T[], shadowedMembers: readonly ShadowedMemberInfo<T>[]);
+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;

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;

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;
@@ -76,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/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/package.json

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