ts2famix 1.4.0 → 2.0.0

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

@@ -1,9 +1,75 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { ScriptEntity } from "./script_entity";
 import { ImportClause } from "./import_clause";
+import { ScopingEntity } from "./scoping_entity";
+import { ScriptEntity } from "./script_entity";
 
 export class Module extends ScriptEntity {
 
+
+    /**
+     * Getter $isAmbient
+     * @return {boolean }
+     */
+	public get $isAmbient(): boolean  {
+		return this.isAmbient;
+	}
+
+    /**
+     * Setter $isAmbient
+     * @param {boolean } value
+     */
+	public set $isAmbient(value: boolean ) {
+		this.isAmbient = value;
+	}
+
+  private isAmbient: boolean = false;
+
+    /**
+     * Getter $isNamespace
+     * @return {boolean }
+     */
+	public get $isNamespace(): boolean  {
+		return this.isNamespace;
+	}
+
+    /**
+     * Setter $isNamespace
+     * @param {boolean } value
+     */
+	public set $isNamespace(value: boolean ) {
+		this.isNamespace = value;
+	}
+  private isNamespace: boolean = false;
+
+    /**
+     * Getter $isModule
+     * @return {boolean }
+     */
+	public get $isModule(): boolean  {
+		return this.isModule;
+	}
+
+    /**
+     * Setter $isModule
+     * @param {boolean } value
+     */
+	public set $isModule(value: boolean ) {
+		this.isModule = value;
+	}
+  
+  private isModule: boolean = true;
+
+  private parentScope: ScopingEntity;
+
+  public getParentScope(): ScopingEntity {
+    return this.parentScope;
+  }
+
+  public setParentScope(parentScope: ScopingEntity): void {
+    this.parentScope = parentScope;
+    parentScope.addModule(this);
+  }
+
   // incomingImports are in NamedEntity
   private outgoingImports: Set<ImportClause> = new Set();
   

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

@@ -88,11 +88,11 @@ export class NamedEntity extends SourcedEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("fullyQualifiedName", this.getFullyQualifiedName());
-    exporter.addProperty("incomingInvocations", this.getReceivedInvocations());
+    // exporter.addProperty("fullyQualifiedName", this.getFullyQualifiedName());
+    // exporter.addProperty("incomingInvocations", this.getReceivedInvocations());
     exporter.addProperty("incomingImports", this.getIncomingImports());
     exporter.addProperty("name", this.getName());
-    exporter.addProperty("aliases", this.getAliases());
+    // exporter.addProperty("aliases", this.getAliases());  /* since these generate Unknown property messages */
     exporter.addProperty("decorators", this.getDecorators());
   }
 }

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

@@ -24,6 +24,6 @@ export class Parameter extends StructuralEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("parentEntity", this.getParentEntity());
+    exporter.addProperty("parentBehaviouralEntity", this.getParentEntity());
   }
 }

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

@@ -0,0 +1,54 @@
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Concretisation } from "./concretisation";
+import { Entity } from "./entity";
+import { ParameterType } from "./parameter_type";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParameterConcretisation extends Entity {
+
+    private genericParameter: ParameterType;
+
+    public getGenericParameter(): ParameterType {
+      return this.genericParameter;
+    }
+  
+    public setGenericParameter(genericEntity: ParameterType): void {
+      this.genericParameter = genericEntity;
+    }
+  
+    private concreteParameter: PrimitiveType;
+  
+    public getConcreteParameter(): PrimitiveType {
+      return this.concreteParameter;
+    }
+  
+    public setConcreteParameter(concreteParameter: PrimitiveType): void {
+      this.concreteParameter = concreteParameter;
+    }
+
+    private concretisations: Set<Concretisation> = new Set();
+
+    public getConcretisations(): Set<Concretisation> {
+      return this.concretisations;
+    }
+
+    public addConcretisation(concretisation: Concretisation): void {
+      if (!this.concretisations.has(concretisation)) {
+        this.concretisations.add(concretisation);
+      }
+    }
+  
+    public getJSON(): string {
+      const json: FamixJSONExporter = new FamixJSONExporter("ParameterConcretisation", this);
+      this.addPropertiesToExporter(json);
+      return json.getJSON();
+    }
+  
+    public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+      super.addPropertiesToExporter(exporter);
+      exporter.addProperty("genericEntity", this.getGenericParameter());
+      exporter.addProperty("concreteEntity", this.getConcreteParameter());
+      exporter.addProperty("concretisations", this.getConcretisations());
+    }
+
+}

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

