ts2famix 1.1.0 → 1.3.0

package/src/famix_functions/famix_functions.ts

@@ -1,10 +1,11 @@
-import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments } from "ts-morph";
+import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments, ImportDeclaration } from "ts-morph";
 import * as Famix from "../lib/famix/src/model/famix";
 import { FamixRepository } from "../lib/famix/src/famix_repository";
 import { FQNFunctions } from "../fqn";
 import { FamixFunctionsIndex } from "./famix_functions_index";
 import { FamixFunctionsAssociations } from "./famix_functions_associations";
 import { FamixFunctionsTypes } from "./famix_functions_types";
+import { logger } from "../analyze";
 
 /**
  * This class contains all the functions needed to create Famix entities
@@ -97,7 +98,7 @@ export class FamixFunctions {
             fmxAlias = new Famix.Alias(this.famixRep);
             fmxAlias.setName(a.getName());
             const aliasNameWithGenerics = aliasName + (a.getTypeParameters().length ? ("<" + a.getTypeParameters().map(tp => tp.getName()).join(", ") + ">") : "");
-            console.info(`> NOTE: alias ${aliasName} has fully qualified name ${aliasFullyQualifiedName} and name with generics ${aliasNameWithGenerics}.`);
+            logger.debug(`> NOTE: alias ${aliasName} has fully qualified name ${aliasFullyQualifiedName} and name with generics ${aliasNameWithGenerics}.`);
 
             const fmxType = this.createOrGetFamixType(aliasNameWithGenerics, a);
             fmxAlias.setAliasedEntity(fmxType);
@@ -189,7 +190,7 @@ export class FamixFunctions {
         try {
             propTypeName = property.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(propTypeName, property);
@@ -288,7 +289,7 @@ export class FamixFunctions {
         try {
             methodTypeName = method.getReturnType().getText().trim();            
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of method: ${fmxMethod.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of method: ${fmxMethod.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(methodTypeName, method);
@@ -332,7 +333,7 @@ export class FamixFunctions {
         try {
             functionTypeName = func.getReturnType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of function: ${func.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of function: ${func.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(functionTypeName, func);
@@ -359,7 +360,7 @@ export class FamixFunctions {
         try {
             paramTypeName = param.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(paramTypeName, param);
@@ -376,13 +377,13 @@ export class FamixFunctions {
      * @param tp A type parameter
      * @returns The Famix model of the type parameter
      */
-    public createFamixTypeParameter(tp: TypeParameterDeclaration): Famix.TypeParameter {
-        const fmxTypeParameter = new Famix.TypeParameter(this.famixRep);
-        fmxTypeParameter.setName(tp.getName());
+    public createFamixParameterType(tp: TypeParameterDeclaration): Famix.ParameterType {
+        const fmxParameterType = new Famix.ParameterType(this.famixRep);
+        fmxParameterType.setName(tp.getName());
 
-        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxTypeParameter);
+        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxParameterType);
 
