ts2famix 1.1.0 → 1.3.0

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());
-  }
-}