@@ -1,24 +1,49 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { Type } from "./type";
-import { ParameterizableClass } from "./parameterizable_class";
-import { ParameterizableInterface } from "./parameterizable_interface";
+import { ParametricClass } from "./parametric_class";
+import { ParametricInterface } from "./parametric_interface";
 import { Method } from "./method";
 import { Function as FamixFunction } from "./function";
 import { Accessor } from "./accessor";
+import { ParametricMethod } from "./parametric_method";
+import { ParametricFunction } from "./parametric_function";
+import { ArrowFunction } from "./arrowFunction";
+import { ParametricArrowFunction } from "./parametric_arrow_function";
 
 export class ParameterType extends Type {
 
-  private parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction;
+  private parentGeneric: ParametricClass | ParametricInterface | Method | ParametricMethod | Accessor | FamixFunction | ParametricFunction | ArrowFunction | ParametricArrowFunction;
 
-  public getParentGeneric(): ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction {
+  public getParentGeneric(): ParametricClass | ParametricInterface | Method | ParametricMethod | Accessor | FamixFunction | ParametricFunction | ArrowFunction | ParametricArrowFunction {
     return this.parentGeneric;
   }
 
-  public setParentGeneric(parentGeneric: ParameterizableClass | ParameterizableInterface | Method | Accessor | FamixFunction): void {
+  public setParentGeneric(parentGeneric: ParametricClass | ParametricInterface | Method | ParametricMethod | Accessor | FamixFunction | ParametricFunction | ArrowFunction | ParametricArrowFunction): void {
     this.parentGeneric = parentGeneric;
-    parentGeneric.addParameterType(this);
+    parentGeneric.addGenericParameter(this);
   }
 
+  private baseType: Type;
+
+  public getBaseType(): Type {
+    return this.baseType;
+  }
+
+  public setBaseType(baseType: Type): void {
+    this.baseType = baseType;
+  }
+
+  private arguments: Set<Type> = new Set();
+
+  public getArguments(): Set<Type> {
+    return this.arguments;
+  }
+
+  public addArgument(argument: Type): void {
+    if (!this.arguments.has(argument)) {
+      this.arguments.add(argument);
+    }
+  }
 
   public getJSON(): string {
     const json: FamixJSONExporter = new FamixJSONExporter("ParameterType", this);
@@ -29,5 +54,7 @@ export class ParameterType extends Type {
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("parentGeneric", this.getParentGeneric());
+    exporter.addProperty("baseType", this.getBaseType());
+    exporter.addProperty("arguments", this.getArguments());
   }
 }

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

@@ -0,0 +1,32 @@
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { ArrowFunction } from "./arrowFunction";
+import { Class } from "./class";
+import { Interface } from "./interface";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParametricArrowFunction extends ArrowFunction {
+  
+  private concreteParameters: Set<PrimitiveType | Class | Interface> = new Set();
+
+  public getConcreteParameters(): Set<PrimitiveType | Class | Interface > {
+    return this.concreteParameters;
+  }
+
+  public addConcreteParameter(concreteParameter: PrimitiveType | Class | Interface): void {
+    if (!this.concreteParameters.has(concreteParameter)) {
+      this.concreteParameters.add(concreteParameter);
+    }
+  }
+
+  public getJSON(): string {
+    const json: FamixJSONExporter = new FamixJSONExporter("ParametricArrowFunction", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("genericParameters", this.getGenericParameters());
+    exporter.addProperty("concreteParameters", this.getConcreteParameters());
+  }
+}

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

@@ -0,0 +1,49 @@
+import { Interface } from "./interface";
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Class } from "./class";
+import { ParameterType } from "./parameter_type";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParametricClass extends Class {
+
+  private genericParameters: Set<ParameterType> = new Set();
+
+  public getGenericParameters(): Set<ParameterType> {
+    return this.genericParameters;
+  }
+
+  public addGenericParameter(genericParameter: ParameterType): void {
+    if (!this.genericParameters.has(genericParameter)) {
+      this.genericParameters.add(genericParameter);
+      genericParameter.setParentGeneric(this);
+    }
+  }
+
+  clearGenericParameters(): void {
+    this.genericParameters.clear();
+  }
+
+  private concreteParameters: Set<PrimitiveType | Class | Interface> = new Set();
+
+  public getConcreteParameters(): Set<PrimitiveType | Class | Interface> {
+    return this.concreteParameters;
+  }
+
+  public addConcreteParameter(concreteParameter: PrimitiveType | Class | Interface ): void {
+    if (!this.concreteParameters.has(concreteParameter)) {
+      this.concreteParameters.add(concreteParameter);
+    }
+  }
+
+  public getJSON(): string {
+    const json: FamixJSONExporter = new FamixJSONExporter("ParametricClass", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("genericParameters", this.getGenericParameters());
+    exporter.addProperty("concreteParameters", this.getConcreteParameters());
+  }
+}

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

@@ -0,0 +1,32 @@
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Class } from "./class";
+import { Function } from "./function";
+import { Interface } from "./interface";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParametricFunction extends Function {
+
+  private concreteParameters: Set<PrimitiveType | Class | Interface> = new Set();
+
+  public getConcreteParameters(): Set<PrimitiveType | Class | Interface> {
+    return this.concreteParameters;
+  }
+
+  public addConcreteParameter(concreteParameter: PrimitiveType | Class | Interface): void {
+    if (!this.concreteParameters.has(concreteParameter)) {
+      this.concreteParameters.add(concreteParameter);
+    }
+  }
+
+  public getJSON(): string {
+    const json: FamixJSONExporter = new FamixJSONExporter("ParametricFunction", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("genericParameters", this.getGenericParameters());
+    exporter.addProperty("concreteParameters", this.getConcreteParameters());
+  }
+}

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

@@ -0,0 +1,49 @@
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Class } from "./class";
+import { Interface } from "./interface";
+import { ParameterType } from "./parameter_type";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParametricInterface extends Interface {
+
+  private genericParameters: Set<ParameterType> = new Set();
+
+  public getGenericParameters(): Set<ParameterType> {
+    return this.genericParameters;
+  }
+
+  public addGenericParameter(genericParameter: ParameterType): void {
+    if (!this.genericParameters.has(genericParameter)) {
+      this.genericParameters.add(genericParameter);
+      genericParameter.setParentGeneric(this);
+    }
+  }
+
+  clearGenericParameters(): void {
+    this.genericParameters.clear();
+  }
+
+  private concreteParameters: Set<PrimitiveType | Class | Interface> = new Set();
+
+  public getConcreteParameters(): Set<PrimitiveType | Class | Interface> {
+    return this.concreteParameters;
+  }
+
+  public addConcreteParameter(concreteParameter: PrimitiveType | Class | Interface): void {
+    if (!this.concreteParameters.has(concreteParameter)) {
+      this.concreteParameters.add(concreteParameter);
+    }
+  }
+
+  public getJSON(): string {
+    const json: FamixJSONExporter = new FamixJSONExporter("ParametricInterface", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("genericParameters", this.getGenericParameters());
+    exporter.addProperty("concreteParameters", this.getConcreteParameters());
+  }
+}

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

@@ -0,0 +1,32 @@
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Class } from "./class";
+import { Interface } from "./interface";
+import { Method } from "./method";
+import { PrimitiveType } from "./primitive_type";
+
+export class ParametricMethod extends Method {
+  
+  private concreteParameters: Set<PrimitiveType | Class | Interface> = new Set();
+
+  public getConcreteParameters(): Set<PrimitiveType | Class | Interface> {
+    return this.concreteParameters;
+  }
+
+  public addConcreteParameter(concreteParameter: PrimitiveType | Class | Interface): void {
+    if (!this.concreteParameters.has(concreteParameter)) {
+      this.concreteParameters.add(concreteParameter);
+    }
+  }
+
+  public getJSON(): string {
+    const json: FamixJSONExporter = new FamixJSONExporter("ParametricMethod", this);
+    this.addPropertiesToExporter(json);
+    return json.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("genericParameters", this.getGenericParameters());
+    exporter.addProperty("concreteParameters", this.getConcreteParameters());
+  }
+}

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

@@ -3,9 +3,28 @@ import { Class } from "./class";
 import { Interface } from "./interface";
 import { StructuralEntity } from "./structural_entity";
 
+export type VisibilityTypes = "public" | "private" | "protected" | "";
+
 export class Property extends StructuralEntity {
 
-  private isClassSide: boolean;
+  private isClassSide: boolean = false;
+
+  /**
+   * Getter $readOnly
+   * @return {boolean}
+   */
+  public get readOnly(): boolean {
+    return this._readOnly;
+  }
+
+  /**
+   * Setter $readOnly
+   * @param {boolean} value
+   */
+  public set readOnly(value: boolean) {
+    this._readOnly = value;
+  }
+  private _readOnly: boolean;
 
   public getIsClassSide(): boolean {
     return this.isClassSide;
@@ -26,19 +45,94 @@ export class Property extends StructuralEntity {
     parentEntity.addProperty(this);
   }
 
-  private modifiers: Set<string> = new Set();
 
-  public getModifiers(): Set<string> {
-    return this.modifiers;
+    /**
+     * Getter $isClassSide
+     * @return {boolean }
+     */
+	public get $isClassSide(): boolean  {
+		return this.isClassSide;
+	}
+
+    /**
+     * Setter $isClassSide
+     * @param {boolean } value
+     */
+	public set $isClassSide(value: boolean ) {
+		this.isClassSide = value;
+	}
+
+    /**
+     * Getter isDefinitelyAssigned
+     * @return {boolean}
+     */
+	public get isDefinitelyAssigned(): boolean {
+		return this._isDefinitelyAssigned;
+	}
+
+    /**
+     * Setter isDefinitelyAssigned
+     * @param {boolean} value
+     */
+	public set isDefinitelyAssigned(value: boolean) {
+		this._isDefinitelyAssigned = value;
+	}
+
+    /**
+     * Getter isOptional
+     * @return {boolean}
+     */
+	public get isOptional(): boolean {
+		return this._isOptional;
+	}
+
+    /**
+     * Setter isOptional
+     * @param {boolean} value
+     */
+	public set isOptional(value: boolean) {
+		this._isOptional = value;
+	}
+
+    /**
+     * Getter isJavaScriptPrivate
+     * @return {boolean}
+     */
+	public get isJavaScriptPrivate(): boolean {
+		return this._isJavaScriptPrivate;
+	}
+
+    /**
+     * Setter isJavaScriptPrivate
+     * @param {boolean} value
+     */
+	public set isJavaScriptPrivate(value: boolean) {
+		this._isJavaScriptPrivate = value;
+	}
+  private _isDefinitelyAssigned: boolean;
+
+  private _isOptional: boolean;
+
+  private _isJavaScriptPrivate: boolean;
+
+  /**
+   * Getter visibility
+   * @return {VisibilityTypes }
+   */
+  public get visibility(): VisibilityTypes {
+    return this._visibility;
   }
 
-  public addModifier(modifier: string): void {
-    if (!this.modifiers.has(modifier)) {
-      this.modifiers.add(modifier);
-    }
+  /**
+   * Setter visibility
+   * @param {VisibilityTypes } value
+   */
+  public set visibility(value: VisibilityTypes) {
+    this._visibility = value;
   }
 
-  
+  private _visibility: VisibilityTypes = "";
+
   public getJSON(): string {
     const json: FamixJSONExporter = new FamixJSONExporter("Property", this);
     this.addPropertiesToExporter(json);
@@ -47,8 +141,12 @@ export class Property extends StructuralEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
+    exporter.addProperty("readOnly", this.readOnly);
     exporter.addProperty("isClassSide", this.getIsClassSide());
-    exporter.addProperty("parentEntity", this.getParentEntity());
-    exporter.addProperty("modifiers", this.getModifiers());
+    exporter.addProperty("parentType", this.getParentEntity());
+    exporter.addProperty("visibility", this.visibility);
+    exporter.addProperty("isDefinitelyAssigned", this.isDefinitelyAssigned);
+    exporter.addProperty("isOptional", this.isOptional);
+    exporter.addProperty("isJavaScriptPrivate", this.isJavaScriptPrivate);
   }
 }

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

@@ -1,9 +1,9 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { Type } from "./type";
-import { Association } from "./association";
 import { ContainerEntity } from "./container_entity";
+import { Entity } from "./entity";
 
-export class Reference extends Association {
+export class Reference extends Entity {
 
   private source: ContainerEntity;
 

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

@@ -1,23 +1,24 @@
 import { FamixJSONExporter } from "../../famix_JSON_exporter";
 import { ContainerEntity } from "./container_entity";
-import { Namespace } from "./namespace";
+// import { Namespace } from "./namespace";
 import { logger } from "../../../../../analyze";
+import { Module } from "./module";
 
 export class ScopingEntity extends ContainerEntity {
 
-  private childrenNamespaces: Set<Namespace> = new Set();
+  private childModules: Set<Module> = new Set();
 
-  public getNamespaces(): Set<Namespace> {
-    return this.childrenNamespaces;
+  public getModules(): Set<Module> {
+    return this.childModules;
   }
 
-  public addNamespace(childNamespace: Namespace): void {
-    if (!this.childrenNamespaces.has(childNamespace)) {
-      logger.debug("Adding namespace " + childNamespace.getName() + " to " + this.getName());
-      this.childrenNamespaces.add(childNamespace);
-      childNamespace.setParentScope(this);
+  public addModule(childModule: Module): void {
+    if (!this.childModules.has(childModule)) {
+      logger.debug("Adding module " + childModule.getName() + " to " + this.getName());
+      this.childModules.add(childModule);
+      childModule.setParentScope(this);
     } else {
-      logger.debug("Namespace " + childNamespace.getName() + " already added to " + this.getName());
+      logger.debug("Module " + childModule.getName() + " already added to " + this.getName());
     }
   }
 
@@ -30,6 +31,6 @@ export class ScopingEntity extends ContainerEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("namespaces", this.getNamespaces());
+//    exporter.addProperty("namespaces", this.getModules());
   }
 }

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

@@ -32,7 +32,5 @@ export class ScriptEntity extends ScopingEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("numberOfLinesOfText", this.getNumberOfLinesOfText());
-    exporter.addProperty("numberOfCharacters", this.getNumberOfCharacters());
   }
 }

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

@@ -31,7 +31,6 @@ export class SourceLanguage extends Entity {
 
   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

@@ -41,7 +41,7 @@ export class SourcedEntity extends Entity {
       this.comments.add(comment);
       comment.setContainer(this);
     } else {
-      logger.warn("WARNING: adding comment that is already in comments: " + comment.getJSON() + " to " + this.getJSON());
+      logger.debug("Adding comment that is already in comments: " + comment.getJSON() + " to " + this.getJSON());
     }
   }
 

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

@@ -79,10 +79,11 @@ export class Type extends ContainerEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("container", this.getContainer());
-    exporter.addProperty("typeAliases", this.getTypeAliases());
-    exporter.addProperty("structuresWithDeclaredType", this.getStructuresWithDeclaredType());
-    exporter.addProperty("behavioralEntitiesWithDeclaredType", this.getBehavioralEntitiesWithDeclaredType());
+    exporter.addProperty("typeContainer", this.getContainer());
+    /* unsupported properties in MM so far */
+    // exporter.addProperty("typeAliases", this.getTypeAliases());
+    // exporter.addProperty("structuresWithDeclaredType", this.getStructuresWithDeclaredType());
+    // exporter.addProperty("behavioralEntitiesWithDeclaredType", this.getBehavioralEntitiesWithDeclaredType());
     exporter.addProperty("incomingReferences", this.getIncomingReferences());
   }
 }