ts2famix 1.1.0 → 1.3.0

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

@@ -1,42 +1,40 @@
-export {Access} from "./access";
-export {Accessor} from "./accessor";
-export {Alias} from "./alias";
-export {Association} from "./association";
-export {BehavioralEntity} from "./behavioral_entity";
-export {CSourceLanguage} from "./c_source_language";
-export {Class} from "./class";
-export {Comment} from "./comment";
-export {ContainerEntity} from "./container_entity";
-export {CustomSourceLanguage} from "./custom_source_language";
-export {Decorator} from "./decorator";
-export {Entity} from "./entity";
-export {EnumValue} from "./enum_value";
-export {Enum} from "./enum";
-export {Property} from "./property";
-export {Function} from "./function";
-export {ImplicitVariable} from "./implicit_variable";
-export {ImportClause} from "./import_clause";
-export {IndexedFileAnchor} from "./indexed_file_anchor";
-export {Inheritance} from "./inheritance";
-export {Interface} from "./interface";
-export {Invocation} from "./invocation";
-export {Method} from "./method";
-export {Module} from "./module";
-export {NamedEntity} from "./named_entity";
-export {Namespace} from "./namespace";
-export {TypeParameter} from "./type_parameter";
-export {Parameter} from "./parameter";
-export {ParameterizableClass} from "./parameterizable_class";
-export {ParameterizableInterface} from "./parameterizable_interface";
-export {ParameterizedType} from "./parameterized_type";
-export {PrimitiveType} from "./primitive_type";
-export {Reference} from "./reference";
-export {ScopingEntity} from "./scoping_entity";
-export {ScriptEntity} from "./script_entity";
-export {SourceAnchor} from "./source_anchor";
-export {SourceLanguage} from "./source_language";
-export {SourcedEntity} from "./sourced_entity";
-export {StructuralEntity} from "./structural_entity";
-export {TextAnchor} from "./text_anchor";
-export {Type} from "./type";
-export {Variable} from "./variable";
+export { Access } from "./access";
+export { Accessor } from "./accessor";
+export { Alias } from "./alias";
+export { Association } from "./association";
+export { BehavioralEntity } from "./behavioral_entity";
+export { Class } from "./class";
+export { Comment } from "./comment";
+export { ContainerEntity } from "./container_entity";
+export { Decorator } from "./decorator";
+export { Entity } from "./entity";
+export { EnumValue } from "./enum_value";
+export { Enum } from "./enum";
+export { Property } from "./property";
+export { Function } from "./function";
+export { ImplicitVariable } from "./implicit_variable";
+export { ImportClause } from "./import_clause";
+export { IndexedFileAnchor } from "./indexed_file_anchor";
+export { Inheritance } from "./inheritance";
+export { Interface } from "./interface";
+export { Invocation } from "./invocation";
+export { Method } from "./method";
+export { Module } from "./module";
+export { NamedEntity } from "./named_entity";
+export { Namespace } from "./namespace";
+export { ParameterType } from "./parameter_type";
+export { Parameter } from "./parameter";
+export { ParameterizableClass } from "./parameterizable_class";
+export { ParameterizableInterface } from "./parameterizable_interface";
+export { ParameterizedType } from "./parameterized_type";
+export { PrimitiveType } from "./primitive_type";
+export { Reference } from "./reference";
+export { ScopingEntity } from "./scoping_entity";
+export { ScriptEntity } from "./script_entity";
+export { SourceAnchor } from "./source_anchor";
+export { SourceLanguage } from "./source_language";
+export { SourcedEntity } from "./sourced_entity";
+export { StructuralEntity } from "./structural_entity";
+export { TextAnchor } from "./text_anchor";
+export { Type } from "./type";
+export { Variable } from "./variable";

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

@@ -23,6 +23,26 @@ export class IndexedFileAnchor extends SourceAnchor {
     this.endPos = endPos;
   }
 
