ts2famix 1.1.0 → 1.2.0

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 {

package/src/ts2famix-cli.ts

@@ -4,6 +4,7 @@ import yargs from "yargs";
 import { Importer } from './analyze';
 import { FamixRepository } from "./lib/famix/src/famix_repository";
 import { Project } from "ts-morph";
+import { config } from "./analyze";
 
 const argv = yargs
     .example(`ts2famix -i "path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'Creates a JSON-format Famix model of typescript files.')
@@ -12,7 +13,20 @@ const argv = yargs
     .nargs('i', 1)
     .alias('o', 'output')
     .nargs('o', 1)
-    .demandOption('input').demandOption('output').parseSync();
+    .alias('l', 'loglevel')
+    .nargs('l', 1)
+    .default('l', 3)
+    .describe('l', 'Set minimum logging level 0: silly, 1: trace, 2: debug, 3: info, 4: warn, 5: error, 6: fatal')
+    .boolean('graphemes')
+    .default('graphemes', false)
+    .describe('graphemes', 'Process graphemes (outside of the BMP) to avoid source anchor offset errors (due to performance issues, this is disabled by default)')
+    .demandOption('input')
+    .demandOption('output')
+    .parseSync();
+
+import { logger } from './analyze';
+logger.settings.minLevel = Number(argv.loglevel) as number;
+config.expectGraphemes = argv.graphemes as boolean;
 
 const importer = new Importer();
 let famixRep: FamixRepository;
@@ -29,11 +43,11 @@ if ((argv.input as string).endsWith('tsconfig.json')) {
     famixRep = importer.famixRepFromPaths(paths);
 }
 
-const jsonOutput = famixRep.getJSON();
+const jsonOutput = famixRep.export({format: "json"});
 const jsonFilePath = argv.output as string;
 
 fs.writeFile(jsonFilePath, jsonOutput, (err) => {
     if (err) { throw err; }
 });
 
-console.info(`Created: ${jsonFilePath}`); 
+logger.info(`Created: ${jsonFilePath}`); 

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CSourceLanguage = void 0;
-const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
-const source_language_1 = require("./source_language");
-class CSourceLanguage extends source_language_1.SourceLanguage {
-    getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("CSourceLanguage", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
-    }
-    addPropertiesToExporter(exporter) {
-        super.addPropertiesToExporter(exporter);
-    }
-}
-exports.CSourceLanguage = CSourceLanguage;

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

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomSourceLanguage = void 0;
-const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
-const source_language_1 = require("./source_language");
-class CustomSourceLanguage extends source_language_1.SourceLanguage {
-    getLanguageName() {
-        return this.languageName;
-    }
-    setLanguageName(languageName) {
-        this.languageName = languageName;
-    }
-    getJSON() {
-        const mse = new famix_JSON_exporter_1.FamixJSONExporter("CustomSourceLanguage", this);
-        this.addPropertiesToExporter(mse);
-        return mse.getJSON();
-    }
-    addPropertiesToExporter(exporter) {
-        super.addPropertiesToExporter(exporter);
-        exporter.addProperty("languageName", this.getLanguageName());
-    }
-}
-exports.CustomSourceLanguage = CustomSourceLanguage;

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

@@ -1,15 +0,0 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { SourceLanguage } from "./source_language";
-
-export class CSourceLanguage extends SourceLanguage {
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("CSourceLanguage", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-  }
-}

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

@@ -1,27 +0,0 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { SourceLanguage } from "./source_language";
-
-export class CustomSourceLanguage extends SourceLanguage {
-
-  private languageName: string;
-
-  public getLanguageName(): string {
-    return this.languageName;
-  }
-
-  public setLanguageName(languageName: string): void {
-    this.languageName = languageName;
-  }
-
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("CustomSourceLanguage", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("languageName", this.getLanguageName());
-  }
-}