ts2famix 1.0.7 → 1.0.8

package/dist/ts2famix-cli.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -29,17 +30,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const yargs_1 = __importDefault(require("yargs"));
 const analyze_1 = require("./analyze");
-const importer = new analyze_1.Importer();
+const ts_morph_1 = require("ts-morph");
 const argv = yargs_1.default
-    .example(`ts-node src/ts2famix-cli.ts -i "../path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'creates a JSON-format model of a typescript project')
+    .example(`ts2famix -i "path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'Creates a JSON-format Famix model of typescript files.')
+    .example(`ts2famix -i path/to/tsconfig.json -o JSONModels/projectName.json`, 'Creates a JSON-format model of a typescript project.')
     .alias('i', 'input')
     .nargs('i', 1)
     .alias('o', 'output')
     .nargs('o', 1)
     .demandOption('input').demandOption('output').parseSync();
-const paths = new Array();
-paths.push(argv.input);
-const famixRep = importer.famixRepFromPaths(paths);
+const importer = new analyze_1.Importer();
+let famixRep;
+if (argv.input.endsWith('tsconfig.json')) {
+    const tsConfigFilePath = argv.input;
+    const project = new ts_morph_1.Project({
+        tsConfigFilePath
+    });
+    famixRep = importer.famixRepFromProject(project);
+}
+else {
+    const paths = new Array();
+    paths.push(argv.input);
+    famixRep = importer.famixRepFromPaths(paths);
+}
 const jsonOutput = famixRep.getJSON();
 const jsonFilePath = argv.output;
 fs.writeFile(jsonFilePath, jsonOutput, (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Examples of the TypeScript compiler API usage",
   "main": "dist/ts2famix-cli.js",
   "scripts": {

package/src/ts2famix-cli.ts

@@ -1,21 +1,34 @@
+#!/usr/bin/env node
 import * as fs from "fs";
 import yargs from "yargs";
 import { Importer } from './analyze';
-
-const importer = new Importer();
+import { FamixRepository } from "./lib/famix/src/famix_repository";
+import { Project } from "ts-morph";
 
 const argv = yargs
-    .example(`ts-node src/ts2famix-cli.ts -i "../path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'creates a JSON-format model of a typescript project')
+    .example(`ts2famix -i "path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'Creates a JSON-format Famix model of typescript files.')
+    .example(`ts2famix -i path/to/tsconfig.json -o JSONModels/projectName.json`, 'Creates a JSON-format model of a typescript project.')
     .alias('i', 'input')
     .nargs('i', 1)
     .alias('o', 'output')
     .nargs('o', 1)
     .demandOption('input').demandOption('output').parseSync();
 
-const paths = new Array<string>();
-paths.push(argv.input as string);
+const importer = new Importer();
+let famixRep: FamixRepository;
+
+if ((argv.input as string).endsWith('tsconfig.json')) {
+    const tsConfigFilePath = argv.input as string;
+    const project = new Project({
+        tsConfigFilePath
+      }); 
+    famixRep = importer.famixRepFromProject(project);
+} else {
+    const paths = new Array<string>();
+    paths.push(argv.input as string);
+    famixRep = importer.famixRepFromPaths(paths);
+}
 
-const famixRep = importer.famixRepFromPaths(paths);
 const jsonOutput = famixRep.getJSON();
 const jsonFilePath = argv.output as string;