ts2famix 1.1.0 → 1.2.0

package/README.md

@@ -38,7 +38,7 @@ cp JSONModels/projectName.json ~/Pharo/images/Moose\ Suite\ 10\ \(stable\)/.
 ```
 
 Then, in a Moose Playground, do :
-```st
+```smalltalk
 Metacello new 
   githubUser: 'fuhrmanator' project: 'FamixTypeScript' commitish: 'master' path: 'src';
   baseline: 'FamixTypeScript';
@@ -51,7 +51,7 @@ Then, generate the metamodel with :
 ```Library > Famix > Manage metamodels > Regenerate all metamodels```
 
 Then, in a Moose Playground, do :
-```st
+```smalltalk
 'projectName.json' asFileReference readStreamDo:
   [ :stream | model := FamixTypeScriptModel new 
     importFromJSONStream: stream. model install ].
@@ -104,6 +104,6 @@ ts-node src/famix2puml.ts -i JSONModels/projectName.json -o PUMLModels/projectNa
 
 ## TypeScript Metamodel API documentation (visualization)
 
-The following was generated by CI using [tplant](https://github.com/bafolts/tplant), in a similar fashion described [here](https://modularmoose.org/2021/07/19/automatic-metamodel-documentation-generation.html).
+The following was generated by CI using [tplant](https://github.com/bafolts/tplant), in a similar fashion described [here](https://modularmoose.org/posts/2021-07-19-automatic-metamodel-documentation-generation).
 
 ![FamixTypeScript API Metamodel](https://raw.githubusercontent.com/maelpaul/FamixTypeScriptImporter/v1/doc/metamodel.svg)

package/dist/analyze.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Importer = void 0;
+exports.Importer = exports.config = exports.logger = void 0;
 const ts_morph_1 = require("ts-morph");
 const fs = __importStar(require("fs"));
 const famix_functions_1 = require("./famix_functions/famix_functions");
@@ -32,6 +32,9 @@ const processAccesses_1 = require("./analyze_functions/processAccesses");
 const processInvocations_1 = require("./analyze_functions/processInvocations");
 const processInheritances_1 = require("./analyze_functions/processInheritances");
 const processImportClauses_1 = require("./analyze_functions/processImportClauses");
+const tslog_1 = require("tslog");
+exports.logger = new tslog_1.Logger({ name: "ts2famix", minLevel: 3 });
+exports.config = { "expectGraphemes": false };
 /**
  * This class is used to build a Famix model from a TypeScript source code
  */
@@ -52,15 +55,15 @@ class Importer {
      */
     famixRepFromPaths(paths) {
         //        try {
-        console.info(`famixRepFromPaths: paths: ${paths}`);
+        exports.logger.debug(`famixRepFromPaths: paths: ${paths}`);
         this.project.addSourceFilesAtPaths(paths);
         this.processEntities(this.project);
         const famixRep = this.famixFunctions.getFamixRepository();
         //        }
         //        catch (error) {
-        // console.error(`> ERROR: got exception ${error}. Exiting...`);
-        // console.error(error.message);
-        // console.error(error.stack);
+        // logger.error(`> ERROR: got exception ${error}. Exiting...`);
+        // logger.error(error.message);
+        // logger.error(error.stack);
         // process.exit(1);
         //        }
         return famixRep;

package/dist/analyze_functions/processAccesses.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessAccesses = void 0;
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the accesses
  */
@@ -17,15 +18,15 @@ class ProcessAccesses {
      * @param accessMap A map of parameters, variables, properties and enum members with their id
      */
     processAccesses(accessMap) {
-        console.info(`processAccesses: Creating accesses:`);
+        analyze_1.logger.debug(`processAccesses: Creating accesses:`);
         accessMap.forEach((v, id) => {
-            console.info(`processAccesses: Accesses to ${v.getName()}`);
+            analyze_1.logger.debug(`processAccesses: Accesses to ${v.getName()}`);
             try {
                 const temp_nodes = v.findReferencesAsNodes();
                 temp_nodes.forEach(node => this.processNodeForAccesses(node, id));
             }
             catch (error) {
-                console.error(`> WARNING: got exception ${error}. Continuing...`);
+                analyze_1.logger.error(`> WARNING: got exception ${error}. Continuing...`);
             }
         });
     }
@@ -41,14 +42,14 @@ class ProcessAccesses {
             // check for a node whose first ancestor is a property declaration and bail?
             // This may be a bug in ts-morph?
             if (n.getFirstAncestorOrThrow().getKindName() === "PropertyDeclaration") {
-                console.info(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()})'s first ancestor is a PropertyDeclaration. Skipping...`);
+                analyze_1.logger.debug(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()})'s first ancestor is a PropertyDeclaration. Skipping...`);
                 return;
             }
             this.famixFunctions.createFamixAccess(n, id);
