@artel/artc 0.6.25224 → 0.6.25225

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

@@ -1,10 +1,10 @@
 import { FoundAnonymousDeclaration } from '../analysis/FoundDeclaration.js';
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
-import { TypeConstructorDeclaration } from '../tree/index.js';
+import { ConstructorDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import type { TypeEntityWithMembers } from './index.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterVariableEntity, TypeMemberEntityContainer, TypeVariableEntity } from './index.js';
+import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterVariableEntity, TypeMemberEntityContainer, FieldEntity } from './index.js';
 export interface ConstructorEntity {
     readonly kind: EntityKind.Constructor;
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -29,25 +29,25 @@ export declare class DefaultConstructorParameterForBaseConstructorInfo {
 }
 export declare class ConstructorParameterInitializingFieldInfo {
     readonly parameter: ParameterVariableEntity;
-    readonly field: TypeVariableEntity;
-    constructor(parameter: ParameterVariableEntity, field: TypeVariableEntity);
+    readonly field: FieldEntity;
+    constructor(parameter: ParameterVariableEntity, field: FieldEntity);
 }
 export type ConstructorEntityDefinition = {
     kind: DefinitionKind.Source;
-    node: TypeConstructorDeclaration;
+    node: ConstructorDeclaration;
 } | {
     kind: DefinitionKind.Intrinsic;
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export declare class TypeConstructorDeclarationEntity implements ConstructorEntity {
+export declare class ConstructorDeclarationEntity implements ConstructorEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Constructor;
     private readonly _valueParameters;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeConstructorDeclaration);
+    constructor(_analyzer: Analyzer, _node: ConstructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
     getDefinition(): ConstructorEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
@@ -91,7 +91,7 @@ export declare class DefaultConstructorEntity implements ConstructorEntity {
     private createOrderedParametersForBaseConstructor;
 }
 export declare class VariableToInitialize {
-    readonly entity: TypeVariableEntity;
+    readonly entity: FieldEntity;
     readonly hasInitializer: boolean;
-    constructor(entity: TypeVariableEntity, hasInitializer: boolean);
+    constructor(entity: FieldEntity, hasInitializer: boolean);
 }

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

@@ -1,6 +1,6 @@
 import { Analyzer } from '../analysis/index.js';
 import { Tag } from '../analysis/Tags.js';
-import { TypeDereferencedVariableGetterDeclaration, TypeDereferencedVariableSetterDeclaration } from '../tree/index.js';
+import { DereferencedVariableGetterDeclaration, DereferencedVariableSetterDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { DefinitionKind, EntityHidingLevel, EntityKind, GetterEntity, SetterEntity, TypeMemberEntityContainer } from './index.js';
 export interface DereferenceOperatorEntity {
@@ -20,11 +20,11 @@ export interface DereferenceOperatorEntity {
 }
 export type DereferenceOperatorEntityDefinition = {
     kind: DefinitionKind.Source;
-    nodes: ReadonlyArray<TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration>;
+    nodes: ReadonlyArray<DereferencedVariableGetterDeclaration | DereferencedVariableSetterDeclaration>;
 } | {
     kind: DefinitionKind.Intrinsic;
 };
-export declare class TypeDereferenceOperatorDeclarationEntity implements DereferenceOperatorEntity {
+export declare class DereferenceOperatorDeclarationEntity implements DereferenceOperatorEntity {
     readonly kind = EntityKind.DereferenceOperator;
     private readonly _analyzer;
     private readonly _getterDeclaration;
@@ -33,7 +33,7 @@ export declare class TypeDereferenceOperatorDeclarationEntity implements Derefer
     private readonly _overriddenMembers;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(analyzer: Analyzer, getterDeclaration: TypeDereferencedVariableGetterDeclaration | undefined, setterDeclaration: TypeDereferencedVariableSetterDeclaration | undefined);
+    constructor(analyzer: Analyzer, getterDeclaration: DereferencedVariableGetterDeclaration | undefined, setterDeclaration: DereferencedVariableSetterDeclaration | undefined);
     getType(): types.Type;
     getGetter(): GetterEntity | undefined;
     getSetter(): SetterEntity | undefined;

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

@@ -1,6 +1,6 @@
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
-import { TypeDestructorDeclaration } from '../tree/index.js';
+import { DestructorDeclaration } from '../tree/index.js';
 import { DefinitionKind, EntityHidingLevel, EntityKind, ParameterVariableEntity, TypeMemberEntityContainer } from './index.js';
 export interface DestructorEntity {
     readonly kind: EntityKind.Destructor;
@@ -13,16 +13,16 @@ export interface DestructorEntity {
 }
 type DestructorEntityDefinition = {
     kind: DefinitionKind.Source;
-    node: TypeDestructorDeclaration;
+    node: DestructorDeclaration;
 };
-export declare class TypeDestructorDeclarationEntity implements DestructorEntity {
+export declare class DestructorDeclarationEntity implements DestructorEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Destructor;
     private readonly _valueParameters;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeDestructorDeclaration);
+    constructor(_analyzer: Analyzer, _node: DestructorDeclaration);
     getValueParameters(): readonly ParameterVariableEntity[];
     getContainer(): TypeMemberEntityContainer;
     getDefinition(): DestructorEntityDefinition;

package/build/types/entities/{MethodEntity.d.ts → FunctionEntity.d.ts}

@@ -1,94 +1,94 @@
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
 import { Name } from '../common/index.js';
-import { MethodBlockLiteral, MethodLiteral, NestedMethodDeclaration, PackageMethodDeclaration, TypeMethodDeclaration } from '../tree/index.js';
+import { FunctionBlockLiteral, FunctionLiteral, NestedFunctionDeclaration, PackageFunctionDeclaration, MethodDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import type { PackageEntity } from './index.js';
 import { DefinitionKind, Entity, EntityHidingLevel, EntityKind, ParameterVariableEntity, SubstitutionApplicationMode, TypeMemberEntityContainer, TypeParameterEntity } from './index.js';
-export type MethodEntity = PackageMethodEntity | TypeMethodEntity | NestedMethodEntity;
-export interface PackageMethodEntity extends IMethodEntity {
+export type FunctionEntity = PackageFunctionEntity | MethodEntity | NestedFunctionEntity;
+export interface PackageFunctionEntity extends IFunctionEntity {
     readonly subkind: 'package';
     getContainingPackage(): PackageEntity;
 }
-export interface TypeMethodEntity extends IMethodEntity {
-    readonly subkind: 'type';
+export interface MethodEntity extends IFunctionEntity {
+    readonly subkind: 'method';
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
-    isMethodTypeInvokeMethod(): boolean;
+    isFunctionTypeInvokeMethod(): boolean;
     getOverriddenMembers(): readonly types.Method[];
 }
-export interface NestedMethodEntity extends IMethodEntity {
+export interface NestedFunctionEntity extends IFunctionEntity {
     readonly subkind: 'nested';
     getContainingEntity(): Entity;
 }
-interface IMethodEntity {
-    readonly kind: EntityKind.Method;
+interface IFunctionEntity {
+    readonly kind: EntityKind.Function;
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
 }
-export type MethodEntityDefinition = {
+export type FunctionEntityDefinition = {
     kind: DefinitionKind.Source;
-    node: PackageMethodDeclaration | TypeMethodDeclaration | NestedMethodDeclaration | MethodLiteral | MethodBlockLiteral;
+    node: PackageFunctionDeclaration | MethodDeclaration | NestedFunctionDeclaration | FunctionLiteral | FunctionBlockLiteral;
 } | {
     kind: DefinitionKind.Intrinsic;
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export declare class PackageMethodDeclarationEntity implements PackageMethodEntity {
+export declare class PackageFunctionDeclarationEntity implements PackageFunctionEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.Method;
+    readonly kind = EntityKind.Function;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: PackageMethodDeclaration);
+    constructor(_analyzer: Analyzer, _node: PackageFunctionDeclaration);
     getName(): Name;
     getContainingPackage(): PackageEntity;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
 }
-export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
+export declare class MethodDeclarationEntity implements MethodEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.Method;
-    readonly subkind = "type";
+    readonly kind = EntityKind.Function;
+    readonly subkind = "method";
     private readonly _typeParameters;
     private readonly _valueParameters;
     private readonly _overriddenMember;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeMethodDeclaration);
+    constructor(_analyzer: Analyzer, _node: MethodDeclaration);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
-    isMethodTypeInvokeMethod(): boolean;
+    isFunctionTypeInvokeMethod(): boolean;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;
@@ -98,27 +98,27 @@ export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getOverriddenMembers(): readonly types.Method[];
 }
-export declare class NestedMethodDeclarationEntity implements NestedMethodEntity {
+export declare class NestedFunctionDeclarationEntity implements NestedFunctionEntity {
     private readonly _analyzer;
     private readonly _node;
-    readonly kind = EntityKind.Method;
+    readonly kind = EntityKind.Function;
     readonly subkind = "nested";
     private readonly _typeParameters;
     private readonly _valueParameters;
-    constructor(_analyzer: Analyzer, _node: NestedMethodDeclaration);
+    constructor(_analyzer: Analyzer, _node: NestedFunctionDeclaration);
     getName(): Name;
     getContainingEntity(): Entity;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
 }
-export declare class IntrinsicPackageMethodEntity implements PackageMethodEntity {
+export declare class IntrinsicPackageFunctionEntity implements PackageFunctionEntity {
     private readonly _name;
     private readonly _typeParameters;
     private readonly _valueParameters;
@@ -127,7 +127,7 @@ export declare class IntrinsicPackageMethodEntity implements PackageMethodEntity
     private readonly _isHidden;
     private readonly _tags;
     private readonly _containingPackage;
-    readonly kind = EntityKind.Method;
+    readonly kind = EntityKind.Function;
     readonly subkind = "package";
     constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _containingPackage: PackageEntity);
     getName(): Name;
@@ -135,14 +135,14 @@ export declare class IntrinsicPackageMethodEntity implements PackageMethodEntity
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
 }
-export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
+export declare class IntrinsicMethodEntity implements MethodEntity {
     private readonly _name;
     private readonly _typeParameters;
     private readonly _valueParameters;
@@ -150,7 +150,7 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     private readonly _isAsync;
     private readonly _isHidden;
     private readonly _tags;
-    private readonly _isMethodTypeInvokeMethod;
+    private readonly _isFunctionTypeInvokeMethod;
     private readonly _container;
     private readonly _isStatic;
     private readonly _isRedefinable;
@@ -158,19 +158,19 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     private readonly _isAbstract;
     private readonly _isModifyingOwningPlainObject;
     private readonly _overriddenMembers;
-    readonly kind = EntityKind.Method;
-    readonly subkind = "type";
-    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isMethodTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMembers: readonly types.Method[]);
+    readonly kind = EntityKind.Function;
+    readonly subkind = "method";
+    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isFunctionTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMembers: readonly types.Method[]);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
-    getDefinition(): MethodEntityDefinition;
+    getDefinition(): FunctionEntityDefinition;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getTypeParametersArity(): number;
-    isMethodTypeInvokeMethod(): boolean;
+    isFunctionTypeInvokeMethod(): boolean;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isRedefinable(): boolean;

package/build/types/entities/{MethodTypeEntity.d.ts → FunctionTypeEntity.d.ts}

@@ -1,31 +1,31 @@
 import { Tag } from '../analysis/Tags.js';
 import { Analyzer } from '../analysis/index.js';
 import { Name } from '../common/index.js';
-import { AnonymousMethodTypeDeclaration, PackageMethodTypeDeclaration } from '../tree/index.js';
+import { AnonymousFunctionTypeDeclaration, PackageFunctionTypeDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { EntityNaming } from './EntityNaming.js';
 import { OriginalTypeEntityMembers } from './TypeEntityMembers.js';
 import type { PackageEntity } from './index.js';
 import { BaseObjectType, DefinitionKind, EntityHidingLevel, EntityKind, ITypeEntity, ParameterVariableEntity, SubstitutionApplicationMode, TypeEntityKind, TypeParameterEntity } from './index.js';
-export type MethodTypeEntity = PackageMethodTypeEntity | AnonymousMethodTypeEntity;
-export interface PackageMethodTypeEntity extends IMethodTypeEntity {
+export type FunctionTypeEntity = PackageFunctionTypeEntity | AnonymousFunctionTypeEntity;
+export interface PackageFunctionTypeEntity extends IFunctionTypeEntity {
     readonly subkind: 'package';
     getName(): Name;
     getContainingPackage(): PackageEntity;
 }
-export interface AnonymousMethodTypeEntity extends IMethodTypeEntity {
+export interface AnonymousFunctionTypeEntity extends IFunctionTypeEntity {
     readonly subkind: 'anonymous';
     getContainingPackage(): PackageEntity;
 }
-interface IMethodTypeEntity extends ITypeEntity {
+interface IFunctionTypeEntity extends ITypeEntity {
     readonly kind: EntityKind.Type;
-    readonly typeEntityKind: TypeEntityKind.Method;
+    readonly typeEntityKind: TypeEntityKind.Function;
     getNaming(): EntityNaming;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
     getMembers(): OriginalTypeEntityMembers;
-    getDefinition(): MethodTypeEntityDefinition;
+    getDefinition(): FunctionTypeEntityDefinition;
     isAsync(): boolean;
     getArity(): number;
     isHidden(): EntityHidingLevel | undefined;
@@ -36,19 +36,19 @@ interface IMethodTypeEntity extends ITypeEntity {
      */
     getBaseObjectType(): BaseObjectType;
 }
-export type MethodTypeEntityDefinition = {
+export type FunctionTypeEntityDefinition = {
     kind: DefinitionKind.Source;
-    node: PackageMethodTypeDeclaration | AnonymousMethodTypeDeclaration;
+    node: PackageFunctionTypeDeclaration | AnonymousFunctionTypeDeclaration;
 } | {
     kind: DefinitionKind.Intrinsic;
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export declare class PackageMethodTypeDeclarationEntity implements PackageMethodTypeEntity {
+export declare class PackageFunctionTypeDeclarationEntity implements PackageFunctionTypeEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Type;
-    readonly typeEntityKind = TypeEntityKind.Method;
+    readonly typeEntityKind = TypeEntityKind.Function;
     readonly subkind = "package";
     private readonly _typeParameters;
     private readonly _valueParameters;
@@ -56,7 +56,7 @@ export declare class PackageMethodTypeDeclarationEntity implements PackageMethod
     private readonly _baseObjectType;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: PackageMethodTypeDeclaration);
+    constructor(_analyzer: Analyzer, _node: PackageFunctionTypeDeclaration);
     getNaming(): EntityNaming;
     getName(): Name;
     getContainingPackage(): PackageEntity;
@@ -64,7 +64,7 @@ export declare class PackageMethodTypeDeclarationEntity implements PackageMethod
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
     getMembers(): OriginalTypeEntityMembers;
-    getDefinition(): MethodTypeEntityDefinition;
+    getDefinition(): FunctionTypeEntityDefinition;
     isAsync(): boolean;
     getArity(): number;
     isHidden(): EntityHidingLevel | undefined;
@@ -72,22 +72,22 @@ export declare class PackageMethodTypeDeclarationEntity implements PackageMethod
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
     getBaseObjectType(): BaseObjectType;
 }
-export declare class AnonymousMethodTypeDeclarationEntity implements AnonymousMethodTypeEntity {
+export declare class AnonymousFunctionTypeDeclarationEntity implements AnonymousFunctionTypeEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Type;
-    readonly typeEntityKind = TypeEntityKind.Method;
+    readonly typeEntityKind = TypeEntityKind.Function;
     readonly subkind = "anonymous";
     private readonly _valueParameters;
     private readonly _members;
     private readonly _baseObjectType;
-    constructor(_analyzer: Analyzer, _node: AnonymousMethodTypeDeclaration);
+    constructor(_analyzer: Analyzer, _node: AnonymousFunctionTypeDeclaration);
     getNaming(): EntityNaming;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
     getReturnType(): types.Type;
     getMembers(): OriginalTypeEntityMembers;
-    getDefinition(): MethodTypeEntityDefinition;
+    getDefinition(): FunctionTypeEntityDefinition;
     isAsync(): boolean;
     getArity(): number;
     isHidden(): EntityHidingLevel | undefined;
@@ -96,16 +96,16 @@ export declare class AnonymousMethodTypeDeclarationEntity implements AnonymousMe
     getContainingPackage(): PackageEntity;
     getBaseObjectType(): BaseObjectType;
 }
-export declare class UnfinishedIntrinsicAnonymousMethodTypeEntity {
+export declare class UnfinishedIntrinsicAnonymousFunctionTypeEntity {
     private readonly _unfinishedValue;
-    get unfinishedValue(): AnonymousMethodTypeEntity;
+    get unfinishedValue(): AnonymousFunctionTypeEntity;
     constructor(analyzer: Analyzer, returnType: types.Type, isAsync: boolean, substitutionApplicationMode: SubstitutionApplicationMode, containingPackage: PackageEntity, isHidden: EntityHidingLevel | undefined);
-    finish(typeParameters: readonly TypeParameterEntity[], valueParameters: readonly ParameterVariableEntity[]): AnonymousMethodTypeEntity;
+    finish(typeParameters: readonly TypeParameterEntity[], valueParameters: readonly ParameterVariableEntity[]): AnonymousFunctionTypeEntity;
 }
-export declare class UnfinishedIntrinsicPackageMethodTypeEntity {
+export declare class UnfinishedIntrinsicPackageFunctionTypeEntity {
     private readonly _unfinishedValue;
-    get unfinishedValue(): PackageMethodTypeEntity;
+    get unfinishedValue(): PackageFunctionTypeEntity;
     constructor(analyzer: Analyzer, name: Name, returnType: types.Type, isAsync: boolean, substitutionApplicationMode: SubstitutionApplicationMode, containingPackage: PackageEntity, isHidden: EntityHidingLevel | undefined);
-    finish(typeParameters: readonly TypeParameterEntity[], valueParameters: readonly ParameterVariableEntity[]): PackageMethodTypeEntity;
+    finish(typeParameters: readonly TypeParameterEntity[], valueParameters: readonly ParameterVariableEntity[]): PackageFunctionTypeEntity;
 }
 export {};

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

@@ -1,9 +1,9 @@
 import { Analyzer } from '../analysis/index.js';
 import { GetterDeclaration } from '../analysis/NodeTypeUtils.js';
 import { Tag } from '../analysis/Tags.js';
-import { PackageVariableGetterDeclaration, TypeIndexedGetterDeclaration, TypeDereferencedVariableGetterDeclaration, TypeVariableGetterDeclaration } from '../tree/index.js';
+import { PackageVariableGetterDeclaration, IndexedElementGetterDeclaration, DereferencedVariableGetterDeclaration, FieldGetterDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, IndexerEntity, PackageVariableEntity, DereferenceOperatorEntity, TypeVariableEntity } from './index.js';
+import { DefinitionKind, EntityHidingLevel, EntityKind, IndexerEntity, PackageVariableEntity, DereferenceOperatorEntity, FieldEntity } from './index.js';
 export interface GetterEntity {
     readonly kind: EntityKind.Getter;
     getReturnType(): types.Type;
@@ -21,7 +21,7 @@ export type GetterEntityDefinition = {
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export type EntityOwningGetter = PackageVariableEntity | TypeVariableEntity | IndexerEntity | DereferenceOperatorEntity;
+export type EntityOwningGetter = PackageVariableEntity | FieldEntity | IndexerEntity | DereferenceOperatorEntity;
 export declare class PackageVariableGetterDeclarationEntity implements GetterEntity {
     private readonly _analyzer;
     private readonly _node;
@@ -36,13 +36,13 @@ export declare class PackageVariableGetterDeclarationEntity implements GetterEnt
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeVariableGetterDeclarationEntity implements GetterEntity {
+export declare class FieldGetterDeclarationEntity implements GetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeVariableGetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: FieldGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
@@ -50,13 +50,13 @@ export declare class TypeVariableGetterDeclarationEntity implements GetterEntity
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeIndexedGetterDeclarationEntity implements GetterEntity {
+export declare class IndexedElementGetterDeclarationEntity implements GetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeIndexedGetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: IndexedElementGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
@@ -64,13 +64,13 @@ export declare class TypeIndexedGetterDeclarationEntity implements GetterEntity
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeDereferencedVariableGetterDeclarationEntity implements GetterEntity {
+export declare class DereferencedVariableGetterDeclarationEntity implements GetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeDereferencedVariableGetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: DereferencedVariableGetterDeclaration);
     getReturnType(): types.Type;
     getDefinition(): GetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;

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

@@ -1,6 +1,6 @@
 import { Analyzer } from '../analysis/index.js';
 import { Tag } from '../analysis/Tags.js';
-import { ParameterDeclaration, TypeIndexedGetterDeclaration, TypeIndexedSetterDeclaration } from '../tree/index.js';
+import { ParameterDeclaration, IndexedElementGetterDeclaration, IndexedElementSetterDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { DefinitionKind, EntityHidingLevel, EntityKind, GetterEntity, ParameterVariableEntity, SetterEntity, TypeMemberEntityContainer } from './index.js';
 export interface IndexerEntity {
@@ -21,7 +21,7 @@ export interface IndexerEntity {
 }
 export type IndexerEntityDefinition = {
     kind: DefinitionKind.Source;
-    nodes: ReadonlyArray<TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration>;
+    nodes: ReadonlyArray<IndexedElementGetterDeclaration | IndexedElementSetterDeclaration>;
 } | {
     kind: DefinitionKind.Intrinsic;
 } | {
@@ -30,7 +30,7 @@ export type IndexerEntityDefinition = {
 export interface SourceIndexerEntity extends IndexerEntity {
     getParameter(node: ParameterDeclaration): ParameterVariableEntity;
 }
-export declare class TypeIndexerDeclarationEntity implements SourceIndexerEntity {
+export declare class IndexerDeclarationEntity implements SourceIndexerEntity {
     readonly kind = EntityKind.Indexer;
     private readonly _analyzer;
     private readonly _getterDeclaration;
@@ -41,7 +41,7 @@ export declare class TypeIndexerDeclarationEntity implements SourceIndexerEntity
     private readonly _modifierFlags;
     private get parameters();
     private get modifierFlags();
-    constructor(analyzer: Analyzer, getterDeclaration: TypeIndexedGetterDeclaration | undefined, setterDeclaration: TypeIndexedSetterDeclaration | undefined);
+    constructor(analyzer: Analyzer, getterDeclaration: IndexedElementGetterDeclaration | undefined, setterDeclaration: IndexedElementSetterDeclaration | undefined);
     getParameter(node: ParameterDeclaration): ParameterVariableEntity;
     getValueParameters(): readonly ParameterVariableEntity[];
     getType(): types.Type;

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

@@ -1,8 +1,8 @@
 import { Analyzer } from '../analysis/index.js';
 import { SetterDeclaration } from '../analysis/NodeTypeUtils.js';
 import { Tag } from '../analysis/Tags.js';
-import { PackageVariableSetterDeclaration, TypeIndexedSetterDeclaration, TypeDereferencedVariableSetterDeclaration, TypeVariableSetterDeclaration } from '../tree/index.js';
-import { DefinitionKind, EntityHidingLevel, EntityKind, IndexerEntity, PackageVariableEntity, DereferenceOperatorEntity, TypeVariableEntity } from './index.js';
+import { PackageVariableSetterDeclaration, IndexedElementSetterDeclaration, DereferencedVariableSetterDeclaration, FieldSetterDeclaration } from '../tree/index.js';
+import { DefinitionKind, EntityHidingLevel, EntityKind, IndexerEntity, PackageVariableEntity, DereferenceOperatorEntity, FieldEntity } from './index.js';
 export interface SetterEntity {
     readonly kind: EntityKind.Setter;
     getDefinition(): SetterEntityDefinition;
@@ -19,7 +19,7 @@ export type SetterEntityDefinition = {
 } | {
     kind: DefinitionKind.TypeScript;
 };
-export type EntityOwningSetter = PackageVariableEntity | TypeVariableEntity | IndexerEntity | DereferenceOperatorEntity;
+export type EntityOwningSetter = PackageVariableEntity | FieldEntity | IndexerEntity | DereferenceOperatorEntity;
 export declare class PackageVariableSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
@@ -33,39 +33,39 @@ export declare class PackageVariableSetterDeclarationEntity implements SetterEnt
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeVariableSetterDeclarationEntity implements SetterEntity {
+export declare class FieldSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeVariableSetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: FieldSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
     getOwningEntity(): EntityOwningSetter;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeIndexedSetterDeclarationEntity implements SetterEntity {
+export declare class IndexedElementSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeIndexedSetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: IndexedElementSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
     getOwningEntity(): EntityOwningSetter;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TypeDereferencedVariableSetterDeclarationEntity implements SetterEntity {
+export declare class DereferencedVariableSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
     private readonly _modifierFlags;
     private get modifierFlags();
-    constructor(_analyzer: Analyzer, _node: TypeDereferencedVariableSetterDeclaration);
+    constructor(_analyzer: Analyzer, _node: DereferencedVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
     isModifyingOwningPlainObject(): boolean;
     getOwningEntity(): EntityOwningSetter;

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

@@ -1,13 +1,13 @@
 import { Tag } from '../analysis/Tags.js';
-import { AliasTypeEntity, EntityKind, MethodTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from './index.js';
-export type TypeEntity = StructuredTypeEntity | MethodTypeEntity | VariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
+import { AliasTypeEntity, EntityKind, FunctionTypeEntity, StructuredTypeEntity, TypeParameterEntity, VariantTypeEntity } from './index.js';
+export type TypeEntity = StructuredTypeEntity | FunctionTypeEntity | VariantTypeEntity | AliasTypeEntity | TypeParameterEntity;
 export interface ITypeEntity {
     readonly kind: EntityKind.Type;
     readonly typeEntityKind: TypeEntityKind;
     getTags(): readonly Tag[];
 }
 export declare enum TypeEntityKind {
-    Method = 0,
+    Function = 0,
     Structured = 1,
     Parameter = 2,
     Variant = 3,