@artel/artc 0.6.25223 → 0.6.25225

package/build/types/api/Api.d.ts

@@ -1,4 +1,4 @@
-export * from '../analysis/AccessedMethod.js';
+export * from '../analysis/AccessedFunction.js';
 export * from '../analysis/AnalyzedTranslationPackage.js';
 export * from '../analysis/Analyzer.js';
 export type { Meaning as AutotypeCallExpressionMeaning } from '../analysis/AutotypeCallExpressionMeaning.js';
@@ -19,12 +19,12 @@ export * from '../analysis/Lookup.js';
 export * from '../analysis/NodeTypeUtils.js';
 export type { Meaning as ObjectExpressionMeaning } from '../analysis/ObjectExpressionMeaning.js';
 export * from '../analysis/PackageMemberLookup.js';
-export type { Meaning as PropertyAccessExpressionMeaning, ResolutionResult as PropertyAccessExpressionResolutionResult } from '../analysis/PropertyAccessExpressionMeaning.js';
+export type { Meaning as MemberAccessExpressionMeaning, ResolutionResult as MemberAccessExpressionResolutionResult } from '../analysis/MemberAccessExpressionMeaning.js';
 export type { IScope, NamedDeclaration, TypeOrContainerWithTypes } from '../analysis/Scope.js';
 export * from '../analysis/SemanticContext.js';
 export * from '../analysis/SourceFileMembers.js';
 export * from '../analysis/SourcePackageDependencyGraph.js';
-export * from '../analysis/SubstitutedMethod.js';
+export * from '../analysis/SubstitutedFunction.js';
 export type { Meaning as TagMeaning } from '../analysis/TagMeaning.js';
 export * from '../analysis/Tags.js';
 export * from '../analysis/TargetTypeHint.js';

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

@@ -5,7 +5,8 @@ export declare const enum HelperPhraseKind {
     TypeParameter = 2,
     Package = 3,
     PackageAlias = 4,
-    Variable = 5,
-    Overloads = 6
+    PackageNameSegment = 5,
+    Variable = 6,
+    Overloads = 7
 }
 export declare function getHelperPhrase(kind: HelperPhraseKind, locale: PackageLocale): string;

package/build/types/diagnostic/DiagnosticCode.d.ts