-            console.info(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()})`);
+            analyze_1.logger.debug(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()})`);
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
         }
     }
 }

package/dist/analyze_functions/processFiles.js

@@ -28,6 +28,7 @@ const ts_morph_1 = require("ts-morph");
 const Famix = __importStar(require("../lib/famix/src/model/famix"));
 const cyclomatic_service_1 = require("../lib/ts-complex/cyclomatic-service");
 const fs = __importStar(require("fs"));
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for an array of source files
  */
@@ -51,7 +52,7 @@ class ProcessFiles {
      */
     processFiles(sourceFiles) {
         sourceFiles.forEach(file => {
-            console.info(`processFiles: File: >>>>>>>>>> ${file.getFilePath()}`);
+            analyze_1.logger.info(`File: >>>>>>>>>> ${file.getFilePath()}`);
             // Computes the cyclomatic complexity metrics for the current source file if it exists (i.e. if it is not from a jest test)
             if (fs.existsSync(file.getFilePath()))
                 this.currentCC = (0, cyclomatic_service_1.calculate)(file.getFilePath());
@@ -112,7 +113,7 @@ class ProcessFiles {
             this.modules.push(f);
         }
         const fmxFile = this.famixFunctions.createOrGetFamixFile(f, isModule);
-        console.info(`processFile: file: ${f.getBaseName()}, fqn = ${fmxFile.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`processFile: file: ${f.getBaseName()}, fqn = ${fmxFile.getFullyQualifiedName()}`);
         this.processComments(f, fmxFile);
         this.processAliases(f, fmxFile);
         this.processClasses(f, fmxFile);
@@ -129,7 +130,7 @@ class ProcessFiles {
      */
     processNamespace(m) {
         const fmxNamespace = this.famixFunctions.createOrGetFamixNamespace(m);
-        console.info(`processNamespace: namespace: ${m.getName()}, (${m.getType().getText()}), ${fmxNamespace.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`processNamespace: namespace: ${m.getName()}, (${m.getType().getText()}), ${fmxNamespace.getFullyQualifiedName()}`);
         this.processComments(m, fmxNamespace);
         this.processAliases(m, fmxNamespace);
         this.processClasses(m, fmxNamespace);
@@ -146,7 +147,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processAliases(m, fmxScope) {
-        console.info(`processAliases: ---------- Finding Aliases:`);
+        analyze_1.logger.debug(`processAliases: ---------- Finding Aliases:`);
         m.getTypeAliases().forEach(a => {
             const fmxAlias = this.processAlias(a);
             fmxScope.addAlias(fmxAlias);
@@ -158,7 +159,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processClasses(m, fmxScope) {
-        console.info(`processClasses: ---------- Finding Classes:`);
+        analyze_1.logger.debug(`processClasses: ---------- Finding Classes:`);
         m.getClasses().forEach(c => {
             const fmxClass = this.processClass(c);
             fmxScope.addType(fmxClass);
@@ -170,7 +171,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processInterfaces(m, fmxScope) {
-        console.info(`processInterfaces: ---------- Finding Interfaces:`);
+        analyze_1.logger.debug(`processInterfaces: ---------- Finding Interfaces:`);
         m.getInterfaces().forEach(i => {
             const fmxInterface = this.processInterface(i);
             fmxScope.addType(fmxInterface);
@@ -182,7 +183,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processVariables(m, fmxScope) {
-        console.info(`processVariables: ---------- Finding Variables:`);
+        analyze_1.logger.debug(`processVariables: ---------- Finding Variables:`);
         m.getVariableStatements().forEach(v => {
             const fmxVariables = this.processVariableStatement(v);
             fmxVariables.forEach(fmxVariable => {
@@ -196,7 +197,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processEnums(m, fmxScope) {
-        console.info(`processEnums: ---------- Finding Enums:`);
+        analyze_1.logger.debug(`processEnums: ---------- Finding Enums:`);
         m.getEnums().forEach(e => {
             const fmxEnum = this.processEnum(e);
             fmxScope.addType(fmxEnum);
@@ -208,7 +209,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processFunctions(m, fmxScope) {
-        console.info(`processFunctions: ---------- Finding Functions:`);
+        analyze_1.logger.debug(`Finding Functions:`);
         m.getFunctions().forEach(f => {
             const fmxFunction = this.processFunction(f);
             fmxScope.addFunction(fmxFunction);
@@ -220,7 +221,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     processNamespaces(m, fmxScope) {
-        console.info(`processNamespaces: ---------- Finding Namespaces:`);
+        analyze_1.logger.debug(`Finding Namespaces:`);
         m.getModules().forEach(md => {
             const fmxNsp = this.processNamespace(md);
             fmxScope.addNamespace(fmxNsp);
@@ -233,7 +234,7 @@ class ProcessFiles {
      */
     processAlias(a) {
         const fmxAlias = this.famixFunctions.createFamixAlias(a);
-        console.info(`processAlias: alias: ${a.getName()}, (${a.getType().getText()}), fqn = ${fmxAlias.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`Alias: ${a.getName()}, (${a.getType().getText()}), fqn = ${fmxAlias.getFullyQualifiedName()}`);
         this.processComments(a, fmxAlias);
         return fmxAlias;
     }
@@ -245,7 +246,7 @@ class ProcessFiles {
     processClass(c) {
         this.classes.push(c);
         const fmxClass = this.famixFunctions.createOrGetFamixClass(c);
-        console.info(`processClass: class: ${c.getName()}, (${c.getType().getText()}), fqn = ${fmxClass.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`Class: ${c.getName()}, (${c.getType().getText()}), fqn = ${fmxClass.getFullyQualifiedName()}`);
         this.processComments(c, fmxClass);
         this.processDecorators(c, fmxClass);
         this.processStructuredType(c, fmxClass);
@@ -271,7 +272,7 @@ class ProcessFiles {
     processInterface(i) {
         this.interfaces.push(i);
         const fmxInterface = this.famixFunctions.createOrGetFamixInterface(i);
-        console.info(`processInterface: interface: ${i.getName()}, (${i.getType().getText()}), fqn = ${fmxInterface.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`Interface: ${i.getName()}, (${i.getType().getText()}), fqn = ${fmxInterface.getFullyQualifiedName()}`);
         this.processComments(i, fmxInterface);
         this.processStructuredType(i, fmxInterface);
         return fmxInterface;
@@ -282,7 +283,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the structured type
      */
     processStructuredType(c, fmxScope) {
-        console.info(`processStructuredType: ---------- Finding Properties and Methods:`);
+        analyze_1.logger.debug(`Finding Properties and Methods:`);
         if (fmxScope instanceof Famix.ParameterizableClass || fmxScope instanceof Famix.ParameterizableInterface) {
             this.processTypeParameters(c, fmxScope);
         }
@@ -302,15 +303,15 @@ class ProcessFiles {
      */
     processProperty(p) {
         const fmxProperty = this.famixFunctions.createFamixProperty(p);
-        console.info(`processProperty: property: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxProperty.getFullyQualifiedName()}`);
-        console.info(` ---> It's a Property${(p instanceof ts_morph_1.PropertySignature) ? "Signature" : "Declaration"}!`);
+        analyze_1.logger.debug(`property: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxProperty.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(` ---> It's a Property${(p instanceof ts_morph_1.PropertySignature) ? "Signature" : "Declaration"}!`);
         const ancestor = p.getFirstAncestorOrThrow();
-        console.info(` ---> Its first ancestor is a ${ancestor.getKindName()}`);
+        analyze_1.logger.debug(` ---> Its first ancestor is a ${ancestor.getKindName()}`);
         if (!(p instanceof ts_morph_1.PropertySignature)) {
             this.processDecorators(p, fmxProperty);
             // only add access if the p's first ancestor is not a PropertyDeclaration
             if (ancestor.getKindName() !== "PropertyDeclaration") {
-                console.info(`processProperty: adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxProperty.getName()}`);
+                analyze_1.logger.debug(`adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxProperty.getName()}`);
                 this.accessMap.set(fmxProperty.id, p);
             }
         }
@@ -324,7 +325,7 @@ class ProcessFiles {
      */
     processMethod(m) {
         const fmxMethod = this.famixFunctions.createFamixMethod(m, this.currentCC);
-        console.info(`processMethod: method: ${!(m instanceof ts_morph_1.ConstructorDeclaration) ? m.getName() : "constructor"}, (${m.getType().getText()}), parent: ${m.getParent().getName()}, fqn = ${fmxMethod.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`Method: ${!(m instanceof ts_morph_1.ConstructorDeclaration) ? m.getName() : "constructor"}, (${m.getType().getText()}), parent: ${m.getParent().getName()}, fqn = ${fmxMethod.getFullyQualifiedName()}`);
         this.processComments(m, fmxMethod);
         this.processTypeParameters(m, fmxMethod);
         this.processParameters(m, fmxMethod);
@@ -348,7 +349,7 @@ class ProcessFiles {
      */
     processFunction(f) {
         const fmxFunction = this.famixFunctions.createFamixFunction(f, this.currentCC);
-        console.info(`processFunction: function: ${(f.getName()) ? f.getName() : "anonymous"}, (${f.getType().getText()}), fqn = ${fmxFunction.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`Function: ${(f.getName()) ? f.getName() : "anonymous"}, (${f.getType().getText()}), fqn = ${fmxFunction.getFullyQualifiedName()}`);
         this.processComments(f, fmxFunction);
         this.processAliases(f, fmxFunction);
         this.processTypeParameters(f, fmxFunction);
@@ -368,7 +369,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the function or the method
      */
     processFunctionExpressions(f, fmxScope) {
-        console.info(`processFunctionExpressions: ---------- Finding Function Expressions:`);
+        analyze_1.logger.debug(`Finding Function Expressions:`);
         const functionExpressions = f.getDescendantsOfKind(ts_morph_1.SyntaxKind.FunctionExpression);
         functionExpressions.forEach((func) => {
             const fmxFunc = this.processFunction(func);
@@ -381,7 +382,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the method or the function
      */
     processParameters(m, fmxScope) {
-        console.info(`processParameters: ---------- Finding Parameters:`);
+        analyze_1.logger.debug(`Finding Parameters:`);
         m.getParameters().forEach(param => {
             const fmxParam = this.processParameter(param);
             fmxScope.addParameter(fmxParam);
@@ -394,12 +395,12 @@ class ProcessFiles {
      */
     processParameter(p) {
         const fmxParam = this.famixFunctions.createFamixParameter(p);
-        console.info(`processParameter: parameter: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxParam.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`parameter: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxParam.getFullyQualifiedName()}`);
         this.processComments(p, fmxParam);
         this.processDecorators(p, fmxParam);
         const parent = p.getParent();
         if (!(parent instanceof ts_morph_1.MethodSignature)) {
-            console.info(`processParameter: adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxParam.getName()}`);
+            analyze_1.logger.debug(`adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxParam.getName()}`);
             this.accessMap.set(fmxParam.id, p);
         }
         return fmxParam;
@@ -410,10 +411,10 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the class, the interface, the method or the function
      */
     processTypeParameters(e, fmxScope) {
-        console.info(`processTypeParameters: ---------- Finding Type Parameters:`);
+        analyze_1.logger.debug(`Finding Type Parameters:`);
         e.getTypeParameters().forEach(tp => {
             const fmxParam = this.processTypeParameter(tp);
-            fmxScope.addTypeParameter(fmxParam);
+            fmxScope.addParameterType(fmxParam);
         });
     }
     /**
@@ -422,8 +423,8 @@ class ProcessFiles {
      * @returns A Famix.TypeParameter representing the type parameter
      */
     processTypeParameter(tp) {
-        const fmxTypeParameter = this.famixFunctions.createFamixTypeParameter(tp);
-        console.info(`processTypeParameter: type parameter: ${tp.getName()}, (${tp.getType().getText()}), fqn = ${fmxTypeParameter.getFullyQualifiedName()}`);
+        const fmxTypeParameter = this.famixFunctions.createFamixParameterType(tp);
+        analyze_1.logger.debug(`type parameter: ${tp.getName()}, (${tp.getType().getText()}), fqn = ${fmxTypeParameter.getFullyQualifiedName()}`);
         this.processComments(tp, fmxTypeParameter);
         return fmxTypeParameter;
     }
@@ -434,7 +435,7 @@ class ProcessFiles {
      */
     processVariableStatement(v) {
         const fmxVariables = new Array();
-        console.info(`processVariableStatement: variable statement: variable statement, (${v.getType().getText()}), ${v.getDeclarationKindKeyword().getText()}`);
+        analyze_1.logger.debug(`Variable statement: ${v.getText()}, (${v.getType().getText()}), ${v.getDeclarationKindKeywords()[0]}, fqn = ${v.getDeclarations()[0].getName()}`);
         v.getDeclarations().forEach(variable => {
             const fmxVar = this.processVariable(variable);
             this.processComments(v, fmxVar);
@@ -449,9 +450,9 @@ class ProcessFiles {
      */
     processVariable(v) {
         const fmxVar = this.famixFunctions.createFamixVariable(v);
-        console.info(`processVariable: variable: ${v.getName()}, (${v.getType().getText()}), ${v.getInitializer() ? "initializer: " + v.getInitializer().getText() : "initializer: "}, fqn = ${fmxVar.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`variable: ${v.getName()}, (${v.getType().getText()}), ${v.getInitializer() ? "initializer: " + v.getInitializer().getText() : "initializer: "}, fqn = ${fmxVar.getFullyQualifiedName()}`);
         this.processComments(v, fmxVar);
-        console.info(`processVariable: adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxVar.getName()}`);
+        analyze_1.logger.debug(`adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxVar.getName()}`);
         this.accessMap.set(fmxVar.id, v);
         return fmxVar;
     }
@@ -462,7 +463,7 @@ class ProcessFiles {
      */
     processEnum(e) {
         const fmxEnum = this.famixFunctions.createFamixEnum(e);
-        console.info(`processEnum: enum: ${e.getName()}, (${e.getType().getText()}), fqn = ${fmxEnum.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`enum: ${e.getName()}, (${e.getType().getText()}), fqn = ${fmxEnum.getFullyQualifiedName()}`);
         this.processComments(e, fmxEnum);
         e.getMembers().forEach(m => {
             const fmxEnumValue = this.processEnumValue(m);
@@ -477,9 +478,9 @@ class ProcessFiles {
      */
     processEnumValue(v) {
         const fmxEnumValue = this.famixFunctions.createFamixEnumValue(v);
-        console.info(`processEnumValue: enum value: ${v.getName()}, (${v.getType().getText()}), fqn = ${fmxEnumValue.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`enum value: ${v.getName()}, (${v.getType().getText()}), fqn = ${fmxEnumValue.getFullyQualifiedName()}`);
         this.processComments(v, fmxEnumValue);
-        console.info(`processEnumValue: adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxEnumValue.getName()}`);
+        analyze_1.logger.debug(`adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxEnumValue.getName()}`);
         this.accessMap.set(fmxEnumValue.id, v);
         return fmxEnumValue;
     }
@@ -489,7 +490,7 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the class, the method, the parameter or the property
      */
     processDecorators(e, fmxScope) {
-        console.info(`processDecorators: ---------- Finding Decorators:`);
+        analyze_1.logger.debug(`Finding Decorators:`);
         e.getDecorators().forEach(dec => {
             const fmxDec = this.processDecorator(dec, e);
             fmxScope.addDecorator(fmxDec);
@@ -503,7 +504,7 @@ class ProcessFiles {
      */
     processDecorator(d, e) {
         const fmxDec = this.famixFunctions.createOrGetFamixDecorator(d, e);
-        console.info(`processDecorator: decorator: ${d.getName()}, (${d.getType().getText()}), fqn = ${fmxDec.getFullyQualifiedName()}`);
+        analyze_1.logger.debug(`decorator: ${d.getName()}, (${d.getType().getText()}), fqn = ${fmxDec.getFullyQualifiedName()}`);
         this.processComments(d, fmxDec);
         return fmxDec;
     }
@@ -513,13 +514,15 @@ class ProcessFiles {
      * @param fmxScope The Famix model of the named entity
      */
     processComments(e, fmxScope) {
-        console.info(`processComments: ---------- Finding Comments:`);
+        analyze_1.logger.debug(`Process comments:`);
         e.getLeadingCommentRanges().forEach(c => {
             const fmxComment = this.processComment(c, fmxScope);
-            fmxScope.addComment(fmxComment);
+            analyze_1.logger.debug(`leading comments, addComment: '${c.getText()}'`);
+            fmxScope.addComment(fmxComment); // redundant, but just in case
         });
         e.getTrailingCommentRanges().forEach(c => {
             const fmxComment = this.processComment(c, fmxScope);
+            analyze_1.logger.debug(`trailing comments, addComment: '${c.getText()}'`);
             fmxScope.addComment(fmxComment);
         });
     }
@@ -530,12 +533,9 @@ class ProcessFiles {
      * @returns A Famix.Comment representing the comment
      */
     processComment(c, fmxScope) {
-        let isJSDoc = false;
-        if (c.getText().substring(0, 3) === "/**") {
-            isJSDoc = true;
-        }
+        const isJSDoc = c.getText().startsWith("/**");
+        analyze_1.logger.debug(`processComment: comment: ${c.getText()}, isJSDoc = ${isJSDoc}`);
         const fmxComment = this.famixFunctions.createFamixComment(c, fmxScope, isJSDoc);
-        console.info(`processComment: comment: ${c.getText()}`);
         return fmxComment;
     }
     /**

package/dist/analyze_functions/processImportClauses.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessImportClauses = void 0;
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the import clauses
  */
@@ -18,12 +19,12 @@ class ProcessImportClauses {
      * @param exports An array of maps of exported declarations
      */
     processImportClauses(modules, exports) {
-        console.info(`processImportClauses: Creating import clauses:`);
+        analyze_1.logger.info(`processImportClauses: Creating import clauses:`);
         modules.forEach(module => {
             module.getImportDeclarations().forEach(impDecl => {
                 const path = this.getModulePath(impDecl);
                 impDecl.getNamedImports().forEach(namedImport => {
-                    console.info(`processImportClauses: Importing (named) ${namedImport.getName()} from ${impDecl.getModuleSpecifierValue()}`);
+                    analyze_1.logger.debug(`processImportClauses: Importing (named) ${namedImport.getName()} from ${impDecl.getModuleSpecifierValue()}`);
                     const importedEntityName = namedImport.getName();
                     let importFoundInExports = false;
                     exports.forEach(e => {
@@ -31,17 +32,34 @@ class ProcessImportClauses {
                             importFoundInExports = true;
                         }
                     });
-                    this.famixFunctions.createFamixImportClause2({ importer: module, moduleSpecifier: impDecl.getModuleSpecifierValue(), moduleSpecifierFilePath: path, importElement: namedImport, isInExports: importFoundInExports, isDefaultExport: false });
+                    this.famixFunctions.createFamixImportClause({ importDeclaration: impDecl,
+                        importer: module,
+                        moduleSpecifierFilePath: path,
+                        importElement: namedImport,
+                        isInExports: importFoundInExports,
+                        isDefaultExport: false });
                 });
                 const defaultImport = impDecl.getDefaultImport();
                 if (defaultImport !== undefined) {
-                    console.info(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, defaultImport, false, true);
+                    analyze_1.logger.debug(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    // call with module, impDecl.getModuleSpecifierValue(), path, defaultImport, false, true
+                    this.famixFunctions.createFamixImportClause({ importDeclaration: impDecl,
+                        importer: module,
+                        moduleSpecifierFilePath: path,
+                        importElement: defaultImport,
+                        isInExports: false,
+                        isDefaultExport: true });
                 }
                 const namespaceImport = impDecl.getNamespaceImport();
                 if (namespaceImport !== undefined) {
-                    console.info(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, namespaceImport, false, false);
+                    analyze_1.logger.debug(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    this.famixFunctions.createFamixImportClause({ importDeclaration: impDecl,
+                        importer: module,
+                        moduleSpecifierFilePath: path,
+                        importElement: namespaceImport,
+                        isInExports: false,
+                        isDefaultExport: false });
+                    // this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, namespaceImport, false, false);
                 }
             });
         });

package/dist/analyze_functions/processInheritances.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessInheritances = void 0;
 const ts_morph_1 = require("ts-morph");
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the inheritances
  */
@@ -19,27 +20,27 @@ class ProcessInheritances {
      * @param interfaces An array of interfaces
      */
     processInheritances(classes, interfaces) {
-        console.info(`processInheritances: Creating inheritances:`);
+        analyze_1.logger.info(`processInheritances: Creating inheritances:`);
         classes.forEach(cls => {
-            console.info(`processInheritances: Checking class inheritance for ${cls.getName()}`);
+            analyze_1.logger.debug(`processInheritances: Checking class inheritance for ${cls.getName()}`);
             const extClass = cls.getBaseClass();
             if (extClass !== undefined) {
                 this.famixFunctions.createFamixInheritance(cls, extClass);
-                console.info(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), extClass: ${extClass.getName()}, (${extClass.getType().getText()})`);
+                analyze_1.logger.debug(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), extClass: ${extClass.getName()}, (${extClass.getType().getText()})`);
             }
-            console.info(`processInheritances: Checking interface inheritance for ${cls.getName()}`);
+            analyze_1.logger.debug(`processInheritances: Checking interface inheritance for ${cls.getName()}`);
             const implementedInterfaces = this.getImplementedOrExtendedInterfaces(interfaces, cls);
             implementedInterfaces.forEach(impInter => {
                 this.famixFunctions.createFamixInheritance(cls, impInter);
-                console.info(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), impInter: ${(impInter instanceof ts_morph_1.InterfaceDeclaration) ? impInter.getName() : impInter.getExpression().getText()}, (${(impInter instanceof ts_morph_1.InterfaceDeclaration) ? impInter.getType().getText() : impInter.getExpression().getText()})`);
+                analyze_1.logger.debug(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), impInter: ${(impInter instanceof ts_morph_1.InterfaceDeclaration) ? impInter.getName() : impInter.getExpression().getText()}, (${(impInter instanceof ts_morph_1.InterfaceDeclaration) ? impInter.getType().getText() : impInter.getExpression().getText()})`);
             });
         });
         interfaces.forEach(inter => {
-            console.info(`processInheritances: Checking interface inheritance for ${inter.getName()}`);
+            analyze_1.logger.debug(`processInheritances: Checking interface inheritance for ${inter.getName()}`);
             const extendedInterfaces = this.getImplementedOrExtendedInterfaces(interfaces, inter);
             extendedInterfaces.forEach(extInter => {
                 this.famixFunctions.createFamixInheritance(inter, extInter);
-                console.info(`processInheritances: inter: ${inter.getName()}, (${inter.getType().getText()}), extInter: ${(extInter instanceof ts_morph_1.InterfaceDeclaration) ? extInter.getName() : extInter.getExpression().getText()}, (${(extInter instanceof ts_morph_1.InterfaceDeclaration) ? extInter.getType().getText() : extInter.getExpression().getText()})`);
+                analyze_1.logger.debug(`processInheritances: inter: ${inter.getName()}, (${inter.getType().getText()}), extInter: ${(extInter instanceof ts_morph_1.InterfaceDeclaration) ? extInter.getName() : extInter.getExpression().getText()}, (${(extInter instanceof ts_morph_1.InterfaceDeclaration) ? extInter.getType().getText() : extInter.getExpression().getText()})`);
             });
         });
     }

package/dist/analyze_functions/processInvocations.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessInvocations = void 0;
 const ts_morph_1 = require("ts-morph");
+const analyze_1 = require("../analyze");
 /**
  * This class is used to build a Famix model for the invocations
  */
@@ -18,15 +19,15 @@ class ProcessInvocations {
      * @param methodsAndFunctionsWithId A map of methods and functions with their id
      */
     processInvocations(methodsAndFunctionsWithId) {
-        console.info(`Creating invocations:`);
+        analyze_1.logger.info(`Creating invocations:`);
         methodsAndFunctionsWithId.forEach((m, id) => {
-            console.info(`Invocations to ${(m instanceof ts_morph_1.MethodDeclaration || m instanceof ts_morph_1.GetAccessorDeclaration || m instanceof ts_morph_1.SetAccessorDeclaration || m instanceof ts_morph_1.FunctionDeclaration) ? m.getName() : ((m instanceof ts_morph_1.ConstructorDeclaration) ? 'constructor' : (m.getName() ? m.getName() : 'anonymous'))}`);
+            analyze_1.logger.debug(`Invocations to ${(m instanceof ts_morph_1.MethodDeclaration || m instanceof ts_morph_1.GetAccessorDeclaration || m instanceof ts_morph_1.SetAccessorDeclaration || m instanceof ts_morph_1.FunctionDeclaration) ? m.getName() : ((m instanceof ts_morph_1.ConstructorDeclaration) ? 'constructor' : (m.getName() ? m.getName() : 'anonymous'))}`);
             try {
                 const temp_nodes = m.findReferencesAsNodes();
                 temp_nodes.forEach(node => this.processNodeForInvocations(node, m, id));
             }
             catch (error) {
-                console.error(`> WARNING: got exception ${error}. Continuing...`);
+                analyze_1.logger.error(`> WARNING: got exception ${error}. Continuing...`);
             }
         });
     }
@@ -39,10 +40,10 @@ class ProcessInvocations {
     processNodeForInvocations(n, m, id) {
         try {
             this.famixFunctions.createFamixInvocation(n, m, id);
-            console.info(`node: node, (${n.getType().getText()})`);
+            analyze_1.logger.debug(`node: node, (${n.getType().getText()})`);
         }
         catch (error) {
-            console.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
+            analyze_1.logger.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
         }
     }
 }