Added property to the TFunctionMetrics for cyclomaticComplexity insid…

src/Famix-TypeScript-Entities/FamixTypeScriptAccess.class.st

@@ -10,7 +10,7 @@
 ### Association target
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `variable` | `FamixTAccess` | `incomingAccesses` | `FamixTAccessible` | Variable accessed. to-side of the association|
+| `candidates` | `FamixTAccess` | `incomingAccesses` | `FamixTAccessible` | Variables that cas be the accessed variable. to-side of the association. Most of the time it will be only one variable, but some languages might have candidates such as Python.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
@@ -42,7 +42,6 @@ Class {
 FamixTypeScriptAccess class >> annotation [
 
 	<FMClass: #Access super: #FamixTypeScriptEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptAccessor.class.st

@@ -15,7 +15,6 @@ Class {
 FamixTypeScriptAccessor class >> annotation [
 
 	<FMClass: #Accessor super: #FamixTypeScriptMethod>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptAlias.class.st

@@ -24,7 +24,6 @@ Class {
 FamixTypeScriptAlias class >> annotation [
 
 	<FMClass: #Alias super: #FamixTypeScriptNamedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptArrowFunction.class.st

@@ -22,6 +22,7 @@ I represent a TypeScript arrow function.
 | `accesses` | `FamixTWithAccesses` | `accessor` | `FamixTAccess` | Accesses to variables made by this behaviour.|
 | `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
 | `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
+| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
 
 ### Incoming dependencies
 | Relation | Origin | Opposite | Type | Comment |
@@ -32,7 +33,6 @@ I represent a TypeScript arrow function.
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
 
 
@@ -41,6 +41,7 @@ I represent a TypeScript arrow function.
 
 | Name | Type | Default value | Comment |
 |---|
+| `cyclomaticComplexity` | `Number` | 0 | Cyclomatic Complexity Property for Functions.|
 | `isStub` | `Boolean` | false | Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.|
 | `name` | `String` | nil | Basic name of the entity, not full reference.|
 | `signature` | `String` | nil | Signature of the message being sent|
@@ -49,8 +50,8 @@ I represent a TypeScript arrow function.
 Class {
 	#name : 'FamixTypeScriptArrowFunction',
 	#superclass : 'FamixTypeScriptBehaviouralEntity',
-	#traits : 'FamixTDefinedInModule + FamixTFunction + FamixTImportable + FamixTInvocable',
-	#classTraits : 'FamixTDefinedInModule classTrait + FamixTFunction classTrait + FamixTImportable classTrait + FamixTInvocable classTrait',
+	#traits : 'FamixTDefinedInModule + FamixTFunction + FamixTImportable + FamixTInvocable + FamixTypeScriptTFunctionMetrics',
+	#classTraits : 'FamixTDefinedInModule classTrait + FamixTFunction classTrait + FamixTImportable classTrait + FamixTInvocable classTrait + FamixTypeScriptTFunctionMetrics classTrait',
 	#category : 'Famix-TypeScript-Entities-Entities',
 	#package : 'Famix-TypeScript-Entities',
 	#tag : 'Entities'
@@ -60,7 +61,6 @@ Class {
 FamixTypeScriptArrowFunction class >> annotation [
 
 	<FMClass: #ArrowFunction super: #FamixTypeScriptBehaviouralEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptBehaviouralEntity.class.st

@@ -15,7 +15,6 @@ Class {
 FamixTypeScriptBehaviouralEntity class >> annotation [
 
 	<FMClass: #BehaviouralEntity super: #FamixTypeScriptContainerEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptClass.class.st

@@ -29,14 +29,14 @@ I represent a TypeScript class.
 |---|
 | `incomingImports` | `FamixTImportable` | `importedEntity` | `FamixTImport` | List of imports of this entity|
 | `incomingReferences` | `FamixTReferenceable` | `referredEntity` | `FamixTReference` | References to this entity by other entities.|
+| `incomingTypings` | `FamixTType` | `declaredType` | `FamixTEntityTyping` | Relations to the entities that have this as type.|
 | `subInheritances` | `FamixTWithInheritances` | `superclass` | `FamixTInheritance` | Subinheritance relationships, i.e. known subclasses of this type.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `receivingInvocations` | `FamixTInvocationsReceiver` | `receiver` | `FamixTInvocation` | List of invocations performed on this entity (considered as the receiver)|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
-| `typedEntities` | `FamixTType` | `declaredType` | `FamixTTypedEntity` | Entities that have this type as declaredType|
 
 
 ## Properties
@@ -63,9 +63,8 @@ Class {
 FamixTypeScriptClass class >> annotation [
 
 	<FMClass: #Class super: #FamixTypeScriptType>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]
 
 { #category : 'testing' }

src/Famix-TypeScript-Entities/FamixTypeScriptComment.class.st

@@ -38,9 +38,8 @@ Class {
 FamixTypeScriptComment class >> annotation [
 
 	<FMClass: #Comment super: #FamixTypeScriptSourcedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]
 
 { #category : 'accessing' }

src/Famix-TypeScript-Entities/FamixTypeScriptConcretization.class.st

@@ -35,20 +35,20 @@
 ### Association source
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `genericEntity` | `FamixTConcretization` | `concretizations` | `FamixTParametricEntity` | Generic entity linked to in this relationship. from-side of the association|
+| `typeArgument` | `FamixTConcretization` | `outgoingConcretizations` | `FamixTTypeArgument` | The type argument that concretizes the type parameter|
 
 ### Association target
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `concreteEntity` | `FamixTConcretization` | `genericization` | `FamixTParametricEntity` | Concrete entity linked to in this relationship. to-side of the association|
+| `typeParameter` | `FamixTConcretization` | `concretizations` | `FamixTTypeParameter` | Type parameter linked to in this relationship.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `next` | `FamixTAssociation` | `previous` | `FamixTAssociation` | Next association in an ordered collection of associations. Currently not supported by the Moose importer|
-| `parameterConcretizations` | `FamixTConcretization` | `concretizations` | `FamixTParameterConcretization` | |
 | `previous` | `FamixTAssociation` | `next` | `FamixTAssociation` | Previous association in an ordered collection of associations. Currently not supported by the Moose importer|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
+| `triggeringAssociation` | `FamixTConcretization` | `concretizations` | `FamixTParametricAssociation` | The association that triggers this concretization.|
 
 
 
@@ -67,7 +67,6 @@ Class {
 FamixTypeScriptConcretization class >> annotation [
 
 	<FMClass: #Concretization super: #FamixTypeScriptEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptContainerEntity.class.st

@@ -26,7 +26,6 @@ Class {
 FamixTypeScriptContainerEntity class >> annotation [
 
 	<FMClass: #ContainerEntity super: #FamixTypeScriptNamedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptDecorator.class.st

@@ -29,8 +29,8 @@ Class {
 	#traits : 'FamixTImportable',
 	#classTraits : 'FamixTImportable classTrait',
 	#instVars : [
-		'#expression => FMProperty',
-		'#decoratedEntity => FMOne type: #FamixTypeScriptNamedEntity opposite: #decorators'
+		'#decoratedEntity => FMOne type: #FamixTypeScriptNamedEntity opposite: #decorators',
+		'#expression => FMProperty'
 	],
 	#category : 'Famix-TypeScript-Entities-Entities',
 	#package : 'Famix-TypeScript-Entities',
@@ -41,9 +41,8 @@ Class {
 FamixTypeScriptDecorator class >> annotation [
 
 	<FMClass: #Decorator super: #FamixTypeScriptNamedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]
 
 { #category : 'accessing' }

src/Famix-TypeScript-Entities/FamixTypeScriptEntity.class.st

@@ -10,10 +10,9 @@ Class {
 FamixTypeScriptEntity class >> annotation [
 
 	<FMClass: #Entity super: #MooseEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
 	<abstract>
-	^ self
 ]
 
 { #category : 'testing' }
@@ -30,6 +29,20 @@ FamixTypeScriptEntity class >> metamodel [
 	^ FamixTypeScriptModel metamodel
 ]
 
+{ #category : 'testing' }
+FamixTypeScriptEntity >> canBeStub [
+
+	<generated>
+	^ false
+]
+
+{ #category : 'testing' }
+FamixTypeScriptEntity >> hasImmediateSource [
+
+	<generated>
+	^ false
+]
+
 { #category : 'testing' }
 FamixTypeScriptEntity >> isAccess [
 

src/Famix-TypeScript-Entities/FamixTypeScriptEnum.class.st

@@ -19,12 +19,12 @@ I represent a Typescript enumerated type
 |---|
 | `incomingImports` | `FamixTImportable` | `importedEntity` | `FamixTImport` | List of imports of this entity|
 | `incomingReferences` | `FamixTReferenceable` | `referredEntity` | `FamixTReference` | References to this entity by other entities.|
+| `incomingTypings` | `FamixTType` | `declaredType` | `FamixTEntityTyping` | Relations to the entities that have this as type.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
-| `typedEntities` | `FamixTType` | `declaredType` | `FamixTTypedEntity` | Entities that have this type as declaredType|
 
 
 ## Properties
@@ -50,7 +50,6 @@ Class {
 FamixTypeScriptEnum class >> annotation [
 
 	<FMClass: #Enum super: #FamixTypeScriptType>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptEnumValue.class.st

@@ -9,15 +9,19 @@ I represent One value (constant) in a Typescript enumerated type
 |---|
 | `parentEnum` | `FamixTEnumValue` | `enumValues` | `FamixTWithEnumValues` | The Enum declaring this value. It offers the implementation of belongsTo|
 
+### Outgoing dependencies
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
+
 ### Incoming dependencies
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `incomingAccesses` | `FamixTAccessible` | `variable` | `FamixTAccess` | All Famix accesses pointing to this structural entity|
+| `incomingAccesses` | `FamixTAccessible` | `candidates` | `FamixTAccess` | All Famix accesses pointing to this structural entity|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
 
 
@@ -44,7 +48,6 @@ Class {
 FamixTypeScriptEnumValue class >> annotation [
 
 	<FMClass: #EnumValue super: #FamixTypeScriptStructuralEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptFile.class.st

@@ -35,7 +35,6 @@ Class {
 FamixTypeScriptFile class >> annotation [
 
 	<FMClass: #File super: #FamixTypeScriptNamedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptFolder.class.st

@@ -35,7 +35,6 @@ Class {
 FamixTypeScriptFolder class >> annotation [
 
 	<FMClass: #Folder super: #FamixTypeScriptNamedEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptFunction.class.st

@@ -22,6 +22,7 @@ I represent a TypeScript function.
 | `accesses` | `FamixTWithAccesses` | `accessor` | `FamixTAccess` | Accesses to variables made by this behaviour.|
 | `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
 | `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
+| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
 
 ### Incoming dependencies
 | Relation | Origin | Opposite | Type | Comment |
@@ -32,7 +33,6 @@ I represent a TypeScript function.
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
 | `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
 
 
@@ -41,6 +41,7 @@ I represent a TypeScript function.
 
 | Name | Type | Default value | Comment |
 |---|
+| `cyclomaticComplexity` | `Number` | 0 | Cyclomatic Complexity Property for Functions.|
 | `isStub` | `Boolean` | false | Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.|
 | `name` | `String` | nil | Basic name of the entity, not full reference.|
 | `signature` | `String` | nil | Signature of the message being sent|
@@ -49,8 +50,8 @@ I represent a TypeScript function.
 Class {
 	#name : 'FamixTypeScriptFunction',
 	#superclass : 'FamixTypeScriptBehaviouralEntity',
-	#traits : 'FamixTDefinedInModule + FamixTFunction + FamixTImportable + FamixTInvocable',
-	#classTraits : 'FamixTDefinedInModule classTrait + FamixTFunction classTrait + FamixTImportable classTrait + FamixTInvocable classTrait',
+	#traits : 'FamixTDefinedInModule + FamixTFunction + FamixTImportable + FamixTInvocable + FamixTypeScriptTFunctionMetrics',
+	#classTraits : 'FamixTDefinedInModule classTrait + FamixTFunction classTrait + FamixTImportable classTrait + FamixTInvocable classTrait + FamixTypeScriptTFunctionMetrics classTrait',
 	#category : 'Famix-TypeScript-Entities-Entities',
 	#package : 'Famix-TypeScript-Entities',
 	#tag : 'Entities'
@@ -60,7 +61,6 @@ Class {
 FamixTypeScriptFunction class >> annotation [
 
 	<FMClass: #Function super: #FamixTypeScriptBehaviouralEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptImplementation.class.st

@@ -38,7 +38,6 @@ Class {
 FamixTypeScriptImplementation class >> annotation [
 
 	<FMClass: #Implementation super: #FamixTypeScriptEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptImportClause.class.st

@@ -36,7 +36,6 @@ Class {
 FamixTypeScriptImportClause class >> annotation [
 
 	<FMClass: #ImportClause super: #FamixTypeScriptEntity>
-	<package: #FamixTypeScript>
+	<package: #'Famix-TypeScript-Entities'>
 	<generated>
-	^ self
 ]

src/Famix-TypeScript-Entities/FamixTypeScriptImportingContext.class.st

@@ -1,6 +1,8 @@
 "
 This class is used to choose the entities to be imported when loading a model from file.
 It is used by `MiImportingContextPresenter` in a `MiImportModelFromFileDialog` to import a FamixTypeScriptModel.
+
+
 "
 Class {
 	#name : 'FamixTypeScriptImportingContext',
@@ -199,13 +201,6 @@ FamixTypeScriptImportingContext >> importParameter [
 	^ self importConcreteEntity: (self class fm3ClassNamed: #Parameter)
 ]
 
-{ #category : 'importing' }
-FamixTypeScriptImportingContext >> importParameterConcretization [
-
-	<generated>
-	^ self importAssociation: (self class fm3ClassNamed: #ParameterConcretization)
-]
-
 { #category : 'importing' }
 FamixTypeScriptImportingContext >> importParameterType [
 
@@ -507,13 +502,6 @@ FamixTypeScriptImportingContext >> shouldImportParameter [
 	^ self shouldImport: #Parameter
 ]
 
-{ #category : 'testing' }
-FamixTypeScriptImportingContext >> shouldImportParameterConcretization [
-
-	<generated>
-	^ self shouldImport: #ParameterConcretization
-]
-
 { #category : 'testing' }
 FamixTypeScriptImportingContext >> shouldImportParameterType [