ts2famix 1.3.1 → 1.4.0

package/dist/famix_functions/helpers_creation.js

@@ -0,0 +1,97 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findTypeAncestor = exports.findAncestor = exports.computeSignature = exports.getSubTypeName = exports.indexOfSplitArray = void 0;
+const Famix = __importStar(require("../lib/famix/src/model/famix"));
+const analyze_1 = require("../analyze");
+const ts_morph_1 = require("ts-morph");
+/**
+ * This function works like indexOf, but it works with arrays of grapheme clusters.
+ * @param targetArray
+ */
+function indexOfSplitArray(params) {
+    const { searchArray, targetArray, start = 0 } = params;
+    for (let i = start; i <= searchArray.length - targetArray.length; i++) {
+        let found = true;
+        for (let j = 0; j < targetArray.length; j++) {
+            if (searchArray[i + j] !== targetArray[j]) {
+                found = false;
+                break;
+            }
+        }
+        if (found) {
+            return i; // Return the index where the target array was found
+        }
+    }
+    return -1; // Return -1 if the target array was not found in the search array
+}
+exports.indexOfSplitArray = indexOfSplitArray;
+function getSubTypeName(fmxNamedEntity) {
+    const name = fmxNamedEntity instanceof Famix.Class ? 'Class' :
+        fmxNamedEntity instanceof Famix.Interface ? 'Interface' :
+            fmxNamedEntity instanceof Famix.Function ? 'Function' :
+                fmxNamedEntity instanceof Famix.Enum ? 'Enum' :
+                    fmxNamedEntity instanceof Famix.EnumValue ? 'EnumValue' :
+                        fmxNamedEntity instanceof Famix.Alias ? 'Alias' :
+                            fmxNamedEntity instanceof Famix.Variable ? 'Variable' :
+                                fmxNamedEntity instanceof Famix.Type ? 'Type' :
+                                    fmxNamedEntity instanceof Famix.Method ? 'Method' :
+                                        fmxNamedEntity instanceof Famix.Decorator ? 'Decorator' :
+                                            fmxNamedEntity instanceof Famix.Accessor ? 'Accessor' :
+                                                fmxNamedEntity instanceof Famix.Parameter ? 'Parameter' :
+                                                    fmxNamedEntity instanceof Famix.Property ? 'Property' :
+                                                        'NamedEntity';
+    analyze_1.logger.debug(`${fmxNamedEntity.getName()} is of type ${name}`);
+    return name;
+}
+exports.getSubTypeName = getSubTypeName;
+/**
+ * Gets the signature of a method or a function
+ * @param text A method or a function source code
+ * @returns The signature of the method or the function
+ */
+function computeSignature(text) {
+    const endSignatureText = text.indexOf("{");
+    return text.substring(0, endSignatureText).trim();
+}
+exports.computeSignature = computeSignature;
+/**
+ * Finds the ancestor of a node
+ * @param node A node
+ * @returns The ancestor of the node
+ */
+function findAncestor(node) {
+    return node.getAncestors().find(a => a.getKind() === ts_morph_1.SyntaxKind.MethodDeclaration || a.getKind() === ts_morph_1.SyntaxKind.Constructor || a.getKind() === ts_morph_1.SyntaxKind.FunctionDeclaration || a.getKind() === ts_morph_1.SyntaxKind.FunctionExpression || a.getKind() === ts_morph_1.SyntaxKind.ModuleDeclaration || a.getKind() === ts_morph_1.SyntaxKind.SourceFile || a.getKindName() === "GetAccessor" || a.getKindName() === "SetAccessor" || a.getKind() === ts_morph_1.SyntaxKind.ClassDeclaration);
+}
+exports.findAncestor = findAncestor;
+/**
+ * Finds the ancestor of a ts-morph element
+ * @param element A ts-morph element
+ * @returns The ancestor of the ts-morph element
+ */
+function findTypeAncestor(element) {
+    return element.getAncestors().find(a => a.getKind() === ts_morph_1.SyntaxKind.MethodDeclaration || a.getKind() === ts_morph_1.SyntaxKind.Constructor || a.getKind() === ts_morph_1.SyntaxKind.MethodSignature || a.getKind() === ts_morph_1.SyntaxKind.FunctionDeclaration || a.getKind() === ts_morph_1.SyntaxKind.FunctionExpression || a.getKind() === ts_morph_1.SyntaxKind.ModuleDeclaration || a.getKind() === ts_morph_1.SyntaxKind.SourceFile || a.getKindName() === "GetAccessor" || a.getKindName() === "SetAccessor" || a.getKind() === ts_morph_1.SyntaxKind.ClassDeclaration || a.getKind() === ts_morph_1.SyntaxKind.InterfaceDeclaration);
+}
+exports.findTypeAncestor = findTypeAncestor;

package/dist/fqn.js

@@ -22,105 +22,116 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FQNFunctions = void 0;
+exports.getNameOfNode = exports.getFQN = void 0;
 const ts = __importStar(require("ts-morph"));
+const analyze_1 = require("./analyze");
+const path_1 = __importDefault(require("path"));
 /**
- * This class is used to get the fully qualified name of a node
+ * Gets the fully qualified name of a node, if it has one
+ * @param node A node
+ * @returns The fully qualified name of the node, or undefined if it doesn't have one
  */
