@artel/artc 0.6.25223 → 0.6.25224

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

@@ -1,4 +1,5 @@
 import { AccessedMethod } from '../analysis/AccessedMethod.js';
+import { PackageNameTreeNode } from '../analysis/ImportedPackageNameTree.js';
 import { Localization } from '../analysis/Localization.js';
 import { LocalizationContext, NamedEntity } from '../analysis/LocalizationContext.js';
 import { SubstitutedMethod } from '../analysis/SubstitutedMethod.js';
@@ -19,6 +20,7 @@ export declare class DisplayService {
     getNamedTypeDisplayParts(type: NamedType): NamedTypeDisplayParts;
     displayPackageAliasEntity(entity: e.PackageAliasEntity): string;
     displayPackage(package_: e.PackageEntity): string;
+    displayPackageNameTreeNode(node: PackageNameTreeNode): string;
     displayValueParameterDeclaration(parameter: ValueParameterDeclaration, typeDisplayOptions?: TypeDisplayOptions): string;
     getValueParameterDeclarationDisplayParts(parameter: ValueParameterDeclaration, typeDisplayOptions?: TypeDisplayOptions): ValueParameterDeclarationDisplayParts;
     displayMethodDeclaration(method: MethodDeclaration): string;
@@ -52,11 +54,11 @@ export declare class DisplayService {
     private displayMethodTypeUsage;
     private displayParameterTypeUsage;
     private displayAliasTypeUsage;
-    private displayUnionTypeUsage;
+    private displayUnionOrIntersectionTypeUsage;
     private displayUnresolvedTypeUsage;
     private displayTypeInternal;
     private displayTypeUsageInternal;
-    private displayUnionTypeTypes;
+    private displayUnionOrIntersectionTypeTypes;
     private displayDeclarationContainer;
     private getEntityName;
 }
@@ -614,7 +616,7 @@ interface IOperatorDeclaration {
     getReturnType(): types.Type;
     getContainer(analyzer: Analyzer | undefined): DeclarationContainer | undefined;
 }
-export type TypeUsage = StructuredTypeUsage | VariantTypeUsage | MethodTypeUsage | AliasTypeUsage | ParameterTypeUsage | UnionTypeUsage | UnresolvedTypeUsage;
+export type TypeUsage = StructuredTypeUsage | VariantTypeUsage | MethodTypeUsage | AliasTypeUsage | ParameterTypeUsage | UnionOrIntersectionTypeUsage | UnresolvedTypeUsage;
 export type StructuredTypeUsage = StructuredTypeUsage_type | StructuredTypeUsage_entity;
 export declare class StructuredTypeUsage_type implements IStructuredTypeUsage {
     readonly type: types.StructuredType;
@@ -740,11 +742,12 @@ interface IParameterTypeUsage {
     getEntity(): e.NamedTypeEntity;
     isNoneExcluded(): boolean;
 }
-type UnionTypeUsage = UnionTypeUsage_type;
-declare class UnionTypeUsage_type {
-    readonly type: types.UnionType;
-    readonly kind = "union";
-    constructor(type: types.UnionType);
+type UnionOrIntersectionTypeUsage = UnionOrIntersectionTypeUsage_type;
+declare class UnionOrIntersectionTypeUsage_type {
+    readonly type: types.UnionType | types.IntersectionType;
+    readonly kind = "union-or-intersection";
+    constructor(type: types.UnionType | types.IntersectionType);
+    isUnionType(): boolean;
     getOriginalTypes(): readonly types.Type[];
     getUnaliasedFlattenedTypes(): readonly types.Type[];
 }

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

@@ -1,10 +1,11 @@
 import { AccessedMethod } from '../analysis/AccessedMethod.js';
 import { MatchResultValueParameter } from '../analysis/ArgumentToParameterMatchResult.js';
+import { PackageNameTreeNode } from '../analysis/ImportedPackageNameTree.js';
+import { Analyzer } from '../analysis/index.js';
 import { Translation, WithLocalization } from '../analysis/Localization.js';
 import { TypeIndexedAccessorDeclaration } from '../analysis/NodeTypeUtils.js';
-import { Analyzer } from '../analysis/index.js';
 import { AccessKind, ReadonlyNonEmptyArray } from '../common/index.js';
-import { AliasTypeEntity, Entity, MethodEntity, MethodTypeEntity, PackageAliasEntity, PackageEntity, StructuredTypeEntity, TypeParameterEntity, VariableEntity, VariantTypeEntity } from '../entities/index.js';
+import { AliasTypeEntity, Entity, MethodEntity, MethodTypeEntity, PackageEntity, StructuredTypeEntity, TypeParameterEntity, VariableEntity, VariantTypeEntity } from '../entities/index.js';
 import * as tree from '../tree/index.js';
 import * as types from '../types/index.js';
 import { TokenOrKeyword } from './TreeUtils.js';
@@ -53,15 +54,14 @@ export declare class ReferenceNodeSemanticInfo {
     get firstBetterTargetWithFallback(): WithLocalization<ReferenceTarget>;
     constructor(targets: ReadonlyNonEmptyArray<WithLocalization<ReferenceTarget>>, isAmbiguous: boolean, betterTargets?: ReadonlyNonEmptyArray<WithLocalization<ReferenceTarget>> | undefined);
 }
-export type ReferenceTarget = EntityReferenceTarget | TypeVariableReferenceTarget | TypeValueParameterReferenceTarget | TypeConstructorReferenceTarget | OperatorReferenceTarget | TypeDereferenceOperatorReferenceTarget | AccessedMethodReferenceTarget | TypeIndexerReferenceTarget | MatchResultValueParameterReferenceTarget | PackageReferenceTarget | TypeContextReferenceTarget;
+export type ReferenceTarget = EntityReferenceTarget | TypeVariableReferenceTarget | TypeValueParameterReferenceTarget | TypeConstructorReferenceTarget | OperatorReferenceTarget | TypeDereferenceOperatorReferenceTarget | AccessedMethodReferenceTarget | TypeIndexerReferenceTarget | MatchResultValueParameterReferenceTarget | PackageReferenceTarget | PackageNameTreeNodeReferenceTarget | TypeContextReferenceTarget;
 export declare class EntityReferenceTarget {
-    readonly entity: ReferencedEntity;
+    readonly entity: Entity;
     readonly accessKind: AccessKind;
     readonly narrowedType?: types.Type | undefined;
     readonly kind = "entity";
-    constructor(entity: ReferencedEntity, accessKind: AccessKind, narrowedType?: types.Type | undefined);
+    constructor(entity: Entity, accessKind: AccessKind, narrowedType?: types.Type | undefined);
 }
-export type ReferencedEntity = VariableEntity | VariantTypeEntity | MethodEntity | TypeParameterEntity | MethodTypeEntity | StructuredTypeEntity | PackageAliasEntity | AliasTypeEntity;
 export declare class TypeVariableReferenceTarget {
     readonly variable: types.Variable;
     readonly accessKind: AccessKind;
@@ -107,6 +107,11 @@ export declare class PackageReferenceTarget {
     readonly kind = "package";
     constructor(package_: PackageEntity);
 }
+export declare class PackageNameTreeNodeReferenceTarget {
+    readonly node: PackageNameTreeNode;
+    readonly kind = "package-name-tree-node";
+    constructor(node: PackageNameTreeNode);
+}
 export declare class TypeContextReferenceTarget {
     readonly type: types.Type;
     readonly typeContextKind: 'object' | 'base';

package/build/types/services/source-generation/EntityToSyntax.d.ts

@@ -42,6 +42,7 @@ export declare class EntityToSyntax {
     private convertAliasType;
     private convertParameterType;
     private convertUnionType;
+    private convertIntersectionType;
     private convertUnresolvedType;
     private createNamedTypeSpecifier;
 }

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

@@ -12,148 +12,150 @@ export declare enum NodeKind {
     NamedTypeSpecifier = 10,
     UnionTypeSpecifier = 11,
     UnionTypeSpecifierTypeList = 12,
-    ParenthesizedTypeSpecifier = 13,
-    NullableTypeSpecifier = 14,
-    AnonymousTypeSpecifier = 15,
-    InvalidTypeSpecifier = 16,
-    AnonymousMethodTypeDeclaration = 17,
-    AnonymousStructuredTypeDeclaration = 18,
-    AnonymousVariantTypeDeclaration = 19,
-    TopLevelTranslationList = 20,
-    TranslationsDeclaration = 21,
-    PackageAliasTypeDeclaration = 22,
-    AliasTypeDeclarationBody = 23,
-    PackageMemberGroupDeclaration = 24,
-    PackageConstructorDeclaration = 25,
-    PackageEntryPointDeclaration = 26,
-    PackageMethodDeclaration = 27,
-    PackageMethodTypeDeclaration = 28,
-    MethodTypeDeclarationBody = 29,
-    BaseTypeList = 30,
-    TypeMemberDeclarationList = 31,
-    TypeMemberDeclarationBlock = 32,
-    PackageStructuredTypeDeclaration = 33,
-    StructuredTypeDeclarationBody = 34,
-    PackageVariableDeclaration = 35,
-    PackageVariableGetterDeclaration = 36,
-    PackageVariableSetterDeclaration = 37,
-    PackageVariantTypeDeclaration = 38,
-    VariantTypeDeclarationBody = 39,
-    TypeExtensionDeclaration = 40,
-    ExtendedTypeClauseCommaList = 41,
-    ExtendedTypeClause = 42,
-    InvalidPackageMemberDeclaration = 43,
-    TypeMemberGroupDeclaration = 44,
-    TypeConstructorDeclaration = 45,
-    TypeDestructorDeclaration = 46,
-    TypeIndexedGetterDeclaration = 47,
-    TypeIndexedSetterDeclaration = 48,
-    TypeIndexerParameterClause = 49,
-    TypeDereferencedVariableGetterDeclaration = 50,
-    TypeDereferencedVariableSetterDeclaration = 51,
-    TypeMethodDeclaration = 52,
-    OperatorDeclaration = 53,
-    TypeVariableDeclaration = 54,
-    TypeVariableGetterDeclaration = 55,
-    TypeVariableSetterDeclaration = 56,
-    InvalidTypeMemberDeclaration = 57,
-    NestedMethodDeclaration = 58,
-    LocalVariableDeclaration = 59,
-    EnumerationVariableDeclaration = 60,
-    ArrayLiteral = 61,
-    ArrayLiteralElementList = 62,
-    AssertionExpression = 63,
-    AssumptionExpression = 64,
-    AsExpression = 65,
-    BinaryExpression = 66,
-    MethodBlockLiteral = 67,
-    ArgumentList = 68,
-    CallExpression = 69,
-    AutotypeCallExpression = 70,
-    IndexedAccessExpression = 71,
-    InvalidExpression = 72,
-    IsExpression = 73,
-    MethodLiteral = 74,
-    ParenthesizedExpression = 75,
-    WhenTernaryExpression = 76,
-    PrefixUnaryExpression = 77,
-    PropertyAccessExpression = 78,
-    ReferenceExpression = 79,
-    DereferenceExpression = 80,
-    TextTemplateLiteral = 81,
-    TextTemplateSpanList = 82,
-    TextTemplateSpan = 83,
-    TokenExpression = 84,
-    KeywordExpression = 85,
-    ObjectExpression = 86,
-    BaseExpression = 87,
-    IdentifierExpression = 88,
-    GenericSpecializationExpression = 89,
-    DefaultMatchExpression = 90,
-    AssignmentStatement = 91,
-    StatementList = 92,
-    StatementBlock = 93,
-    FunctionBlock = 94,
-    BreakLoopStatement = 95,
-    ContinueLoopStatement = 96,
-    DisposeStatement = 97,
-    RunStatement = 98,
-    TryStatement = 99,
-    CatchClause = 100,
-    ErrorVariableDeclaration = 101,
-    FinallyClause = 102,
-    EmptyStatement = 103,
-    ErrorStatement = 104,
-    ImportantStatement = 105,
-    ExpressionStatement = 106,
-    EnumerationVariableList = 107,
-    ForStatement = 108,
-    IfStatement = 109,
-    ElseIfClauseList = 110,
-    ElseIfClause = 111,
-    ElseClause = 112,
-    InvalidStatement = 113,
-    NestedMethodDeclarationStatement = 114,
-    LocalVariableDeclarationStatement = 115,
-    LoopStatement = 116,
-    ReturnStatement = 117,
-    CaseClauseList = 118,
-    SwitchStatement = 119,
-    MatchExpressionList = 120,
-    CaseClause = 121,
-    WhileStatement = 122,
-    YieldStatement = 123,
-    TranslationParameterList = 124,
-    TranslationParameterClause = 125,
-    ConstructorTranslation = 126,
-    IndexerTranslationParameterClause = 127,
-    IndexerTranslation = 128,
-    TranslationTypeParameterList = 129,
-    TranslationTypeParameterClause = 130,
-    PackageMethodTranslation = 131,
-    TypeMethodTranslation = 132,
-    MethodTypeTranslation = 133,
-    PackageImportTranslation = 134,
-    QualifiedName = 135,
-    PackageVariableTranslation = 136,
-    TypeVariableOrVariantTranslation = 137,
-    TypeMemberTranslationList = 138,
-    TypeTranslation = 139,
-    TextLiteralTranslation = 140,
-    TextTemplateLiteralTranslation = 141,
-    VariantDeclaration = 142,
-    TypeParameterDeclaration = 143,
-    ParameterDeclaration = 144,
-    Argument = 145,
-    TagList = 146,
-    Tag = 147,
-    ModifierList = 148,
-    Modifier = 149,
-    ParameterClause = 150,
-    ParameterList = 151,
-    TypeArgumentClause = 152,
-    TypeArgumentList = 153,
-    TypeParameterClause = 154,
-    TypeParameterList = 155,
-    TypeAnnotation = 156
+    IntersectionTypeSpecifier = 13,
+    IntersectionTypeSpecifierTypeList = 14,
+    ParenthesizedTypeSpecifier = 15,
+    NullableTypeSpecifier = 16,
+    AnonymousTypeSpecifier = 17,
+    InvalidTypeSpecifier = 18,
+    AnonymousMethodTypeDeclaration = 19,
+    AnonymousStructuredTypeDeclaration = 20,
+    AnonymousVariantTypeDeclaration = 21,
+    TopLevelTranslationList = 22,
+    TranslationsDeclaration = 23,
+    PackageAliasTypeDeclaration = 24,
+    AliasTypeDeclarationBody = 25,
+    PackageMemberGroupDeclaration = 26,
+    PackageConstructorDeclaration = 27,
+    PackageEntryPointDeclaration = 28,
+    PackageMethodDeclaration = 29,
+    PackageMethodTypeDeclaration = 30,
+    MethodTypeDeclarationBody = 31,
+    BaseTypeList = 32,
+    TypeMemberDeclarationList = 33,
+    TypeMemberDeclarationBlock = 34,
+    PackageStructuredTypeDeclaration = 35,
+    StructuredTypeDeclarationBody = 36,
+    PackageVariableDeclaration = 37,
+    PackageVariableGetterDeclaration = 38,
+    PackageVariableSetterDeclaration = 39,
+    PackageVariantTypeDeclaration = 40,
+    VariantTypeDeclarationBody = 41,
+    TypeExtensionDeclaration = 42,
+    ExtendedTypeClauseCommaList = 43,
+    ExtendedTypeClause = 44,
+    InvalidPackageMemberDeclaration = 45,
+    TypeMemberGroupDeclaration = 46,
+    TypeConstructorDeclaration = 47,
+    TypeDestructorDeclaration = 48,
+    TypeIndexedGetterDeclaration = 49,
+    TypeIndexedSetterDeclaration = 50,
+    TypeIndexerParameterClause = 51,
+    TypeDereferencedVariableGetterDeclaration = 52,
+    TypeDereferencedVariableSetterDeclaration = 53,
+    TypeMethodDeclaration = 54,
+    OperatorDeclaration = 55,
+    TypeVariableDeclaration = 56,
+    TypeVariableGetterDeclaration = 57,
+    TypeVariableSetterDeclaration = 58,
+    InvalidTypeMemberDeclaration = 59,
+    NestedMethodDeclaration = 60,
+    LocalVariableDeclaration = 61,
+    EnumerationVariableDeclaration = 62,
+    ArrayLiteral = 63,
+    ArrayLiteralElementList = 64,
+    AssertionExpression = 65,
+    AssumptionExpression = 66,
+    AsExpression = 67,
+    BinaryExpression = 68,
+    MethodBlockLiteral = 69,
+    ArgumentList = 70,
+    CallExpression = 71,
+    AutotypeCallExpression = 72,
+    IndexedAccessExpression = 73,
+    InvalidExpression = 74,
+    IsExpression = 75,
+    MethodLiteral = 76,
+    ParenthesizedExpression = 77,
+    WhenTernaryExpression = 78,
+    PrefixUnaryExpression = 79,
+    PropertyAccessExpression = 80,
+    ReferenceExpression = 81,
+    DereferenceExpression = 82,
+    TextTemplateLiteral = 83,
+    TextTemplateSpanList = 84,
+    TextTemplateSpan = 85,
+    TokenExpression = 86,
+    KeywordExpression = 87,
+    ObjectExpression = 88,
+    BaseExpression = 89,
+    IdentifierExpression = 90,
+    GenericSpecializationExpression = 91,
+    DefaultMatchExpression = 92,
+    AssignmentStatement = 93,
+    StatementList = 94,
+    StatementBlock = 95,
+    FunctionBlock = 96,
+    BreakLoopStatement = 97,
+    ContinueLoopStatement = 98,
+    DisposeStatement = 99,
+    RunStatement = 100,
+    TryStatement = 101,
+    CatchClause = 102,
+    ErrorVariableDeclaration = 103,
+    FinallyClause = 104,
+    EmptyStatement = 105,
+    ErrorStatement = 106,
+    ImportantStatement = 107,
+    ExpressionStatement = 108,
+    EnumerationVariableList = 109,
+    ForStatement = 110,
+    IfStatement = 111,
+    ElseIfClauseList = 112,
+    ElseIfClause = 113,
+    ElseClause = 114,
+    InvalidStatement = 115,
+    NestedMethodDeclarationStatement = 116,
+    LocalVariableDeclarationStatement = 117,
+    LoopStatement = 118,
+    ReturnStatement = 119,
+    CaseClauseList = 120,
+    SwitchStatement = 121,
+    MatchExpressionList = 122,
+    CaseClause = 123,
+    WhileStatement = 124,
+    YieldStatement = 125,
+    TranslationParameterList = 126,
+    TranslationParameterClause = 127,
+    ConstructorTranslation = 128,
+    IndexerTranslationParameterClause = 129,
+    IndexerTranslation = 130,
+    TranslationTypeParameterList = 131,
+    TranslationTypeParameterClause = 132,
+    PackageMethodTranslation = 133,
+    TypeMethodTranslation = 134,
+    MethodTypeTranslation = 135,
+    PackageImportTranslation = 136,
+    QualifiedName = 137,
+    PackageVariableTranslation = 138,
+    TypeVariableOrVariantTranslation = 139,
+    TypeMemberTranslationList = 140,
+    TypeTranslation = 141,
+    TextLiteralTranslation = 142,
+    TextTemplateLiteralTranslation = 143,
+    VariantDeclaration = 144,
+    TypeParameterDeclaration = 145,
+    ParameterDeclaration = 146,
+    Argument = 147,
+    TagList = 148,
+    Tag = 149,
+    ModifierList = 150,
+    Modifier = 151,
+    ParameterClause = 152,
+    ParameterList = 153,
+    TypeArgumentClause = 154,
+    TypeArgumentList = 155,
+    TypeParameterClause = 156,
+    TypeParameterList = 157,
+    TypeAnnotation = 158
 }

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

@@ -111,7 +111,7 @@ export declare class PackagePath extends BaseNode {
     constructor(parts: readonly PackagePathPart[]);
     toRed(rangeStart: number, parent: red.PackagePathParent): red.PackagePath;
 }
-export type TypeSpecifier = NamedTypeSpecifier | AnonymousTypeSpecifier | UnionTypeSpecifier | ParenthesizedTypeSpecifier | NullableTypeSpecifier | InvalidTypeSpecifier;
+export type TypeSpecifier = NamedTypeSpecifier | AnonymousTypeSpecifier | UnionTypeSpecifier | IntersectionTypeSpecifier | ParenthesizedTypeSpecifier | NullableTypeSpecifier | InvalidTypeSpecifier;
 export declare class NamedTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.NamedTypeSpecifier;
     readonly children: readonly [
@@ -143,6 +143,25 @@ export declare class UnionTypeSpecifierTypeList extends BaseNode {
     constructor(elements: readonly UnionTypeSpecifierTypeListElement[]);
     toRed(rangeStart: number, parent: red.UnionTypeSpecifierTypeListParent): red.UnionTypeSpecifierTypeList;
 }
+export declare class IntersectionTypeSpecifier extends BaseNode {
+    readonly kind = NodeKind.IntersectionTypeSpecifier;
+    readonly children: readonly [
+        IntersectionTypeSpecifierTypeList
+    ];
+    get typeList(): IntersectionTypeSpecifierTypeList;
+    protected get thisAsNode(): Node;
+    constructor(typeList: IntersectionTypeSpecifierTypeList);
+    toRed(rangeStart: number, parent: red.NonNamedTypeSpecifierParent): red.IntersectionTypeSpecifier;
+}
+export type IntersectionTypeSpecifierTypeListElement = TypeSpecifier | Token<TokenKind.Ampersand>;
+export declare class IntersectionTypeSpecifierTypeList extends BaseNode {
+    readonly kind = NodeKind.IntersectionTypeSpecifierTypeList;
+    readonly children: readonly IntersectionTypeSpecifierTypeListElement[];
+    get elements(): readonly IntersectionTypeSpecifierTypeListElement[];
+    protected get thisAsNode(): Node;
+    constructor(elements: readonly IntersectionTypeSpecifierTypeListElement[]);
+    toRed(rangeStart: number, parent: red.IntersectionTypeSpecifierTypeListParent): red.IntersectionTypeSpecifierTypeList;
+}
 export declare class ParenthesizedTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.ParenthesizedTypeSpecifier;
     readonly children: readonly [
@@ -1465,12 +1484,12 @@ export declare class ErrorStatement extends BaseNode {
     readonly kind = NodeKind.ErrorStatement;
     readonly children: readonly [
         Keyword<KeywordKind.Error>,
-        Expression | undefined
+        Expression
     ];
     get errorKeyword(): Keyword<KeywordKind.Error>;
-    get expression(): Expression | undefined;
+    get expression(): Expression;
     protected get thisAsNode(): Node;
-    constructor(errorKeyword: Keyword<KeywordKind.Error>, expression: Expression | undefined);
+    constructor(errorKeyword: Keyword<KeywordKind.Error>, expression: Expression);
     toRed(rangeStart: number, parent: red.ErrorStatementParent): red.ErrorStatement;
 }
 export declare class ImportantStatement extends BaseNode {
@@ -2184,4 +2203,4 @@ export declare class TypeAnnotation extends BaseNode {
     constructor(colonToken: Token<TokenKind.Colon>, typeSpecifier: TypeSpecifier);
     toRed(rangeStart: number, parent: red.TypeAnnotationParent): red.TypeAnnotation;
 }
-export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | FunctionBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ImportantStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | ElseClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | CaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;
+export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | IntersectionTypeSpecifier | IntersectionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | FunctionBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ImportantStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | ElseClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | CaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;

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

@@ -31,6 +31,7 @@ export declare class SyntaxFactory {
     static indexerParameterClause(indexerParameters: readonly tree.ParameterDeclaration[]): tree.TypeIndexerParameterClause;
     static namedTypeSpecifier(name: string | readonly string[], typeArguments?: readonly tree.TypeSpecifier[]): tree.NamedTypeSpecifier;
     static unionTypeSpecifier(typeSpecifiers: readonly tree.TypeSpecifier[]): tree.UnionTypeSpecifier;
+    static intersectionTypeSpecifier(typeSpecifiers: readonly tree.TypeSpecifier[]): tree.IntersectionTypeSpecifier;
     static nullableTypeSpecifier(typeSpecifier: tree.TypeSpecifier): tree.NullableTypeSpecifier;
     static parenthesizedTypeSpecifier(typeSpecifier: tree.TypeSpecifier): tree.ParenthesizedTypeSpecifier;
     static anonymousStructuredTypeSpecifier(body: tree.StructuredTypeDeclarationBody): tree.AnonymousTypeSpecifier;

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

@@ -67,9 +67,13 @@ export declare class SyntaxToCode {
     private writeAnonymousStructuredTypeDeclaration;
     private writeAnonymousVariantTypeDeclaration;
     private writeUnionTypeSpecifier;
+    private writeUnionTypeSpecifierTypeList;
+    private writeIntersectionTypeSpecifier;
+    private writeIntersectionTypeSpecifierTypeList;
     private writeParenthesizedTypeSpecifier;
     private writeNullableTypeSpecifier;
-    private doesConstituentTypeRequireParenthesis;
+    private doesUnionTypeElementRequireParenthesis;
+    private doesIntersectionTypeElementRequireParenthesis;
     private doesTypeMadeNullableRequireParenthesis;
     private writeQualifiedName;
     private writeTypeArgumentClause;

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

@@ -133,9 +133,9 @@ export declare class PackagePath extends BaseNode {
     constructor(green: green.PackagePath, rangeStart: number, parent: PackagePathParent);
     private createChildren;
 }
-export type TypeSpecifier = NamedTypeSpecifier | AnonymousTypeSpecifier | UnionTypeSpecifier | ParenthesizedTypeSpecifier | NullableTypeSpecifier | InvalidTypeSpecifier;
+export type TypeSpecifier = NamedTypeSpecifier | AnonymousTypeSpecifier | UnionTypeSpecifier | IntersectionTypeSpecifier | ParenthesizedTypeSpecifier | NullableTypeSpecifier | InvalidTypeSpecifier;
 export type NamedTypeSpecifierParent = BaseTypeList | NonNamedTypeSpecifierParent;
-export type NonNamedTypeSpecifierParent = AliasTypeDeclarationBody | AsExpression | IsExpression | TypeParameterDeclaration | TypeArgumentList | TypeAnnotation | ParenthesizedTypeSpecifier | NullableTypeSpecifier | UnionTypeSpecifierTypeList;
+export type NonNamedTypeSpecifierParent = AliasTypeDeclarationBody | AsExpression | IsExpression | TypeParameterDeclaration | TypeArgumentList | TypeAnnotation | ParenthesizedTypeSpecifier | NullableTypeSpecifier | UnionTypeSpecifierTypeList | IntersectionTypeSpecifierTypeList;
 export declare class NamedTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.NamedTypeSpecifier;
     readonly green: green.NamedTypeSpecifier;
@@ -173,6 +173,31 @@ export declare class UnionTypeSpecifierTypeList extends BaseNode {
     constructor(green: green.UnionTypeSpecifierTypeList, rangeStart: number, parent: UnionTypeSpecifierTypeListParent);
     private createChildren;
 }
+export declare class IntersectionTypeSpecifier extends BaseNode {
+    readonly kind = NodeKind.IntersectionTypeSpecifier;
+    readonly green: green.IntersectionTypeSpecifier;
+    readonly parent: NonNamedTypeSpecifierParent;
+    private _children;
+    get children(): readonly [IntersectionTypeSpecifierTypeList];
+    get typeList(): IntersectionTypeSpecifierTypeList;
+    protected get thisAsNode(): Node;
+    constructor(green: green.IntersectionTypeSpecifier, rangeStart: number, parent: NonNamedTypeSpecifierParent);
+    private createChildren;
+}
+export type IntersectionTypeSpecifierTypeListElement = TypeSpecifier | Token<TokenKind.Ampersand>;
+export type IntersectionTypeSpecifierTypeListParent = IntersectionTypeSpecifier;
+export declare class IntersectionTypeSpecifierTypeList extends BaseNode {
+    readonly kind = NodeKind.IntersectionTypeSpecifierTypeList;
+    readonly green: green.IntersectionTypeSpecifierTypeList;
+    readonly parent: IntersectionTypeSpecifierTypeListParent;
+    private _children;
+    get children(): readonly IntersectionTypeSpecifierTypeListElement[];
+    get elements(): readonly IntersectionTypeSpecifierTypeListElement[];
+    get types(): Query<TypeSpecifier>;
+    protected get thisAsNode(): Node;
+    constructor(green: green.IntersectionTypeSpecifierTypeList, rangeStart: number, parent: IntersectionTypeSpecifierTypeListParent);
+    private createChildren;
+}
 export declare class ParenthesizedTypeSpecifier extends BaseNode {
     readonly kind = NodeKind.ParenthesizedTypeSpecifier;
     readonly green: green.ParenthesizedTypeSpecifier;
@@ -1439,9 +1464,9 @@ export declare class ErrorStatement extends BaseNode {
     readonly green: green.ErrorStatement;
     readonly parent: ErrorStatementParent;
     private _children;
-    get children(): readonly [Keyword<green.KeywordKind.Error>, Expression | undefined];
+    get children(): readonly [Keyword<green.KeywordKind.Error>, Expression];
     get errorKeyword(): Keyword<KeywordKind.Error>;
-    get expression(): Expression | undefined;
+    get expression(): Expression;
     protected get thisAsNode(): Node;
     constructor(green: green.ErrorStatement, rangeStart: number, parent: ErrorStatementParent);
     private createChildren;
@@ -2182,4 +2207,4 @@ export declare class TypeAnnotation extends BaseNode {
     constructor(green: green.TypeAnnotation, rangeStart: number, parent: TypeAnnotationParent);
     private createChildren;
 }
-export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | FunctionBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ImportantStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | ElseClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | CaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;
+export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | IntersectionTypeSpecifier | IntersectionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | FunctionBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ImportantStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | ElseClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | CaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;

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

@@ -103,6 +103,7 @@ declare class TypeContext {
     private ofTypeAlias;
     private ofObjectType;
     private ofUnionType;
+    private ofIntersectionType;
     private ofTypeParameter;
     private createTypeArguments;
     private createTypeFromEntity;

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;