+  private endLine: number;
+
+  public getEndLine(): number {
+    return this.endLine;
+  }
+
+  public setEndLine(sourceEndLine: number) {
+    this.endLine = sourceEndLine;
+  }
+
+  private startLine: number;
+
+  public getStartLine(): number {
+    return this.startLine;
+  }
+
+  public setStartLine(sourceStartLine: number) {
+    this.startLine = sourceStartLine;
+  }
+
   private fileName: string;
 
   public getFileName(): string {
@@ -35,15 +55,17 @@ export class IndexedFileAnchor extends SourceAnchor {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("IndexedFileAnchor", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("IndexedFileAnchor", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("startPos", this.getStartPos());
     exporter.addProperty("endPos", this.getEndPos());
+    exporter.addProperty("startLine", this.getStartLine());
+    exporter.addProperty("endLine", this.getEndLine());
     exporter.addProperty("fileName", this.getFileName());
   }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -81,15 +81,15 @@ export class NamedEntity extends SourcedEntity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("NamedEntity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("NamedEntity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("fullyQualifiedName", this.getFullyQualifiedName());
-    exporter.addProperty("receivedInvocations", this.getReceivedInvocations());
+    exporter.addProperty("incomingInvocations", this.getReceivedInvocations());
     exporter.addProperty("incomingImports", this.getIncomingImports());
     exporter.addProperty("name", this.getName());
     exporter.addProperty("aliases", this.getAliases());

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

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

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

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

package/src/lib/famix/src/model/famix/{type_parameter.ts → parameter_type.ts}

@@ -3,27 +3,27 @@ import { Type } from "./type";
 import { ParameterizableClass } from "./parameterizable_class";
 import { ParameterizableInterface } from "./parameterizable_interface";
 import { Method } from "./method";
-import { Function } from "./function";
+import { Function as FamixFunction } from "./function";
 import { Accessor } from "./accessor";
 
-export class TypeParameter extends Type {
+export class ParameterType extends Type {
 
-  private parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | Function;
+  private parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction;
 
-  public getParentGeneric(): ParameterizableClass | ParameterizableInterface | Method | Accessor | Function {
+  public getParentGeneric(): ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction {
     return this.parentGeneric;
   }
 
-  public setParentGeneric(parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | Function): void {
+  public setParentGeneric(parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction): void {
     this.parentGeneric = parentGeneric;
-    parentGeneric.addTypeParameter(this);
+    parentGeneric.addParameterType(this);
   }
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("TypeParameter", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ParameterType", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

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

@@ -1,31 +1,31 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { Class } from "./class";
-import { TypeParameter } from "./type_parameter";
+import { ParameterType } from "./parameter_type";
 
 export class ParameterizableClass extends Class {
 
-  private typeParameters: Set<TypeParameter> = new Set();
+  private parameterTypes: Set<ParameterType> = new Set();
 
-  public getTypeParameters(): Set<TypeParameter> {
-    return this.typeParameters;
+  public getParameterTypes(): Set<ParameterType> {
+    return this.parameterTypes;
   }
 
-  public addTypeParameter(typeParameter: TypeParameter): void {
-    if (!this.typeParameters.has(typeParameter)) {
-      this.typeParameters.add(typeParameter);
-      typeParameter.setParentGeneric(this);
+  public addParameterType(parameterType: ParameterType): void {
+    if (!this.parameterTypes.has(parameterType)) {
+      this.parameterTypes.add(parameterType);
+      parameterType.setParentGeneric(this);
     }
   }
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ParameterizableClass", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ParameterizableClass", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("typeParameters", this.getTypeParameters());
+    exporter.addProperty("parameterTypes", this.getParameterTypes());
   }
 }

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

@@ -1,31 +1,31 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { Interface } from "./interface";
-import { TypeParameter } from "./type_parameter";
+import { ParameterType } from "./parameter_type";
 
 export class ParameterizableInterface extends Interface {
 
-  private typeParameters: Set<TypeParameter> = new Set();
+  private parameterTypes: Set<ParameterType> = new Set();
 
-  public getTypeParameters(): Set<TypeParameter> {
-    return this.typeParameters;
+  public getParameterTypes(): Set<ParameterType> {
+    return this.parameterTypes;
   }
 
-  public addTypeParameter(typeParameter: TypeParameter): void {
-    if (!this.typeParameters.has(typeParameter)) {
-      this.typeParameters.add(typeParameter);
-      typeParameter.setParentGeneric(this);
+  public addParameterType(parameterType: ParameterType): void {
+    if (!this.parameterTypes.has(parameterType)) {
+      this.parameterTypes.add(parameterType);
+      parameterType.setParentGeneric(this);
     }
   }
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ParameterizableInterface", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ParameterizableInterface", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("typeParameters", this.getTypeParameters());
+    exporter.addProperty("parameterTypes", this.getParameterTypes());
   }
 }

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { ContainerEntity } from "./container_entity";
 import { Namespace } from "./namespace";
+import { logger } from "../../../../../analyze";
 
 export class ScopingEntity extends ContainerEntity {
 
@@ -12,19 +13,19 @@ export class ScopingEntity extends ContainerEntity {
 
   public addNamespace(childNamespace: Namespace): void {
     if (!this.childrenNamespaces.has(childNamespace)) {
-      console.info("Adding namespace " + childNamespace.getName() + " to " + this.getName());
+      logger.debug("Adding namespace " + childNamespace.getName() + " to " + this.getName());
       this.childrenNamespaces.add(childNamespace);
       childNamespace.setParentScope(this);
     } else {
-      console.info("Namespace " + childNamespace.getName() + " already added to " + this.getName());
+      logger.debug("Namespace " + childNamespace.getName() + " already added to " + this.getName());
     }
   }
 
   
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("ScopingEntity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("ScopingEntity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

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

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

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

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

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

@@ -6,6 +6,11 @@ export class SourceLanguage extends Entity {
 
   private sourcedEntities: Set<SourcedEntity> = new Set();
 
+  // name of the source language
+  get name(): string {
+    return "TypeScript";
+  }
+
   public getSourcedEntities(): Set<SourcedEntity> {
     return this.sourcedEntities;
   }
@@ -19,13 +24,14 @@ export class SourceLanguage extends Entity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("SourceLanguage", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("SourceLanguage", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
+    exporter.addProperty("name", this.name);
     exporter.addProperty("sourcedEntities", this.getSourcedEntities());
   }
 }

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

@@ -3,6 +3,7 @@ import { SourceLanguage } from "./source_language";
 import { Entity } from "./entity";
 import { Comment } from "./comment";
 import { SourceAnchor } from "./source_anchor";
+import { logger } from "../../../../../analyze";
 
 export class SourcedEntity extends Entity {
 
@@ -39,6 +40,8 @@ export class SourcedEntity extends Entity {
     if (!this.comments.has(comment)) {
       this.comments.add(comment);
       comment.setContainer(this);
+    } else {
+      logger.warn("WARNING: adding comment that is already in comments: " + comment.getJSON() + " to " + this.getJSON());
     }
   }
 
@@ -55,9 +58,9 @@ export class SourcedEntity extends Entity {
 
 
   public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("SourcedEntity", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
+    const json: FamixJSONExporter = new FamixJSONExporter("SourcedEntity", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
   }
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {

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

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

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

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

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

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

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

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