@artel/artc 0.6.25223 → 0.6.25225

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

@@ -3,10 +3,10 @@ import { ConstructorEntity } from './ConstructorEntity.js';
 import { DereferenceOperatorEntity } from './DereferenceOperatorEntity.js';
 import { DestructorEntity } from './DestructorEntity.js';
 import { IndexerEntity } from './IndexerEntity.js';
-import { TypeMethodEntity } from './MethodEntity.js';
+import { MethodEntity } from './FunctionEntity.js';
 import { OperatorEntity } from './OperatorEntity.js';
 import { OperatorKind } from './OperatorKind.js';
-import { TypeVariableEntity } from './VariableEntity.js';
+import { FieldEntity } from './VariableEntity.js';
 export declare class OriginalTypeEntityMembers {
     private readonly _namedMembers;
     private readonly _operators;
@@ -28,4 +28,4 @@ export declare class OriginalTypeEntityMembers {
     getConstructors(): readonly ConstructorEntity[];
     getDestructors(): readonly DestructorEntity[];
 }
-export type NamedTypeMemberEntity = TypeVariableEntity | TypeMethodEntity;
+export type NamedTypeMemberEntity = FieldEntity | MethodEntity;

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

@@ -3,7 +3,7 @@ import { Tag } from '../analysis/Tags.js';
 import { Name } from '../common/index.js';
 import { TypeParameterDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
-import { AliasTypeEntity, DefinitionKind, EntityHidingLevel, EntityKind, ITypeEntity, MethodEntity, MethodTypeEntity, StructuredTypeEntity, TypeEntityKind, VariantTypeEntity } from './index.js';
+import { AliasTypeEntity, DefinitionKind, EntityHidingLevel, EntityKind, ITypeEntity, FunctionEntity, FunctionTypeEntity, StructuredTypeEntity, TypeEntityKind, VariantTypeEntity } from './index.js';
 export interface TypeParameterEntity extends ITypeEntity {
     readonly kind: EntityKind.Type;
     readonly typeEntityKind: TypeEntityKind.Parameter;
@@ -27,7 +27,7 @@ export type TypeParameterEntityDefinition = {
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export type EntityContainingTypeParameter = VariantTypeEntity | MethodEntity | MethodTypeEntity | StructuredTypeEntity | AliasTypeEntity;
+export type EntityContainingTypeParameter = VariantTypeEntity | FunctionEntity | FunctionTypeEntity | StructuredTypeEntity | AliasTypeEntity;
 /**
  * Класс позволяет работать с ограничением параметра шаблона, исключая циклы.
  *

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

@@ -1,17 +1,17 @@
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
 import { Lazy, Name } from '../common/index.js';
-import { EnumerationVariableDeclaration, ErrorVariableDeclaration, LocalVariableDeclaration, MethodLiteral, PackageVariableDeclaration, PackageVariableGetterDeclaration, PackageVariableSetterDeclaration, ParameterDeclaration, TypeVariableDeclaration, TypeVariableGetterDeclaration, TypeVariableSetterDeclaration, VariantDeclaration } from '../tree/index.js';
+import { EnumerationVariableDeclaration, ErrorVariableDeclaration, FieldDeclaration, FieldGetterDeclaration, FieldSetterDeclaration, FunctionLiteral, LocalVariableDeclaration, PackageVariableDeclaration, PackageVariableGetterDeclaration, PackageVariableSetterDeclaration, ParameterDeclaration, VariantDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import type { Entity, IndexerEntity, PackageEntity } from './index.js';
-import { Entity as ActualEntity, ConstructorEntity, DefinitionKind, DestructorEntity, EntityHidingLevel, EntityKind, GetterEntity, MethodEntity, MethodTypeEntity, OperatorEntity, SetterEntity, TypeMemberEntityContainer } from './index.js';
-export type VariableEntity = PackageVariableEntity | TypeVariableEntity | ParameterVariableEntity | LocalVariableEntity;
+import { Entity as ActualEntity, ConstructorEntity, DefinitionKind, DestructorEntity, EntityHidingLevel, EntityKind, FunctionEntity, FunctionTypeEntity, GetterEntity, OperatorEntity, SetterEntity, TypeMemberEntityContainer } from './index.js';
+export type VariableEntity = PackageVariableEntity | FieldEntity | ParameterVariableEntity | LocalVariableEntity;
 export interface PackageVariableEntity extends IVariableEntity {
     readonly subkind: 'package';
     getContainingPackage(): PackageEntity;
 }
-export interface TypeVariableEntity extends IVariableEntity {
-    readonly subkind: 'type';
+export interface FieldEntity extends IVariableEntity {
+    readonly subkind: 'field';
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;
@@ -42,20 +42,20 @@ interface IVariableEntity {
     isSpecial(): SpecialVariableEntityInfo | undefined;
     getTags(): readonly Tag[];
 }
-export type ParameterVariableEntityContainer = ParameterVariableEntityContainer.Entity | ParameterVariableEntityContainer.MethodLiteral;
+export type ParameterVariableEntityContainer = ParameterVariableEntityContainer.Entity | ParameterVariableEntityContainer.FunctionLiteral;
 export declare namespace ParameterVariableEntityContainer {
     class Entity {
         readonly entity: EntityContainingValueParameter;
         readonly kind = "entity";
         constructor(entity: EntityContainingValueParameter);
     }
-    class MethodLiteral {
-        readonly entityContainingMethod: ActualEntity;
-        readonly kind = "method-literal";
-        constructor(entityContainingMethod: ActualEntity);
+    class FunctionLiteral {
+        readonly entityContainingFunction: ActualEntity;
+        readonly kind = "function-literal";
+        constructor(entityContainingFunction: ActualEntity);
     }
 }
-export type EntityContainingValueParameter = MethodEntity | IndexerEntity | ConstructorEntity | DestructorEntity | MethodTypeEntity | SetterEntity | OperatorEntity;
+export type EntityContainingValueParameter = FunctionEntity | IndexerEntity | ConstructorEntity | DestructorEntity | FunctionTypeEntity | SetterEntity | OperatorEntity;
 export type VariableEntityDefinition = {
     kind: DefinitionKind.Source;
     value: SourceVariableEntityDefinition;
@@ -67,18 +67,18 @@ export type VariableEntityDefinition = {
 export type SourceVariableEntityDefinition = SingleSourceVariableEntityDefinition | MultiSourceVariableEntityDefinition;
 export type SingleSourceVariableEntityDefinition = {
     kind: 'single';
-    node: PackageVariableDeclaration | TypeVariableDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ErrorVariableDeclaration | ParameterDeclaration | VariantDeclaration;
+    node: PackageVariableDeclaration | FieldDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ErrorVariableDeclaration | ParameterDeclaration | VariantDeclaration;
 };
 export type MultiSourceVariableEntityDefinition = {
     kind: 'multi';
-    nodes: ReadonlyArray<PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | ParameterDeclaration>;
+    nodes: ReadonlyArray<PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | FieldGetterDeclaration | FieldSetterDeclaration | ParameterDeclaration>;
 };
-export declare class ImplicitMethodBlockParameterSpecialVariableEntityInfo {
+export declare class ImplicitFunctionBlockParameterSpecialVariableEntityInfo {
     readonly targetTypeParameter: types.ValueParameter;
-    readonly kind = "implicit-method-block-parameter";
+    readonly kind = "implicit-function-block-parameter";
     constructor(targetTypeParameter: types.ValueParameter);
 }
-export type SpecialVariableEntityInfo = ResultSpecialVariableEntityInfo | ValueSpecialVariableEntityInfo | BackingSpecialVariableEntityInfo | ImplicitMethodBlockParameterSpecialVariableEntityInfo;
+export type SpecialVariableEntityInfo = ResultSpecialVariableEntityInfo | ValueSpecialVariableEntityInfo | BackingSpecialVariableEntityInfo | ImplicitFunctionBlockParameterSpecialVariableEntityInfo;
 export declare class ResultSpecialVariableEntityInfo {
     readonly kind = "result";
 }
@@ -86,9 +86,9 @@ export declare class ValueSpecialVariableEntityInfo {
     readonly kind = "value";
 }
 export declare class BackingSpecialVariableEntityInfo {
-    readonly computedVariable: PackageVariableEntity | TypeVariableEntity;
+    readonly computedVariable: PackageVariableEntity | FieldEntity;
     readonly kind = "backing";
-    constructor(computedVariable: PackageVariableEntity | TypeVariableEntity);
+    constructor(computedVariable: PackageVariableEntity | FieldEntity);
 }
 export declare class PackageVariableDeclarationEntity implements PackageVariableEntity {
     private readonly _analyzer;
@@ -131,16 +131,16 @@ export declare class ComputedPackageVariableDeclarationEntity implements Package
     isSpecial(): SpecialVariableEntityInfo | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeVariableDeclarationEntity implements TypeVariableEntity {
+export declare class FieldDeclarationEntity implements FieldEntity {
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _analyzer;
     private readonly _node;
     private readonly _typeInferrer;
     private readonly _overriddenMembers;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(analyzer: Analyzer, node: TypeVariableDeclaration);
+    constructor(analyzer: Analyzer, node: FieldDeclaration);
     getName(): Name;
     getType(): types.Type;
     getDefinition(): VariableEntityDefinition;
@@ -158,9 +158,9 @@ export declare class TypeVariableDeclarationEntity implements TypeVariableEntity
     getOverriddenMembers(): readonly types.Variable[];
     isVariant(): boolean;
 }
-export declare class ComputedTypeVariableDeclarationEntity implements TypeVariableEntity {
+export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _analyzer;
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
@@ -168,7 +168,7 @@ export declare class ComputedTypeVariableDeclarationEntity implements TypeVariab
     private readonly _overriddenMembers;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(analyzer: Analyzer, getterDeclaration: TypeVariableGetterDeclaration | undefined, setterDeclaration: TypeVariableSetterDeclaration | undefined);
+    constructor(analyzer: Analyzer, getterDeclaration: FieldGetterDeclaration | undefined, setterDeclaration: FieldSetterDeclaration | undefined);
     getName(): Name;
     getType(): types.Type;
     getContainer(): TypeMemberEntityContainer;
@@ -186,9 +186,9 @@ export declare class ComputedTypeVariableDeclarationEntity implements TypeVariab
     getOverriddenMembers(): readonly types.Variable[];
     isVariant(): boolean;
 }
-export declare class VariantDeclarationEntity implements TypeVariableEntity {
+export declare class VariantDeclarationEntity implements FieldEntity {
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _analyzer;
     private readonly _node;
     private readonly _variantTypeDeclaration;
@@ -284,7 +284,7 @@ export declare class ParameterDeclarationEntity implements ParameterVariableEnti
     isOptional(): boolean;
     isVariadic(): boolean;
 }
-export declare class TypeIndexerParameterDeclarationEntity implements ParameterVariableEntity {
+export declare class IndexParameterDeclarationEntity implements ParameterVariableEntity {
     private readonly _analyzer;
     private readonly _getterParameterDeclaration;
     private readonly _setterParameterDeclaration;
@@ -307,14 +307,14 @@ export declare class TypeIndexerParameterDeclarationEntity implements ParameterV
     isOptional(): boolean;
     isVariadic(): boolean;
 }
-export declare class MethodLiteralParameterDeclarationEntity implements ParameterVariableEntity {
+export declare class FunctionLiteralParameterDeclarationEntity implements ParameterVariableEntity {
     private readonly _analyzer;
     private readonly _node;
-    private readonly _methodLiteral;
+    private readonly _functionLiteral;
     readonly kind = EntityKind.Variable;
     readonly subkind = "parameter";
     private readonly _parameterIndex;
-    constructor(_analyzer: Analyzer, _node: ParameterDeclaration, _methodLiteral: MethodLiteral);
+    constructor(_analyzer: Analyzer, _node: ParameterDeclaration, _functionLiteral: FunctionLiteral);
     getName(): Name;
     getType(): types.Type;
     getDefinition(): VariableEntityDefinition;
@@ -350,7 +350,7 @@ export declare class IntrinsicPackageVariableEntity implements PackageVariableEn
     getTags(): readonly Tag[];
     getContainingPackage(): PackageEntity;
 }
-export declare class IntrinsicTypeVariableEntity implements TypeVariableEntity {
+export declare class IntrinsicFieldEntity implements FieldEntity {
     private readonly _name;
     private readonly _type;
     private readonly _container;
@@ -364,7 +364,7 @@ export declare class IntrinsicTypeVariableEntity implements TypeVariableEntity {
     private readonly _setter;
     private readonly _overriddenMembers;
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMembers: readonly types.Variable[]);
     getName(): Name;
     getType(): types.Type;

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

@@ -4,8 +4,8 @@ import { DereferenceOperatorEntity } from './DereferenceOperatorEntity.js';
 import { DestructorEntity } from './DestructorEntity.js';
 import { GetterEntity } from './GetterEntity.js';
 import { IndexerEntity } from './IndexerEntity.js';
-import { MethodEntity, PackageMethodEntity, TypeMethodEntity } from './MethodEntity.js';
-import { MethodTypeEntity, PackageMethodTypeEntity } from './MethodTypeEntity.js';
+import { FunctionEntity, MethodEntity, PackageFunctionEntity } from './FunctionEntity.js';
+import { FunctionTypeEntity, PackageFunctionTypeEntity } from './FunctionTypeEntity.js';
 import { OperatorEntity } from './OperatorEntity.js';
 import { PackageAliasEntity } from './PackageAliasEntity.js';
 import { PackageEntity } from './PackageEntity.js';
@@ -14,7 +14,7 @@ import { PackageStructuredTypeEntity, StructuredTypeEntity } from './StructuredT
 import { TypeEntity } from './TypeEntity.js';
 import { TypeExtensionEntity } from './TypeExtensionEntity.js';
 import { TypeParameterEntity } from './TypeParameterEntity.js';
-import { PackageVariableEntity, TypeVariableEntity, VariableEntity } from './VariableEntity.js';
+import { PackageVariableEntity, FieldEntity, VariableEntity } from './VariableEntity.js';
 import { PackageVariantTypeEntity, VariantTypeEntity } from './VariantTypeEntity.js';
 export * from './AliasTypeEntity.js';
 export * from './ConstructorEntity.js';
@@ -24,8 +24,8 @@ export * from './EntityHiding.js';
 export * from './EntityNaming.js';
 export * from './GetterEntity.js';
 export * from './IndexerEntity.js';
-export * from './MethodEntity.js';
-export * from './MethodTypeEntity.js';
+export * from './FunctionEntity.js';
+export * from './FunctionTypeEntity.js';
 export * from './OperatorEntity.js';
 export * from './OperatorKind.js';
 export * from './PackageAliasEntity.js';
@@ -46,7 +46,7 @@ export declare const enum DefinitionKind {
 }
 export declare const enum EntityKind {
     Variable = 0,
-    Method = 1,
+    Function = 1,
     Type = 2,
     Getter = 3,
     Setter = 4,
@@ -59,23 +59,23 @@ export declare const enum EntityKind {
     TypeExtension = 11,
     Package = 12
 }
-export type Entity = PackageEntity | VariableEntity | VariantTypeEntity | GetterEntity | SetterEntity | MethodEntity | TypeParameterEntity | OperatorEntity | IndexerEntity | DereferenceOperatorEntity | ConstructorEntity | DestructorEntity | MethodTypeEntity | StructuredTypeEntity | PackageAliasEntity | AliasTypeEntity | TypeExtensionEntity;
-export type PackageTypeEntity = PackageMethodTypeEntity | PackageStructuredTypeEntity | PackageVariantTypeEntity | AliasTypeEntity;
+export type Entity = PackageEntity | VariableEntity | VariantTypeEntity | GetterEntity | SetterEntity | FunctionEntity | TypeParameterEntity | OperatorEntity | IndexerEntity | DereferenceOperatorEntity | ConstructorEntity | DestructorEntity | FunctionTypeEntity | StructuredTypeEntity | PackageAliasEntity | AliasTypeEntity | TypeExtensionEntity;
+export type PackageTypeEntity = PackageFunctionTypeEntity | PackageStructuredTypeEntity | PackageVariantTypeEntity | AliasTypeEntity;
 export declare function isPackageTypeEntity(entity: TypeEntity): entity is PackageTypeEntity;
-export type NamedTypeEntity = PackageMethodTypeEntity | PackageStructuredTypeEntity | PackageVariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
-export type TypeEntityWithMembers = MethodTypeEntity | StructuredTypeEntity | VariantTypeEntity | AliasTypeEntity;
+export type NamedTypeEntity = PackageFunctionTypeEntity | PackageStructuredTypeEntity | PackageVariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
+export type TypeEntityWithMembers = FunctionTypeEntity | StructuredTypeEntity | VariantTypeEntity | AliasTypeEntity;
 export declare function isTypeEntityWithMembers(entity: TypeEntity): entity is TypeEntityWithMembers;
 export type TypeOrExtensionEntity = TypeEntity | TypeExtensionEntity;
 export type TypeWithMembersOrExtensionEntity = TypeEntityWithMembers | TypeExtensionEntity;
 export declare function isTypeWithMembersOrExtensionEntity(entity: Entity): entity is TypeWithMembersOrExtensionEntity;
 export declare function isTypeEntity(entity: Entity): entity is TypeEntity;
 export declare function isNamedTypeEntity(entity: TypeEntity): entity is NamedTypeEntity;
-export type PackageMemberEntity = PackageVariableEntity | PackageMethodEntity | PackageTypeEntity | TypeExtensionEntity;
+export type PackageMemberEntity = PackageVariableEntity | PackageFunctionEntity | PackageTypeEntity | TypeExtensionEntity;
 export declare function isPackageMemberEntity(entity: Entity): entity is PackageMemberEntity;
-export type NamedPackageMemberEntity = PackageVariableEntity | PackageMethodEntity | PackageTypeEntity;
-export type EntityWithTags = ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity | MethodEntity | VariableEntity | GetterEntity | SetterEntity | TypeEntity | OperatorEntity;
+export type NamedPackageMemberEntity = PackageVariableEntity | PackageFunctionEntity | PackageTypeEntity;
+export type EntityWithTags = ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity | FunctionEntity | VariableEntity | GetterEntity | SetterEntity | TypeEntity | OperatorEntity;
 export declare function isEntityWithTags(entity: Entity): entity is EntityWithTags;
-export type TypeMemberEntity = TypeVariableEntity | TypeMethodEntity | OperatorEntity | ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity;
+export type TypeMemberEntity = FieldEntity | MethodEntity | OperatorEntity | ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity;
 export declare function isTypeMemberEntity(entity: Entity): entity is TypeMemberEntity;
 export declare function entityToStringDecorator<T extends {
     new (...args: any[]): Entity;

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

@@ -34,7 +34,6 @@ export declare class CompletionService {
     private getCompletionItemInfosForTargetSignaturesValueParameters;
     private getScopeCompletionItemInfos;
     private getTypeCompletionItemInfos;
-    private getEntityFromType;
     private getTypeCompletionItemInfosFromPackage;
     private getTypeCompletionItemInfosFromPackageNameSegment;
     private getTypeCompletionItemInfosFromScope;
@@ -51,7 +50,7 @@ export declare class CompletionService {
     private getTopLevelAliasListCompletionItemInfos;
     private getTypeAliasMemberListItemInfos;
     private getOperatorNameItemInfos;
-    private mergeOverloadedMethods;
+    private mergeOverloadedFunctions;
     private removeCompletionItemsWithDuplicateLabels;
     private convertCompletionItemInfos;
     private convertCompletionItemInfo;
@@ -70,23 +69,23 @@ export declare class CompletionItem {
 export declare const enum CompletionItemKind {
     PackageNameSegment = 0,
     PackageAlias = 1,
-    TypeVariable = 2,
-    TypeMethod = 3,
+    Field = 2,
+    Method = 3,
     Operator = 4,
-    TypeIndexer = 5,
-    TypeConstructor = 6,
+    Indexer = 5,
+    Constructor = 6,
     PackageVariable = 7,
-    PackageMethod = 8,
+    PackageFunction = 8,
     LocalVariable = 9,
     ParameterVariable = 10,
-    NestedMethod = 11,
+    NestedFunction = 11,
     Variant = 12,
     RefObjectType = 13,
     PlainObjectType = 14,
     AspectType = 15,
     VariantType = 16,
     TypeParameter = 17,
-    MethodType = 18,
+    FunctionType = 18,
     AliasType = 19,
     InvalidType = 20,
     Keyword = 21,