ts2famix 2.0.0 → 2.0.1

package/doc-uml/famix-typescript-model.puml

@@ -1,251 +1,277 @@
 @startuml
+class FamixJSONExporter {
+    -element: FamixBaseElement
+    -bufferArray: any
+    -FamixPrefix: string
+    +addProperty(name: string, prop: unknown): void
+    +getJSON(): string
+}
 class Entity extends FamixBaseElement {
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
 }
 class SourceLanguage extends Entity {
-    -sourcedEntities: Set<SourcedEntity>
+    -_sourcedEntities: Set<SourcedEntity>
     +name: string
-    +getSourcedEntities(): Set<SourcedEntity>
     +addSourcedEntity(sourcedEntity: SourcedEntity): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +sourcedEntities: Set<SourcedEntity>
 }
 class Comment extends SourcedEntity {
-    -isJSDoc: boolean
-    +getIsJSDoc(): boolean
-    +setIsJSDoc(isJSDoc: boolean): void
-    -container: SourcedEntity
-    +getContainer(): SourcedEntity
-    +setContainer(container: SourcedEntity): void
-    -content: string
-    +getContent(): string
-    +setContent(content: string): void
+    -_isJSDoc: boolean
+    -_container: SourcedEntity
+    -_content: string
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +isJSDoc: boolean
+    +isJSDoc: boolean
+    +container: SourcedEntity
+    +container: SourcedEntity
+    +content: string
+    +content: string
 }
 class SourceAnchor extends Entity {
-    -element: SourcedEntity
-    +getElement(): SourcedEntity
-    +setElement(element: SourcedEntity): void
+    -_element: SourcedEntity
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +element: SourcedEntity
+    +element: SourcedEntity
 }
 class SourcedEntity extends Entity {
-    -isStub: boolean
-    +getIsStub(): boolean
-    +setIsStub(isStub: boolean): void
-    -sourceAnchor: SourceAnchor
-    +getSourceAnchor(): SourceAnchor
-    +setSourceAnchor(sourceAnchor: SourceAnchor): void
-    -comments: Set<Comment>
-    +getComments(): Set<Comment>
+    -_isStub: boolean
+    -_sourceAnchor: SourceAnchor
+    -_comments: Set<Comment>
     +addComment(comment: Comment): void
-    -declaredSourceLanguage: SourceLanguage
-    +getDeclaredSourceLanguage(): SourceLanguage
-    +setDeclaredSourceLanguage(declaredSourceLanguage: SourceLanguage): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class Association extends SourcedEntity {
-    -next: Association
-    +getNext(): Association
-    +setNext(next: Association): void
-    -previous: Association
-    +getPrevious(): Association
-    +setPrevious(previous: Association): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class Namespace extends ScopingEntity {
-    -parentScope: ScopingEntity
-    +getParentScope(): ScopingEntity
-    +setParentScope(parentScope: ScopingEntity): void
+    -_declaredSourceLanguage: SourceLanguage
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +isStub: boolean
+    +isStub: boolean
+    +sourceAnchor: SourceAnchor
+    +sourceAnchor: SourceAnchor
+    +comments: Set<Comment>
+    +declaredSourceLanguage: SourceLanguage
+    +declaredSourceLanguage: SourceLanguage
 }
 class ScopingEntity extends ContainerEntity {
-    -childrenNamespaces: Set<Namespace>
-    +getNamespaces(): Set<Namespace>
-    +addNamespace(childNamespace: Namespace): void
+    -_modules: Set<Module>
+    +addModule(childModule: Module): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +modules: Set<Module>
 }
 class ScriptEntity extends ScopingEntity {
-    -numberOfLinesOfText: number
-    +getNumberOfLinesOfText(): number
-    +setNumberOfLinesOfText(numberOfLinesOfText: number): void
-    -numberOfCharacters: number
-    +getNumberOfCharacters(): number
-    +setNumberOfCharacters(numberOfCharacters: number): void
+    -_numberOfLinesOfText: number
+    -_numberOfCharacters: number
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +numberOfLinesOfText: number
+    +numberOfLinesOfText: number
+    +numberOfCharacters: number
+    +numberOfCharacters: number
 }
 class Module extends ScriptEntity {
-    -outgoingImports: Set<ImportClause>
-    +getOutgoingImports(): Set<ImportClause>
+    +isAmbient: boolean
+    +isAmbient: boolean
+    -_isAmbient: boolean
+    +isNamespace: boolean
+    +isNamespace: boolean
+    -_isNamespace: boolean
+    +isModule: boolean
+    +isModule: boolean
+    -_isModule: boolean
+    -_parentScope: ScopingEntity
+    -_outgoingImports: Set<ImportClause>
     +addOutgoingImport(importClause: ImportClause): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentScope: ScopingEntity
+    +parentScope: ScopingEntity
+    +outgoingImports: Set<ImportClause>
 }
-class ImportClause extends Association {
-    -importingEntity: Module
-    +getImportingEntity(): Module
-    +setImportingEntity(importer: Module): void
-    -importedEntity: NamedEntity
-    +getImportedEntity(): NamedEntity
-    +setImportedEntity(importedEntity: NamedEntity): void
-    -moduleSpecifier: string
-    +getModuleSpecifier(): string
-    +setModuleSpecifier(moduleSpecifier: string): void
+class ImportClause extends Entity {
+    -_importingEntity: Module
+    -_importedEntity: NamedEntity
+    -_moduleSpecifier: string
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +importingEntity: Module
+    +importingEntity: Module
+    +importedEntity: NamedEntity
+    +importedEntity: NamedEntity
+    +moduleSpecifier: string
+    +moduleSpecifier: string
 }
 class Alias extends NamedEntity {
-    -parentEntity: NamedEntity
-    +getParentEntity(): NamedEntity
-    +setParentEntity(parentEntity: NamedEntity): void
-    -aliasedEntity: Type
-    +getAliasedEntity(): Type
-    +setAliasedEntity(aliasedEntity: Type): void
+    -_parentEntity: NamedEntity
+    -_aliasedEntity: Type
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentEntity: NamedEntity
+    +parentEntity: NamedEntity
+    +aliasedEntity: Type
+    +aliasedEntity: Type
 }
 class Decorator extends NamedEntity {
-    -decoratorExpression: string
-    +getDecoratorExpression(): string
-    +setDecoratorExpression(decoratorExpression: string): void
-    -decoratedEntity: NamedEntity
-    +getDecoratedEntity(): NamedEntity
-    +setDecoratedEntity(decoratedEntity: NamedEntity): void
+    -_decoratorExpression: string
+    -_decoratedEntity: NamedEntity
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +decoratorExpression: string
+    +decoratorExpression: string
+    +decoratedEntity: NamedEntity
+    +decoratedEntity: NamedEntity
 }
 class NamedEntity extends SourcedEntity {
-    -fullyQualifiedName: string
-    +getFullyQualifiedName(): string
-    +setFullyQualifiedName(fullyQualifiedName: string): void
-    -receivedInvocations: Set<Invocation>
-    +getReceivedInvocations(): Set<Invocation>
+    -_fullyQualifiedName: string
+    -_receivedInvocations: Set<Invocation>
     +addReceivedInvocation(receivedInvocation: Invocation): void
-    -incomingImports: Set<ImportClause>
-    +getIncomingImports(): Set<ImportClause>
+    -_incomingImports: Set<ImportClause>
     +addIncomingImport(anImport: ImportClause): void
-    -name: string
-    +getName(): string
-    +setName(name: string): void
-    -aliases: Set<Alias>
-    +getAliases(): Set<Alias>
+    -_name: string
+    -_aliases: Set<Alias>
     +addAlias(alias: Alias): void
-    -decorators: Set<Decorator>
-    +getDecorators(): Set<Decorator>
+    -_decorators: Set<Decorator>
     +addDecorator(decorator: Decorator): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +fullyQualifiedName: string
+    +fullyQualifiedName: string
+    +receivedInvocations: Set<Invocation>
+    +incomingImports: Set<ImportClause>
+    +name: string
+    +name: string
+    +aliases: Set<Alias>
+    +decorators: Set<Decorator>
 }
 class Parameter extends StructuralEntity {
-    -parentEntity: BehavioralEntity
-    +getParentEntity(): BehavioralEntity
-    +setParentEntity(parentEntity: BehavioralEntity): void
+    -_parentEntity: BehavioralEntity
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentEntity: BehavioralEntity
+    +parentEntity: BehavioralEntity
 }
 class Property extends StructuralEntity {
-    -isClassSide: boolean
-    +getIsClassSide(): boolean
-    +setIsClassSide(isClassSide: boolean): void
-    -parentEntity: Class | Interface
-    +getParentEntity(): Class | Interface
-    +setParentEntity(parentEntity: Class | Interface): void
-    -modifiers: Set<string>
-    +getModifiers(): Set<string>
-    +addModifier(modifier: string): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class Inheritance extends Association {
-    -superclass: Class | Interface
-    +getSuperclass(): Class | Interface
-    +setSuperclass(superclass: Class | Interface): void
-    -subclass: Class | Interface
-    +getSubclass(): Class | Interface
-    +setSubclass(subclass: Class | Interface): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    -_isClassSide: boolean
+    +readOnly: boolean
+    +readOnly: boolean
+    -_readOnly: boolean
+    -_parentEntity: Class | Interface
+    +isDefinitelyAssigned: boolean
+    +isDefinitelyAssigned: boolean
+    +isOptional: boolean
+    +isOptional: boolean
+    +isJavaScriptPrivate: boolean
+    +isJavaScriptPrivate: boolean
+    -_isDefinitelyAssigned: boolean
+    -_isOptional: boolean
+    -_isJavaScriptPrivate: boolean
+    +visibility: VisibilityTypes
+    +visibility: VisibilityTypes
+    -_visibility: VisibilityTypes
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +isClassSide: boolean
+    +isClassSide: boolean
+    +parentEntity: Class | Interface
+    +parentEntity: Class | Interface
+}
+class Inheritance extends Entity {
+    -_superclass: Class | Interface
+    -_subclass: Class | Interface
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +superclass: Class | Interface
+    +superclass: Class | Interface
+    +subclass: Class | Interface
+    +subclass: Class | Interface
 }
-class Interface extends Type {
-    -properties: Set<Property>
-    +getProperties(): Set<Property>
+class Class extends Type {
+    -_isAbstract: boolean
+    -_properties: Set<Property>
     +addProperty(property: Property): void
-    -methods: Set<Method>
-    +getMethods(): Set<Method>
+    -_methods: Set<Method>
     +addMethod(method: Method): void
-    -superInheritances: Set<Inheritance>
-    +getSuperInheritances(): Set<Inheritance>
+    -_superInheritances: Set<Inheritance>
     +addSuperInheritance(superInheritance: Inheritance): void
-    -subInheritances: Set<Inheritance>
-    +getSubInheritances(): Set<Inheritance>
+    -_subInheritances: Set<Inheritance>
     +addSubInheritance(subInheritance: Inheritance): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +isAbstract: boolean
+    +isAbstract: boolean
+    +properties: Set<Property>
+    +methods: Set<Method>
+    +superInheritances: Set<Inheritance>
+    +subInheritances: Set<Inheritance>
 }
 class Method extends BehavioralEntity {
-    -parentEntity: Class | Interface
-    +getParentEntity(): Class | Interface
-    +setParentEntity(parentEntity: Class | Interface): void
-    -kind: string
-    +getKind(): string
-    +setKind(kind: string): void
-    -isAbstract: boolean
-    +getIsAbstract(): boolean
-    +setIsAbstract(isAbstract: boolean): void
-    -isClassSide: boolean
-    +getIsClassSide(): boolean
-    +setIsClassSide(isClassSide: boolean): void
-    -isPrivate: boolean
-    +getIsPrivate(): boolean
-    +setIsPrivate(isPrivate: boolean): void
-    -isPublic: boolean
-    +getIsPublic(): boolean
-    +setIsPublic(isPublic: boolean): void
-    -isProtected: boolean
-    +getIsProtected(): boolean
-    +setIsProtected(isProtected: boolean): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    -_parentEntity: Class | Interface
+    -_kind: string
+    -_isAbstract: boolean
+    -_isClassSide: boolean
+    -_isPrivate: boolean
+    -_isPublic: boolean
+    -_isProtected: boolean
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentEntity: Class | Interface
+    +parentEntity: Class | Interface
+    +kind: string
+    +kind: string
+    +isAbstract: boolean
+    +isAbstract: boolean
+    +isClassSide: boolean
+    +isClassSide: boolean
+    +isPrivate: boolean
+    +isPrivate: boolean
+    +isPublic: boolean
+    +isPublic: boolean
+    +isProtected: boolean
+    +isProtected: boolean
 }
-class Class extends Type {
-    -isAbstract: boolean
-    +getIsAbstract(): boolean
-    +setIsAbstract(isAbstract: boolean): void
-    -properties: Set<Property>
-    +getProperties(): Set<Property>
+class Interface extends Type {
+    -_properties: Set<Property>
     +addProperty(property: Property): void
-    -methods: Set<Method>
-    +getMethods(): Set<Method>
+    -_methods: Set<Method>
     +addMethod(method: Method): void
-    -superInheritances: Set<Inheritance>
-    +getSuperInheritances(): Set<Inheritance>
+    -_superInheritances: Set<Inheritance>
     +addSuperInheritance(superInheritance: Inheritance): void
-    -subInheritances: Set<Inheritance>
-    +getSubInheritances(): Set<Inheritance>
+    -_subInheritances: Set<Inheritance>
     +addSubInheritance(subInheritance: Inheritance): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +properties: Set<Property>
+    +methods: Set<Method>
+    +superInheritances: Set<Inheritance>
+    +subInheritances: Set<Inheritance>
+}
+class PrimitiveType extends Type {
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
 }
-class ParameterizableClass extends Class {
-    -parameterTypes: Set<ParameterType>
-    +getParameterTypes(): Set<ParameterType>
-    +addParameterType(parameterType: ParameterType): void
+class ParametricClass extends Class {
+    -_genericParameters: Set<ParameterType>
+    +addGenericParameter(genericParameter: ParameterType): void
+    +clearGenericParameters(): void
+    -_concreteParameters: Set<Class | Interface | PrimitiveType>
+    +addConcreteParameter(concreteParameter: Class | Interface | PrimitiveType): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +genericParameters: Set<ParameterType>
+    +concreteParameters: Set<Class | Interface | PrimitiveType>
 }
-class ParameterizableInterface extends Interface {
-    -parameterTypes: Set<ParameterType>
-    +getParameterTypes(): Set<ParameterType>
-    +addParameterType(parameterType: ParameterType): void
+class ParametricInterface extends Interface {
+    -_genericParameters: Set<ParameterType>
+    +addGenericParameter(genericParameter: ParameterType): void
+    +clearGenericParameters(): void
+    -_concreteParameters: Set<Class | Interface | PrimitiveType>
+    +addConcreteParameter(concreteParameter: Class | Interface | PrimitiveType): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +genericParameters: Set<ParameterType>
+    +concreteParameters: Set<Class | Interface | PrimitiveType>
 }
 class Function extends BehavioralEntity {
     +getJSON(): string
@@ -255,257 +281,286 @@ class Accessor extends Method {
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
 }
+class ParametricMethod extends Method {
+    -_concreteParameters: Set<Class | Interface | PrimitiveType>
+    +addConcreteParameter(concreteParameter: Class | Interface | PrimitiveType): void
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +concreteParameters: Set<Class | Interface | PrimitiveType>
+}
+class ParametricFunction extends Function {
+    -_concreteParameters: Set<Class | Interface | PrimitiveType>
+    +addConcreteParameter(concreteParameter: Class | Interface | PrimitiveType): void
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +concreteParameters: Set<Class | Interface | PrimitiveType>
+}
+class ArrowFunction extends BehavioralEntity {
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+}
+class ParametricArrowFunction extends ArrowFunction {
+    -_concreteParameters: Set<Class | Interface | PrimitiveType>
+    +addConcreteParameter(concreteParameter: Class | Interface | PrimitiveType): void
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +concreteParameters: Set<Class | Interface | PrimitiveType>
+}
 class ParameterType extends Type {
-    -parentGeneric: Method | ParameterizableClass | ParameterizableInterface | Accessor | FamixFunction
-    +getParentGeneric(): Method | ParameterizableClass | ParameterizableInterface | Accessor | FamixFunction
-    +setParentGeneric(parentGeneric: Method | ParameterizableClass | ParameterizableInterface | Accessor | FamixFunction): void
+    -_parentGeneric: Method | ParametricArrowFunction | ArrowFunction | ParametricClass | ParametricInterface | ParametricMethod | Accessor | FamixFunction | ParametricFunction
+    -_baseType: Type
+    -_arguments: Set<Type>
+    +addArgument(argument: Type): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentGeneric: Method | ParametricArrowFunction | ArrowFunction | ParametricClass | ParametricInterface | ParametricMethod | Accessor | FamixFunction | ParametricFunction
+    +parentGeneric: Method | ParametricArrowFunction | ArrowFunction | ParametricClass | ParametricInterface | ParametricMethod | Accessor | FamixFunction | ParametricFunction
+    +baseType: Type
+    +baseType: Type
+    +arguments: Set<Type>
 }
 class BehavioralEntity extends ContainerEntity {
-    -isGeneric: boolean
-    +getIsGeneric(): boolean
-    +setIsGeneric(isGeneric: boolean): void
-    -signature: string
-    +getSignature(): string
-    +setSignature(signature: string): void
-    -parameters: Set<Parameter>
-    +getParameters(): Set<Parameter>
+    -_signature: string
+    -_parameters: Set<Parameter>
     +addParameter(parameter: Parameter): void
-    -numberOfParameters: number
-    +getNumberOfParameters(): number
-    +setNumberOfParameters(numberOfParameters: number): void
-    -incomingInvocations: Set<Invocation>
-    +getIncomingInvocations(): Set<Invocation>
+    -_numberOfParameters: number
+    -_incomingInvocations: Set<Invocation>
     +addIncomingInvocation(incomingInvocation: Invocation): void
-    -declaredType: Type
-    +getDeclaredType(): Type
-    +setDeclaredType(declaredType: Type): void
-    -typeParameters: Set<ParameterType>
-    +getParameterTypes(): Set<ParameterType>
-    +addParameterType(typeParameter: ParameterType): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class Invocation extends Association {
-    -candidates: Set<BehavioralEntity>
-    +getCandidates(): Set<BehavioralEntity>
+    -_declaredType: Type
+    -_genericParameters: Set<ParameterType>
+    +addGenericParameter(genericParameter: ParameterType): void
+    +clearGenericParameters(): void
+    +getJSON(): string
+    +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +signature: string
+    +signature: string
+    +parameters: Set<Parameter>
+    +numberOfParameters: number
+    +numberOfParameters: number
+    +incomingInvocations: Set<Invocation>
+    +declaredType: Type
+    +declaredType: Type
+    +genericParameters: Set<ParameterType>
+}
+class Invocation extends Entity {
+    -_candidates: Set<BehavioralEntity>
     +addCandidate(candidate: BehavioralEntity): void
-    -receiver: NamedEntity
-    +getReceiver(): NamedEntity
-    +setReceiver(receiver: NamedEntity): void
-    -sender: ContainerEntity
-    +getSender(): ContainerEntity
-    +setSender(sender: ContainerEntity): void
-    -signature: string
-    +getSignature(): string
-    +setSignature(signature: string): void
+    -_receiver: NamedEntity
+    -_sender: ContainerEntity
+    -_signature: string
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +candidates: Set<BehavioralEntity>
+    +receiver: NamedEntity
+    +receiver: NamedEntity
+    +sender: ContainerEntity
+    +sender: ContainerEntity
+    +signature: string
+    +signature: string
 }
-class Reference extends Association {
-    -source: ContainerEntity
-    +getSource(): ContainerEntity
-    +setSource(source: ContainerEntity): void
-    -target: Type
-    +getTarget(): Type
-    +setTarget(target: Type): void
+class Reference extends Entity {
+    -_source: ContainerEntity
+    -_target: Type
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +source: ContainerEntity
+    +source: ContainerEntity
+    +target: Type
+    +target: Type
 }
 class Variable extends StructuralEntity {
-    -parentContainerEntity: ContainerEntity
-    +getParentContainerEntity(): ContainerEntity
-    +setParentContainerEntity(parentContainerEntity: ContainerEntity): void
+    -_parentContainerEntity: ContainerEntity
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentContainerEntity: ContainerEntity
+    +parentContainerEntity: ContainerEntity
 }
 class ContainerEntity extends NamedEntity {
-    -parentContainerEntity: ContainerEntity
-    +getParentContainerEntity(): ContainerEntity
-    +setParentContainerEntity(parentContainerEntity: ContainerEntity): void
-    -childrenContainerEntities: Set<ContainerEntity>
-    +getChildrenContainerEntities(): Set<ContainerEntity>
+    -_parentContainerEntity: ContainerEntity
+    -_childrenContainerEntities: Set<ContainerEntity>
     +addChildContainerEntity(childContainerEntity: ContainerEntity): void
-    -cyclomaticComplexity: number
-    +getCyclomaticComplexity(): number
-    +setCyclomaticComplexity(cyclomaticComplexity: number): void
-    -numberOfStatements: number
-    +getNumberOfStatements(): number
-    +setNumberOfStatements(numberOfStatements: number): void
-    -outgoingReferences: Set<Reference>
-    +getOutgoingReferences(): Set<Reference>
+    -_cyclomaticComplexity: number
+    -_numberOfStatements: number
+    -_outgoingReferences: Set<Reference>
     +addOutgoingReference(outgoingReference: Reference): void
-    -numberOfLinesOfCode: number
-    +getNumberOfLinesOfCode(): number
-    +setNumberOfLinesOfCode(numberOfLinesOfCode: number): void
-    -outgoingInvocations: Set<Invocation>
-    +getOutgoingInvocations(): Set<Invocation>
+    -_numberOfLinesOfCode: number
+    -_outgoingInvocations: Set<Invocation>
     +addOutgoingInvocation(outgoingInvocation: Invocation): void
-    -accesses: Set<Access>
-    +getAccesses(): Set<Access>
+    -_accesses: Set<Access>
     +addAccess(access: Access): void
     -childrenTypes: Set<Type>
-    +getTypes(): Set<Type>
     +addType(childType: Type): void
     -childrenFunctions: Set<FamixFunctionEntity>
-    +getFunctions(): Set<FamixFunctionEntity>
     +addFunction(childFunction: FamixFunctionEntity): void
-    -variables: Set<Variable>
-    +getVariables(): Set<Variable>
+    -_variables: Set<Variable>
     +addVariable(variable: Variable): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentContainerEntity: ContainerEntity
+    +parentContainerEntity: ContainerEntity
+    +childrenContainerEntities: Set<ContainerEntity>
+    +cyclomaticComplexity: number
+    +cyclomaticComplexity: number
+    +numberOfStatements: number
+    +numberOfStatements: number
+    +outgoingReferences: Set<Reference>
+    +numberOfLinesOfCode: number
+    +numberOfLinesOfCode: number
+    +outgoingInvocations: Set<Invocation>
+    +accesses: Set<Access>
+    +types: Set<Type>
+    +functions: Set<FamixFunctionEntity>
+    +variables: Set<Variable>
 }
 class Type extends ContainerEntity {
-    -container: ContainerEntity
-    +getContainer(): ContainerEntity
-    +setContainer(container: ContainerEntity): void
-    -typeAliases: Set<Alias>
-    +getTypeAliases(): Set<Alias>
+    -_container: ContainerEntity
+    -_typeAliases: Set<Alias>
     +addTypeAlias(typeAlias: Alias): void
-    -structuresWithDeclaredType: Set<StructuralEntity>
-    +getStructuresWithDeclaredType(): Set<StructuralEntity>
+    -_structuresWithDeclaredType: Set<StructuralEntity>
     +addStructureWithDeclaredType(structureWithDeclaredType: StructuralEntity): void
-    -behavioralEntitiesWithDeclaredType: Set<BehavioralEntity>
-    +getBehavioralEntitiesWithDeclaredType(): Set<BehavioralEntity>
+    -_behavioralEntitiesWithDeclaredType: Set<BehavioralEntity>
     +addBehavioralEntityWithDeclaredType(behavioralEntityWithDeclaredType: BehavioralEntity): void
-    -incomingReferences: Set<Reference>
-    +getIncomingReferences(): Set<Reference>
+    -_incomingReferences: Set<Reference>
     +addIncomingReference(incomingReference: Reference): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +container: ContainerEntity
+    +container: ContainerEntity
+    +typeAliases: Set<Alias>
+    +structuresWithDeclaredType: Set<StructuralEntity>
+    +behavioralEntitiesWithDeclaredType: Set<BehavioralEntity>
+    +incomingReferences: Set<Reference>
 }
 class StructuralEntity extends NamedEntity {
-    -incomingAccesses: Set<Access>
-    +getIncomingAccesses(): Set<Access>
+    -_incomingAccesses: Set<Access>
     +addIncomingAccess(incomingAccess: Access): void
-    -declaredType: Type
-    +getDeclaredType(): Type
-    +setDeclaredType(declaredType: Type): void
+    -_declaredType: Type
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +incomingAccesses: Set<Access>
+    +declaredType: Type
+    +declaredType: Type
 }
-class Access extends Association {
-    -accessor: ContainerEntity
-    +getAccessor(): ContainerEntity
-    +setAccessor(accessor: ContainerEntity): void
-    -variable: StructuralEntity
-    +getVariable(): StructuralEntity
-    +setVariable(variable: StructuralEntity): void
-    -isWrite: boolean
-    +getIsWrite(): boolean
-    +setIsWrite(isWrite: boolean): void
+class Access extends Entity {
+    -_accessor: ContainerEntity
+    -_variable: StructuralEntity
+    -_isWrite: boolean
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +accessor: ContainerEntity
+    +accessor: ContainerEntity
+    +variable: StructuralEntity
+    +variable: StructuralEntity
+    +isWrite: boolean
+    +isWrite: boolean
 }
-class Enum extends Type {
-    -values: Set<EnumValue>
-    +getValues(): Set<EnumValue>
-    +addValue(value: EnumValue): void
+class Concretisation extends Entity {
+    -_genericEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
+    -_concreteEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +genericEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
+    +genericEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
+    +concreteEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
+    +concreteEntity: ParametricClass | ParametricInterface | ParametricMethod | ParametricFunction
 }
-class EnumValue extends StructuralEntity {
-    -parentEntity: Enum
-    +getParentEntity(): Enum
-    +setParentEntity(parentEntity: Enum): void
+class Enum extends Type {
+    -_values: Set<EnumValue>
+    +addValue(value: EnumValue): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +values: Set<EnumValue>
 }
-class ImplicitVariable extends Variable {
+class EnumValue extends StructuralEntity {
+    -_parentEntity: Enum
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +parentEntity: Enum
+    +parentEntity: Enum
 }
 class IndexedFileAnchor extends SourceAnchor {
-    -startPos: number
-    +getStartPos(): number
-    +setStartPos(startPos: number): void
-    -endPos: number
-    +getEndPos(): number
-    +setEndPos(endPos: number): void
-    -endLine: number
-    +getEndLine(): number
-    +setEndLine(sourceEndLine: number): void
-    -startLine: number
-    +getStartLine(): number
-    +setStartLine(sourceStartLine: number): void
-    -fileName: string
-    +getFileName(): string
-    +setFileName(fileName: string): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class ParameterizedType extends Type {
-    -baseType: Type
-    +getBaseType(): Type
-    +setBaseType(baseType: Type): void
-    -arguments: Set<Type>
-    +getArguments(): Set<Type>
-    +addArgument(argument: Type): void
-    +getJSON(): string
-    +addPropertiesToExporter(exporter: FamixJSONExporter): void
-}
-class PrimitiveType extends Type {
+    -_startPos: number
+    -_endPos: number
+    -_fileName: string
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +startPos: number
+    +startPos: number
+    +endPos: number
+    +endPos: number
+    +fileName: string
+    +fileName: string
 }
-class TextAnchor extends SourceAnchor {
-    -startPos: number
-    +getStartPos(): number
-    +setStartPos(startPos: number): void
-    -endPos: number
-    +getEndPos(): number
-    +setEndPos(endPos: number): void
-    -fileName: string
-    +getFileName(): string
-    +setFileName(fileName: string): void
+class ParameterConcretisation extends Entity {
+    -_genericParameter: ParameterType
+    -_concreteParameter: PrimitiveType
+    -_concretisations: Set<Concretisation>
+    +addConcretisation(concretisation: Concretisation): void
     +getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
+    +genericParameter: ParameterType
+    +genericParameter: ParameterType
+    +concreteParameter: PrimitiveType
+    +concreteParameter: PrimitiveType
+    +concretisations: Set<Concretisation>
 }
 interface SearchParameters {
     +searchArray: string[]
     +targetArray: string[]
-    +start?: number
+    +start?: number | undefined
 }
 class EntityDictionary {
     +famixRep: FamixRepository
     -fmxAliasMap: Map<string, Famix.Alias>
-    -fmxClassMap: Map<string, Famix.Class | Famix.ParameterizableClass>
-    -fmxInterfaceMap: Map<string, Famix.Interface | Famix.ParameterizableInterface>
-    -fmxNamespaceMap: Map<string, Famix.Namespace>
+    -fmxClassMap: Map<string, Famix.Class | Famix.ParametricClass>
+    -fmxInterfaceMap: Map<string, Famix.Interface | Famix.ParametricInterface>
+    -fmxModuleMap: Map<string, Famix.Module>
     -fmxFileMap: Map<string, Famix.Module | Famix.ScriptEntity>
-    -fmxTypeMap: Map<string, Famix.Type | Famix.PrimitiveType | Famix.ParameterizedType>
+    -fmxTypeMap: Map<string, Famix.Type | Famix.ParameterType | Famix.PrimitiveType>
+    -fmxFunctionAndMethodMap: Map<string, Famix.Method | Famix.ParametricMethod | Famix.Function | Famix.ParametricFunction>
     -UNKNOWN_VALUE: string
     +fmxElementObjectMap: Map<Famix.Entity, TSMorphObjectType>
+    +tsMorphElementObjectMap: Map<TSMorphObjectType, Famix.Entity>
+    +addSourceAnchor(fmx: Famix.SourcedEntity, node: TSMorphObjectType): Famix.IndexedFileAnchor
     +makeFamixIndexFileAnchor(sourceElement: TSMorphObjectType, famixElement: Famix.SourcedEntity): void
     +createOrGetFamixFile(f: SourceFile, isModule: boolean): Famix.Module | Famix.ScriptEntity
-    +createOrGetFamixNamespace(m: ModuleDeclaration): Famix.Namespace
+    +createOrGetFamixModule(m: ModuleDeclaration): Famix.Module
     +createFamixAlias(a: TypeAliasDeclaration): Famix.Alias
-    +createOrGetFamixClass(cls: ClassDeclaration): Famix.Class | Famix.ParameterizableClass
-    +createOrGetFamixInterface(inter: InterfaceDeclaration): Famix.Interface | Famix.ParameterizableInterface
+    +createOrGetFamixClass(cls: ClassDeclaration): Famix.Class | Famix.ParametricClass
+    +createOrGetFamixInterface(inter: InterfaceDeclaration): Famix.Interface | Famix.ParametricInterface
+    +createOrGetFamixConcreteElement(concreteElement: ParametricVariantType, concreteElementDeclaration: ConcreteElementTSMorphType, concreteArguments: TypeNode<ts.TypeNode>[]): ParametricVariantType
     +createFamixProperty(property: PropertyDeclaration | PropertySignature): Famix.Property
-    +createFamixMethod(method: MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration, currentCC: unknown): Famix.Method | Famix.Accessor
-    +createFamixFunction(func: FunctionDeclaration | FunctionExpression, currentCC: unknown): Famix.Function
+    +createOrGetFamixMethod(method: MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration, currentCC: { [key: string]: number; }): Famix.Method | Famix.ParametricMethod | Famix.Accessor
+    +createOrGetFamixFunction(func: FunctionDeclaration | FunctionExpression, currentCC: { [key: string]: number; }): Famix.Function | Famix.ParametricFunction
     +createFamixParameter(param: ParameterDeclaration): Famix.Parameter
     +createFamixParameterType(tp: TypeParameterDeclaration): Famix.ParameterType
+    +createOrGetFamixConcreteType(param: TypeNode<ts.TypeNode>): Famix.Class | Famix.Interface | Famix.ParameterType | Famix.PrimitiveType
     +createFamixVariable(variable: VariableDeclaration): Famix.Variable
     +createFamixEnum(enumEntity: EnumDeclaration): Famix.Enum
     +createFamixEnumValue(enumMember: EnumMember): Famix.EnumValue
     +createOrGetFamixDecorator(decorator: Decorator, decoratedEntity: ClassDeclaration | MethodDeclaration | ParameterDeclaration | PropertyDeclaration | GetAccessorDeclaration | SetAccessorDeclaration): Famix.Decorator
     +createFamixComment(comment: CommentRange, fmxScope: Famix.NamedEntity, isJSDoc: boolean): Famix.Comment
-    +createOrGetFamixType(typeName: string, element: MethodDeclaration | ConstructorDeclaration | MethodSignature | FunctionDeclaration | ... 8 more ... | TypeAliasDeclaration): Famix.Type | Famix.PrimitiveType | Famix.ParameterizedType
+    +createOrGetFamixType(typeName: string, element: TypeDeclaration): Famix.Type | Famix.ParameterType | Famix.PrimitiveType
     +createFamixAccess(node: Identifier, id: number): void
     +createFamixInvocation(node: Identifier, m: MethodDeclaration | ConstructorDeclaration | FunctionDeclaration | FunctionExpression | GetAccessorDeclaration | SetAccessorDeclaration, id: number): void
     +createFamixInheritance(cls: ClassDeclaration | InterfaceDeclaration, inhClass: ClassDeclaration | InterfaceDeclaration | ExpressionWithTypeArguments): void
-    +createFamixImportClause(importClauseInfo: { importDeclaration?: ImportDeclaration | ImportEqualsDeclaration; importer: SourceFile; moduleSpecifierFilePath: string; importElement: ImportSpecifier | Identifier; isInExports: boolean; isDefaultExport: boolean; }): void
+    +createFamixImportClause(importedEntity: Famix.NamedEntity, importingEntity: Famix.Module): void
+    +oldCreateFamixImportClause(importClauseInfo: { importDeclaration?: ImportDeclaration | ImportEqualsDeclaration | undefined; importerSourceFile: SourceFile; moduleSpecifierFilePath: string; importElement: ImportSpecifier | Identifier; isInExports: boolean; isDefaultExport: boolean; }): void
+    +createFamixArrowFunction(arrowExpression: Expression<ts.Expression>, currentCC: { [key: string]: number; }): Famix.ParametricArrowFunction | Famix.ArrowFunction
+    +createFamixConcretisation(conEntity: Famix.ParametricClass | Famix.ParametricInterface | Famix.ParametricMethod | Famix.ParametricFunction, genEntity: Famix.ParametricClass | Famix.ParametricInterface | Famix.ParametricMethod | Famix.ParametricFunction): Famix.Concretisation
+    +createFamixParameterConcretisation(concretisation: Famix.Concretisation): Famix.ParameterConcretisation | undefined
+    +createFamixConcretisationClassOrInterfaceSpecialisation(element: ClassDeclaration | InterfaceDeclaration): void
+    +createFamixConcretisationGenericInstantiation(cls: ClassDeclaration): void
+    +createFamixConcretisationFunctionInstantiation(element: MethodDeclaration | FunctionDeclaration): void
+    +createFamixConcretisationInterfaceClass(cls: ClassDeclaration): void
+    +createFamixConcretisationTypeInstanciation(element: ClassDeclaration | InterfaceDeclaration): void
     +convertToRelativePath(absolutePath: string, absolutePathProject: string): string
 }
 class FamixRepository {
     -elements: Set<FamixBaseElement>
     -famixClasses: Set<Class>
     -famixInterfaces: Set<Interface>
-    -famixNamespaces: Set<Namespace>
+    -famixModules: Set<Module>
     -famixMethods: Set<Method>
     -famixVariables: Set<Variable>
     -famixFunctions: Set<FamixFunctionEntity>
@@ -513,23 +568,24 @@ class FamixRepository {
     -idCounter: number
     -absolutePath: string
     -fmxElementObjectMap: Map<Famix.Entity, TSMorphObjectType>
+    -tsMorphObjectMap: Map<TSMorphObjectType, Famix.Entity>
     +setFmxElementObjectMap(fmxElementObjectMap: Map<Famix.Entity, TSMorphObjectType>): void
     +getFmxElementObjectMap(): Map<Famix.Entity, TSMorphObjectType>
     +getAbsolutePath(): string
     +setAbsolutePath(path: string): void
-    +getFamixEntityById(id: number): FamixBaseElement
-    +getFamixEntityByFullyQualifiedName(fullyQualifiedName: string): FamixBaseElement
+    +getFamixEntityById(id: number): FamixBaseElement | undefined
+    +getFamixEntityByFullyQualifiedName(fullyQualifiedName: string): FamixBaseElement | undefined
     +export(arg0: { format: string; }): string
     +_getAllEntities(): Set<FamixBaseElement>
     +_getAllEntitiesWithType(theType: string): Set<FamixBaseElement>
-    +_getFamixClass(fullyQualifiedName: string): Class
-    +_getFamixInterface(fullyQualifiedName: string): Interface
-    +_getFamixMethod(fullyQualifiedName: string): Method
-    +_getFamixFunction(fullyQualifiedName: string): FamixFunctionEntity
-    +_getFamixVariable(fullyQualifiedName: string): Variable
-    +_getFamixNamespace(fullyQualifiedName: string): Namespace
-    +_getFamixNamespaces(): Set<Namespace>
-    +_getFamixFile(fullyQualifiedName: string): Module | ScriptEntity
+    +_getFamixClass(fullyQualifiedName: string): Class | undefined
+    +_getFamixInterface(fullyQualifiedName: string): Interface | undefined
+    +_getFamixMethod(fullyQualifiedName: string): Method | undefined
+    +_getFamixFunction(fullyQualifiedName: string): FamixFunctionEntity | undefined
+    +_getFamixVariable(fullyQualifiedName: string): Variable | undefined
+    +_getFamixModule(fullyQualifiedName: string): Module | undefined
+    +_getFamixModules(): Set<Module>
+    +_getFamixFile(fullyQualifiedName: string): Module | ScriptEntity | undefined
     +_getFamixFiles(): Set<Module | ScriptEntity>
     +_methodNamesAsSetFromClass(className: string): Set<string>
     +_methodParentsAsSetFromClass(className: string): Set<Type>
@@ -540,7 +596,7 @@ class FamixRepository {
 class Importer {
     -project: Project
     +famixRepFromPaths(paths: string[]): FamixRepository
-    -processEntities(project: any): void
+    -processEntities(project: Project): void
     +famixRepFromSource(filename: string, source: string): FamixRepository
     +famixRepFromProject(project: Project): FamixRepository
 }
@@ -549,11 +605,4 @@ abstract class FamixBaseElement {
     +{abstract} getJSON(): string
     +addPropertiesToExporter(exporter: FamixJSONExporter): void
 }
-class FamixJSONExporter {
-    -element: FamixBaseElement
-    -bufferArray: any
-    -FamixPrefix: string
-    +addProperty(name: string, prop: unknown): void
-    +getJSON(): string
-}
 @enduml