@artel/artc 0.6.25229 → 0.6.25230

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

@@ -24,7 +24,7 @@ export declare class PackageVariableSetterDeclarationEntity implements SetterEnt
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -37,7 +37,7 @@ export declare class FieldSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: FieldSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -50,7 +50,7 @@ export declare class IndexedElementSetterDeclarationEntity implements SetterEnti
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: IndexedElementSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -63,7 +63,7 @@ export declare class DereferencedVariableSetterDeclarationEntity implements Sett
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: DereferencedVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;

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

@@ -149,7 +149,7 @@ export declare class SourcePackageStructuredTypeDeclarationData {
     private readonly _baseObjectType;
     private readonly _baseAspectTypes;
     private readonly _members;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: PackageStructuredTypeDeclaration, entity: PackageStructuredTypeEntity);
     getNaming(): EntityNaming;

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

@@ -21,7 +21,7 @@ export declare class SourceTypeExtensionEntity implements TypeExtensionEntity {
     private readonly _analyzer;
     private readonly _node;
     private readonly _members;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: TypeExtensionDeclaration);
     getMembers(): OriginalTypeEntityMembers;

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

@@ -15,10 +15,10 @@ export interface FieldEntity extends IVariableEntity {
     readonly subkind: 'field';
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export interface ParameterVariableEntity extends IVariableEntity {
@@ -109,7 +109,7 @@ export declare class PackageVariableDeclarationEntity implements PackageVariable
     readonly kind = EntityKind.Variable;
     readonly subkind = "package";
     private readonly _typeInferrer;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: tree.PackageVariableDeclaration);
@@ -132,7 +132,7 @@ export declare class ComputedPackageVariableDeclarationEntity implements Package
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: tree.PackageVariableGetterDeclaration | undefined, setterDeclaration: tree.PackageVariableSetterDeclaration | undefined);
     getName(): Name;
@@ -153,7 +153,7 @@ export declare class FieldDeclarationEntity implements FieldEntity {
     private readonly _node;
     private readonly _typeInferrer;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: tree.FieldDeclaration);
@@ -168,10 +168,10 @@ export declare class FieldDeclarationEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     ensureAllDiagnosticsReported(): void;
 }
@@ -183,7 +183,7 @@ export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: tree.FieldGetterDeclaration | undefined, setterDeclaration: tree.FieldSetterDeclaration | undefined);
     getName(): Name;
@@ -192,15 +192,15 @@ export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     isHidden(): EntityHidingLevel | undefined;
     isConstant(): boolean;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getDefinition(): VariableEntityDefinition;
     getGetter(): GetterEntity | undefined;
     getSetter(): SetterEntity | undefined;
     isSpecial(): SpecialVariableEntityInfo | undefined;
     getTags(): readonly Tag[];
-    getOverriddenMembers(): readonly types.Variable[];
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class VariantDeclarationEntity implements FieldEntity {
@@ -222,10 +222,10 @@ export declare class VariantDeclarationEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class LocalVariableDeclarationEntity implements LocalVariableEntity {
@@ -383,9 +383,9 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     private readonly _type;
     private readonly _container;
     private readonly _isStatic;
-    private readonly _isBasic;
-    private readonly _isRedefined;
-    private readonly _isAbstract;
+    private readonly _markedBasic;
+    private readonly _isOverride;
+    private readonly _markedAbstract;
     private readonly _isSpecial;
     private readonly _isHidden;
     private readonly _getter;
@@ -393,7 +393,7 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     private readonly _overriddenMembers;
     readonly kind = EntityKind.Variable;
     readonly subkind = "field";
-    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _isBasic: boolean, _isRedefined: boolean, _isAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMembers: readonly types.Variable[]);
+    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _markedBasic: boolean, _isOverride: boolean, _markedAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMembers: readonly types.Field[]);
     getName(): Name;
     getType(): types.Type;
     getDefinition(): VariableEntityDefinition;
@@ -405,10 +405,10 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class IntrinsicParameterVariableEntity implements ParameterVariableEntity {

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

@@ -49,7 +49,7 @@ export declare class PackageVariantTypeDeclarationEntity implements PackageVaria
     private readonly _members;
     private readonly _underlyingType;
     private readonly _baseObjectType;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariantTypeDeclaration);
     getNaming(): EntityNaming;

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

@@ -78,8 +78,36 @@ export declare function isEntityWithTags(entity: Entity): entity is EntityWithTa
 export type TypeMemberEntity = FieldEntity | MethodEntity | OperatorEntity | ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity;
 export declare function isTypeMemberEntity(entity: Entity): entity is TypeMemberEntity;
 export declare namespace TypeMemberEntity {
+    /**
+     * Возвращает `true`, если это член аспектного типа.
+     */
     function isAspectTypeMember(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление является всеобщим (помечено модификатором "всеобщее").
+     */
     function isStatic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление помечено модификатором "базовое".
+     */
+    function markedBasic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление можно заменить в производном типе.
+     *
+     * Объявление можно заменить в производном типе, если оно не всеобщее, и выполняется одно из условий:
+     * - объявление помечено модификатором "базовое"
+     * - объявление помечено модификатором "абстрактное"
+     * - объявление помечено модификатором "расширенное"
+     * - объявление является членом аспектного типа
+     */
+    function isBasic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление не имеет реализации.
+     *
+     * Объявление не имеет реализации, если выполняется одно из условий:
+     * - объявление помечено модификатором "абстрактное"
+     * - объявление является является членом аспекта, не помечено модификатором "базовое" и не является всеобщим.
+     */
+    function isAbstract(entity: TypeMemberEntity): boolean;
 }
 export declare function entityToStringDecorator<T extends {
     new (...args: any[]): Entity;

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

@@ -86,11 +86,11 @@ export declare class VariableDeclaration_entity implements IVariableDeclaration
     getContainer(): DeclarationContainer | undefined;
 }
 export declare class VariableDeclaration_typeMember implements IVariableDeclaration {
-    readonly value: types.Variable;
+    readonly value: types.Field;
     readonly localization: Localization;
     readonly narrowedType?: types.Type | undefined;
     readonly kind = "type-member";
-    constructor(value: types.Variable, localization: Localization, narrowedType?: types.Type | undefined);
+    constructor(value: types.Field, localization: Localization, narrowedType?: types.Type | undefined);
     getEntity(): e.VariableEntity;
     getLocalization(): Localization;
     getType(): types.Type;

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

@@ -63,11 +63,11 @@ export declare class EntityReferenceTarget {
     constructor(entity: Entity, accessKind: AccessKind, narrowedType?: types.Type | undefined);
 }
 export declare class FieldReferenceTarget {
-    readonly variable: types.Variable;
+    readonly field: types.Field;
     readonly accessKind: AccessKind;
     readonly narrowedType: types.Type | undefined;
-    readonly kind = "type-variable";
-    constructor(variable: types.Variable, accessKind: AccessKind, narrowedType: types.Type | undefined);
+    readonly kind = "field";
+    constructor(field: types.Field, accessKind: AccessKind, narrowedType: types.Type | undefined);
 }
 export declare class TypeValueParameterReferenceTarget {
     readonly parameter: types.ValueParameter;

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

@@ -38,7 +38,7 @@ export declare enum KeywordKind {
     Const = 36,
     Hidden = 37,
     Abstract = 38,
-    Redefined = 39,
+    Override = 39,
     Async = 40,
     Static = 41,
     As = 42,

package/build/types/tree/green/Nodes.d.ts

@@ -2104,7 +2104,7 @@ export declare class Modifier extends BaseNode {
     toRed(rangeStart: number, parent: red.ModifierParent): red.Modifier;
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
-export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Const;
+export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Override | KeywordKind.Async | KeywordKind.Const;
 export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export declare class ParameterClause extends BaseNode {
     readonly kind = NodeKind.ParameterClause;

package/build/types/tree/red/Nodes.d.ts

@@ -2085,7 +2085,7 @@ export declare class Modifier extends BaseNode {
     private createChildren;
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
-export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Const;
+export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Override | KeywordKind.Async | KeywordKind.Const;
 export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export type ParameterClauseParent = PackageFunctionDeclaration | NestedFunctionDeclaration | FunctionLiteral | ConstructorDeclaration | DestructorDeclaration | MethodDeclaration | OperatorDeclaration | FunctionTypeDeclarationBody;
 export declare class ParameterClause extends BaseNode {

package/build/types/ts-interop/Entities.d.ts

@@ -310,10 +310,10 @@ export declare class TsPropertyEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     private getDeclaration;
 }
@@ -340,10 +340,10 @@ export declare class TsAccessorEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     private getGetAccessorDeclaration;
 }
@@ -375,7 +375,7 @@ export declare class TsSetAccessorEntity implements SetterEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TsFunctionEntity implements MethodEntity {
+export declare class TsMethodEntity implements MethodEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _declaration;
@@ -395,9 +395,9 @@ export declare class TsFunctionEntity implements MethodEntity {
     getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
@@ -423,9 +423,9 @@ export declare class TsIteratorFunctionEntity implements MethodEntity {
     getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
@@ -499,9 +499,9 @@ export declare class TsIndexSignatureEntity implements IndexerEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Indexer[];
 }
@@ -518,7 +518,7 @@ export declare class TsConstructorEntity implements ConstructorEntity {
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class TsSignatureBasedDefaultConstructorEntity implements ConstructorEntity {
@@ -533,7 +533,7 @@ export declare class TsSignatureBasedDefaultConstructorEntity implements Constru
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class TsEnumEntity implements PackageVariantTypeEntity {
@@ -571,10 +571,10 @@ export declare class TsEnumMemberEntity implements FieldEntity {
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _variantTypeEntity: VariantTypeEntity);
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isBasic(): boolean;
-    isOverridden(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     getType(): types.Type;
     getGetter(): GetterEntity | undefined;

package/build/types/ts-interop/TsTypeMembersCreator.d.ts

@@ -30,7 +30,7 @@ export declare class TsTypeMembersCreator {
      * @param symbol (symbol.flags & ts.SymbolFlags.Method) !== 0
      */
     private createMethods;
-    private createFunctionEntityNoReplacement;
+    private createMethodEntityNoReplacement;
     private createConstructors;
     private createIndexerSignatures;
     private registerTypeParameters;

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

@@ -4,8 +4,8 @@ import { ConstructorEntity, DereferenceOperatorEntity, DestructorEntity, EntityH
 import { FunctionType } from './FunctionType.js';
 import { Substitutions } from './Substitutions.js';
 import { Type } from './Type.js';
-export type TypeMember = Variable | Method | Operator | Constructor | Destructor | Indexer | DereferenceOperator;
-export type NamedTypeMember = Variable | Method;
+export type TypeMember = Field | Method | Operator | Constructor | Destructor | Indexer | DereferenceOperator;
+export type NamedTypeMember = Field | Method;
 export declare class Method implements ITypeMember {
     private readonly _analyzer;
     private readonly _entity;
@@ -39,10 +39,10 @@ export declare class ValueParameter {
     isOptional(): boolean;
     isVariadic(): boolean;
 }
-export declare class Variable implements ITypeMember {
+export declare class Field implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
-    readonly kind = "variable";
+    readonly kind = "field";
     constructor(_entity: FieldEntity, _substitutions: Substitutions);
     getName(): Name;
     getType(): Type;
@@ -52,7 +52,7 @@ export declare class Variable implements ITypeMember {
     isHidden(): EntityHidingLevel | undefined;
     isStatic(): boolean;
     isVariant(): boolean;
-    applySubstitutions(substitutions: Substitutions): Variable;
+    applySubstitutions(substitutions: Substitutions): Field;
     equals(other: TypeMember): boolean;
 }
 export declare class Operator implements ITypeMember {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.25229",
+  "version": "0.6.25230",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "LGPL-3.0-or-later",
@@ -36,9 +36,9 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "7.23.0",
-    "@babel/parser": "7.23.0",
-    "@babel/types": "7.23.0",
+    "@babel/generator": "7.27.3",
+    "@babel/parser": "7.27.3",
+    "@babel/types": "7.27.3",
     "@vscode/l10n": "0.0.18",
     "jsonc-parser": "3.3.1",
     "reactronic": "^0.93.25025",