ts2famix 1.1.0 → 1.3.0

package/dist/famix_functions/famix_functions.js

@@ -31,6 +31,7 @@ const fqn_1 = require("../fqn");
 const famix_functions_index_1 = require("./famix_functions_index");
 const famix_functions_associations_1 = require("./famix_functions_associations");
 const famix_functions_types_1 = require("./famix_functions_types");
+const analyze_1 = require("../analyze");
 /**
  * This class contains all the functions needed to create Famix entities
  */
@@ -115,7 +116,7 @@ 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}.`);
+            analyze_1.logger.debug(`> NOTE: alias ${aliasName} has fully qualified name ${aliasFullyQualifiedName} and name with generics ${aliasNameWithGenerics}.`);
             const fmxType = this.createOrGetFamixType(aliasNameWithGenerics, a);
             fmxAlias.setAliasedEntity(fmxType);
             this.famixFunctionsIndex.makeFamixIndexFileAnchor(a, fmxAlias);
@@ -195,7 +196,7 @@ class FamixFunctions {
             propTypeName = property.getType().getText().trim();
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
         }
         const fmxType = this.createOrGetFamixType(propTypeName, property);
         fmxProperty.setDeclaredType(fmxType);
@@ -288,7 +289,7 @@ class FamixFunctions {
             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...`);
+            analyze_1.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);
         fmxMethod.setDeclaredType(fmxType);