-class FQNFunctions {
-    /**
-     * Gets the fully qualified name of a node, if it has one
-     * @param node A node
-     * @returns The fully qualified name of the node, or undefined if it doesn't have one
-     */
-    getFQN(node) {
-        if (node instanceof ts.SourceFile) {
-            return `"${node.getFilePath()}"`;
-        }
-        const symbol = node.getSymbol();
-        if (!symbol) {
-            return undefined;
-        }
-        const declarations = symbol.getDeclarations();
-        if (!declarations) {
-            return undefined;
-        }
-        const sourceFile = declarations[0].getSourceFile();
-        if (!sourceFile) {
-            return undefined;
-        }
-        const sourceFilePath = sourceFile.getFilePath();
-        const sourceFileDirectory = sourceFilePath.substring(0, sourceFilePath.lastIndexOf("/"));
-        const qualifiedNameParts = [];
-        const nodeName = this.getNameOfNode(node);
-        if (nodeName)
-            qualifiedNameParts.push(nodeName);
-        const ancestors = node.getAncestors();
-        ancestors.forEach(a => {
-            const partName = this.getNameOfNode(a);
-            if (partName)
-                qualifiedNameParts.push(partName);
-        });
-        if (qualifiedNameParts.length > 0) {
-            return `"${sourceFileDirectory}/${qualifiedNameParts.pop()}".${qualifiedNameParts.reverse().join(".")}`;
-        }
-        else {
-            return undefined;
-        }
+function getFQN(node) {
+    const absolutePathProject = analyze_1.entityDictionary.famixRep.getAbsolutePath();
+    if (node instanceof ts.SourceFile) {
+        return analyze_1.entityDictionary.convertToRelativePath(path_1.default.normalize(node.getFilePath()), absolutePathProject).replace(/\\/sg, "/");
+    }
+    const symbol = node.getSymbol();
+    if (!symbol) {
+        return undefined;
+    }
+    const declarations = symbol.getDeclarations();
+    if (!declarations) {
+        return undefined;
+    }
+    const sourceFile = declarations[0].getSourceFile();
+    if (!sourceFile) {
+        return undefined;
+    }
+    const absolutePath = path_1.default.normalize(sourceFile.getFilePath());
+    const positionNodeModules = absolutePath.indexOf('node_modules');
+    let pathInProject = "";
+    if (positionNodeModules !== -1) {
+        const pathFromNodeModules = absolutePath.substring(positionNodeModules);
+        pathInProject = pathFromNodeModules;
+    }
+    else {
+        pathInProject = analyze_1.entityDictionary.convertToRelativePath(absolutePath, absolutePathProject).replace(/\\/g, "/");
     }
-    /**
-     * Gets the name of a node, if it has one
-     * @param a A node
-     * @returns The name of the node, or an empty string if it doesn't have one
-     */
-    getNameOfNode(a) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-        switch (a.getKind()) {
-            case ts.SyntaxKind.SourceFile:
-                return (_a = a.asKind(ts.SyntaxKind.SourceFile)) === null || _a === void 0 ? void 0 : _a.getBaseName();
-            case ts.SyntaxKind.ModuleDeclaration:
-                return (_b = a.asKind(ts.SyntaxKind.ModuleDeclaration)) === null || _b === void 0 ? void 0 : _b.getName();
-            case ts.SyntaxKind.ClassDeclaration:
-                return (_c = a.asKind(ts.SyntaxKind.ClassDeclaration)) === null || _c === void 0 ? void 0 : _c.getName();
-            case ts.SyntaxKind.InterfaceDeclaration:
-                return (_d = a.asKind(ts.SyntaxKind.InterfaceDeclaration)) === null || _d === void 0 ? void 0 : _d.getName();
-            case ts.SyntaxKind.PropertyDeclaration:
-                return (_e = a.asKind(ts.SyntaxKind.PropertyDeclaration)) === null || _e === void 0 ? void 0 : _e.getName();
-            case ts.SyntaxKind.PropertySignature:
-                return (_f = a.asKind(ts.SyntaxKind.PropertySignature)) === null || _f === void 0 ? void 0 : _f.getName();
-            case ts.SyntaxKind.MethodDeclaration:
-                return (_g = a.asKind(ts.SyntaxKind.MethodDeclaration)) === null || _g === void 0 ? void 0 : _g.getName();
-            case ts.SyntaxKind.MethodSignature:
-                return (_h = a.asKind(ts.SyntaxKind.MethodSignature)) === null || _h === void 0 ? void 0 : _h.getName();
-            case ts.SyntaxKind.GetAccessor:
-                return (_j = a.asKind(ts.SyntaxKind.GetAccessor)) === null || _j === void 0 ? void 0 : _j.getName();
-            case ts.SyntaxKind.SetAccessor:
-                return (_k = a.asKind(ts.SyntaxKind.SetAccessor)) === null || _k === void 0 ? void 0 : _k.getName();
-            case ts.SyntaxKind.FunctionDeclaration:
-                return (_l = a.asKind(ts.SyntaxKind.FunctionDeclaration)) === null || _l === void 0 ? void 0 : _l.getName();
-            case ts.SyntaxKind.FunctionExpression:
-                return ((_m = a.asKind(ts.SyntaxKind.FunctionExpression)) === null || _m === void 0 ? void 0 : _m.getName()) ? (_o = a.asKind(ts.SyntaxKind.FunctionExpression)) === null || _o === void 0 ? void 0 : _o.getName() : "anonymous";
-            case ts.SyntaxKind.Parameter:
-                return (_p = a.asKind(ts.SyntaxKind.Parameter)) === null || _p === void 0 ? void 0 : _p.getName();
-            case ts.SyntaxKind.VariableDeclaration:
-                return (_q = a.asKind(ts.SyntaxKind.VariableDeclaration)) === null || _q === void 0 ? void 0 : _q.getName();
-            case ts.SyntaxKind.Decorator:
-                return "@" + ((_r = a.asKind(ts.SyntaxKind.Decorator)) === null || _r === void 0 ? void 0 : _r.getName());
-            case ts.SyntaxKind.TypeParameter:
-                return (_s = a.asKind(ts.SyntaxKind.TypeParameter)) === null || _s === void 0 ? void 0 : _s.getName();
-            case ts.SyntaxKind.EnumDeclaration:
-                return (_t = a.asKind(ts.SyntaxKind.EnumDeclaration)) === null || _t === void 0 ? void 0 : _t.getName();
-            case ts.SyntaxKind.EnumMember:
-                return (_u = a.asKind(ts.SyntaxKind.EnumMember)) === null || _u === void 0 ? void 0 : _u.getName();
-            case ts.SyntaxKind.TypeAliasDeclaration:
-                return (_v = a.asKind(ts.SyntaxKind.TypeAliasDeclaration)) === null || _v === void 0 ? void 0 : _v.getName();
-            case ts.SyntaxKind.Constructor:
-                return "constructor";
-            default:
-                // ancestor hasn't got a useful name
-                return "";
-        }
+    const qualifiedNameParts = [];
+    const nodeName = this.getNameOfNode(node);
+    if (nodeName)
+        qualifiedNameParts.push(nodeName);
+    const ancestors = node.getAncestors();
+    ancestors.forEach(a => {
+        const partName = this.getNameOfNode(a);
+        if (partName)
+            qualifiedNameParts.push(partName);
+    });
+    qualifiedNameParts.pop();
+    if (qualifiedNameParts.length > 0) {
+        return `{${pathInProject}}.${qualifiedNameParts.reverse().join(".")}`;
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getFQN = getFQN;
+/**
+ * Gets the name of a node, if it has one
+ * @param a A node
+ * @returns The name of the node, or an empty string if it doesn't have one
+ */
+function getNameOfNode(a) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    switch (a.getKind()) {
+        case ts.SyntaxKind.SourceFile:
+            return (_a = a.asKind(ts.SyntaxKind.SourceFile)) === null || _a === void 0 ? void 0 : _a.getBaseName();
+        case ts.SyntaxKind.ModuleDeclaration:
+            return (_b = a.asKind(ts.SyntaxKind.ModuleDeclaration)) === null || _b === void 0 ? void 0 : _b.getName();
+        case ts.SyntaxKind.ClassDeclaration:
+            return (_c = a.asKind(ts.SyntaxKind.ClassDeclaration)) === null || _c === void 0 ? void 0 : _c.getName();
+        case ts.SyntaxKind.InterfaceDeclaration:
+            return (_d = a.asKind(ts.SyntaxKind.InterfaceDeclaration)) === null || _d === void 0 ? void 0 : _d.getName();
+        case ts.SyntaxKind.PropertyDeclaration:
+            return (_e = a.asKind(ts.SyntaxKind.PropertyDeclaration)) === null || _e === void 0 ? void 0 : _e.getName();
+        case ts.SyntaxKind.PropertySignature:
+            return (_f = a.asKind(ts.SyntaxKind.PropertySignature)) === null || _f === void 0 ? void 0 : _f.getName();
+        case ts.SyntaxKind.MethodDeclaration:
+            return (_g = a.asKind(ts.SyntaxKind.MethodDeclaration)) === null || _g === void 0 ? void 0 : _g.getName();
+        case ts.SyntaxKind.MethodSignature:
+            return (_h = a.asKind(ts.SyntaxKind.MethodSignature)) === null || _h === void 0 ? void 0 : _h.getName();
+        case ts.SyntaxKind.GetAccessor:
+            return (_j = a.asKind(ts.SyntaxKind.GetAccessor)) === null || _j === void 0 ? void 0 : _j.getName();
+        case ts.SyntaxKind.SetAccessor:
+            return (_k = a.asKind(ts.SyntaxKind.SetAccessor)) === null || _k === void 0 ? void 0 : _k.getName();
+        case ts.SyntaxKind.FunctionDeclaration:
+            return (_l = a.asKind(ts.SyntaxKind.FunctionDeclaration)) === null || _l === void 0 ? void 0 : _l.getName();
+        case ts.SyntaxKind.FunctionExpression:
+            return ((_m = a.asKind(ts.SyntaxKind.FunctionExpression)) === null || _m === void 0 ? void 0 : _m.getName()) ? (_o = a.asKind(ts.SyntaxKind.FunctionExpression)) === null || _o === void 0 ? void 0 : _o.getName() : "anonymous";
+        case ts.SyntaxKind.Parameter:
+            return (_p = a.asKind(ts.SyntaxKind.Parameter)) === null || _p === void 0 ? void 0 : _p.getName();
+        case ts.SyntaxKind.VariableDeclaration:
+            return (_q = a.asKind(ts.SyntaxKind.VariableDeclaration)) === null || _q === void 0 ? void 0 : _q.getName();
+        case ts.SyntaxKind.Decorator:
+            return "@" + ((_r = a.asKind(ts.SyntaxKind.Decorator)) === null || _r === void 0 ? void 0 : _r.getName());
+        case ts.SyntaxKind.TypeParameter:
+            return (_s = a.asKind(ts.SyntaxKind.TypeParameter)) === null || _s === void 0 ? void 0 : _s.getName();
+        case ts.SyntaxKind.EnumDeclaration:
+            return (_t = a.asKind(ts.SyntaxKind.EnumDeclaration)) === null || _t === void 0 ? void 0 : _t.getName();
+        case ts.SyntaxKind.EnumMember:
+            return (_u = a.asKind(ts.SyntaxKind.EnumMember)) === null || _u === void 0 ? void 0 : _u.getName();
+        case ts.SyntaxKind.TypeAliasDeclaration:
+            return (_v = a.asKind(ts.SyntaxKind.TypeAliasDeclaration)) === null || _v === void 0 ? void 0 : _v.getName();
+        case ts.SyntaxKind.Constructor:
+            return "constructor";
+        default:
+            // ancestor hasn't got a useful name
+            return "";
     }
 }
-exports.FQNFunctions = FQNFunctions;
+exports.getNameOfNode = getNameOfNode;

package/dist/lib/famix/src/famix_base_element.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FamixBaseElement = void 0;
+const analyze_1 = require("../../../analyze");
+// import { FamixRepository } from "./famix_repository";
 class FamixBaseElement {
-    constructor(repo) {
-        repo.addElement(this);
+    // constructor(repo: FamixRepository) {
+    //   repo.addElement(this);
+    // }
+    constructor() {
     }
-    // @ts-ignore
-    // tslint:disable-next-line:no-empty
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     addPropertiesToExporter(exporter) {
+        analyze_1.logger.debug("addPropertiesToExporter not implemented for " + this.constructor.name + `(${exporter})`);
     }
 }
 exports.FamixBaseElement = FamixBaseElement;

package/dist/lib/famix/src/famix_repository.js

@@ -16,7 +16,21 @@ class FamixRepository {
         this.famixFunctions = new Set(); // All Famix functions
         this.famixFiles = new Set(); // All Famix files
         this.idCounter = 1; // Id counter
-        this.addElement(new famix_1.SourceLanguage(this)); // add the source language entity (TypeScript)
+        this.absolutePath = "";
+        this.fmxElementObjectMap = new Map();
+        this.addElement(new famix_1.SourceLanguage()); // add the source language entity (TypeScript)
+    }
+    setFmxElementObjectMap(fmxElementObjectMap) {
+        this.fmxElementObjectMap = fmxElementObjectMap;
+    }
+    getFmxElementObjectMap() {
+        return this.fmxElementObjectMap;
+    }
+    getAbsolutePath() {
+        return this.absolutePath;
+    }
+    setAbsolutePath(path) {
+        this.absolutePath = path;
     }
     /**
      * Gets a Famix entity by id
@@ -41,6 +55,9 @@ class FamixRepository {
         if (arg0.format === "json") {
             return this.getJSON();
         }
+        else {
+            throw new Error("Unsupported format");
+        }
     }
     // Only for tests
     /**
@@ -63,48 +80,48 @@ class FamixRepository {
      * @param name A class name
      * @returns The Famix class corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixClass(name) {
-        return Array.from(this.famixClasses.values()).find(ns => ns.getName() === name);
+    _getFamixClass(fullyQualifiedName) {
+        return Array.from(this.famixClasses.values()).find(ns => ns.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets a Famix interface by name
      * @param name An interface name
      * @returns The Famix interface corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixInterface(name) {
-        return Array.from(this.famixInterfaces.values()).find(ns => ns.getName() === name);
+    _getFamixInterface(fullyQualifiedName) {
+        return Array.from(this.famixInterfaces.values()).find(ns => ns.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets a Famix method by name
      * @param name A method name
      * @returns The Famix method corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixMethod(name) {
-        return Array.from(this.famixMethods.values()).find(ns => ns.getName() === name);
+    _getFamixMethod(fullyQualifiedName) {
+        return Array.from(this.famixMethods.values()).find(ns => ns.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets a Famix function by name
      * @param name A function name
      * @returns The Famix function corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixFunction(name) {
-        return Array.from(this.famixFunctions.values()).find(ns => ns.getName() === name);
+    _getFamixFunction(fullyQualifiedName) {
+        return Array.from(this.famixFunctions.values()).find(ns => ns.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets a Famix variable by name
      * @param name A variable name
      * @returns The Famix variable corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixVariable(name) {
-        return Array.from(this.famixVariables.values()).find(v => v.getName() === name);
+    _getFamixVariable(fullyQualifiedName) {
+        return Array.from(this.famixVariables.values()).find(v => v.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets a Famix namespace by name
      * @param name A namespace name
      * @returns The Famix namespace corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixNamespace(name) {
-        return Array.from(this.famixNamespaces.values()).find(ns => ns.getName() === name);
+    _getFamixNamespace(fullyQualifiedName) {
+        return Array.from(this.famixNamespaces.values()).find(ns => ns.getFullyQualifiedName() === fullyQualifiedName);
     }
     /**
      * Gets all Famix namespaces
@@ -118,8 +135,8 @@ class FamixRepository {
      * @param name A file name
      * @returns The Famix file corresponding to the name or undefined if it doesn't exist
      */
-    _getFamixFile(name) {
-        return Array.from(this.famixFiles.values()).find(ns => ns.getName() === name);
+    _getFamixFile(fullyQualifiedName) {
+        return Array.from(this.famixFiles.values()).find(ns => ns.getName() === fullyQualifiedName);
     }
     /**
      * Gets all Famix files

package/dist/lib/ts-complex/cyclomatic-service.js

@@ -17,10 +17,9 @@ exports.calculate = void 0;
 const typescript_1 = require("typescript");
 const tsutils_1 = require("tsutils");
 const fs_1 = require("fs");
-const { isIdentifier } = require('typescript');
 const getNodeName = (node) => {
     const { name, pos, end } = node;
-    const key = name !== undefined && isIdentifier(name) ? name.text : JSON.stringify({ pos, end });
+    const key = name !== undefined && (0, typescript_1.isIdentifier)(name) ? name.text : JSON.stringify({ pos, end });
     return key;
 };
 const increasesComplexity = (node) => {
@@ -77,7 +76,7 @@ const calculate = (filePath) => {
         throw new Error(`File "${filePath}" does not exists`);
     }
     const sourceText = (0, fs_1.readFileSync)(filePath).toString();
-    const source = (0, typescript_1.createSourceFile)(filePath, sourceText, isIdentifier.ES2015);
+    const source = (0, typescript_1.createSourceFile)(filePath, sourceText, typescript_1.ScriptTarget.ES2015);
     return calculateFromSource(source);
 };
 exports.calculate = calculate;

package/doc-uml/metamodel-full.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="206px" preserveAspectRatio="none" style="width:303px;height:206px;background:#FFFFFF;" version="1.1" viewBox="0 0 303 206" width="303px" zoomAndPan="magnify"><defs/><g><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="261" x="5" y="19">Dot Executable: /opt/local/bin/dot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="237" x="5" y="35.2969">Dot executable does not exist</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="291" x="5" y="51.5938">Cannot find Graphviz. You should try</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="67.8906">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="79" x="5" y="84.1875">@startuml</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="57" x="5" y="100.4844">testdot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="72" x="5" y="116.7813">@enduml</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="133.0781">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="17" x="10" y="149.375">or</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="165.6719">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="227" x="5" y="181.9688">java -jar plantuml.jar -testdot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="198.2656">&#160;</text><!--SRC=[xHpBSjmsykwlu96koAuzRZ5RIicIx9eaihGUnJviRRau78p4DOUS9KYj5Dl_ldWsq423CtOYUX_nGHwYdsW0_G10Lat9UNRU3lNmaB7xWRLhdhqij_NzYvApyuPjMJja7vzaujztDspuSNdvEdzQP7pew_P6DvVhzLNVxLW_r8nVT-VtkwuVM9ypywFG32MfXGaETrszVlBvIQKKM7PZNx6Vo_PcB6yOA6BqqkAVSOMqLer2Kf4jsV2NfTVuSAmLQiijmoeApPUOMdOYHIywX9fpN_93aI6WxSeZM-YqswgXiAP1EbWBrVp7vLbN5TcgwnfMjg3KGWEaNWZ47IYazVlrhEhQeQnRgIaI309EBOAoQup2VPGKjqYaw70qZgUwFJGnTv20SgO1qZqvQQlRhazCOAQNKyg6PhMbBMWHQ3wpzdCTk8nm7Yw7SKLDGzbEpq852GZHXE2UWGjaxc2DwqPdHX-91qXffi5aLAlF-1op5e-zEQd1rgbW165qqv0RFeLTpaZ8cWaBzsoDdM4HE4SGUaQYksvZ0fuaE4piJBFhXFEkgikXxjffLzSAQE6ZWsQl1KHg5i6uWKMaQ1HsFRkhkv7JpAyCD2K0u2IRcOpuMiG_lYih5qYNLRSJ4h09TsBKsq62v6Zx6Awx3aLDh1Y9OwGqpxdS4-gfxJ_47co1whPkra9XC9XPuF3ibhX3iOiyH1BAGrEkECDZuOPaDZFqzMu8h43EWdRShbX_kVbPc8TVRgxLuj2DhlCnZjJPn-8qrWHtjEeitkbjsPULw11FAk5G9dJmaDAiPngBYsuzDlvQz8R6348t3ZUTaBdOIXPc5kg7qwOSkJSHBp6gdOq4ib0T8-UrXrHaFibCfl15Wa5ydsyJ28K7SxKmDdI918PBJNqC7cDeZb99ZOXcdm52WYzNQvYTBH2Eb1XXyGXhWZ5IOAjqMkvOLMzggMIGz5vWE97yXXW9ZdE5yQOkEGomrsiSUwRiVULXfAoDS98iaQLBgPaRaEk7dPjL9pvCodHG7a89FZFPLgHnNLyENfL1s7TjaGINdd4krbOqgSvY769YKLWJtCECLk9DBwmpZ9GQwn1jYlUCULPO2979wcPiceU_ZcBEYBMeqe9eC5v6ACHO44XfrcWaUbQn-ewj5-rTLobNQuCCDBWGyoP6XZ0JeWipnkXvB4w46_YDVMyhYgB3Gjy2eqw7FeoSbwt-aGvxpyXjeyH8gEOsPMtj74nVbDyu3fmCAEz3XTRgKJkNGdjHQa5rlU4DY_CuNjKW8aGIOg39BUN2EPQPbe_mtiA00k0Mpz2FrJ3sPJCLBLwmsrBKLe2L31aqudJS26dcieMcVzXhYfgVIe9blMRK_We0wKqM1wRuu3eOcKKXPv_48XRARqGTapHw0dFQwX5Hc1sf9CPCUctwOpyvqc0xuH6261oBa5j6CsT3Y_QMzVLGjjLaqij78KLHJDbx2LZJrlRm9XdZFRPnTO02guF4hwpmrI6Y7zNyHXuONsPhu5k0kvuyTYKUUti-5iDEi037wIZcjVbHm9B6KvaDjztQYBfG3zv4ra0h1O7bD5RFkMOXwXZrVp1yGg8tso36GyindaS-hWln8ROy3mcmyr1KuS_oS4uThDBg2nHQONLMXoZpc5M-6WwOOc4SeKFPDtMh7-fs7UKxFub68jzHpJu1pk7uoKeqbzL0nIGBeqCIG0acWP2P8b_Dh_hwJfGMb1W3eeLOOCmX532kcfeyfzEG17iDYyWZxRk1LQ8oelKtm5GFB9ZYCzTPf_fBEUjP9jeV4U6FYF2xrZVrh-MgONXMwoSN53IcdEjsrlbjntvSy51X-X78iWT-Suwa51a2VXkJn9cPQ_b_CytBiQtGiMSYWtZCNTjAh37kRIoQdERZRDD2-NeoIrTvpIlMYgbJMKydCXjoZNrApxDFhfEVj5xMxa7cPKIfauN74iP3OO_VovacSpHtznp4rXmw7OTrRoZYg6w1CGSSSkgRjXp6dhWNPY54rkjW4NsuLw878dHGX7EA7HFXb9n3yfmHUM1wvObE79XYqOa3KmyfpPhUk3raItaH8qzjASVeUImkkQLiRxHePuwEUCuyK7J2Wu0n4oHZ40rNgM7_tU8Ial9jufApyTJULLMswtejAXvZYj01U7Ub0DDQ8e4hhqrPt1puJ-_GsdEEdZvgCYSLVUgC2U0a6-nGX2KaF71epgqekAhSAGmE60b6ytclHvmxRzY6YOYsPzjJdPXDM5B19osfCHACyB8jUy4oS0hNgZ5o1wRP9vd9Rc_BlfOH_S23aQ33QLDUKUXJbgK93fCwsyLed57ilNJmdsyjk9U6SM138Y3rV6kApbrCfIYbfvMKeUOLqRX7yOUgwRPYULUdtNRNi7j54UGbfmGIaPcGQ5C2oFneEOYWOUxk9l8ZXpAH7tb8QTP80tkd2voW6JruZkzqELGxO26oTwSBG7aagN2UbpIAkOrtsiajqEcxVX9d_rq_XJN1dJJCGOdZPOmybJZ6w7aiBfaubgfgWeDxzUITt1ie7DtxS7bshvvppQGm9HYvhhsz39mgeWmH9uOg7rGC4XcfPMvBFIC0bN-Xmm1SApEDBLImxLeD-rHa117IxCw4CwEHZMvE3Ti2QWGeGhPjoIsp0gBaJ846xKsaBXIxDrjIKGMzAPEA9EIxCfDvZL3kPEBMoRM39swU04OElAWRADna8eo_guVRCrGagVUfWap5syjDKiAxM3IjtDkrj14fJq6AA6b2_LZXAg9EzITToBpOos5_WHD28WwhFGXxoY5RD1yGWnOHwaGCYf3pI58Y1ZtcdVSmIPv81Qsw9vCUVn5WfJm_niinSp8IpB15yUWRnLD5NMds7zD-qEvGJhb1m4co8-DClFIZIAD6aaJY7bAQON3a-gwlwUDY1Q1tBZKef9rf1Cz5NaPkjD-LpMYNWqHwAv_zI2t1TXs422fEYyTSSIaoWC_OAoNl2syKIhhapGi7dBvi8V7cUusYgQjwYFO9eE7ZusyBhjazMx-ic_2TL_GYhDtZ6Sf-kEhY6cnf04I90Q2G6Aqz8PBYUwwQ2Qu6WCb2ZhA2eLZATfgdWkWDg7DC7sHFeYiazwM5f2pXILY6N92CZHWI-egv0L0Nooqe99x_N5Y7Cz8thKJwIWJC5wOv2fO0m8IuvEjlHk_LNboEdLWWNP9PS6wPp1g4h_fwAzBEEvQorsFMGaBS_zYo_-zQDZMSzIvPsLUtxYZA3ZvNxITzNpvOkN_xkmRf7MqIf8p-0vZF1LOPuyvgLU6NFTn5s4WDtx2TqLNywdWzTFs3iUdsNbMG5wN047_CpUmZZVtSgq0bgZhMJg3Q8s_zH9s7Epvm3fxWvP-Ja_m0mV64ztSJF8ENWIM9d1m9RFD6g1Nlln7gwELAJj2hHGxA8pz0T4bxLCFubzS_lRvyz_hzsvEVVpd74rB8D5-Ok5pzWrK32DSSjNv7sVNoekjtjnh7SuZRyWDJc2erS8c13OlsenKH_L6cfX4W6ACalsrHzQmSs6N_IYn0jVCaHEKR-y42-NIKrLpRsC-hzzgUPkzUwjxQbqTr5MRt3uCPu7DH8FDEZmuEwe6YLm1Q0pM_ywgnT-WfylqBXEODSprNBgLmDx0eAOSldSWA4_SXFKdoLejfXUDBa6uX4M_o7YJcAkf6lLNKzHYWaK6OQ7db2a-CkYG1Hrarzkg8vxJ8nlP3s_tBcsts2eyPP4CUzG2sLZVYHm6NmR1ys6A5joudPUFBHlvGu6icthq2Qim1cEQZxohiz0m_Z9bBr3o64vky53CBY_Z8Kap4-d7hrsOK1rVR1TIwZ9KiBfYCX9g5_ese5IAzjAPViZlAeZTOmyKDipDO88I1lNM3MxzmCaFVGC_8FAblsRmfsnlfoxVtvlCVpY-kRUmWFZ9bt9VcGHiIhiBuATPH1fz1-ethdLvipvy_p_wSRJk18dz-clRUNnEHuq2XjmzRTN2sM8k-gRVLXDdMv2ShF5Bll2icttwXYGxrFb_ZAm_fYhl4JSOy_uKMpBkzFVLUDTjF8ffTR-JMkXfZM_Gb5VHU84QVr5Yqcwx8FcQwpPFpWtthE519jPt_SomRNzdlC_Un2fVJV9y5dtIGZLVbS6iNX2M3F4gp1tmf42Q5GEQBLjSL79QZR3rZct9i1Wto89-nERhsJZYRw-uDQqevrQKcURdYNJCEIAsZp6yLJagcVLwTP39Gk0QDwuZWqsd-cQRtWKARD4Eo13Sb_Ce0fJjmv1oa-YZZepy7f94kKkzjQF3RgJDFZNBeGQt1he4PfB14uL2lJxjHPt9U2VoC6XceD7vBrY-hu9X3_jLSmygPOlxqInIKbQxNUQAAH-2TPw185vqTI7al7XRh7FcoS4xIL5_w1GUQgzuYaDjEVvB-PjFrst9mVk1pqCVtwhC3JNWPY5v58RPrY_bmQ_RGGBazJBpQPRAFNdK2PAuicIGDoWqWDmN19At62GYzF7pVgE2b6l21J7QI3qvWWTXLd9FKGSKPaoS_LUQwM-zJaVGr11VtZbhQENttNbTeIfqJBh1VzjtMLhVYRo0xUfVVqEj3c4CvUBxWVTtMqeD88g4dQ-GN0LZZTrVu5RsaZsmzvVPxe-zlXfD_pxOV_WeMwxrNq7LGDD4Hxwr9PQLhuietSRTZzpInwoROoSGBbZkmBrkyaU9BC7TevKPcYx9iUwiMJ_v09bPMoyl3RX6qdv-KvbNCp0l_nAU7dQlLpnyjtUVi4L_92X6Y3xcIxldPQjniM6_sLuNHTQlP1M6R-ZwbwKEERI-tIlowVd9o_Hi0]--></g></svg>

package/doc-uml/metamodel.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="206px" preserveAspectRatio="none" style="width:303px;height:206px;background:#FFFFFF;" version="1.1" viewBox="0 0 303 206" width="303px" zoomAndPan="magnify"><defs/><g><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="261" x="5" y="19">Dot Executable: /opt/local/bin/dot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="237" x="5" y="35.2969">Dot executable does not exist</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="291" x="5" y="51.5938">Cannot find Graphviz. You should try</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="67.8906">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="79" x="5" y="84.1875">@startuml</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="57" x="5" y="100.4844">testdot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="72" x="5" y="116.7813">@enduml</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="133.0781">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="17" x="10" y="149.375">or</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="165.6719">&#160;</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="227" x="5" y="181.9688">java -jar plantuml.jar -testdot</text><text fill="#33FF02" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="5" x="5" y="198.2656">&#160;</text><!--SRC=[xHpBSjouyUwlO6vqhUpACSLDQKkMPDVihYp5exKFgPIBmy58Z3daX20LARR_FNWsq423C_Qkw3pM1tc8Vg81z0C0-OUwhPfnpJB-eMxvS_FqV3TkcoTLKtAUdRT3FJnax7vWxPfdByjjVV-YvEoyOLlM3jd79vduzzqD6tvSNhxEdnOP7_gwlT7DvNfzrNSxrWyruzVT-VskwmVMvypyA3H3IMfXWiDTLw-VV3OABBknhzZFPNipbZSC535wQV7Fk49QgqOXgSYMRFZpqcjyEDOAjUMMOHM5vajCBJkHeXSTGisvB_cXo13GTkMHBNJQRTLGMDCW7Qo5QlxZygohYcpLTGqhMr1geG5IBmJY3XJI-lrwLdNjKDQjr1G91W6d5a7PDKRXFagAMoHIT3WQnrFT7fgOEqX0ETC0wPwSjDLjroScCDFBAML3izhI5hG8D9zP-xaEN4Ou3vV3kAAceModPw6218HeGd3Fm0KoTx36TQCpeu_40wGqqs0ogjLdV8vPYyVUdDHWwrGmWZ2wQSWDdy8kPoHapOI5UxR6ph08d2C8FIFHNRSn0KyI72PsfjbrmdbNrULGT-sqgsi5jF3HGRFN0Y8rYs3Sm29ID0gxdjtLtSXfvbS6cX80S9BDJ4PyBU8VtvML2wJBgji92TY4Ep7gxI11ShHz3DTTXw8cLep4CLAQvrpk2VNKzXzY3xP0TLitQw4m6CmiS7XsIzoXs4KU8WdbeIbNdE6nS4CocndwUZS4LY1dGJjkLwo_tFmipCClDzTgSUX6r_aOH-hiOt4QQu8xMdKMx_IsxCjAT8WdbN0e4pfuI6dMCut5HRSU6tyjUaDZ1g4RXvjEo5ni9Gip2_N3QLEEt9k8bnZLpaO2MQYEaVFQGoeodsGcK_WYmI2-pxS9XCA3kLeO6xf40iEbfZu6Zp4qHwcaHaIppm0XmPUhDSpE5WX7IeomU8GrmHWfi5KwBNUigZUrL398UYymd4X-Gum4nxd2U5EN70ROwpMEFLFsll8mKjP6E4cMoDAbrCmDoFN3pisg4nycPJee3w44dvbiAzAuhYy7hyeWxBksI89BppWNQokQL6Sn3Z6nAAm9xc56A_6c5zOPHagDTOWsnNl6F2iiXCXaTJCspSDVHZ5dn5fKQK4q62yZ568i2AGqQpGIFQjOVSVMY_QkgvIhjK466bo8UHCZGvW9qOKPO_Gy5YV23Vp6lhSLHT5XeM-1KQT37qREorR_I8UzP-IsKM8aL7ERihPs3gOlocyS1qu6bFUXGclrg9rBeRqejQ2wtl26nNaShseG4I89CT3abdBX7CjCoqTuRs500N2BP-Z7QXZxifcA5Y_ORIbgAy1AXWmQSJfkX3HpsKBJF-mrHSrF9S6oNZDgVmM0z2QB0rDyS1sCpAAGiqzY4GlbDwAEIHezWJbjzOWep8vK4cCclJRziPySQR2Ty0X138v5o2sZcREXHNlB-deesseowUMZaA8efkoz1AnfQtjuaupn7jkuEa21rK7YLrRuwX3HZsf-8m-CBxCry2t0NKyUknAFlJqVYs4dM83ZT1JpslmeO4dZgSo6ssvjH5se1syYQw2LWi1o6gldNBCGTOpwFnW-8T6RRH3ZeUKOpoCVruNu45kUXmJOUIYgy6TvEASELcdr1Ggji3ghGvHvp2fV3GTCiJ2EqA7icxhL3tMxZlATdqGZaU-ePfy0vt3yP2MQosgWOfA5qI49e0IJGCXCaQ_cLtrz9qeBIem1qK8iCEOG2XXNJKsUqsb8Whs6HUIHzjt0Ab4PqVeROAe75apncUkiK_sbdFKi4-ttYF1xHFXDwvlwN-MgONXMwoSN53IcdEjsrlbjntvSy51X-X78iWT-Suwa51a2VXkJn9cPQ_b_CytBiQtGiMSYWtZCNTjAh37kRIoQdERZRDD2-NeoIrTvpIlMYgbJMKydCXjoZNrApxDFhfEVj5xMxa7cPKIfauN74iP3OO_VovacSpHtznp4rXmw7OTrRoZYg6w1CGSSSkgRjXp6dhWNPY54rkjW4NsuLw878dHGX7EA7HFXb9n3yfmHUM1wvObE79XYqOa3KmyfpPhUk3raItaH8qzjASVeUImkkQLiRxHePuwEUCuyK7J2Wu0n4oHZ40rNgM7_pU8Ial9jufApyTJULLMswtejAXvZYj01U7Ub0DDQ8e4hhqrPt1puJ-_GsdEEdZvgCYSLVUgC2U0a6-nGX2KaF71epgqekAhSAGmE60b6ytclHvmxRzY6YOYsPzjJdPXDM5B19osfCHACyB8jUy4oS0hNgZ5o1wRP9vd9Rc_BlfOH_S23aQ33QLDUKUXJbgK93fCwsyLed57ilNJmdsyjk9U6SM138Y3rV6kApbrCfIYbfvMKeUOLqRX7yOUgwRPYULUdtNRNi7j54UGbfmGIaPcGQ5C2oFneEOYWOUxk9l8ZXpAH7tb8QTP80tkd2voW6JruZkzqELGxO26oTwSBG7aagN2UbpIAkOrtsiajqEcxVX9d_rq_XJN1dJJCGOdZPOmybJZ6w7aiBfaubgfgWeDxzUITt1ie7DtxS7bshvvppQGm9HYvhhsz39mgeWmH9uOg7rGC4XcfPMvBFIC0bN-Xmm1SApEDBLImxLeD-rHa117IxCw4CwEHZMvE3Ti2QWGeGhPjoIsp0gBaJ846xKsaBXIxDrjIKGMzAPEA9EIxCfDvZL3kPEBMoRM39swU04OElAWRADna8eo_guVRCrGagVUfWap5syjDKiAxM3IjtDkrj14fJq6AA6b2_LZXAg9EzITToBpOos5_WHD28WwhFGXxoY5RD1yGWnOHwaGCYf3pI58Y1ZtcdVSmIPv81Qsw9vCUVn5WfJm_niinSp8IpB15yUWRnLD5NMds7zD-qEvGJhb1m4co8-DClFIZIAD6aaJY7bAQON3a-gwlwUDY1Q1tBZKef9rf1Cz5NaPkjD-LpMYNWqHwAv_zI2t1TXs422fEYyTSSIaoWC_OAoNl2syKIhhapGi7dBvi8V7cUusYgQjwYFO9eE7ZusyBhjazMx-ic_2TL_GYhDtZ6Sf-kEhY6cnf04I90Q2G6Aqz8PBYUwwQ2Qu6WCb2ZhA2eLZATfgdWkWDg7DC7sHFeYiazwM5f2pXILY6N92CZHWI-egv0L0Nooqe99x_N5Y7Cz8thKJwIWJC5wOv2fO0m8IuvEjlHk_LNboEdLWWNP9PS6wPp1g4h_fwAzBEEvQorsFMGaBS_zYo_-zQDZMSzIvPsLUtxYZA3ZvNxITzNpvOkN_zcmRf7MqIf8p-0vZlC_f0o5cjAlooXxi86wdX6xOpkefV7Q-7hdymDjtUgmhoeXGOue-vcNsaiPzx5QX4LSVQ2LHxvAsVgFDmnmVEmHEy_7DoaXyWE9xm_cw2P_0oi2IHaoE1RTu8jUBzDq8TlLp92Ngro45vv0U8BccFQXZ_ylgdrvVlNhz_U_BpB-TuGWgPvWiJbwk_ise0uPgZrkyekrvUTFtkLkDu3d5RVc0AKwK6BZ6mOT5-j2AYFyhKD084OvJajosgdfK3k-nVYGMeTfw4g7nZFrWWduwocciR-tdrNjlJxDrBtLlxygYkmkp-OJ03V2uAPDxfqS51FL3q2a1heEPtNZNs3Zr5ld-1qBnXhkVAfHJk1XObvV2b4rbXuZwa9qdUQZ6jS7m9qYqauatUWyHSHTsejugw7WCqCWWJBQzSuObHboJWAAl6NXtnd1RPs7vektzwiyrUuJ63RCYZ7i3MwaRyAE0o69OFMwpmrkMaR7pPo1yAVCt4krT0ZJa0qtpqNOMTdk67CNE9ciTmOfENOcPX4HzPYebOFsxzsepYu6gxW5gNiPB51PEHKBFGln6rGgINrlHBTaTPz0PhkBXXTWOBX32mjsvmwnTEPkWRw1cP9_KjcpTbUoDz-VRUVFx3-SMrZHt4HwQC-z8yQ4F2LHW_nJhAu3D8ltAzqulj-VFdsP-oRITGvCzFqzxxQo9o72Zqzc6h3iuMQz4tzRQQCDkQ_6I5H-gTTyNasoyqqQ7UvsjyvI5TSPUuoPZdlz22URUtfzwhPlj9HBFhZTnQLsDiYxwaWjuBnEYJ6ejsqnNPnqotUN9-i6yT1ogfjlD_Z6NZA_jzvZvMuNAQxxFWamwoyQeSRks2i6IGHsdsW2y5mgGGo7pHwhg2mtAKhMTiKuxDe44Uv3CsHzVU2MTptRrXJIcdkjGaBrUyQyO1gNMK-Qt2IScqpwkJJ0OArw1n7H5yEiq_q_G-K6YJPaYMuAQ4NncWT0UEd8DK7sLyzEU0DD95whqD3NuxTUQfKGuzg3NODJ2359Oe7EhrQJVgJCuhWPzH8mELng_9-cKL77F8lvfhM3bJp9z-YOAoqlKwJrJn2Bpp31JfehC3AU_5msAT8ryMpacQwak_u41prLi4SjlfZzBVRBf-MmxE3tmE-lXUVNQW2Iy3qQienBPkCHzkpHuQABU7YLUxJFRHgqw0p9KbawH1kG7afY2OfDKu0Q6NX-yR5RnK0pwGoKxomGai4BkASv8wg3XZykIdobntwtqgahw6uEBUKKixf-_UwmfDgNF21VRBljlQwbRy3MH7x_8RUdq8SoW7pnUyhzjQUX199FHaZVmY06lyxWg_efVqaQsdt7vlzFtDSFBlsVR3Ny5YlVSAkWwA9ZhYlJMfh7HDNFacxdRidYPstGGxcNZ1SWVsPOitKdm9vWwjtCXiKPPjRzNYoH_8nCfgUNdOBOBsyvFIl8gPUU6V-FImSxNw-QEb-vmzuYjP8KBq8LVIFJzRZPiDwyt-gZ2wRZMx86nJtwSqVSYnxULMYL_NJqwkVmC0]--></g></svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A TypeScript to JSON importer for Moose 10.",
   "main": "dist/ts2famix-cli.js",
   "scripts": {

package/src/analyze.ts

@@ -1,31 +1,28 @@
 import { Project } from "ts-morph";
 import * as fs from 'fs';
 import { FamixRepository } from "./lib/famix/src/famix_repository";
-import { FamixFunctions } from "./famix_functions/famix_functions";
-import { ProcessFiles } from "./analyze_functions/processFiles";
-import { ProcessAccesses } from "./analyze_functions/processAccesses";
-import { ProcessInvocations } from "./analyze_functions/processInvocations";
-import { ProcessInheritances } from "./analyze_functions/processInheritances";
-import { ProcessImportClauses } from "./analyze_functions/processImportClauses";
-
 import { Logger } from "tslog";
+import * as processFunctions from "./analyze_functions/process_functions";
+import { EntityDictionary } from "./famix_functions/EntityDictionary";
+import path from "path";
 
 export const logger = new Logger({ name: "ts2famix", minLevel: 3});
 export const config = { "expectGraphemes": false };
+export const entityDictionary = new EntityDictionary();
 
 /**
  * This class is used to build a Famix model from a TypeScript source code
  */
 export class Importer {
 
-    private project = new Project(); // The project containing the source files to analyze
-    private famixFunctions = new FamixFunctions(); // FamixFunctions object, it contains all the functions needed to create Famix entities
-    private processFiles = new ProcessFiles(this.famixFunctions); // ProcessFiles object, it contains all the functions needed to process the source files
-    private processAccesses = new ProcessAccesses(this.famixFunctions); // ProcessAccesses object, it contains all the functions needed to process the accesses
-    private processInvocations = new ProcessInvocations(this.famixFunctions); // ProcessInvocations object, it contains all the functions needed to process the invocations
-    private processInheritances = new ProcessInheritances(this.famixFunctions); // ProcessInheritances object, it contains all the functions needed to process the inheritances
-    private processImportClauses = new ProcessImportClauses(this.famixFunctions); // ProcessImportClauses object, it contains all the functions needed to process the import clauses
-
+    private project = new Project(
+        {
+            compilerOptions: {
+                baseUrl: "./test_src"
+            }
+        }
+    ); // The project containing the source files to analyze
+    
     /**
      * Main method
      * @param paths An array of paths to the source files to analyze
@@ -36,9 +33,12 @@ export class Importer {
 //        try {
         logger.debug(`famixRepFromPaths: paths: ${paths}`);
         this.project.addSourceFilesAtPaths(paths);
+
+        initFamixRep(this.project);
+
         this.processEntities(this.project);
 
-        const famixRep = this.famixFunctions.getFamixRepository();
+        const famixRep = entityDictionary.famixRep;
 //        }
 //        catch (error) {
             // logger.error(`> ERROR: got exception ${error}. Exiting...`);
@@ -51,18 +51,19 @@ export class Importer {
     }
 
     private processEntities(project) {
-        this.processFiles.processFiles(project.getSourceFiles());
-        const accesses = this.processFiles.getAccesses();
-        const methodsAndFunctionsWithId = this.processFiles.getMethodsAndFunctionsWithId();
-        const classes = this.processFiles.getClasses();
-        const interfaces = this.processFiles.getInterfaces();
-        const modules = this.processFiles.getModules();
-        const exports = this.processFiles.getExports();
-
-        this.processImportClauses.processImportClauses(modules, exports);
-        this.processAccesses.processAccesses(accesses);
-        this.processInvocations.processInvocations(methodsAndFunctionsWithId);
-        this.processInheritances.processInheritances(classes, interfaces);
+        processFunctions.processFiles(project.getSourceFiles());
+        const accesses = processFunctions.accessMap;
+        const methodsAndFunctionsWithId = processFunctions.methodsAndFunctionsWithId;
+        const classes = processFunctions.classes;
+        const interfaces = processFunctions.interfaces;
+        const modules = processFunctions.modules;
+        const exports = processFunctions.exportedMap;
+
+        processFunctions.processImportClausesForImportEqualsDeclarations(project.getSourceFiles(), exports);
+        processFunctions.processImportClausesForModules(modules, exports);
+        processFunctions.processAccesses(accesses);
+        processFunctions.processInvocations(methodsAndFunctionsWithId);
+        processFunctions.processInheritances(classes, interfaces);
     }
 
     /**
@@ -92,9 +93,25 @@ export class Importer {
         //const sourceFileNames = project.getSourceFiles().map(f => f.getFilePath()) as Array<string>;
 
         //const famixRep = this.famixRepFromPaths(sourceFileNames);
+
+        initFamixRep(project);
+        
         this.processEntities(project);
 
-        return this.famixFunctions.getFamixRepository();
+        return entityDictionary.famixRep;
     }
 
 }
+
+function initFamixRep(project :Project ): void {
+    
+        // get compiler options
+        const compilerOptions = project.getCompilerOptions();
+
+        // get baseUrl
+        const baseUrl = compilerOptions.baseUrl;
+
+        const absoluteBaseUrl = path.resolve(baseUrl);
+
+        entityDictionary.famixRep.setAbsolutePath(path.normalize(absoluteBaseUrl));
+}