@@ -1,133 +1,132 @@
 export declare enum DiagnosticCode {
-    UnterminatedToken = 0,
-    UnterminatedMultiLineComment = 1,
-    UnterminatedNumber = 2,
-    UnterminatedTextOrTextTemplate = 3,
-    UnterminatedQuotedIdentifier = 4,
-    IdentifierExpected = 5,
-    TypeNameExpected = 6,
-    PackageNameExpected = 7,
-    TypeMemberDeclarationExpected = 8,
-    SourceFileMemberExpected = 9,
-    EnumerationVariableDeclarationExpected = 10,
-    StatementExpected = 11,
-    ExpressionExpected = 12,
-    BaseTypeNameExpected = 13,
-    TypeSpecifierExpected = 14,
-    TypeBodyExpected = 15,
-    MethodCallArgumentExpected = 16,
-    IndexedAccessArgumentExpected = 17,
-    TagArgumentExpected = 18,
-    TypeParameterExpected = 19,
-    ParameterExpected = 20,
-    RunStatementClauseExpected = 21,
-    CatchClauseOrFinallyClauseExpected = 22,
-    PackageImportExpected = 23,
-    UsingDirectiveOrSourceFileMemberExpected = 24,
-    TypeMemberTranslationExpected = 25,
-    TranslationExpected = 26,
-    Expected0But1Found = 27,
-    InvalidTextTemplateLiteral = 28,
-    RunKeywordCreationKeywordOrModifierListExpected = 29,
-    ModifierListExpected = 30,
-    HidingLevelExpected = 31,
-    ParameterNameCanContainOnlyOneBackQuote = 32,
-    FieldNameCanContainOnlyTwoBackQuote = 33,
-    BackQuotesCanOnlyBeUsedInParameterAndFieldNames = 34,
-    NameThatMatchesKeywordMustBeEnclosedInSingleQuotes = 35,
-    TagNameExpected = 36,
-    TypeCannotBeUsedAsValue = 37,
-    PackageMemberNotFound = 38,
-    TypeMemberNotFound = 39,
-    CannotAccessStaticMembersOnTypeParameter = 40,
-    IndexerOfTheSpecifiedTypeNotFound = 41,
-    DereferenceOperatorOfTheSpecifiedTypeNotFound = 42,
-    IndexerNotFound = 43,
-    CannotCreateInstanceOfAspect = 44,
-    CannotCreateInstanceOfTypeParameter = 45,
-    CannotCreateInstanceOfUnresolvedType = 46,
-    TypeConstructorNotFound = 47,
-    CannotInvokeExpression = 48,
-    NamedArgumentExpectedButPositionalArgumentFound = 49,
-    ParameterWithGivenNameNotFound = 50,
-    ArgumentForParameterAlreadyPassed = 51,
-    PackageAliasCannotBeUsedAsValue = 52,
-    PackageNameCannotBeUsedAsValue = 53,
-    UnknownVariable = 54,
-    UnknownType = 55,
-    TypeWithArity0NotFound = 56,
-    VariableUsedBeforeBeingDeclared = 57,
-    Type0IsNotAssignableToType1 = 58,
-    VariableNotFound = 59,
-    MethodNotFound = 60,
-    UnknownPackage = 61,
-    CannotAssignValueToExpression = 62,
-    NotEveryRequiredParameterIsProvidedWithArgument = 63,
-    ParameterForPositionalArgumentNotFound = 64,
-    CannotDetermineTargetTypeToCallTheConstructor = 65,
-    AmbiguousAccess = 66,
-    PackageNameConflictsWithDeclarationName = 67,
-    CanNotAssignValueToContextVariable = 68,
-    ExpectedPackageNameOrAliasButFoundType = 69,
-    TypeExpected = 70,
-    NameOfTypeOrPackageNotFound = 71,
-    TypeIsNotATag = 72,
-    ExpressionOfType0CanNotBeUsedForEnumeration = 73,
-    Operator0IsNotDefinedForTypes1And2 = 74,
-    Operator0IsNotDefinedForType1 = 75,
-    VariantMustHaveAssociatedValue = 76,
-    PackageMemberOrPackageNotFound = 77,
-    TranslationsCanOnlyBeDeclaredInTranslationPackage = 78,
-    UnknownTranslatedPackage0 = 79,
-    BaseCannotBeUsedInThisContext = 80,
-    OverriddenMethodNotFound = 81,
-    ObjectCannotBeUsedInThisContext = 82,
-    BaseCannotBeUsedAsAnExpressionInItself = 83,
-    InterfacePackageMustNotContainImplementation = 84,
-    InterfacePackageVariablesMustNotHaveInitializers = 85,
-    BodyIsMissing = 86,
-    AbstractTypeMembersMustNotHaveBody = 87,
-    AbstractVariablesMustNotHaveInitializers = 88,
-    PackageIsAlreadyImportedInAnotherLanguage = 89,
-    OnlySubprogramsWithReturnTypeCanReturnValue = 90,
-    MethodsUsingYieldStatementCanNotReturnValue = 91,
-    YieldStatementCanNotBeUsedInAnonymousMethods = 92,
-    YieldStatementCanNotBeUsedHere = 93,
-    MethodsUsingYieldStatementMustHaveEnumerableAsReturnType = 94,
-    YieldStatementCanNotBeUsedInTryStatementThatHasCatchClause = 95,
-    YieldStatementCanNotBeUsedInFinallyClause = 96,
-    SubprogramMustReturnValue = 97,
-    ResultVariableCanNotBeUsedInMethodsUsingYieldStatement = 98,
-    TypeAliasReferencesItself = 99,
-    TypeParameterHasCircularConstraint = 100,
-    BaseTypeCausesInheritanceCycle = 101,
-    OnlyGenericTypesAndFunctionsCanBeSpecialized = 102,
-    Expected0TypeArguments = 103,
-    ExpectedFrom0To1TypeArguments = 104,
-    Type0IsNotAssignableToConstraint1 = 105,
-    VariableIsDeclaredButNotUsed = 106,
-    DefaultConstructorArgumentsMustBeNamed = 107,
-    IncorrectBodyOfRedefinableAliasTypeMethod = 108,
-    TheFollowingDeclarationsAreNotTranslated0 = 109,
-    TheFollowingDeclarationAreNotTranslated0And1More = 110,
-    OperatorMustNotBeStatic = 111,
-    Operator0MustNotHaveParameters = 112,
-    Operator0MustHaveOneParameter = 113,
-    Operator0MustHaveNoMoreThanOneParameter = 114,
-    CorrespondingRedefinableTypeMemberNotFound = 115,
-    ConstructorCanNotBeRedefinable = 116,
-    ConstructorCanNotBeRedefined = 117,
-    AsyncMethodCanOnlyBeCalledFromMethodMarkedWithAsyncModifier = 118,
-    TagNotFound = 119,
-    TypeOrMethodNameExpected = 120,
-    PackageNameOrAliasExpected = 121,
-    ExpressionCanBeNone = 122,
-    NoneAwareAccessCanNotBeUsedOnTheLeftHandSideOfAssignmentStatement = 123,
-    UnreachableCode = 124,
-    CanNotFindTsLibDirectoryBaseSearchPaths0 = 125,
-    SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 126,
-    ProgramWithoutMainPackageCanNotBeCompiled = 127,
-    JsonConfigurationValidationError = 128,
-    StandardPackage0NotFound = 129,
-    Declaration0NotFoundInStandardPackage1 = 130
+    UnterminatedToken = 1000,
+    UnterminatedMultiLineComment = 1001,
+    UnterminatedNumber = 1002,
+    UnterminatedTextOrTextTemplate = 1003,
+    UnterminatedQuotedIdentifier = 1004,
+    IdentifierExpected = 101,
+    TypeNameExpected = 102,
+    PackageNameExpected = 103,
+    TypeMemberDeclarationExpected = 104,
+    PackageMemberDeclarationExpected = 105,
+    EnumerationVariableDeclarationExpected = 106,
+    StatementExpected = 107,
+    ExpressionExpected = 108,
+    BaseTypeNameExpected = 109,
+    TypeSpecifierExpected = 110,
+    TypeBodyExpected = 111,
+    FunctionCallArgumentExpected = 112,
+    IndexedAccessArgumentExpected = 113,
+    TagArgumentExpected = 114,
+    TypeParameterExpected = 115,
+    ParameterExpected = 116,
+    CatchClauseOrFinallyClauseExpected = 117,
+    PackageImportExpected = 118,
+    DeclarationOrPackageImportExpected = 119,
+    Expected0But1Found = 120,
+    InvalidTextTemplateLiteral = 121,
+    ModifierListExpected = 122,
+    RunKeywordCreationKeywordOrModifierListExpected = 123,
+    HidingLevelExpected = 124,
+    ParameterNameCanContainOnlyOneBackQuote = 125,
+    FieldNameCanContainOnlyTwoBackQuote = 126,
+    BackQuotesCanOnlyBeUsedInParameterAndFieldNames = 127,
+    NameThatMatchesKeywordMustBeEnclosedInSingleQuotes = 128,
+    TagNameExpected = 129,
+    TypeMemberTranslationExpected = 130,
+    TranslationExpected = 131,
+    TypeCannotBeUsedAsValue = 2001,
+    PackageNameCannotBeUsedAsValue = 2002,
+    PackageAliasCannotBeUsedAsValue = 2003,
+    PackageMemberOrPackageNotFound = 2004,
+    PackageMemberNotFound = 2005,
+    TypeMemberNotFound = 2006,
+    ConstructorNotFound = 2007,
+    IndexerOfTheSpecifiedTypeNotFound = 2008,
+    DereferenceOperatorOfTheSpecifiedTypeNotFound = 2009,
+    IndexerNotFound = 2010,
+    CannotAccessStaticMembersOnTypeParameter = 2011,
+    CannotCreateInstanceOfAspect = 2012,
+    CannotCreateInstanceOfTypeParameter = 2013,
+    CannotCreateInstanceOfUnresolvedType = 2014,
+    ExpressionIsNotCallable = 2015,
+    ParameterForPositionalArgumentNotFound = 2016,
+    ParameterWithGivenNameNotFound = 2017,
+    NamedArgumentExpectedButPositionalArgumentFound = 2018,
+    ArgumentForParameterAlreadyAssigned = 2019,
+    NotAllRequiredParametersAreProvidedWithArguments = 2020,
+    UnknownVariable = 2021,
+    UnknownType = 2022,
+    TypeWithArity0NotFound = 2023,
+    VariableUsedBeforeBeingDeclared = 2024,
+    Type0IsNotAssignableToType1 = 2025,
+    VariableNotFound = 2026,
+    FunctionNotFound = 2027,
+    UnknownPackage = 2028,
+    CannotAssignValueToExpression = 2029,
+    CannotDetermineTargetTypeToCallTheConstructor = 2030,
+    AmbiguousAccess = 2031,
+    AmbiguousAccess0 = 2032,
+    CanNotAssignValueToContextVariable = 2033,
+    ExpectedPackageNameOrAliasButFoundType = 2034,
+    TypeExpected = 2035,
+    NameOfTypeOrPackageNotFound = 2036,
+    TypeIsNotATag = 2037,
+    ExpressionOfType0CanNotBeUsedForEnumeration = 2038,
+    Operator0IsNotDefinedForTypes1And2 = 2039,
+    Operator0IsNotDefinedForType1 = 2040,
+    VariantMustHaveAssociatedValue = 2041,
+    TranslationsCanOnlyBeDeclaredInTranslationPackage = 2042,
+    UnknownTranslatedPackage0 = 2043,
+    BaseCannotBeUsedInThisContext = 2044,
+    OverriddenMethodNotFound = 2045,
+    ObjectCannotBeUsedInThisContext = 2046,
+    BaseCannotBeUsedAsAnExpressionInItself = 2047,
+    InterfacePackageMustNotContainImplementation = 2048,
+    InterfacePackageVariablesMustNotHaveInitializers = 2049,
+    BodyIsMissing = 2050,
+    AbstractTypeMembersMustNotHaveBody = 2051,
+    AbstractVariablesMustNotHaveInitializers = 2052,
+    PackageIsAlreadyImportedInAnotherLanguage = 2053,
+    OnlySubprogramsWithReturnTypeCanReturnValue = 2054,
+    FunctionsUsingYieldStatementCanNotReturnValue = 2055,
+    YieldStatementCanNotBeUsedInAnonymousFunctions = 2056,
+    YieldStatementCanNotBeUsedHere = 2057,
+    FunctionsUsingYieldStatementMustHaveEnumerableAsReturnType = 2058,
+    YieldStatementCanNotBeUsedInTryStatementThatHasCatchClause = 2059,
+    YieldStatementCanNotBeUsedInFinallyClause = 2060,
+    SubprogramMustReturnValue = 2061,
+    ResultVariableCanNotBeUsedInFunctionsUsingYieldStatement = 2062,
+    TypeAliasReferencesItself = 2063,
+    TypeParameterHasCircularConstraint = 2064,
+    BaseTypeCausesInheritanceCycle = 2065,
+    OnlyGenericTypesAndFunctionsCanBeSpecialized = 2066,
+    Expected0TypeArguments = 2067,
+    ExpectedFrom0To1TypeArguments = 2068,
+    Type0IsNotAssignableToConstraint1 = 2069,
+    VariableIsDeclaredButNotUsed = 2070,
+    DefaultConstructorArgumentsMustBeNamed = 2071,
+    IncorrectBodyOfRedefinableAliasTypeMethod = 2072,
+    TheFollowingDeclarationsAreNotTranslated0 = 2073,
+    TheFollowingDeclarationAreNotTranslated0And1More = 2074,
+    OperatorFunctionMustNotBeStatic = 2075,
+    OperatorFunction0MustNotHaveParameters = 2076,
+    OperatorFunction0MustHaveOneParameter = 2077,
+    OperatorFunction0MustHaveNoMoreThanOneParameter = 2078,
+    CorrespondingRedefinableTypeMemberNotFound = 2079,
+    ConstructorCanNotBeRedefinable = 2080,
+    ConstructorCanNotBeRedefined = 2081,
+    AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier = 2082,
+    TagNotFound = 2083,
+    TypeOrFunctionNameExpected = 2084,
+    PackageNameOrAliasExpected = 2085,
+    ExpressionCanBeNone = 2086,
+    NoneAwareAccessCanNotBeUsedOnTheLeftHandSideOfAssignmentStatement = 2087,
+    UnreachableCode = 2088,
+    CanNotFindTsLibDirectoryBaseSearchPaths0 = 2089,
+    SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 2090,
+    ProgramWithoutMainPackageCanNotBeCompiled = 2091,
+    JsonConfigurationValidationError = 2092,
+    StandardPackage0NotFound = 2093,
+    Declaration0NotFoundInStandardPackage1 = 2094
 }