-        return fmxTypeParameter;
+        return fmxParameterType;
     }
 
     /**
@@ -397,7 +398,7 @@ export class FamixFunctions {
         try {
             variableTypeName = variable.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(variableTypeName, variable);
@@ -435,7 +436,7 @@ export class FamixFunctions {
         try {
             enumValueTypeName = enumMember.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(enumValueTypeName, enumMember);
@@ -477,9 +478,9 @@ export class FamixFunctions {
      * @returns The Famix model of the comment
      */
     public createFamixComment(comment: CommentRange, fmxScope: Famix.NamedEntity, isJSDoc: boolean): Famix.Comment {
+        logger.debug(`> NOTE: creating comment ${comment.getText()} in scope ${fmxScope.getName()}.`);
         const fmxComment = new Famix.Comment(this.famixRep);
-        fmxComment.setContent(comment.getText());
-        fmxComment.setContainer(fmxScope);
+        fmxComment.setContainer(fmxScope);  // adds comment to the container's comments collection
         fmxComment.setIsJSDoc(isJSDoc);
 
         this.famixFunctionsIndex.makeFamixIndexFileAnchor(comment, fmxComment);
@@ -527,6 +528,8 @@ export class FamixFunctions {
 
     /**
      * Creates a Famix import clause
+     * @param importClauseInfo An import clause
+     * @param importDeclaration An import declaration (optional)
      * @param importer A source file which is a module
      * @param moduleSpecifier The name of the module where the export declaration is
      * @param moduleSpecifierFilePath The path of the module where the export declaration is
@@ -534,14 +537,8 @@ export class FamixFunctions {
      * @param isInExports A boolean indicating if the imported entity is in the exports
      * @param isDefaultExport A boolean indicating if the imported entity is a default export
      */    
-    public createFamixImportClause(importer: SourceFile, moduleSpecifier: string, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean): void {
-        this.famixFunctionsAssociations.createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport);
-    }
-
-    // create the same function as createFamixImportClause but with a signature that has a single object parameter that has all the parameters
-    // this way we can call this function from the processImportClauses.ts file
-    public createFamixImportClause2(importClause: {importer: SourceFile, moduleSpecifier: string, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean}): void {
-        this.famixFunctionsAssociations.createFamixImportClause(importClause.importer, importClause.moduleSpecifier, importClause.moduleSpecifierFilePath, importClause.importElement, importClause.isInExports, importClause.isDefaultExport);
+    public createFamixImportClause(importClauseInfo: {importDeclaration?: ImportDeclaration, importer: SourceFile, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean}): void {
+        this.famixFunctionsAssociations.createFamixImportClause(importClauseInfo);
     }
 
     /**

package/src/famix_functions/famix_functions_associations.ts

@@ -1,9 +1,9 @@
-import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, SourceFile, GetAccessorDeclaration, SetAccessorDeclaration, Node, ImportSpecifier, SyntaxKind, FunctionExpression, ExpressionWithTypeArguments } from "ts-morph";
+import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, SourceFile, GetAccessorDeclaration, SetAccessorDeclaration, Node, ImportSpecifier, SyntaxKind, FunctionExpression, ExpressionWithTypeArguments, ImportDeclaration } from "ts-morph";
 import * as Famix from "../lib/famix/src/model/famix";
 import { FamixRepository } from "../lib/famix/src/famix_repository";
 import { FQNFunctions } from "../fqn";
 import { FamixFunctionsIndex } from "./famix_functions_index";
-import { Alias, Class, Enum, Interface, Variable } from "../lib/famix/src/model/famix";
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the associations
@@ -79,7 +79,7 @@ export class FamixFunctionsAssociations {
         const fmxInheritance = new Famix.Inheritance(this.famixRep);
         // const clsName = cls.getName();
         const classFullyQualifiedName = this.FQNFunctions.getFQN(cls);
-        console.info(`createFamixInheritance: classFullyQualifiedName: class fqn = ${classFullyQualifiedName}`);
+        logger.debug(`createFamixInheritance: classFullyQualifiedName: class fqn = ${classFullyQualifiedName}`);
         let subClass: Famix.Class | Famix.Interface;
         if (cls instanceof ClassDeclaration) {
             subClass = this.famixClassMap.get(classFullyQualifiedName);
@@ -133,15 +133,17 @@ export class FamixFunctionsAssociations {
 
     /**
      * Creates a Famix import clause
+     * @param importClauseInfo The information needed to create a Famix import clause
+     * @param importDeclaration The import declaration
      * @param importer A source file which is a module
-     * @param moduleSpecifier The name of the module where the export declaration is
      * @param moduleSpecifierFilePath The path of the module where the export declaration is
      * @param importElement The imported entity
      * @param isInExports A boolean indicating if the imported entity is in the exports
      * @param isDefaultExport A boolean indicating if the imported entity is a default export
      */
-    public createFamixImportClause(importer: SourceFile, moduleSpecifier: string, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean): void {
-        console.info(`createFamixImportClause: Creating import clause:`);
+    public createFamixImportClause(importClauseInfo: {importDeclaration?: ImportDeclaration, importer: SourceFile, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean}): void {
+        const {importDeclaration, importer, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport} = importClauseInfo;
+        logger.debug(`createFamixImportClause: Creating import clause:`);
         const fmxImportClause = new Famix.ImportClause(this.famixRep);
 
         let importedEntity: Famix.NamedEntity;
@@ -181,17 +183,13 @@ export class FamixFunctionsAssociations {
         const fmxImporter = this.getFamixEntityByFullyQualifiedName(importerFullyQualifiedName) as Famix.Module;
         fmxImportClause.setImportingEntity(fmxImporter);
         fmxImportClause.setImportedEntity(importedEntity);
-        fmxImportClause.setModuleSpecifier(moduleSpecifier);
+        fmxImportClause.setModuleSpecifier(importDeclaration?.getModuleSpecifierValue() as string);
 
-        console.info(`createFamixImportClause: ${fmxImportClause.getImportedEntity()?.getName()} (of type ${fmxImportClause.getImportedEntity() instanceof Class ? 'Class' :
-        fmxImportClause.getImportedEntity() instanceof Interface ? 'Interface' :
-        fmxImportClause.getImportedEntity() instanceof Function ? 'Function' :
-        fmxImportClause.getImportedEntity() instanceof Enum ? 'Enum' :
-        fmxImportClause.getImportedEntity() instanceof Alias ? 'Alias' :
-        fmxImportClause.getImportedEntity() instanceof Variable ? 'Variable' :
-            'NamedEntity'}) is imported by ${fmxImportClause.getImportingEntity()?.getName()}`);
+        logger.debug(`createFamixImportClause: ${fmxImportClause.getImportedEntity()?.getName()} (of type ${
+            getSubTypeName(fmxImportClause.getImportedEntity())}) is imported by ${fmxImportClause.getImportingEntity()?.getName()}`);
 
-        this.famixFunctionsIndex.makeFamixIndexFileAnchor(null, fmxImportClause);
+        // make an index file anchor for the import clause
+        this.famixFunctionsIndex.makeFamixIndexFileAnchor(importDeclaration, fmxImportClause);
 
         fmxImporter.addOutgoingImport(fmxImportClause);
     }
@@ -223,3 +221,22 @@ export class FamixFunctionsAssociations {
         return node.getAncestors().find(a => a.getKind() === SyntaxKind.MethodDeclaration || a.getKind() === SyntaxKind.Constructor || a.getKind() === SyntaxKind.FunctionDeclaration || a.getKind() === SyntaxKind.FunctionExpression || a.getKind() === SyntaxKind.ModuleDeclaration || a.getKind() === SyntaxKind.SourceFile || a.getKindName() === "GetAccessor" || a.getKindName() === "SetAccessor" || a.getKind() === SyntaxKind.ClassDeclaration);
     }
 }
+function getSubTypeName(fmxNamedEntity: Famix.NamedEntity) {
+    const name = fmxNamedEntity instanceof Famix.Class ? 'Class' :
+        fmxNamedEntity instanceof Famix.Interface ? 'Interface' :
+            fmxNamedEntity instanceof Famix.Function ? 'Function' :
+                fmxNamedEntity instanceof Famix.Enum ? 'Enum' :
+                    fmxNamedEntity instanceof Famix.EnumValue ? 'EnumValue' :
+                        fmxNamedEntity instanceof Famix.Alias ? 'Alias' :
+                            fmxNamedEntity instanceof Famix.Variable ? 'Variable' :
+                                fmxNamedEntity instanceof Famix.Type ? 'Type' :
+                                    fmxNamedEntity instanceof Famix.Method ? 'Method' :
+                                        fmxNamedEntity instanceof Famix.Decorator ? 'Decorator' :
+                                            fmxNamedEntity instanceof Famix.Accessor ? 'Accessor' :
+                                                fmxNamedEntity instanceof Famix.Parameter ? 'Parameter' :
+                                                    fmxNamedEntity instanceof Famix.Property ? 'Property' :
+                                                        'NamedEntity';
+    logger.debug(`${fmxNamedEntity.getName()} is of type ${name}`);
+    return name;
+}
+

package/src/famix_functions/famix_functions_index.ts

@@ -1,8 +1,9 @@
-import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments } from "ts-morph";
+import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments, ImportDeclaration } from "ts-morph";
 import * as Famix from "../lib/famix/src/model/famix";
 import { FamixRepository } from "../lib/famix/src/famix_repository";
 import { FQNFunctions } from "../fqn";
 import GraphemeSplitter from "grapheme-splitter";
+import { logger, config } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the index file anchors
@@ -25,14 +26,24 @@ export class FamixFunctionsIndex {
      * @param sourceElement A source element
      * @param famixElement The Famix model of the source element
      */
-    public makeFamixIndexFileAnchor(sourceElement: SourceFile | ModuleDeclaration | ClassDeclaration | InterfaceDeclaration | MethodDeclaration | ConstructorDeclaration | MethodSignature | FunctionDeclaration | FunctionExpression | ParameterDeclaration | VariableDeclaration | PropertyDeclaration | PropertySignature | TypeParameterDeclaration | Identifier | Decorator | GetAccessorDeclaration | SetAccessorDeclaration | ImportSpecifier | CommentRange | EnumDeclaration | EnumMember | TypeAliasDeclaration | ExpressionWithTypeArguments, famixElement: Famix.SourcedEntity): void {
+    public makeFamixIndexFileAnchor(sourceElement: ImportDeclaration | SourceFile | ModuleDeclaration | ClassDeclaration | InterfaceDeclaration | MethodDeclaration | ConstructorDeclaration | MethodSignature | FunctionDeclaration | FunctionExpression | ParameterDeclaration | VariableDeclaration | PropertyDeclaration | PropertySignature | TypeParameterDeclaration | Identifier | Decorator | GetAccessorDeclaration | SetAccessorDeclaration | ImportSpecifier | CommentRange | EnumDeclaration | EnumMember | TypeAliasDeclaration | ExpressionWithTypeArguments, famixElement: Famix.SourcedEntity): void {
+        logger.debug("making index file anchor for '" + sourceElement?.getText() + "' with famixElement " + famixElement.getJSON());
         const fmxIndexFileAnchor = new Famix.IndexedFileAnchor(this.famixRep);
         fmxIndexFileAnchor.setElement(famixElement);
 
         if (sourceElement !== null) {
             fmxIndexFileAnchor.setFileName(sourceElement.getSourceFile().getFilePath());
+            let sourceStart, sourceEnd, sourceLineStart, sourceLineEnd: number;
             if (!(sourceElement instanceof CommentRange)) {
-                // sourceElement.getStart() and sourceElement.getEnd() are based on text that has not been split into grapheme clusters, so we need to split the text and then adjust the start and end positions by finding the string inside the split text that has been joined together to form the original text
+                sourceStart = sourceElement.getStart();
+                sourceEnd = sourceElement.getEnd();
+                sourceLineStart = sourceElement.getStartLineNumber();
+                sourceLineEnd = sourceElement.getEndLineNumber();
+            } else {
+                sourceStart = sourceElement.getPos();
+                sourceEnd = sourceElement.getEnd();
+            }
+            if (config.expectGraphemes) {
                 /**
                  * The following logic handles the case of multi-code point characters (e.g. emoji) in the source text.
                  * This is needed because Pharo/Smalltalk treats multi-code point characters as a single character, 
@@ -47,31 +58,36 @@ export class FamixFunctionsIndex {
                 const sourceFileText = sourceElement.getSourceFile().getFullText();
                 const hasGraphemeClusters = splitter.countGraphemes(sourceFileText) > 1;
                 if (hasGraphemeClusters) {
-                    const sourceElementText = sourceFileText.substring(sourceElement.getStart(), sourceElement.getEnd());
+                    const sourceElementText = sourceFileText.substring(sourceStart, sourceEnd);
                     const sourceElementTextGraphemes = splitter.splitGraphemes(sourceElementText);
                     const sourceFileTextGraphemes = splitter.splitGraphemes(sourceFileText);
-                    const start = sourceElement.getStart();
-                    const numberOfGraphemeClustersBeforeStart = splitter.countGraphemes(sourceFileText.substring(0, start));
+                    const numberOfGraphemeClustersBeforeStart = splitter.countGraphemes(sourceFileText.substring(0, sourceStart));
     
                     // find the start of the sourceElementTextGraphemes array in the sourceFileTextGraphemes array
-                    const newStart = indexOfSplitArray({searchArray: sourceFileTextGraphemes, 
+                    sourceStart = indexOfSplitArray({searchArray: sourceFileTextGraphemes, 
                                                         targetArray: sourceElementTextGraphemes, 
-                                                        start: start - numberOfGraphemeClustersBeforeStart});
-                    const newEnd = newStart + sourceElementTextGraphemes.length;
-
-                    // note: the +1 is because the source anchor is 1-based, but ts-morph is 0-based
-                    fmxIndexFileAnchor.setStartPos(newStart + 1);
-                    fmxIndexFileAnchor.setEndPos(newEnd + 1);
-                } else {
-                    // note: the +1 is because the source anchor is 1-based, but ts-morph is 0-based
-                    fmxIndexFileAnchor.setStartPos(sourceElement.getStart() + 1);
-                    fmxIndexFileAnchor.setEndPos(sourceElement.getEnd() + 1);
-                }
+                                                        start: sourceStart - numberOfGraphemeClustersBeforeStart});
+                    sourceEnd = sourceStart + sourceElementTextGraphemes.length;
+                } 
+            }
+            // note: the +1 is because the source anchor is 1-based, but ts-morph is 0-based
+            fmxIndexFileAnchor.setStartPos(sourceStart + 1);
+            fmxIndexFileAnchor.setEndPos(sourceEnd + 1);
+            if (!(sourceElement instanceof CommentRange)) {
+                fmxIndexFileAnchor.setStartLine(sourceLineStart);
+                fmxIndexFileAnchor.setEndLine(sourceLineEnd);    
             }
 
             if (!(famixElement instanceof Famix.Association) && !(famixElement instanceof Famix.Comment) && !(sourceElement instanceof CommentRange) && !(sourceElement instanceof Identifier) && !(sourceElement instanceof ImportSpecifier) && !(sourceElement instanceof ExpressionWithTypeArguments)) {
                 (famixElement as Famix.NamedEntity).setFullyQualifiedName(this.FQNFunctions.getFQN(sourceElement));
             }
+        } else {
+            // sourceElement is null
+            logger.warn("sourceElement is null for famixElement " + famixElement.getJSON());
+            fmxIndexFileAnchor.setFileName("unknown");
+            fmxIndexFileAnchor.setStartPos(0);
+            fmxIndexFileAnchor.setEndPos(0);
+
         }
     }
 }

package/src/famix_functions/famix_functions_types.ts

@@ -3,6 +3,7 @@ import * as Famix from "../lib/famix/src/model/famix";
 import { FamixRepository } from "../lib/famix/src/famix_repository";
 import { FQNFunctions } from "../fqn";
 import { FamixFunctionsIndex } from "./famix_functions_index";
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the types
@@ -34,7 +35,7 @@ export class FamixFunctionsTypes {
         let isPrimitiveType = false;
         let isParameterizedType = false;
 
-        console.info("Creating (or getting) type: '" + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
+        logger.debug("Creating (or getting) type: '" + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
 
         const typeAncestor = this.findTypeAncestor(element);
         const ancestorFullyQualifiedName = this.FQNFunctions.getFQN(typeAncestor);

package/src/generate_uml.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # Gets latest plantuml
 rm -f plantuml.jar
 wget --no-verbose https://downloads.sourceforge.net/project/plantuml/plantuml.jar

package/src/lib/famix/src/famix_repository.ts

@@ -1,11 +1,10 @@
 import { FamixBaseElement } from "./famix_base_element";
-import { Class, Interface, Namespace, Variable, Method, Function as FamixFunctionEntity, Type, NamedEntity, ScriptEntity, Module } from "./model/famix";
+import { Class, Interface, Namespace, Variable, Method, Function as FamixFunctionEntity, Type, NamedEntity, ScriptEntity, Module, SourceLanguage } from "./model/famix";
 
 /**
  * This class is used to store all Famix elements
  */
 export class FamixRepository {
-
   private elements = new Set<FamixBaseElement>(); // All Famix elements
   private famixClasses = new Set<Class>(); // All Famix classes
   private famixInterfaces = new Set<Interface>(); // All Famix interfaces
@@ -16,6 +15,10 @@ export class FamixRepository {
   private famixFiles = new Set<ScriptEntity | Module>(); // All Famix files
   private idCounter = 1; // Id counter
 
+  constructor() {
+    this.addElement(new SourceLanguage(this));  // add the source language entity (TypeScript)
+  }
+
   /**
    * Gets a Famix entity by id
    * @param id An id of a Famix entity
@@ -37,7 +40,13 @@ export class FamixRepository {
     return entity;
   }
 
-  
+  export(arg0: { format: string; }) {
+    if(arg0.format === "json") {
+      return this.getJSON();
+    }
+  }
+
+
   // Only for tests
 
   /**

package/src/lib/famix/src/model/famix/access.ts

@@ -39,9 +39,9 @@ export class Access extends Association {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Access", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Access", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/accessor.ts

@@ -4,9 +4,9 @@ import { Method } from "./method";
 export class Accessor extends Method {
   
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Accessor", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Accessor", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/alias.ts

@@ -28,9 +28,9 @@ export class Alias extends NamedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Alias", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Alias", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/association.ts

@@ -31,9 +31,9 @@ export class Association extends SourcedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Association", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Association", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/behavioral_entity.ts

@@ -3,7 +3,7 @@ import { Type } from "./type";
 import { ContainerEntity } from "./container_entity";
 import { Parameter } from "./parameter";
 import { Invocation } from "./invocation";
-import { TypeParameter } from "./type_parameter";
+import { ParameterType } from "./parameter_type";
 
 export class BehavioralEntity extends ContainerEntity {
 
@@ -74,13 +74,13 @@ export class BehavioralEntity extends ContainerEntity {
     declaredType.addBehavioralEntityWithDeclaredType(this);
   }
 
-  private typeParameters: Set<TypeParameter> = new Set();
+  private typeParameters: Set<ParameterType> = new Set();
 
-  public getTypeParameters(): Set<TypeParameter> {
+  public getParameterTypes(): Set<ParameterType> {
     return this.typeParameters;
   }
 
-  public addTypeParameter(typeParameter: TypeParameter): void {
+  public addParameterType(typeParameter: ParameterType): void {
     if (!this.typeParameters.has(typeParameter)) {
       this.typeParameters.add(typeParameter);
       typeParameter.setParentGeneric(this);
@@ -89,9 +89,9 @@ export class BehavioralEntity extends ContainerEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("BehavioralEntity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("BehavioralEntity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
@@ -102,6 +102,6 @@ export class BehavioralEntity extends ContainerEntity {
     exporter.addProperty("numberOfParameters", this.getNumberOfParameters());
     exporter.addProperty("incomingInvocations", this.getIncomingInvocations());
     exporter.addProperty("declaredType", this.getDeclaredType());
-    exporter.addProperty("typeParameters", this.getTypeParameters());
+    exporter.addProperty("typeParameters", this.getParameterTypes());
   }
 }

package/src/lib/famix/src/model/famix/class.ts

@@ -70,9 +70,9 @@ export class Class extends Type {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Class", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Class", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/comment.ts

@@ -36,9 +36,9 @@ export class Comment extends SourcedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Comment", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Comment", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/container_entity.ts

@@ -143,9 +143,9 @@ export class ContainerEntity extends NamedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ContainerEntity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ContainerEntity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/decorator.ts

@@ -26,9 +26,9 @@ export class Decorator extends NamedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Decorator", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Decorator", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/entity.ts

@@ -4,9 +4,9 @@ import { FamixBaseElement } from "../../famix_base_element";
 export class Entity extends FamixBaseElement {
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Entity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Entity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/enum.ts

@@ -19,9 +19,9 @@ export class Enum extends Type {
   
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Enum", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Enum", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/enum_value.ts

@@ -17,9 +17,9 @@ export class EnumValue extends StructuralEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("EnumValue", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("EnumValue", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/function.ts

@@ -4,9 +4,9 @@ import { BehavioralEntity } from "./behavioral_entity";
 export class Function extends BehavioralEntity {
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Function", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("Function", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/implicit_variable.ts

@@ -4,9 +4,9 @@ import { Variable } from "./variable";
 export class ImplicitVariable extends Variable {
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ImplicitVariable", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ImplicitVariable", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

package/src/lib/famix/src/model/famix/import_clause.ts

@@ -39,9 +39,9 @@ export class ImportClause extends Association {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ImportClause", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ImportClause", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {