@artel/artc 0.6.25223 → 0.6.25225

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

@@ -6,7 +6,7 @@ import { PackageEntityDefinition } from '../entities/PackageEntity.js';
 import { OriginalPackageMembers } from '../entities/PackageMembers.js';
 import { OriginalTypeEntityMembers } from '../entities/TypeEntityMembers.js';
 import type { EntityContainingTypeParameter, EntityContainingValueParameter, EntityOwningGetter, TypeEntityWithMembers, VariantTypeEntity } from '../entities/index.js';
-import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousMethodTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntityDefinition, MethodTypeEntityDefinition, PackageMethodEntity, PackageMethodTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterVariableEntity, ParameterVariableEntityContainer, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, SubstitutionApplicationMode, TypeEntityKind, TypeMemberEntityContainer, TypeMethodEntity, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, TypeVariableEntity, VariableEntityDefinition, VariantTypeEntityDefinition } from '../entities/index.js';
+import { AliasTypeEntity, AliasTypeEntityDefinition, AliasedType, AnonymousFunctionTypeEntity, AnonymousStructuredTypeEntity, BaseAspectTypes, BaseObjectType, ConstructorEntity, ConstructorEntityDefinition, DefaultConstructorEntityInfo, EntityHidingLevel, EntityKind, EntityNaming, EntityOwningSetter, FunctionEntityDefinition, GetterEntity, GetterEntityDefinition, IndexerEntity, IndexerEntityDefinition, InterfacePackageEntityInfo, MethodEntity, FunctionTypeEntityDefinition, PackageFunctionEntity, PackageFunctionTypeEntity, PackageStructuredTypeEntity, PackageVariableEntity, PackageVariantTypeEntity, ParameterVariableEntity, ParameterVariableEntityContainer, SetterEntity, SetterEntityDefinition, SpecialVariableEntityInfo, StructuredTypeEntityDefinition, SubstitutionApplicationMode, TypeEntityKind, TypeMemberEntityContainer, TypeParameterConstraint, TypeParameterEntity, TypeParameterEntityDefinition, FieldEntity, VariableEntityDefinition, VariantTypeEntityDefinition } from '../entities/index.js';
 import { JavaScriptImplementationConfig, PackageName, PlatformKind, ProgramPackage } from '../project/index.js';
 import * as tree from '../tree/index.js';
 import * as types from '../types/index.js';
@@ -41,8 +41,8 @@ export declare class SourcePackageLoadedFromDtsEntity implements PackageEntity {
     getImplementedInterfacePackage(): PackageEntity | undefined;
     getSupportedPlatforms(): readonly PlatformKind[];
     getPackageAliasTypeDeclarationEntity(node: tree.PackageAliasTypeDeclaration): AliasTypeEntity;
-    getPackageMethodDeclarationEntity(node: tree.PackageMethodDeclaration): PackageMethodEntity;
-    getPackageMethodTypeDeclarationEntity(node: tree.PackageMethodTypeDeclaration): PackageMethodTypeEntity;
+    getPackageFunctionDeclarationEntity(node: tree.PackageFunctionDeclaration): PackageFunctionEntity;
+    getPackageFunctionTypeDeclarationEntity(node: tree.PackageFunctionTypeDeclaration): PackageFunctionTypeEntity;
     getPackageStructuredTypeDeclarationEntity(node: tree.PackageStructuredTypeDeclaration): PackageStructuredTypeEntity;
     getPackageVariableDeclarationEntity(node: tree.PackageVariableDeclaration): PackageVariableEntity;
     getComputedPackageVariableDeclaration(node: tree.PackageVariableGetterDeclaration | tree.PackageVariableSetterDeclaration): PackageVariableEntity;
@@ -71,14 +71,14 @@ export declare class TsGlobalVariableEntity implements PackageVariableEntity {
     getTags(): readonly Tag[];
     private getDeclaration;
 }
-export declare class TsGlobalFunctionEntity implements PackageMethodEntity {
+export declare class TsGlobalFunctionEntity implements PackageFunctionEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _isDefaultExport;
     private readonly _declaration;
     private readonly _containingPackage;
     private readonly _forceHiddenInPackage;
-    readonly kind = EntityKind.Method;
+    readonly kind = EntityKind.Function;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
@@ -89,7 +89,7 @@ export declare class TsGlobalFunctionEntity implements PackageMethodEntity {
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
@@ -289,13 +289,13 @@ export declare class SourceAndTsNamedTypeLiteralMergeEntity implements PackageSt
     getTags(): readonly Tag[];
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
 }
-export declare class TsPropertyEntity implements TypeVariableEntity {
+export declare class TsPropertyEntity implements FieldEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _containingType;
     private readonly _forceStatic;
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _type;
     private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingType: TypeEntityWithMembers, _forceStatic: boolean);
@@ -317,13 +317,13 @@ export declare class TsPropertyEntity implements TypeVariableEntity {
     isVariant(): boolean;
     private getDeclaration;
 }
-export declare class TsAccessorEntity implements TypeVariableEntity {
+export declare class TsAccessorEntity implements FieldEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _containingType;
     private readonly _forceStatic;
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _type;
     private readonly _getter;
     private readonly _setter;
@@ -375,14 +375,14 @@ export declare class TsSetAccessorEntity implements SetterEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TsMethodEntity implements TypeMethodEntity {
+export declare class TsFunctionEntity implements MethodEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _declaration;
     private readonly _containingType;
     private readonly _forceStatic;
-    readonly kind = EntityKind.Method;
-    readonly subkind = "type";
+    readonly kind = EntityKind.Function;
+    readonly subkind = "method";
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _returnType;
@@ -392,7 +392,7 @@ export declare class TsMethodEntity implements TypeMethodEntity {
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;
@@ -403,16 +403,16 @@ export declare class TsMethodEntity implements TypeMethodEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
-    isMethodTypeInvokeMethod(): boolean;
+    isFunctionTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
 }
-export declare class TsIteratorMethodEntity implements TypeMethodEntity {
+export declare class TsIteratorFunctionEntity implements MethodEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _containingType;
-    readonly kind = EntityKind.Method;
-    readonly subkind = "type";
+    readonly kind = EntityKind.Function;
+    readonly subkind = "method";
     private readonly _returnType;
     private readonly _overriddenMembers;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _containingType: TypeEntityWithMembers);
@@ -420,7 +420,7 @@ export declare class TsIteratorMethodEntity implements TypeMethodEntity {
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;
@@ -431,7 +431,7 @@ export declare class TsIteratorMethodEntity implements TypeMethodEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
-    isMethodTypeInvokeMethod(): boolean;
+    isFunctionTypeInvokeMethod(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
     private getFirstDeclaration;
@@ -561,12 +561,12 @@ export declare class TsEnumEntity implements PackageVariantTypeEntity {
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
 }
-export declare class TsEnumMemberEntity implements TypeVariableEntity {
+export declare class TsEnumMemberEntity implements FieldEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _variantTypeEntity;
     readonly kind = EntityKind.Variable;
-    readonly subkind = "type";
+    readonly subkind = "field";
     private readonly _type;
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _variantTypeEntity: VariantTypeEntity);
     getContainer(): TypeMemberEntityContainer;
@@ -608,13 +608,13 @@ export declare class TsTypeAliasEntity implements AliasTypeEntity {
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     private getDeclaration;
 }
-export declare class TsAnonymousFunctionTypeEntity implements AnonymousMethodTypeEntity {
+export declare class TsAnonymousFunctionTypeEntity implements AnonymousFunctionTypeEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _declaration;
     private readonly _containingPackage;
     readonly kind = EntityKind.Type;
-    readonly typeEntityKind = TypeEntityKind.Method;
+    readonly typeEntityKind = TypeEntityKind.Function;
     readonly subkind = "anonymous";
     private readonly _valueParameters;
     private readonly _returnType;
@@ -626,7 +626,7 @@ export declare class TsAnonymousFunctionTypeEntity implements AnonymousMethodTyp
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
     getMembers(): OriginalTypeEntityMembers;
-    getDefinition(): MethodTypeEntityDefinition;
+    getDefinition(): FunctionTypeEntityDefinition;
     isAsync(): boolean;
     getArity(): number;
     isHidden(): EntityHidingLevel | undefined;
@@ -646,7 +646,7 @@ export declare class TsAnonymousFunctionTypeEntity implements AnonymousMethodTyp
  * type MyType = { (): number } // псевдоним типа с единственным членом - сигнатурой вызова
  * ```
  */
-export declare class TsNamedFunctionTypeEntity implements PackageMethodTypeEntity {
+export declare class TsNamedFunctionTypeEntity implements PackageFunctionTypeEntity {
     private readonly _tsctx;
     private readonly _signatureSymbol;
     private readonly _signatureDeclaration;
@@ -656,7 +656,7 @@ export declare class TsNamedFunctionTypeEntity implements PackageMethodTypeEntit
     private readonly _containingPackage;
     private readonly _forceHiddenInPackage;
     readonly kind = EntityKind.Type;
-    readonly typeEntityKind = TypeEntityKind.Method;
+    readonly typeEntityKind = TypeEntityKind.Function;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
@@ -671,7 +671,7 @@ export declare class TsNamedFunctionTypeEntity implements PackageMethodTypeEntit
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
     getMembers(): OriginalTypeEntityMembers;
-    getDefinition(): MethodTypeEntityDefinition;
+    getDefinition(): FunctionTypeEntityDefinition;
     isAsync(): boolean;
     getArity(): number;
     isHidden(): EntityHidingLevel | undefined;

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

@@ -31,7 +31,7 @@ export declare class TsInteropContext {
     getTypeMemberHiding(node: ts.Declaration | undefined, containingType: TypeEntity): EntityHidingLevel | undefined;
     onPackageMembersCreated(pkg: PackageEntity, creationResult: TsPackageMembersCreationResult): void;
     onTypeMembersCreated(type: TypeEntityWithMembers, creationResult: TsTypeMembersCreationResult): void;
-    ifTypeCanBeExpressedByMethodTypeThenCallSignature(symbol: ts.Symbol): ts.Symbol | undefined;
+    ifTypeCanBeExpressedByFunctionTypeThenCallSignature(symbol: ts.Symbol): ts.Symbol | undefined;
     getName(original: string, ownerKind: 'type' | 'variable' | 'method'): Name;
     createDefaultExportTag(): Tag;
     private getPackagesCreationResult;
@@ -103,6 +103,7 @@ declare class TypeContext {
     private ofTypeAlias;
     private ofObjectType;
     private ofUnionType;
+    private ofIntersectionType;
     private ofTypeParameter;
     private createTypeArguments;
     private createTypeFromEntity;

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

@@ -59,7 +59,7 @@ export declare class TsPackageMembersCreator {
     private createReplacementSourceEntities;
     private getSourceEntity;
 }
-export type NamedPackageMemberDeclaration = tree.PackageAliasTypeDeclaration | tree.PackageMethodDeclaration | tree.PackageMethodTypeDeclaration | tree.PackageStructuredTypeDeclaration | tree.PackageVariableDeclaration | tree.PackageVariableGetterDeclaration | tree.PackageVariableSetterDeclaration | tree.PackageVariantTypeDeclaration;
+export type NamedPackageMemberDeclaration = tree.PackageAliasTypeDeclaration | tree.PackageFunctionDeclaration | tree.PackageFunctionTypeDeclaration | tree.PackageStructuredTypeDeclaration | tree.PackageVariableDeclaration | tree.PackageVariableGetterDeclaration | tree.PackageVariableSetterDeclaration | tree.PackageVariantTypeDeclaration;
 export declare class TsPackageMembersCreationResult {
     readonly members: OriginalPackageMembers;
     readonly typeEntityBySymbol: ReadonlyMap<ts.Symbol, TypeEntity>;

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 createMethodEntityNoReplacement;
+    private createFunctionEntityNoReplacement;
     private createConstructors;
     private createIndexerSignatures;
     private registerTypeParameters;

package/build/types/types/{MethodType.d.ts → FunctionType.d.ts}

@@ -1,19 +1,19 @@
 import { Analyzer } from '../analysis/index.js';
-import { MethodTypeEntity, TypeParameterEntity } from '../entities/index.js';
+import { FunctionTypeEntity, TypeParameterEntity } from '../entities/index.js';
 import { IType, SubstitutionMap, Substitutions, Type, ValueParameter } from './index.js';
-export declare class MethodType implements IType {
+export declare class FunctionType implements IType {
     private readonly _analyzer;
     private readonly _entity;
     private readonly _substitutions;
-    readonly kind = "method";
+    readonly kind = "function";
     private readonly _valueParameters;
     get debuggerDisplay(): string;
-    constructor(_analyzer: Analyzer, _entity: MethodTypeEntity, _substitutions: Substitutions);
+    constructor(_analyzer: Analyzer, _entity: FunctionTypeEntity, _substitutions: Substitutions);
     getTypeParameters(): readonly TypeParameterEntity[];
     getSubstitutions(): Substitutions;
-    applySubstitutions(map: SubstitutionMap): MethodType;
+    applySubstitutions(map: SubstitutionMap): FunctionType;
     equals(other: Type): boolean;
-    getEntity(): MethodTypeEntity;
+    getEntity(): FunctionTypeEntity;
     isAsync(): boolean;
     getReturnType(): Type;
     getValueParameters(): readonly ValueParameter[];

package/build/types/types/IntersectionType.d.ts

@@ -0,0 +1,20 @@
+import { Analyzer } from '../analysis/index.js';
+import { TypeEntity } from '../entities/index.js';
+import { SubstitutionMap, Substitutions } from './Substitutions.js';
+import { IType, Type } from './index.js';
+export declare class IntersectionType implements IType {
+    readonly kind = "intersection";
+    readonly originalTypes: readonly Type[];
+    private readonly _analyzer;
+    private readonly _unaliasedFlattenedTypes;
+    get unaliasedFlattenedTypes(): readonly Type[];
+    get debuggerDisplay(): string;
+    constructor(analyzer: Analyzer, originalTypes: readonly Type[]);
+    equals(other: Type): boolean;
+    getSubstitutions(): Substitutions;
+    applySubstitutions(map: SubstitutionMap): Type;
+    getEntity(): TypeEntity | undefined;
+    getBaseObjectTypeOrAliasedType(): Type | undefined;
+    toString(): string;
+    private unaliasAndFlattenType;
+}

package/build/types/types/ParameterType.d.ts

@@ -4,12 +4,15 @@ import { IType, SubstitutionMap, Substitutions, Type } from './index.js';
 export declare class ParameterType implements IType {
     private readonly _analyzer;
     private readonly _entity;
-    private readonly _excludeNone;
+    readonly isNoneExcluded: boolean;
     readonly kind = "parameter";
-    get isNoneExcluded(): boolean;
+    private readonly _constraint;
+    /**
+     * Ограничение параметра типа с учётом флага {@link isNoneExcluded}.
+     */
     get constraint(): Type | undefined;
     get debuggerDisplay(): string;
-    constructor(_analyzer: Analyzer, _entity: TypeParameterEntity, _excludeNone: boolean);
+    constructor(_analyzer: Analyzer, _entity: TypeParameterEntity, isNoneExcluded: boolean);
     getSubstitutions(): Substitutions;
     getEntity(): TypeParameterEntity;
     applySubstitutions(map: SubstitutionMap): Type;

package/build/types/types/StandardTypes.d.ts

@@ -19,7 +19,7 @@ export declare class StandardTypes {
     private _reference;
     private _task;
     private _error;
-    private _method;
+    private _func;
     constructor(_analyzer: Analyzer);
     get refObject(): StructuredType;
     get plainObject(): StructuredType;
@@ -38,5 +38,5 @@ export declare class StandardTypes {
     get reference(): StructuredType;
     get task(): StructuredType;
     get error(): StructuredType;
-    get method(): StructuredType;
+    get func(): StructuredType;
 }

package/build/types/types/Type.d.ts

@@ -1,12 +1,13 @@
 import { TypeEntity } from '../entities/index.js';
 import { AliasType } from './AliasType.js';
-import { MethodType } from './MethodType.js';
+import { IntersectionType } from './IntersectionType.js';
+import { FunctionType } from './FunctionType.js';
 import { ParameterType } from './ParameterType.js';
 import { StructuredType } from './StructuredType.js';
 import { UnresolvedType } from './UnresolvedType.js';
 import { VariantType } from './VariantType.js';
 import { SubstitutionMap, Substitutions, UnionType } from './index.js';
-export type Type = StructuredType | VariantType | MethodType | AliasType | UnresolvedType | ParameterType | UnionType;
+export type Type = StructuredType | VariantType | FunctionType | AliasType | UnresolvedType | ParameterType | UnionType | IntersectionType;
 export interface IType {
     getSubstitutions(): Substitutions;
     applySubstitutions(map: SubstitutionMap): Type;

package/build/types/types/TypeFactory.d.ts

@@ -1,16 +1,18 @@
 import { Analyzer } from '../analysis/index.js';
-import { AliasTypeEntity, MethodTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from '../entities/index.js';
-import { AliasType, MethodType, ParameterType, StructuredType, Substitutions, Type, UnresolvedType, VariantType } from './index.js';
+import { AliasTypeEntity, FunctionTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from '../entities/index.js';
+import { AliasType, FunctionType, ParameterType, StructuredType, Substitutions, Type, UnresolvedType, VariantType } from './index.js';
 export declare class TypeFactory {
     readonly analyzer: Analyzer;
     constructor(analyzer: Analyzer);
     getStructuredType(entity: StructuredTypeEntity, substitutions: Substitutions): StructuredType;
     getParameterType(entity: TypeParameterEntity, excludeNone: boolean): ParameterType;
     getVariantType(entity: VariantTypeEntity, substitutions: Substitutions): VariantType;
-    getMethodType(entity: MethodTypeEntity, substitutions: Substitutions): MethodType;
+    getFunctionType(entity: FunctionTypeEntity, substitutions: Substitutions): FunctionType;
     getAliasType(entity: AliasTypeEntity, substitutions: Substitutions): AliasType;
-    getUnionType(types: readonly Type[], excludeDuplicates?: boolean): Type;
+    getUnionType(types: readonly Type[], reduce?: boolean): Type;
+    getIntersectionType(types: readonly Type[], reduce?: boolean): Type;
     getUnresolvedType(): UnresolvedType;
-    private getUniqueFlattenedConstituentTypes;
-    private excludeDuplicateTypesComparingWithEqualsMethod;
+    private flattenAndExcludeDuplicateTypes;
+    private removeBaseTypes;
+    private removeDerivedTypes;
 }

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

@@ -1,7 +1,7 @@
 import { Analyzer } from '../analysis/index.js';
 import { Name } from '../common/index.js';
-import { ConstructorEntity, DereferenceOperatorEntity, DestructorEntity, EntityHidingLevel, IndexerEntity, OperatorEntity, OperatorKind, ParameterVariableEntity, TypeMethodEntity, TypeParameterEntity, TypeVariableEntity } from '../entities/index.js';
-import { MethodType } from './MethodType.js';
+import { ConstructorEntity, DereferenceOperatorEntity, DestructorEntity, EntityHidingLevel, IndexerEntity, OperatorEntity, OperatorKind, ParameterVariableEntity, MethodEntity, TypeParameterEntity, FieldEntity } from '../entities/index.js';
+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;
@@ -13,14 +13,14 @@ export declare class Method implements ITypeMember {
     readonly kind = "method";
     private readonly _valueParameters;
     private readonly _signatureEntity;
-    constructor(_analyzer: Analyzer, _entity: TypeMethodEntity, _substitutions: Substitutions);
+    constructor(_analyzer: Analyzer, _entity: MethodEntity, _substitutions: Substitutions);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ValueParameter[];
     getReturnType(): Type;
-    getEntity(): TypeMethodEntity;
+    getEntity(): MethodEntity;
     getSubstitutions(): Substitutions;
-    getSignatureType(): MethodType;
+    getSignatureType(): FunctionType;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     isStatic(): boolean;
@@ -43,10 +43,10 @@ export declare class Variable implements ITypeMember {
     private readonly _entity;
     private readonly _substitutions;
     readonly kind = "variable";
-    constructor(_entity: TypeVariableEntity, _substitutions: Substitutions);
+    constructor(_entity: FieldEntity, _substitutions: Substitutions);
     getName(): Name;
     getType(): Type;
-    getEntity(): TypeVariableEntity;
+    getEntity(): FieldEntity;
     getSubstitutions(): Substitutions;
     isConstant(): boolean;
     isHidden(): EntityHidingLevel | undefined;
@@ -68,7 +68,7 @@ export declare class Operator implements ITypeMember {
     getReturnType(): Type;
     getEntity(): OperatorEntity;
     getSubstitutions(): Substitutions;
-    getSignatureType(): MethodType;
+    getSignatureType(): FunctionType;
     isHidden(): EntityHidingLevel | undefined;
     isStatic(): boolean;
     applySubstitutions(substitutions: Substitutions): Operator;

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

@@ -1,5 +1,6 @@
 export * from './AliasType.js';
-export * from './MethodType.js';
+export * from './IntersectionType.js';
+export * from './FunctionType.js';
 export * from './ParameterType.js';
 export * from './StandardTypes.js';
 export * from './StructuredType.js';

package/package.json

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

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

@@ -1,53 +0,0 @@
-import { Name } from '../common/index.js';
-import { MethodEntity, ParameterVariableEntity, TypeParameterEntity } from '../entities/index.js';
-import * as types from '../types/index.js';
-import { Analyzer } from './Analyzer.js';
-import { SubstitutedMethod } from './SubstitutedMethod.js';
-export type AccessedMethod = AccessedMethod_entity | AccessedMethod_typeMember | AccessedMethod_substitutedMethod;
-export declare class AccessedMethod_entity implements IAccessedMethod {
-    readonly value: MethodEntity;
-    readonly kind = "entity";
-    constructor(value: MethodEntity);
-    getTypeParameters(): readonly TypeParameterEntity[];
-    getValueParameters(): readonly AccessedMethodValueParameter[];
-    getReturnType(): types.Type;
-    getEntity(): MethodEntity;
-    getName(): Name;
-    getSignatureType(analyzer: Analyzer): types.MethodType;
-}
-export declare class AccessedMethod_typeMember implements IAccessedMethod {
-    readonly value: types.Method;
-    readonly kind = "type-member";
-    constructor(value: types.Method);
-    getTypeParameters(): readonly TypeParameterEntity[];
-    getValueParameters(): readonly AccessedMethodValueParameter[];
-    getReturnType(): types.Type;
-    getEntity(): MethodEntity;
-    getName(): Name;
-    getSignatureType(_analyzer: Analyzer): types.MethodType;
-}
-export declare class AccessedMethod_substitutedMethod implements IAccessedMethod {
-    readonly value: SubstitutedMethod;
-    readonly kind = "substituted-method";
-    constructor(value: SubstitutedMethod);
-    getTypeParameters(): readonly TypeParameterEntity[];
-    getValueParameters(): readonly AccessedMethodValueParameter[];
-    getReturnType(): types.Type;
-    getEntity(): MethodEntity;
-    getName(): Name;
-    getSignatureType(_analyzer: Analyzer): types.MethodType;
-}
-export declare class AccessedMethodValueParameter {
-    readonly entity: ParameterVariableEntity;
-    readonly type: types.Type;
-    constructor(entity: ParameterVariableEntity, type: types.Type);
-}
-interface IAccessedMethod {
-    getTypeParameters(): readonly TypeParameterEntity[];
-    getValueParameters(): readonly AccessedMethodValueParameter[];
-    getReturnType(): types.Type;
-    getEntity(): MethodEntity;
-    getName(): Name;
-    getSignatureType(analyzer: Analyzer): types.MethodType;
-}
-export {};

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

@@ -1,129 +0,0 @@
-import { Diagnostic } from '../diagnostic/Diagnostic.js';
-import { SourceFile } from '../project/SourceFile.js';
-import * as tree from '../tree/index.js';
-export declare class ControlFlowGraphBuilder {
-    private readonly _sourceFile;
-    private readonly _controlFlowNodeByReference;
-    private readonly _unreachableCodeDiagnostics;
-    private _isInRebuildingFinallyClauseGraphMode;
-    private _currentPredecessor;
-    private _currentContinueLoopTarget;
-    private _currentBreakLoopTarget;
-    private _currentErrorTarget;
-    private _currentReturnTarget;
-    constructor(sourceFile: SourceFile);
-    build(): ControlFlowGraphBuildResult;
-    private visitNode;
-    private visitAssignmentStatement;
-    private visitIfStatement;
-    private visitWhileStatement;
-    private visitLoopStatement;
-    private visitForStatement;
-    private visitContinueLoopStatement;
-    private visitBreakLoopStatement;
-    private visitSwitchStatement;
-    private visitTryStatement;
-    private visitReturnStatement;
-    private visitErrorStatement;
-    private visitLocalVariableDeclaration;
-    private visitWhenTernaryExpression;
-    private visitCondition;
-    private visitBinaryExpression;
-    private visitPrefixUnaryExpressionInCondition;
-    private visitIsExpressionInCondition;
-    private setAssignmentAsCurrentPredecessor;
-    private visitChildren;
-    private addUnreachableCodeDiagnostic;
-}
-export declare class ControlFlowGraphBuildResult {
-    readonly controlFlowNodeByReference: ReadonlyMap<NarrowableReferenceExpression, ControlFlowNode>;
-    readonly unreachableCodeDiagnostics: readonly Diagnostic[];
-    constructor(controlFlowNodeByReference: ReadonlyMap<NarrowableReferenceExpression, ControlFlowNode>, unreachableCodeDiagnostics: readonly Diagnostic[]);
-}
-export declare function isNarrowableExpression(node: tree.Node): node is tree.Expression;
-export type NarrowableReferenceExpression = tree.IdentifierExpression | tree.PropertyAccessExpression | tree.ObjectExpression;
-export declare function isNarrowableReferenceExpression(node: tree.Node): node is NarrowableReferenceExpression;
-export declare function unwrapExpressionForNarrowableReferenceCheck(node: tree.Expression): tree.Expression;
-export type ControlFlowNode = ControlFlowNode.Start | ControlFlowNode.Condition | ControlFlowNode.Assignment | ControlFlowNode.LocalVariableDeclaration | ControlFlowNode.Split | ControlFlowNode.Loop | ControlFlowNode.Unreachable;
-export declare namespace ControlFlowNode {
-    abstract class ControlFlowNodeBase {
-        protected abstract thisAsNode: ControlFlowNode;
-        /**
-         * Для отладочных целей.
-         */
-        generateVisualizationCode(): string;
-    }
-    /**
-     * Начальный узел, не имеющий предшественников.
-     */
-    export class Start extends ControlFlowNodeBase {
-        readonly kind = "start";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-    }
-    /**
-     * Хранит информацию об истинности некоторого условия. Например, если условие `а != пусто` истинно, то из типа
-     * переменной `а` необходимо исключить тип `Пусто`.
-     */
-    export class Condition extends ControlFlowNodeBase {
-        readonly predecessor: ControlFlowNode;
-        readonly syntaxNode: ConditionControlFlowNodeExpression;
-        readonly isTrue: boolean;
-        readonly kind = "condition";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-        constructor(predecessor: ControlFlowNode, syntaxNode: ConditionControlFlowNodeExpression, isTrue: boolean);
-    }
-    /**
-     * Создаётся в местах присваивания значений в переменную, а также объявления переменных с начальным значением.
-     * После присваивания тип переменной меняется на тип выражения справа от равно.
-     */
-    export class Assignment extends ControlFlowNodeBase {
-        readonly predecessor: ControlFlowNode;
-        readonly syntaxNode: tree.AssignmentStatement;
-        readonly kind = "assignment";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-        constructor(predecessor: ControlFlowNode, syntaxNode: tree.AssignmentStatement);
-    }
-    export class LocalVariableDeclaration extends ControlFlowNodeBase {
-        readonly predecessor: ControlFlowNode;
-        readonly syntaxNode: tree.LocalVariableDeclaration;
-        readonly kind = "local-variable-declaration";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-        constructor(predecessor: ControlFlowNode, syntaxNode: tree.LocalVariableDeclaration);
-    }
-    /**
-     * Вспомогательный узел, использующийся в местах, где происходит разветвление графа потока управления. Тип переменной
-     * для этого узла определяется как союзный тип из типов переменных в предшествующих узлах.
-     */
-    export class Split extends ControlFlowNodeBase {
-        readonly predecessors: readonly ControlFlowNode[];
-        readonly kind = "split";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-        constructor(predecessors: readonly ControlFlowNode[]);
-    }
-    /**
-     * Используется для циклов (пока, цикл - повтор пока, для-из). Отличается от узла `Split` тем, что предшествующие
-     * узлы, указанные в массиве `loopingPredecessors` образуют циклы в графе потока управления.
-     */
-    export abstract class Loop extends ControlFlowNodeBase {
-        readonly kind = "loop";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-        abstract predecessor: ControlFlowNode;
-        abstract loopingPredecessors: readonly ControlFlowNode[];
-    }
-    /**
-     * Обозначает недостижимый код.
-     */
-    export class Unreachable extends ControlFlowNodeBase {
-        readonly kind = "unreachable";
-        get debuggerDisplay(): string;
-        protected get thisAsNode(): ControlFlowNode;
-    }
-    export {};
-}
-export type ConditionControlFlowNodeExpression = tree.BinaryExpression | tree.IsExpression;