@@ -327,7 +328,7 @@ class FamixFunctions {
             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...`);
+            analyze_1.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);
         fmxFunction.setDeclaredType(fmxType);
@@ -350,7 +351,7 @@ class FamixFunctions {
             paramTypeName = param.getType().getText().trim();
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
         }
         const fmxType = this.createOrGetFamixType(paramTypeName, param);
         fmxParam.setDeclaredType(fmxType);
@@ -363,11 +364,11 @@ class FamixFunctions {
      * @param tp A type parameter
      * @returns The Famix model of the type parameter
      */
-    createFamixTypeParameter(tp) {
-        const fmxTypeParameter = new Famix.TypeParameter(this.famixRep);
-        fmxTypeParameter.setName(tp.getName());
-        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxTypeParameter);
-        return fmxTypeParameter;
+    createFamixParameterType(tp) {
+        const fmxParameterType = new Famix.ParameterType(this.famixRep);
+        fmxParameterType.setName(tp.getName());
+        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxParameterType);
+        return fmxParameterType;
     }
     /**
      * Creates a Famix variable
@@ -381,7 +382,7 @@ class FamixFunctions {
             variableTypeName = variable.getType().getText().trim();
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
         }
         const fmxType = this.createOrGetFamixType(variableTypeName, variable);
         fmxVariable.setDeclaredType(fmxType);
@@ -412,7 +413,7 @@ class FamixFunctions {
             enumValueTypeName = enumMember.getType().getText().trim();
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
         }
         const fmxType = this.createOrGetFamixType(enumValueTypeName, enumMember);
         fmxEnumValue.setDeclaredType(fmxType);
@@ -446,9 +447,9 @@ class FamixFunctions {
      * @returns The Famix model of the comment
      */
     createFamixComment(comment, fmxScope, isJSDoc) {
+        analyze_1.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);
         return fmxComment;
@@ -489,6 +490,8 @@ 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
@@ -496,13 +499,8 @@ 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
      */
-    createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport) {
-        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
-    createFamixImportClause2(importClause) {
-        this.famixFunctionsAssociations.createFamixImportClause(importClause.importer, importClause.moduleSpecifier, importClause.moduleSpecifierFilePath, importClause.importElement, importClause.isInExports, importClause.isDefaultExport);
+    createFamixImportClause(importClauseInfo) {
+        this.famixFunctionsAssociations.createFamixImportClause(importClauseInfo);
     }
     /**
      * Gets a Famix entity by fully qualified name

package/dist/famix_functions/famix_functions_associations.js

@@ -28,7 +28,7 @@ const ts_morph_1 = require("ts-morph");
 const Famix = __importStar(require("../lib/famix/src/model/famix"));
 const fqn_1 = require("../fqn");
 const famix_functions_index_1 = require("./famix_functions_index");
-const famix_1 = require("../lib/famix/src/model/famix");
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the associations
  */
@@ -90,7 +90,7 @@ 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}`);
+        analyze_1.logger.debug(`createFamixInheritance: classFullyQualifiedName: class fqn = ${classFullyQualifiedName}`);
         let subClass;
         if (cls instanceof ts_morph_1.ClassDeclaration) {
             subClass = this.famixClassMap.get(classFullyQualifiedName);
@@ -137,16 +137,18 @@ 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
      */
-    createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport) {
+    createFamixImportClause(importClauseInfo) {
         var _a, _b;
-        console.info(`createFamixImportClause: Creating import clause:`);
+        const { importDeclaration, importer, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport } = importClauseInfo;
+        analyze_1.logger.debug(`createFamixImportClause: Creating import clause:`);
         const fmxImportClause = new Famix.ImportClause(this.famixRep);
         let importedEntity;
         let importedEntityName;
@@ -184,15 +186,10 @@ class FamixFunctionsAssociations {
         const fmxImporter = this.getFamixEntityByFullyQualifiedName(importerFullyQualifiedName);
         fmxImportClause.setImportingEntity(fmxImporter);
         fmxImportClause.setImportedEntity(importedEntity);
-        fmxImportClause.setModuleSpecifier(moduleSpecifier);
-        console.info(`createFamixImportClause: ${(_a = fmxImportClause.getImportedEntity()) === null || _a === void 0 ? void 0 : _a.getName()} (of type ${fmxImportClause.getImportedEntity() instanceof famix_1.Class ? 'Class' :
-            fmxImportClause.getImportedEntity() instanceof famix_1.Interface ? 'Interface' :
-                fmxImportClause.getImportedEntity() instanceof Function ? 'Function' :
-                    fmxImportClause.getImportedEntity() instanceof famix_1.Enum ? 'Enum' :
-                        fmxImportClause.getImportedEntity() instanceof famix_1.Alias ? 'Alias' :
-                            fmxImportClause.getImportedEntity() instanceof famix_1.Variable ? 'Variable' :
-                                'NamedEntity'}) is imported by ${(_b = fmxImportClause.getImportingEntity()) === null || _b === void 0 ? void 0 : _b.getName()}`);
-        this.famixFunctionsIndex.makeFamixIndexFileAnchor(null, fmxImportClause);
+        fmxImportClause.setModuleSpecifier(importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.getModuleSpecifierValue());
+        analyze_1.logger.debug(`createFamixImportClause: ${(_a = fmxImportClause.getImportedEntity()) === null || _a === void 0 ? void 0 : _a.getName()} (of type ${getSubTypeName(fmxImportClause.getImportedEntity())}) is imported by ${(_b = fmxImportClause.getImportingEntity()) === null || _b === void 0 ? void 0 : _b.getName()}`);
+        // make an index file anchor for the import clause
+        this.famixFunctionsIndex.makeFamixIndexFileAnchor(importDeclaration, fmxImportClause);
         fmxImporter.addOutgoingImport(fmxImportClause);
     }
     /**
@@ -221,3 +218,21 @@ class FamixFunctionsAssociations {
     }
 }
 exports.FamixFunctionsAssociations = FamixFunctionsAssociations;
+function getSubTypeName(fmxNamedEntity) {
+    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';
+    analyze_1.logger.debug(`${fmxNamedEntity.getName()} is of type ${name}`);
+    return name;
+}

package/dist/famix_functions/famix_functions_index.js

@@ -31,6 +31,7 @@ const ts_morph_1 = require("ts-morph");
 const Famix = __importStar(require("../lib/famix/src/model/famix"));
 const fqn_1 = require("../fqn");
 const grapheme_splitter_1 = __importDefault(require("grapheme-splitter"));
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the index file anchors
  */
@@ -49,12 +50,23 @@ class FamixFunctionsIndex {
      * @param famixElement The Famix model of the source element
      */
     makeFamixIndexFileAnchor(sourceElement, famixElement) {
+        analyze_1.logger.debug("making index file anchor for '" + (sourceElement === null || sourceElement === void 0 ? void 0 : 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;
             if (!(sourceElement instanceof ts_morph_1.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 (analyze_1.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,
@@ -69,30 +81,35 @@ 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 ts_morph_1.CommentRange)) {
+                fmxIndexFileAnchor.setStartLine(sourceLineStart);
+                fmxIndexFileAnchor.setEndLine(sourceLineEnd);
+            }
             if (!(famixElement instanceof Famix.Association) && !(famixElement instanceof Famix.Comment) && !(sourceElement instanceof ts_morph_1.CommentRange) && !(sourceElement instanceof ts_morph_1.Identifier) && !(sourceElement instanceof ts_morph_1.ImportSpecifier) && !(sourceElement instanceof ts_morph_1.ExpressionWithTypeArguments)) {
                 famixElement.setFullyQualifiedName(this.FQNFunctions.getFQN(sourceElement));
             }
         }
+        else {
+            // sourceElement is null
+            analyze_1.logger.warn("sourceElement is null for famixElement " + famixElement.getJSON());
+            fmxIndexFileAnchor.setFileName("unknown");
+            fmxIndexFileAnchor.setStartPos(0);
+            fmxIndexFileAnchor.setEndPos(0);
+        }
     }
 }
 exports.FamixFunctionsIndex = FamixFunctionsIndex;

package/dist/famix_functions/famix_functions_types.js

@@ -28,6 +28,7 @@ const ts_morph_1 = require("ts-morph");
 const Famix = __importStar(require("../lib/famix/src/model/famix"));
 const fqn_1 = require("../fqn");
 const famix_functions_index_1 = require("./famix_functions_index");
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the types
  */
@@ -52,7 +53,7 @@ class FamixFunctionsTypes {
         let fmxType;
         let isPrimitiveType = false;
         let isParameterizedType = false;
-        console.info("Creating (or getting) type: '" + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
+        analyze_1.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);
         const ancestor = this.getFamixEntityByFullyQualifiedName(ancestorFullyQualifiedName);

package/dist/lib/famix/src/famix_repository.js

@@ -16,6 +16,7 @@ class FamixRepository {
         this.famixFunctions = new Set(); // All Famix functions
         this.famixFiles = new Set(); // All Famix files
         this.idCounter = 1; // Id counter
+        this.addElement(new famix_1.SourceLanguage(this)); // add the source language entity (TypeScript)
     }
     /**
      * Gets a Famix entity by id
@@ -36,6 +37,11 @@ class FamixRepository {
         const entity = allEntities.find(e => e.getFullyQualifiedName() === fullyQualifiedName);
         return entity;
     }
+    export(arg0) {
+        if (arg0.format === "json") {
+            return this.getJSON();
+        }
+    }
     // Only for tests
     /**
      * Gets all Famix entities

package/dist/lib/famix/src/model/famix/access.js

@@ -25,9 +25,9 @@ class Access extends association_1.Association {
         this.isWrite = isWrite;
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Access", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Access", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/accessor.js

@@ -5,9 +5,9 @@ const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
 const method_1 = require("./method");
 class Accessor extends method_1.Method {
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Accessor", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Accessor", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/alias.js

@@ -19,9 +19,9 @@ class Alias extends named_entity_1.NamedEntity {
         aliasedEntity.addTypeAlias(this);
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Alias", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Alias", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/association.js

@@ -23,9 +23,9 @@ class Association extends sourced_entity_1.SourcedEntity {
         }
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Association", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Association", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/behavioral_entity.js

@@ -53,19 +53,19 @@ class BehavioralEntity extends container_entity_1.ContainerEntity {
         this.declaredType = declaredType;
         declaredType.addBehavioralEntityWithDeclaredType(this);
     }
-    getTypeParameters() {
+    getParameterTypes() {
         return this.typeParameters;
     }
-    addTypeParameter(typeParameter) {
+    addParameterType(typeParameter) {
         if (!this.typeParameters.has(typeParameter)) {
             this.typeParameters.add(typeParameter);
             typeParameter.setParentGeneric(this);
         }
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("BehavioralEntity", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("BehavioralEntity", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
@@ -75,7 +75,7 @@ class BehavioralEntity extends container_entity_1.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());
     }
 }
 exports.BehavioralEntity = BehavioralEntity;

package/dist/lib/famix/src/model/famix/class.js

@@ -54,9 +54,9 @@ class Class extends type_1.Type {
         }
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Class", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Class", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/comment.js

@@ -24,9 +24,9 @@ class Comment extends sourced_entity_1.SourcedEntity {
         this.content = content;
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Comment", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Comment", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/container_entity.js

@@ -103,9 +103,9 @@ class ContainerEntity extends named_entity_1.NamedEntity {
         }
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("ContainerEntity", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("ContainerEntity", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/decorator.js

@@ -18,9 +18,9 @@ class Decorator extends named_entity_1.NamedEntity {
         decoratedEntity.addDecorator(this);
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Decorator", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Decorator", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/entity.js

@@ -5,9 +5,9 @@ const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
 const famix_base_element_1 = require("../../famix_base_element");
 class Entity extends famix_base_element_1.FamixBaseElement {
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Entity", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Entity", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/enum.js

@@ -18,9 +18,9 @@ class Enum extends type_1.Type {
         }
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Enum", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Enum", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/enum_value.js

@@ -12,9 +12,9 @@ class EnumValue extends structural_entity_1.StructuralEntity {
         parentEntity.addValue(this);
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("EnumValue", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("EnumValue", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/function.js

@@ -5,9 +5,9 @@ const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
 const behavioral_entity_1 = require("./behavioral_entity");
 class Function extends behavioral_entity_1.BehavioralEntity {
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("Function", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("Function", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/implicit_variable.js

@@ -5,9 +5,9 @@ const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
 const variable_1 = require("./variable");
 class ImplicitVariable extends variable_1.Variable {
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("ImplicitVariable", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("ImplicitVariable", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/import_clause.js

@@ -25,9 +25,9 @@ class ImportClause extends association_1.Association {
         this.moduleSpecifier = moduleSpecifier;
     }
     getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("ImportClause", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
+        const json = new famix_JSON_exporter_1.FamixJSONExporter("ImportClause", this);
+        this.addPropertiesToExporter(json);
+        return json.getJSON();
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);

package/dist/lib/famix/src/model/famix/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Variable = exports.Type = exports.TextAnchor = exports.StructuralEntity = exports.SourcedEntity = exports.SourceLanguage = exports.SourceAnchor = exports.ScriptEntity = exports.ScopingEntity = exports.Reference = exports.PrimitiveType = exports.ParameterizedType = exports.ParameterizableInterface = exports.ParameterizableClass = exports.Parameter = exports.TypeParameter = exports.Namespace = exports.NamedEntity = exports.Module = exports.Method = exports.Invocation = exports.Interface = exports.Inheritance = exports.IndexedFileAnchor = exports.ImportClause = exports.ImplicitVariable = exports.Function = exports.Property = exports.Enum = exports.EnumValue = exports.Entity = exports.Decorator = exports.CustomSourceLanguage = exports.ContainerEntity = exports.Comment = exports.Class = exports.CSourceLanguage = exports.BehavioralEntity = exports.Association = exports.Alias = exports.Accessor = exports.Access = void 0;
+exports.Variable = exports.Type = exports.TextAnchor = exports.StructuralEntity = exports.SourcedEntity = exports.SourceLanguage = exports.SourceAnchor = exports.ScriptEntity = exports.ScopingEntity = exports.Reference = exports.PrimitiveType = exports.ParameterizedType = exports.ParameterizableInterface = exports.ParameterizableClass = exports.Parameter = exports.ParameterType = exports.Namespace = exports.NamedEntity = exports.Module = exports.Method = exports.Invocation = exports.Interface = exports.Inheritance = exports.IndexedFileAnchor = exports.ImportClause = exports.ImplicitVariable = exports.Function = exports.Property = exports.Enum = exports.EnumValue = exports.Entity = exports.Decorator = exports.ContainerEntity = exports.Comment = exports.Class = exports.BehavioralEntity = exports.Association = exports.Alias = exports.Accessor = exports.Access = void 0;
 var access_1 = require("./access");
 Object.defineProperty(exports, "Access", { enumerable: true, get: function () { return access_1.Access; } });
 var accessor_1 = require("./accessor");
@@ -11,16 +11,12 @@ var association_1 = require("./association");
 Object.defineProperty(exports, "Association", { enumerable: true, get: function () { return association_1.Association; } });
 var behavioral_entity_1 = require("./behavioral_entity");
 Object.defineProperty(exports, "BehavioralEntity", { enumerable: true, get: function () { return behavioral_entity_1.BehavioralEntity; } });
-var c_source_language_1 = require("./c_source_language");
-Object.defineProperty(exports, "CSourceLanguage", { enumerable: true, get: function () { return c_source_language_1.CSourceLanguage; } });
 var class_1 = require("./class");
 Object.defineProperty(exports, "Class", { enumerable: true, get: function () { return class_1.Class; } });
 var comment_1 = require("./comment");
 Object.defineProperty(exports, "Comment", { enumerable: true, get: function () { return comment_1.Comment; } });
 var container_entity_1 = require("./container_entity");
 Object.defineProperty(exports, "ContainerEntity", { enumerable: true, get: function () { return container_entity_1.ContainerEntity; } });
-var custom_source_language_1 = require("./custom_source_language");
-Object.defineProperty(exports, "CustomSourceLanguage", { enumerable: true, get: function () { return custom_source_language_1.CustomSourceLanguage; } });
 var decorator_1 = require("./decorator");
 Object.defineProperty(exports, "Decorator", { enumerable: true, get: function () { return decorator_1.Decorator; } });
 var entity_1 = require("./entity");
@@ -53,8 +49,8 @@ var named_entity_1 = require("./named_entity");
 Object.defineProperty(exports, "NamedEntity", { enumerable: true, get: function () { return named_entity_1.NamedEntity; } });
 var namespace_1 = require("./namespace");
 Object.defineProperty(exports, "Namespace", { enumerable: true, get: function () { return namespace_1.Namespace; } });
-var type_parameter_1 = require("./type_parameter");
-Object.defineProperty(exports, "TypeParameter", { enumerable: true, get: function () { return type_parameter_1.TypeParameter; } });
+var parameter_type_1 = require("./parameter_type");
+Object.defineProperty(exports, "ParameterType", { enumerable: true, get: function () { return parameter_type_1.ParameterType; } });
 var parameter_1 = require("./parameter");
 Object.defineProperty(exports, "Parameter", { enumerable: true, get: function () { return parameter_1.Parameter; } });
 var parameterizable_class_1 = require("./parameterizable_class");