@artel/artc 0.6.25255 → 0.6.25256

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

@@ -1,52 +1,19 @@
 import { Analyzer } from '../analysis/index.js';
-import { StructuredTypeDeclaration, TypeWithMembersDeclaration, VariantTypeDeclaration } from '../analysis/NodeTypeUtils.js';
-import { PackageEntity, TypeEntity, TypeEntityWithMembers } from '../entities/index.js';
-import { SourceFile } from '../project/index.js';
+import { TypeWithMembersDeclaration } from '../analysis/NodeTypeUtils.js';
+import { PackageEntity, TypeEntity } from '../entities/index.js';
+import { SourceFile, SourcePackage } from '../project/index.js';
 import * as tree from '../tree/index.js';
 import { PackageLocale } from './PackageLocale.js';
-export declare abstract class TreeQuery {
-    protected abstract get node(): tree.Node;
-    static fromNode(node: tree.Node): NodeQuery;
-    static fromTypeMemberDeclaration(node: tree.TypeMemberDeclaration): TypeMemberDeclarationQuery;
-    sourceFile(): tree.SourceFile;
-    projectSourceFile(analyzer: Analyzer): SourceFile;
-    packageEntity(analyzer: Analyzer): PackageEntity;
-    locale(analyzer: Analyzer): PackageLocale;
+export declare class TreeQuery {
+    static getSourceFileNode(node: tree.Node): tree.SourceFile;
+    static getSourceFile(node: tree.Node, analyzer: Analyzer): SourceFile;
+    static getSourcePackage(node: tree.Node, analyzer: Analyzer): SourcePackage;
+    static getPackageEntity(node: tree.Node, analyzer: Analyzer): PackageEntity;
+    static getLocale(node: tree.Node, analyzer: Analyzer): PackageLocale;
 }
-declare class NodeQuery extends TreeQuery {
-    private readonly _node;
-    constructor(_node: tree.Node);
-    protected get node(): tree.Node;
+export declare class TypeMemberQuery {
+    static getContainingDeclaration(node: tree.TypeMemberDeclaration): TypeWithMemberOrTypeExtensionDeclaration;
+    static getOutermostMemberBlock(node: tree.TypeMemberDeclaration): tree.TypeMemberDeclarationBlock;
+    static getContextualTypeEntity(node: tree.TypeMemberDeclaration, analyzer: Analyzer): TypeEntity | undefined;
 }
-declare class TypeMemberDeclarationQuery extends TreeQuery {
-    private readonly _node;
-    constructor(_node: tree.TypeMemberDeclaration);
-    protected get node(): tree.Node;
-    container(): TypeMemberDeclarationContainer;
-}
-export type TypeMemberDeclarationContainer = TypeMemberDeclarationContainer_type | TypeMemberDeclarationContainer_typeExtension;
-declare class TypeMemberDeclarationContainer_type implements ITypeMemberDeclarationContainer {
-    readonly declaration: TypeWithMembersDeclaration;
-    readonly memberBlock: tree.TypeMemberDeclarationBlock;
-    readonly kind = "type";
-    constructor(declaration: TypeWithMembersDeclaration, memberBlock: tree.TypeMemberDeclarationBlock);
-    getNode(): TypeWithMembersDeclaration;
-    getMemberBlock(): tree.TypeMemberDeclarationBlock;
-    getTypeEntity(analyzer: Analyzer): TypeEntityWithMembers;
-    getContextualTypeEntity(analyzer: Analyzer): TypeEntity | undefined;
-}
-declare class TypeMemberDeclarationContainer_typeExtension implements ITypeMemberDeclarationContainer {
-    readonly declaration: tree.TypeExtensionDeclaration;
-    readonly memberBlock: tree.TypeMemberDeclarationBlock;
-    readonly kind = "type-extension";
-    constructor(declaration: tree.TypeExtensionDeclaration, memberBlock: tree.TypeMemberDeclarationBlock);
-    getNode(): tree.TypeExtensionDeclaration;
-    getMemberBlock(): tree.TypeMemberDeclarationBlock;
-    getContextualTypeEntity(analyzer: Analyzer): TypeEntity | undefined;
-}
-interface ITypeMemberDeclarationContainer {
-    getNode(): StructuredTypeDeclaration | VariantTypeDeclaration | tree.PackageAliasTypeDeclaration | tree.TypeExtensionDeclaration;
-    getMemberBlock(): tree.TypeMemberDeclarationBlock;
-    getContextualTypeEntity(analyzer: Analyzer): TypeEntity | undefined;
-}
-export {};
+export type TypeWithMemberOrTypeExtensionDeclaration = TypeWithMembersDeclaration | tree.TypeExtensionDeclaration;

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

@@ -1,6 +1,6 @@
 import * as tree from '../tree/index.js';
 import { CancellationToken } from './index.js';
-export declare function traverseTreeWithCancellationToken(root: tree.Node, cancellationToken: CancellationToken | undefined, throttleTimeMs: number, visitNodeCb: (node: tree.Node, controller: TraversalController) => void): Promise<void>;
+export declare function traverseTreeWithCancellationToken(root: tree.Node, cancellationToken: CancellationToken | undefined, throttleTimeMs: number, visitTokens: boolean, visitNodeCb: (node: tree.Node, controller: TraversalController) => void): Promise<void>;
 export declare function traverseTree(root: tree.Node, visitNodeCb: (node: tree.Node, controller: TraversalController) => void): void;
 export declare class TraversalController {
     isTraverseStopped: boolean;

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

@@ -7,7 +7,6 @@ export * from './Constants.js';
 export * from './Debug.js';
 export * from './Delayed.js';
 export * from './Displayable.js';
-export * from './Errors.js';
 export * from './FormatString.js';
 export * from './Interner.js';
 export * from './JavaScriptIdentifier.js';

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

@@ -3,6 +3,7 @@ import { NamedPackageMemberEntity, TypeEntity, TypeExtensionEntity } from '../en
 export declare class PackageEntityMembers {
     private readonly _namedMembers;
     private readonly _typeExtensions;
+    private static readonly _emptyNamedMembers;
     private readonly _membersByNameKey;
     private get membersByNameKey();
     constructor(_namedMembers: readonly NamedPackageMemberEntity[], _typeExtensions: readonly TypeExtensionEntity[]);

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

@@ -13,6 +13,8 @@ export declare class TypeEntityMembers {
     private readonly _destructors;
     private readonly _indexers;
     private readonly _dereferenceOperators;
+    private static readonly _emptyNamedMembers;
+    private static readonly _emptyOperators;
     private readonly _membersByNameKey;
     private readonly _operatorsByKind;
     private get membersByNameKey();

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

@@ -33,6 +33,7 @@ export * from './FunctionEntity.js';
 export * from './FunctionTypeEntity.js';
 export * from './GetterEntity.js';
 export * from './IndexerEntity.js';
+export * from './LocalizableTextEntity.js';
 export * from './OperatorEntity.js';
 export * from './OperatorKind.js';
 export * from './PackageAliasEntity.js';
@@ -46,7 +47,6 @@ export * from './TypeMemberContainer.js';
 export * from './TypeParameterEntity.js';
 export * from './VariableEntity.js';
 export * from './VariantTypeEntity.js';
-export * from './LocalizableTextEntity.js';
 export declare const enum DefinitionKind {
     Source = 0,
     Intrinsic = 1,

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

@@ -3,16 +3,19 @@ import { PackageNameTreeNode } from '../analysis/ImportedPackageNameTree.js';
 import { SubstitutedFunction } from '../analysis/SubstitutedFunction.js';
 import { Analyzer } from '../analysis/index.js';
 import { HelperPhraseKind } from '../common/HelperPhrases.js';
-import { PackageDialect, PackageLocale } from '../common/index.js';
+import { Name, PackageDialect, PackageLocale } from '../common/index.js';
 import * as e from '../entities/index.js';
 import { NamedEntity } from '../entities/index.js';
+import { SourceFile } from '../project/index.js';
 import { KeywordKind } from '../tree/index.js';
 import * as types from '../types/index.js';
 export declare class DisplayService {
     private readonly _analyzer;
     private readonly _locale;
-    private readonly _dialect?;
-    constructor(_analyzer: Analyzer | undefined, _locale: PackageLocale, _dialect?: PackageDialect | undefined);
+    private readonly _dialect;
+    private readonly _contextualSourceFile?;
+    private _packageNameShorteningMap;
+    constructor(_analyzer: Analyzer | undefined, _locale: PackageLocale, _dialect: PackageDialect, _contextualSourceFile?: SourceFile | undefined);
     displayVariableDeclaration(variable: VariableDeclaration): string;
     displayType(type: types.Type): string;
     getFunctionTypeBodyDisplayParts(type: types.FunctionType): FunctionTypeBodyDisplayParts;
@@ -48,7 +51,8 @@ export declare class DisplayService {
     displayTypeMember(member: types.TypeMember): string;
     displayKeyword(kind: KeywordKind): string;
     displayHelperPhrase(kind: HelperPhraseKind): string;
-    displayEntityNameText(entity: NamedEntity): string;
+    displayEntityName(entity: NamedEntity): string;
+    displayName(name: Name): string;
     private displayTypeEntityAsUsage;
     private displayStructuredTypeUsage;
     private displayVariantTypeUsage;
@@ -61,6 +65,8 @@ export declare class DisplayService {
     private displayTypeUsageInternal;
     private displayUnionOrIntersectionTypeTypes;
     private displayDeclarationContainer;
+    private displayDeclarationContainerWithEndingDot;
+    private getPackageNameShorteningMap;
 }
 interface TypeDisplayOptions {
     readonly unionAndAliasTypeDisplayKind: UnionAndAliasTypeDisplayKind;
@@ -233,7 +239,7 @@ export declare class ValueParameterDeclaration_entity implements IValueParameter
     readonly value: e.VariableEntity;
     readonly kind = "entity";
     constructor(value: e.VariableEntity);
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;
@@ -242,7 +248,7 @@ export declare class ValueParameterDeclaration_typeMember implements IValueParam
     readonly value: types.ValueParameter;
     readonly kind = "type-member";
     constructor(value: types.ValueParameter);
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;
@@ -251,7 +257,7 @@ export declare class ValueParameterDeclaration_substitutedFunction implements IV
     readonly entity: e.VariableEntity;
     readonly type: types.Type;
     constructor(entity: e.VariableEntity, type: types.Type);
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;
@@ -266,7 +272,7 @@ export declare class ValueParameterDeclaration_matchResultValueParameter impleme
         entity: e.VariableEntity;
         type: types.Type;
     });
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;
@@ -275,13 +281,13 @@ export declare class ValueParameterDeclaration_universal implements IValueParame
     readonly entity: e.VariableEntity;
     readonly type: types.Type;
     constructor(entity: e.VariableEntity, type: types.Type);
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;
 }
 interface IValueParameter {
-    getName(): string;
+    getName(): Name;
     getEntity(): e.VariableEntity;
     isOptional(): boolean;
     getType(): types.Type;

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

@@ -2,6 +2,7 @@ import { Range } from '../common/index.js';
 import { Node } from './Nodes.js';
 import { Token } from './Token.js';
 export declare abstract class BaseNode {
+    protected static readonly emptyChildren_: [];
     abstract readonly children: readonly (Node | undefined)[];
     protected parent_: BaseNode | undefined;
     protected rangeWithTrivia_: Range | undefined;
@@ -16,11 +17,16 @@ export declare abstract class BaseNode {
      * Информация для оценки размера дерева при отладке.
      */
     get descendantCount(): number;
+    /**
+     * Информация для оценки размера дерева при отладке.
+     */
+    get tokenCount(): number;
     findLeftmostToken(): Token | undefined;
     findRightmostToken(): Token | undefined;
     protected setParentForChildren(): void;
     protected getLengthWithTrivia(): number;
     protected getStartWithTrivia(): number;
     private countDescendants;
+    private countTokens;
 }
 export declare function toSourceCode(node: Node, lengthLimit?: number, excludeTrivia?: boolean): string;

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

@@ -195,7 +195,7 @@ export declare class AnonymousTypeSpecifier extends BaseNode {
 }
 export declare class MissingTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.MissingTypeSpecifier;
-    readonly children: never[];
+    get children(): readonly [];
     get parent(): NonNamedTypeSpecifierParent;
     protected get thisAsNode(): Node;
     constructor(rangeWithTrivia: Range | undefined);
@@ -1081,7 +1081,7 @@ export declare class IndexedAccessExpression extends BaseNode {
 }
 export declare class MissingExpression extends BaseNode {
     readonly kind = NodeKind.MissingExpression;
-    readonly children: never[];
+    get children(): readonly [];
     get parent(): ExpressionParent;
     protected get thisAsNode(): Node;
     constructor(rangeWithTrivia: Range | undefined);
@@ -1617,7 +1617,7 @@ export declare class ElseClause extends BaseNode {
 }
 export declare class MissingStatement extends BaseNode {
     readonly kind = NodeKind.MissingStatement;
-    readonly children: never[];
+    get children(): readonly [];
     get parent(): StatementList;
     protected get thisAsNode(): Node;
     constructor(rangeWithTrivia: Range | undefined);

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

@@ -16,5 +16,5 @@ export declare class IntersectionType implements IType {
     getEntity(): TypeEntity | undefined;
     getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
-    private unaliasAndFlattenType;
+    private unaliasAndFlattenTypes;
 }

package/build/types/types/Substitutions.d.ts

@@ -2,16 +2,28 @@ import { Analyzer } from '../analysis/index.js';
 import { TypeParameterEntity } from '../entities/index.js';
 import { Type } from './index.js';
 export declare class Substitutions {
+    private static _empty;
     /**
      * Ключом `SubstitutionMap` всегда является параметр на языке оригинала.
      */
     readonly map: SubstitutionMap;
-    private readonly _analyzer;
     get size(): number;
-    constructor(analyzer: Analyzer, parameters: readonly TypeParameterEntity[], types: readonly Type[]);
-    constructor(analyzer: Analyzer, map: SubstitutionMap);
+    private constructor();
+    /**
+     * Создаёт словарь подстановок на основе массива параметров типа и массива аргументов типа. Если количество аргументов
+     * типа меньше, чем количество параметров, в качестве аргументов используются значения по умолчанию параметров типа,
+     * к которым применяются подстановки, переданные в параметре `outerSubstitutions`. Если значение по умолчанию
+     * отсутствует, в качестве аргумента используется тип `unresolved`.
+     */
+    static create(analyzer: Analyzer, parameters: readonly TypeParameterEntity[], types: readonly Type[] | undefined, outerSubstitutions: Substitutions | undefined): Substitutions;
+    /**
+     * Создаёт словарь подстановок на основе массива параметров типа и массива аргументов типа. Массивы должны иметь
+     * одинаковую длину.
+     */
+    static withExactArgumentCount(parameters: readonly TypeParameterEntity[], types: readonly Type[]): Substitutions;
+    static fromSubstitutionMap(map: SubstitutionMap): Substitutions;
     static identity(analyzer: Analyzer, parameters: readonly TypeParameterEntity[]): Substitutions;
-    static empty(analyzer: Analyzer): Substitutions;
+    static empty(): Substitutions;
     getParameters(): Iterable<TypeParameterEntity>;
     getTypes(): Iterable<Type>;
     substituteTypes(substitutions: Substitutions): Substitutions;

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

@@ -14,7 +14,7 @@ export declare class Method implements ITypeMember {
     private readonly _substitutions;
     readonly kind = "method";
     private readonly _valueParameters;
-    private readonly _signatureEntity;
+    private readonly _signatureType;
     get debuggerDisplay(): string;
     constructor(_analyzer: Analyzer, _entity: MethodEntity, _substitutions: Substitutions);
     getName(): Name;

package/build/types/types/UnionType.d.ts

@@ -16,5 +16,5 @@ export declare class UnionType implements IType {
     getEntity(): TypeEntity | undefined;
     getBaseObjectTypeOrAliasedType(): Type | undefined;
     toString(): string;
-    private unaliasAndFlattenType;
+    private unaliasAndFlattenTypes;
 }

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.25255",
+  "version": "0.6.25256",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "LGPL-3.0-or-later",
   "type": "module",
+  "bin": {
+    "artel": "build/Cli.js",
+    "артель": "build/Cli.js",
+    "artc": "build/Cli.js",
+    "артк": "build/Cli.js"
+  },
   "files": [
     "build/**/*.*js",
     "build/types/**/*.d.ts",

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

@@ -1,2 +0,0 @@
-export declare class RecursiveAnalysisError extends Error {
-}