package/build/types/emitter/EmitPhaseName.d.ts

@@ -9,13 +9,13 @@ export declare class EmitPhaseName {
     static ofExtensionMethodTargetParameter(locale: PackageLocale): string;
     static ofGlobalVariableGetter(locale: PackageLocale, originalName: string): string;
     static ofGlobalVariableSetter(locale: PackageLocale, originalName: string): string;
-    static ofTypeVariableGetter(locale: PackageLocale, originalName: string): string;
-    static ofTypeVariableSetter(locale: PackageLocale, originalName: string): string;
-    static ofTypeIndexedElementGetter(locale: PackageLocale): string;
-    static ofTypeIndexedElementSetter(locale: PackageLocale): string;
-    static ofTypeDereferencedVariable(locale: PackageLocale): string;
-    static ofTypeDereferencedVariableGetter(locale: PackageLocale): string;
-    static ofTypeDereferencedVariableSetter(locale: PackageLocale): string;
+    static ofFieldGetter(locale: PackageLocale, originalName: string): string;
+    static ofFieldSetter(locale: PackageLocale, originalName: string): string;
+    static ofIndexedElementGetter(locale: PackageLocale): string;
+    static ofIndexedElementSetter(locale: PackageLocale): string;
+    static ofDereferencedVariable(locale: PackageLocale): string;
+    static ofDereferencedVariableGetter(locale: PackageLocale): string;
+    static ofDereferencedVariableSetter(locale: PackageLocale): string;
     static ofTypeBackingVariable(locale: PackageLocale, originalName: string): string;
     static ofTempVariable(locale: PackageLocale, id: number): string;
     static ofDefaultImport(locale: PackageLocale, id: number): string;
@@ -31,7 +31,7 @@ export declare class EmitPhaseName {
     static ofPlainObjectMethodResultNewThisProperty(locale: PackageLocale): string;
     static ofPlainObjectMethodResultResultProperty(locale: PackageLocale): string;
     static ofProxyVariable(locale: PackageLocale, originalName: string): string;
-    static ofTypeConstructor(locale: PackageLocale): string;
+    static ofConstructor(locale: PackageLocale): string;
     static ofTypeExtension(locale: PackageLocale, extendedTypeName: string): string;
     static ofOperator(locale: PackageLocale, kind: OperatorKind): string;
     static ofSetterParameter(locale: PackageLocale): string;

package/build/types/emitter/Emitter.d.ts

@@ -20,9 +20,9 @@ export declare class Emitter {
     emitToString(): string;
     private createEmitterPackageFromSource;
     private enumerateEmittingSourcePackages;
-    private createPackageWithMainMethod;
-    private createMainMethod;
-    private createMainMethodCall;
+    private createPackageWithMainFunction;
+    private createMainFunction;
+    private createMainFunctionCall;
     private createUniqueNamesForPackageMembers;
     private setOutputUris;
     private addImports;
@@ -59,7 +59,7 @@ export interface SourceMapOptions {
     useAbsolutePaths?: boolean;
     includeSourcesContent?: boolean;
     justApplicationCode?: boolean;
-    mapMainMethodCallToProgramFirstLine?: boolean;
+    mapMainFunctionCallToProgramFirstLine?: boolean;
 }
 export declare enum SourceMapMode {
     Linked = "linked",

package/build/types/emitter/EmitterContext.d.ts

@@ -43,7 +43,7 @@ declare class StandardTypes {
     private _text;
     private _char;
     private _array;
-    private _method;
+    private _func;
     private _textTemplate;
     private _reference;
     get none(): Type;
@@ -55,7 +55,7 @@ declare class StandardTypes {
     get text(): Type;
     get char(): Type;
     get array(): Type;
-    get method(): Type;
+    get func(): Type;
     get textTemplate(): Type;
     get reference(): Type;
     constructor(_analyzer: Analyzer, _entityMap: EntityMap);

package/build/types/emitter/Entities.d.ts

@@ -1,29 +1,29 @@
 import { PackageLocale } from '../common/index.js';
 import { JavaScriptImplementationConfig } from '../project/SourcePackage.js';
-export interface MethodEntity {
+export interface FunctionEntity {
     readonly kind: 'method';
-    methodEntityKind: MethodEntityKind;
+    functionEntityKind: FunctionEntityKind;
     name: string;
     parameters: readonly VariableEntity[];
     returnType: Type;
     ifTypeMemberThenContainingType: TypeOrExtensionEntity | undefined;
     isPackageMember: boolean;
     containingPackage: PackageEntity;
-    details: MethodEntityDetails;
+    details: FunctionEntityDetails;
 }
-export declare enum MethodEntityKind {
-    RegularMethod = 0,
+export declare enum FunctionEntityKind {
+    RegularFunction = 0,
     GetterOrSetter = 1,
     Constructor = 2,
     Destructor = 3,
     Operator = 4
 }
-export declare class MethodEntityDetails implements TypeMemberEntityDetails {
+export declare class FunctionEntityDetails implements TypeMemberEntityDetails {
     isAsync: boolean;
     isPackageConstructor: boolean;
     isPackageEntryPoint: boolean;
-    overriddenMembers: readonly MethodEntity[];
-    ifRedefinableAliasTypeMethodThenRealMethod: MethodEntity | undefined;
+    overriddenMembers: readonly FunctionEntity[];
+    ifRedefinableAliasTypeMethodThenRealMethod: FunctionEntity | undefined;
     isDefaultExport: boolean;
     isAliasTypeOrExtensionMemberThatRequiresLowering: boolean;
     isBuiltInOperator: boolean;
@@ -32,6 +32,7 @@ export declare class MethodEntityDetails implements TypeMemberEntityDetails {
     isTypeExtensionMemberAddedToPrototype: boolean;
     isAbstract: boolean;
     isStatic: boolean;
+    originalFunctionEntityKind: FunctionEntityKind;
 }
 export interface ComputedNameInfo {
     /**
@@ -54,14 +55,14 @@ export interface VariableEntity {
     ifTypeMemberThenContainingType: TypeOrExtensionEntity | undefined;
     isPackageMember: boolean;
     containingPackage: PackageEntity;
-    getter: MethodEntity | undefined;
-    setter: MethodEntity | undefined;
+    getter: FunctionEntity | undefined;
+    setter: FunctionEntity | undefined;
     details: VariableEntityDetails;
 }
 export declare class VariableEntityDetails implements TypeMemberEntityDetails {
     isVariadicParameter: boolean;
     overriddenMembers: readonly VariableEntity[];
-    isProxiedTypeVariable: ProxiedTypeVariableInfo | undefined;
+    isProxiedField: ProxiedFieldInfo | undefined;
     isDefaultExport: boolean;
     hasComputedName: ComputedNameInfo | undefined;
     isRedefinable: boolean;
@@ -69,11 +70,11 @@ export declare class VariableEntityDetails implements TypeMemberEntityDetails {
     isTypeExtensionMemberAddedToPrototype: boolean;
     isStatic: boolean;
 }
-export interface ProxiedTypeVariableInfo {
+export interface ProxiedFieldInfo {
     readonly tagType: TypeOrExtensionEntity;
-    readonly constructor: MethodEntity;
+    readonly constructor: FunctionEntity;
 }
-export type TypeMemberEntity = MethodEntity | VariableEntity;
+export type TypeMemberEntity = FunctionEntity | VariableEntity;
 interface TypeMemberEntityDetails {
     isStatic: boolean;
     isAbstract: boolean;
@@ -114,7 +115,7 @@ export declare enum TypeOrExtensionEntityKind {
     StructuredType = 0,
     AliasType = 1,
     VariantType = 2,
-    MethodType = 3,
+    FunctionType = 3,
     ParameterType = 4,
     TypeExtension = 5
 }
@@ -123,7 +124,7 @@ export declare enum StructuredTypeKind {
     PlainObject = 1,
     Aspect = 2
 }
-export type PackageMemberEntity = MethodEntity | VariableEntity | TypeOrExtensionEntity;
+export type PackageMemberEntity = FunctionEntity | VariableEntity | TypeOrExtensionEntity;
 export interface PackageEntity {
     readonly kind: 'package';
     name: string;
@@ -134,9 +135,9 @@ export interface PackageEntity {
 export declare class PackageEntityDetails {
     isJavaScriptPackage: JavaScriptImplementationConfig | undefined;
     isSource: boolean;
-    isPackageWithMainMethod: boolean;
+    isPackageWithMainFunction: boolean;
 }
-export type Type = SimpleType | UnionType;
+export type Type = SimpleType | UnionOrIntersectionType;
 export declare class SimpleType {
     readonly entity: TypeOrExtensionEntity;
     readonly typeArguments: readonly Type[];
@@ -144,14 +145,15 @@ export declare class SimpleType {
     constructor(entity: TypeOrExtensionEntity, typeArguments: readonly Type[]);
     equals(other: Type): boolean;
 }
-export declare class UnionType {
+export declare class UnionOrIntersectionType {
     readonly types: readonly Type[];
-    readonly kind = "union";
-    constructor(types: readonly Type[]);
+    readonly isUnion: boolean;
+    readonly kind = "union-or-intersection";
+    constructor(types: readonly Type[], isUnion: boolean);
     equals(other: Type): boolean;
 }
-export type Entity = VariableEntity | MethodEntity | TypeOrExtensionEntity | PackageEntity;
-export type NamedEntity = VariableEntity | MethodEntity | TypeOrExtensionEntity;
+export type Entity = VariableEntity | FunctionEntity | TypeOrExtensionEntity | PackageEntity;
+export type NamedEntity = VariableEntity | FunctionEntity | TypeOrExtensionEntity;
 export declare function isComputedVariableEntity(entity: VariableEntity): boolean;
 export declare class IntrinsicVariableEntity implements VariableEntity {
     name: string;
@@ -160,13 +162,13 @@ export declare class IntrinsicVariableEntity implements VariableEntity {
     readonly kind = "variable";
     ifTypeMemberThenContainingType: TypeOrExtensionEntity | undefined;
     isPackageMember: boolean;
-    getter: MethodEntity | undefined;
-    setter: MethodEntity | undefined;
+    getter: FunctionEntity | undefined;
+    setter: FunctionEntity | undefined;
     details: VariableEntityDetails;
     constructor(name: string, type: Type, containingPackage: PackageEntity);
 }
-export declare class IntrinsicMethodEntity implements MethodEntity {
-    methodEntityKind: MethodEntityKind;
+export declare class IntrinsicFunctionEntity implements FunctionEntity {
+    functionEntityKind: FunctionEntityKind;
     name: string;
     parameters: readonly VariableEntity[];
     returnType: Type;
@@ -174,8 +176,8 @@ export declare class IntrinsicMethodEntity implements MethodEntity {
     readonly kind = "method";
     ifTypeMemberThenContainingType: TypeOrExtensionEntity | undefined;
     isPackageMember: boolean;
-    details: MethodEntityDetails;
-    constructor(methodEntityKind: MethodEntityKind, name: string, parameters: readonly VariableEntity[], returnType: Type, containingPackage: PackageEntity);
+    details: FunctionEntityDetails;
+    constructor(functionEntityKind: FunctionEntityKind, name: string, parameters: readonly VariableEntity[], returnType: Type, containingPackage: PackageEntity);
 }
 export declare class IntrinsicPackageEntity implements PackageEntity {
     name: string;

package/build/types/emitter/EntityMap.d.ts

@@ -12,22 +12,22 @@ export declare class EntityMap {
     private readonly _analyzer;
     private readonly _targetPlatform;
     private readonly _variables;
-    private readonly _methods;
+    private readonly _functions;
     private readonly _typeOrExtensions;
     private readonly _packages;
     private readonly _linkedPackages;
     constructor(analyzer: Analyzer, targetPlatform: PlatformKind);
     getVariableEntity(entity: analyzerEntities.VariableEntity): emitterEntities.VariableEntity;
-    getMethodEntity(entity: analyzerEntities.MethodEntity): emitterEntities.MethodEntity;
-    getOperatorEntity(entity: analyzerEntities.OperatorEntity): emitterEntities.MethodEntity;
-    getConstructorEntity(entity: analyzerEntities.ConstructorEntity): emitterEntities.MethodEntity;
-    getDestructorEntity(entity: analyzerEntities.DestructorEntity): emitterEntities.MethodEntity;
-    getGetterEntity(entity: analyzerEntities.GetterEntity): emitterEntities.MethodEntity;
-    getSetterEntity(entity: analyzerEntities.SetterEntity): emitterEntities.MethodEntity;
+    getFunctionEntity(entity: analyzerEntities.FunctionEntity): emitterEntities.FunctionEntity;
+    getOperatorEntity(entity: analyzerEntities.OperatorEntity): emitterEntities.FunctionEntity;
+    getConstructorEntity(entity: analyzerEntities.ConstructorEntity): emitterEntities.FunctionEntity;
+    getDestructorEntity(entity: analyzerEntities.DestructorEntity): emitterEntities.FunctionEntity;
+    getGetterEntity(entity: analyzerEntities.GetterEntity): emitterEntities.FunctionEntity;
+    getSetterEntity(entity: analyzerEntities.SetterEntity): emitterEntities.FunctionEntity;
     getStructuredTypeEntity(entity: analyzerEntities.StructuredTypeEntity): emitterEntities.TypeOrExtensionEntity;
     getVariantTypeEntity(entity: analyzerEntities.VariantTypeEntity): emitterEntities.TypeOrExtensionEntity;
     getTypeParameterEntity(entity: analyzerEntities.TypeParameterEntity): emitterEntities.TypeOrExtensionEntity;
-    getMethodTypeEntity(entity: analyzerEntities.MethodTypeEntity): emitterEntities.TypeOrExtensionEntity;
+    getFunctionTypeEntity(entity: analyzerEntities.FunctionTypeEntity): emitterEntities.TypeOrExtensionEntity;
     getAliasTypeEntity(entity: analyzerEntities.AliasTypeEntity): emitterEntities.TypeOrExtensionEntity;
     getTypeExtensionEntity(entity: analyzerEntities.TypeExtensionEntity): emitterEntities.TypeOrExtensionEntity;
     getTypeOrExtensionEntity(entity: analyzerEntities.TypeEntity | analyzerEntities.TypeExtensionEntity): emitterEntities.TypeOrExtensionEntity;

package/build/types/emitter/IrBuilder.d.ts

@@ -26,7 +26,7 @@ export declare class IrBuilder {
     private buildContinueLoopStatement;
     private buildBreakLoopStatement;
     private buildPackageEntryPointDeclaration;
-    private buildPackageMethodDeclaration;
+    private buildPackageFunctionDeclaration;
     private buildPackageStructuredTypeDeclaration;
     private buildPackageAliasTypeDeclaration;
     private buildPackageVariableDeclaration;
@@ -37,20 +37,20 @@ export declare class IrBuilder {
     private buildVariantDeclaration;
     private buildTypeExtensionDeclaration;
     private buildTypeMemberList;
-    private buildTypeConstructorDeclaration;
+    private buildConstructorDeclaration;
     private createDefaultStructuredTypeConstructor;
-    private buildTypeDestructorDeclaration;
-    private buildTypeIndexedGetterDeclaration;
-    private buildTypeIndexedSetterDeclaration;
-    private buildTypeDereferencedVariableGetterDeclaration;
-    private buildTypeDereferencedVariableSetterDeclaration;
-    private buildTypeMethodDeclaration;
+    private buildDestructorDeclaration;
+    private buildIndexedElementGetterDeclaration;
+    private buildIndexedElementSetterDeclaration;
+    private buildDereferencedVariableGetterDeclaration;
+    private buildDereferencedVariableSetterDeclaration;
+    private buildMethodDeclaration;
     private buildOperatorDeclaration;
-    private buildTypeVariableDeclaration;
-    private buildComputedTypeVariableDeclaration;
-    private buildTypeVariableGetterDeclarationRequired;
-    private buildTypeVariableSetterDeclaration;
-    private buildBackingTypeVariable;
+    private buildFieldDeclaration;
+    private buildComputedFieldDeclaration;
+    private buildFieldGetterDeclarationRequired;
+    private buildFieldSetterDeclaration;
+    private buildBackingField;
     private buildDisposeStatement;
     private buildRunStatement;
     private buildTryStatement;
@@ -61,7 +61,7 @@ export declare class IrBuilder {
     private buildForStatement;
     private buildIfStatement;
     private buildElseIfClausesRecursively;
-    private buildNestedMethodDeclarationStatement;
+    private buildNestedFunctionDeclarationStatement;
     private buildParameterList;
     private buildLocalVariableDeclarationStatement;
     private buildLoopStatement;
@@ -79,15 +79,15 @@ export declare class IrBuilder {
     private buildAssumptionExpression;
     private buildAsExpression;
     private buildBinaryExpression;
-    private buildMethodBlockLiteral;
+    private buildFunctionBlockLiteral;
     private buildCallExpression;
     private buildAutotypeCallExpression;
     private buildIndexedAccessExpression;
     private buildIsExpression;
-    private buildMethodLiteral;
+    private buildFunctionLiteral;
     private buildParenthesizedExpression;
     private buildPrefixUnaryExpression;
-    private buildPropertyAccessExpression;
+    private buildMemberAccessExpression;
     private convertIndexedAccess;
     private convertDereferencedVariableAccess;
     private buildReferenceExpression;
@@ -111,7 +111,7 @@ export declare class IrBuilder {
     private buildAnonymousStructuredTypeDeclaration;
     private buildAnonymousVariantTypeDeclaration;
     private getUnderlyingTypeKind;
-    private createAccessedMethodFromOperator;
+    private createAccessedFunctionFromOperator;
     private expressionIsCallee;
     private generateLoopLabel;
     private getSourceLocation;