ts2famix 1.0.17 → 1.2.0

package/src/analyze_functions/processFiles.ts

@@ -3,6 +3,7 @@ import * as Famix from "../lib/famix/src/model/famix";
 import { FamixFunctions } from "../famix_functions/famix_functions";
 import { calculate } from "../lib/ts-complex/cyclomatic-service";
 import * as fs from 'fs';
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for an array of source files
@@ -32,7 +33,7 @@ export class ProcessFiles {
      */
     public processFiles(sourceFiles: Array<SourceFile>): void {
         sourceFiles.forEach(file => {
-            console.info(`processFiles: File: >>>>>>>>>> ${file.getFilePath()}`);
+            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()))
@@ -105,7 +106,7 @@ export class ProcessFiles {
 
         const fmxFile = this.famixFunctions.createOrGetFamixFile(f, isModule);
 
-        console.info(`processFile: file: ${f.getBaseName()}, fqn = ${fmxFile.getFullyQualifiedName()}`);
+        logger.debug(`processFile: file: ${f.getBaseName()}, fqn = ${fmxFile.getFullyQualifiedName()}`);
 
         this.processComments(f, fmxFile);
 
@@ -132,7 +133,7 @@ export class ProcessFiles {
     private processNamespace(m: ModuleDeclaration): Famix.Namespace {
         const fmxNamespace = this.famixFunctions.createOrGetFamixNamespace(m);
 
-        console.info(`processNamespace: namespace: ${m.getName()}, (${m.getType().getText()}), ${fmxNamespace.getFullyQualifiedName()}`);
+        logger.debug(`processNamespace: namespace: ${m.getName()}, (${m.getType().getText()}), ${fmxNamespace.getFullyQualifiedName()}`);
 
         this.processComments(m, fmxNamespace);
 
@@ -159,7 +160,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processAliases(m: SourceFile | ModuleDeclaration | FunctionDeclaration | FunctionExpression | MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace | Famix.Function | Famix.Method | Famix.Accessor): void {
-        console.info(`processAliases: ---------- Finding Aliases:`);
+        logger.debug(`processAliases: ---------- Finding Aliases:`);
         m.getTypeAliases().forEach(a => {
             const fmxAlias = this.processAlias(a);
             fmxScope.addAlias(fmxAlias);
@@ -172,7 +173,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processClasses(m: SourceFile | ModuleDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace): void {
-        console.info(`processClasses: ---------- Finding Classes:`);
+        logger.debug(`processClasses: ---------- Finding Classes:`);
         m.getClasses().forEach(c => {
             const fmxClass = this.processClass(c);
             fmxScope.addType(fmxClass);
@@ -185,7 +186,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processInterfaces(m: SourceFile | ModuleDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace): void {
-        console.info(`processInterfaces: ---------- Finding Interfaces:`);
+        logger.debug(`processInterfaces: ---------- Finding Interfaces:`);
         m.getInterfaces().forEach(i => {
             const fmxInterface = this.processInterface(i);
             fmxScope.addType(fmxInterface);
@@ -198,7 +199,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processVariables(m: SourceFile | ModuleDeclaration | FunctionDeclaration | FunctionExpression | MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace | Famix.Function | Famix.Method | Famix.Accessor): void {
-        console.info(`processVariables: ---------- Finding Variables:`);
+        logger.debug(`processVariables: ---------- Finding Variables:`);
         m.getVariableStatements().forEach(v => {
             const fmxVariables = this.processVariableStatement(v);
             fmxVariables.forEach(fmxVariable => {
@@ -213,7 +214,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processEnums(m: SourceFile | ModuleDeclaration | FunctionDeclaration | FunctionExpression | MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace | Famix.Function | Famix.Method | Famix.Accessor): void {
-        console.info(`processEnums: ---------- Finding Enums:`);
+        logger.debug(`processEnums: ---------- Finding Enums:`);
         m.getEnums().forEach(e => {
             const fmxEnum = this.processEnum(e);
             fmxScope.addType(fmxEnum);
@@ -226,7 +227,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processFunctions(m: SourceFile | ModuleDeclaration | FunctionDeclaration | FunctionExpression | MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace | Famix.Function | Famix.Method | Famix.Accessor): void {
-        console.info(`processFunctions: ---------- Finding Functions:`);
+        logger.debug(`Finding Functions:`);
         m.getFunctions().forEach(f => {
             const fmxFunction = this.processFunction(f);
             fmxScope.addFunction(fmxFunction);
@@ -239,7 +240,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the container
      */
     private processNamespaces(m: SourceFile | ModuleDeclaration, fmxScope: Famix.ScriptEntity | Famix.Module | Famix.Namespace): void {
-        console.info(`processNamespaces: ---------- Finding Namespaces:`);
+        logger.debug(`Finding Namespaces:`);
         m.getModules().forEach(md => {
             const fmxNsp = this.processNamespace(md);
             fmxScope.addNamespace(fmxNsp);
@@ -254,7 +255,7 @@ export class ProcessFiles {
     private processAlias(a: TypeAliasDeclaration): Famix.Alias {
         const fmxAlias = this.famixFunctions.createFamixAlias(a);
 
-        console.info(`processAlias: alias: ${a.getName()}, (${a.getType().getText()}), fqn = ${fmxAlias.getFullyQualifiedName()}`);
+        logger.debug(`Alias: ${a.getName()}, (${a.getType().getText()}), fqn = ${fmxAlias.getFullyQualifiedName()}`);
 
         this.processComments(a, fmxAlias);
 
@@ -271,7 +272,7 @@ export class ProcessFiles {
 
         const fmxClass = this.famixFunctions.createOrGetFamixClass(c);
 
-        console.info(`processClass: class: ${c.getName()}, (${c.getType().getText()}), fqn = ${fmxClass.getFullyQualifiedName()}`);
+        logger.debug(`Class: ${c.getName()}, (${c.getType().getText()}), fqn = ${fmxClass.getFullyQualifiedName()}`);
 
         this.processComments(c, fmxClass);
 
@@ -307,7 +308,7 @@ export class ProcessFiles {
 
         const fmxInterface = this.famixFunctions.createOrGetFamixInterface(i);
 
-        console.info(`processInterface: interface: ${i.getName()}, (${i.getType().getText()}), fqn = ${fmxInterface.getFullyQualifiedName()}`);
+        logger.debug(`Interface: ${i.getName()}, (${i.getType().getText()}), fqn = ${fmxInterface.getFullyQualifiedName()}`);
 
         this.processComments(i, fmxInterface);
 
@@ -322,7 +323,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the structured type
      */
     private processStructuredType(c: ClassDeclaration | InterfaceDeclaration, fmxScope: Famix.Class | Famix.ParameterizableClass | Famix.Interface | Famix.ParameterizableInterface): void {
-        console.info(`processStructuredType: ---------- Finding Properties and Methods:`);
+        logger.debug(`Finding Properties and Methods:`);
         if (fmxScope instanceof Famix.ParameterizableClass || fmxScope instanceof Famix.ParameterizableInterface) {
             this.processTypeParameters(c, fmxScope);
         }
@@ -346,16 +347,16 @@ export class ProcessFiles {
     private processProperty(p: PropertyDeclaration | PropertySignature): Famix.Property {
         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 PropertySignature) ? "Signature" : "Declaration"}!`);
+        logger.debug(`property: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxProperty.getFullyQualifiedName()}`);
+        logger.debug(` ---> It's a Property${(p instanceof PropertySignature) ? "Signature" : "Declaration"}!`);
         const ancestor = p.getFirstAncestorOrThrow();
-        console.info(` ---> Its first ancestor is a ${ancestor.getKindName()}`);
+        logger.debug(` ---> Its first ancestor is a ${ancestor.getKindName()}`);
 
         if (!(p instanceof 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()}`);
+                logger.debug(`adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxProperty.getName()}`);
                 this.accessMap.set(fmxProperty.id, p);
             }
         }
@@ -373,7 +374,7 @@ export class ProcessFiles {
     private processMethod(m: MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration): Famix.Method | Famix.Accessor {
         const fmxMethod = this.famixFunctions.createFamixMethod(m, this.currentCC);
 
-        console.info(`processMethod: method: ${!(m instanceof ConstructorDeclaration) ? m.getName() : "constructor"}, (${m.getType().getText()}), parent: ${(m.getParent() as ClassDeclaration | InterfaceDeclaration).getName()}, fqn = ${fmxMethod.getFullyQualifiedName()}`);
+        logger.debug(`Method: ${!(m instanceof ConstructorDeclaration) ? m.getName() : "constructor"}, (${m.getType().getText()}), parent: ${(m.getParent() as ClassDeclaration | InterfaceDeclaration).getName()}, fqn = ${fmxMethod.getFullyQualifiedName()}`);
 
         this.processComments(m, fmxMethod);
 
@@ -410,7 +411,7 @@ export class ProcessFiles {
     private processFunction(f: FunctionDeclaration | FunctionExpression): Famix.Function {
         const fmxFunction = this.famixFunctions.createFamixFunction(f, this.currentCC);
 
-        console.info(`processFunction: function: ${(f.getName()) ? f.getName() : "anonymous"}, (${f.getType().getText()}), fqn = ${fmxFunction.getFullyQualifiedName()}`);
+        logger.debug(`Function: ${(f.getName()) ? f.getName() : "anonymous"}, (${f.getType().getText()}), fqn = ${fmxFunction.getFullyQualifiedName()}`);
 
         this.processComments(f, fmxFunction);
 
@@ -441,7 +442,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the function or the method
      */
     private processFunctionExpressions(f: FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration, fmxScope: Famix.Function | Famix.Method | Famix.Accessor): void {
-        console.info(`processFunctionExpressions: ---------- Finding Function Expressions:`);
+        logger.debug(`Finding Function Expressions:`);
         const functionExpressions = f.getDescendantsOfKind(SyntaxKind.FunctionExpression);
         functionExpressions.forEach((func) => {
             const fmxFunc = this.processFunction(func);
@@ -455,7 +456,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the method or the function
      */
     private processParameters(m: MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration | FunctionDeclaration | FunctionExpression, fmxScope: Famix.Method | Famix.Accessor | Famix.Function): void {
-        console.info(`processParameters: ---------- Finding Parameters:`);
+        logger.debug(`Finding Parameters:`);
         m.getParameters().forEach(param => {
             const fmxParam = this.processParameter(param);
             fmxScope.addParameter(fmxParam);
@@ -470,7 +471,7 @@ export class ProcessFiles {
     private processParameter(p: ParameterDeclaration): Famix.Parameter {
         const fmxParam = this.famixFunctions.createFamixParameter(p);
 
-        console.info(`processParameter: parameter: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxParam.getFullyQualifiedName()}`);
+        logger.debug(`parameter: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxParam.getFullyQualifiedName()}`);
 
         this.processComments(p, fmxParam);
 
@@ -479,7 +480,7 @@ export class ProcessFiles {
         const parent = p.getParent();
 
         if (!(parent instanceof MethodSignature)) {
-            console.info(`processParameter: adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxParam.getName()}`);
+            logger.debug(`adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxParam.getName()}`);
             this.accessMap.set(fmxParam.id, p);
         }
 
@@ -492,10 +493,10 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the class, the interface, the method or the function
      */
     private processTypeParameters(e: ClassDeclaration | InterfaceDeclaration | MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration | FunctionDeclaration | FunctionExpression, fmxScope: Famix.ParameterizableClass | Famix.ParameterizableInterface | Famix.Method | Famix.Accessor | Famix.Function): void {
-        console.info(`processTypeParameters: ---------- Finding Type Parameters:`);
+        logger.debug(`Finding Type Parameters:`);
         e.getTypeParameters().forEach(tp => {
             const fmxParam = this.processTypeParameter(tp);
-            fmxScope.addTypeParameter(fmxParam);
+            fmxScope.addParameterType(fmxParam);
         });
     }
 
@@ -504,10 +505,10 @@ export class ProcessFiles {
      * @param tp A type parameter
      * @returns A Famix.TypeParameter representing the type parameter
      */
-    private processTypeParameter(tp: TypeParameterDeclaration): Famix.TypeParameter {
-        const fmxTypeParameter = this.famixFunctions.createFamixTypeParameter(tp);
+    private processTypeParameter(tp: TypeParameterDeclaration): Famix.ParameterType {
+        const fmxTypeParameter = this.famixFunctions.createFamixParameterType(tp);
 
-        console.info(`processTypeParameter: type parameter: ${tp.getName()}, (${tp.getType().getText()}), fqn = ${fmxTypeParameter.getFullyQualifiedName()}`);
+        logger.debug(`type parameter: ${tp.getName()}, (${tp.getType().getText()}), fqn = ${fmxTypeParameter.getFullyQualifiedName()}`);
 
         this.processComments(tp, fmxTypeParameter);
 
@@ -522,7 +523,7 @@ export class ProcessFiles {
     private processVariableStatement(v: VariableStatement): Array<Famix.Variable> {
         const fmxVariables = new Array<Famix.Variable>();
 
-        console.info(`processVariableStatement: variable statement: variable statement, (${v.getType().getText()}), ${v.getDeclarationKindKeyword().getText()}`);
+        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);
@@ -541,11 +542,11 @@ export class ProcessFiles {
     private processVariable(v: VariableDeclaration): Famix.Variable {
         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()}`);
+        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()}`);
+        logger.debug(`adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxVar.getName()}`);
         this.accessMap.set(fmxVar.id, v);
 
         return fmxVar;
@@ -559,7 +560,7 @@ export class ProcessFiles {
     private processEnum(e: EnumDeclaration): Famix.Enum {
         const fmxEnum = this.famixFunctions.createFamixEnum(e);
 
-        console.info(`processEnum: enum: ${e.getName()}, (${e.getType().getText()}), fqn = ${fmxEnum.getFullyQualifiedName()}`);
+        logger.debug(`enum: ${e.getName()}, (${e.getType().getText()}), fqn = ${fmxEnum.getFullyQualifiedName()}`);
 
         this.processComments(e, fmxEnum);
 
@@ -579,11 +580,11 @@ export class ProcessFiles {
     private processEnumValue(v: EnumMember): Famix.EnumValue {
         const fmxEnumValue = this.famixFunctions.createFamixEnumValue(v);
 
-        console.info(`processEnumValue: enum value: ${v.getName()}, (${v.getType().getText()}), fqn = ${fmxEnumValue.getFullyQualifiedName()}`);
+        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()}`);
+        logger.debug(`adding access: ${v.getName()}, (${v.getType().getText()}) Famix ${fmxEnumValue.getName()}`);
         this.accessMap.set(fmxEnumValue.id, v);
 
         return fmxEnumValue;
@@ -595,7 +596,7 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the class, the method, the parameter or the property
      */
     private processDecorators(e: ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ParameterDeclaration | PropertyDeclaration, fmxScope: Famix.Class | Famix.ParameterizableClass | Famix.Method | Famix.Accessor | Famix.Parameter | Famix.Property): void {
-        console.info(`processDecorators: ---------- Finding Decorators:`);
+        logger.debug(`Finding Decorators:`);
         e.getDecorators().forEach(dec => {
             const fmxDec = this.processDecorator(dec, e);
             fmxScope.addDecorator(fmxDec);
@@ -611,7 +612,7 @@ export class ProcessFiles {
     private processDecorator(d: Decorator, e: ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ParameterDeclaration | PropertyDeclaration): Famix.Decorator {
         const fmxDec = this.famixFunctions.createOrGetFamixDecorator(d, e);
 
-        console.info(`processDecorator: decorator: ${d.getName()}, (${d.getType().getText()}), fqn = ${fmxDec.getFullyQualifiedName()}`);
+        logger.debug(`decorator: ${d.getName()}, (${d.getType().getText()}), fqn = ${fmxDec.getFullyQualifiedName()}`);
 
         this.processComments(d, fmxDec);
 
@@ -624,13 +625,15 @@ export class ProcessFiles {
      * @param fmxScope The Famix model of the named entity
      */
     private processComments(e: SourceFile | ModuleDeclaration | ClassDeclaration | InterfaceDeclaration | MethodDeclaration | ConstructorDeclaration | MethodSignature | GetAccessorDeclaration | SetAccessorDeclaration | FunctionDeclaration | FunctionExpression | ParameterDeclaration | VariableDeclaration | PropertyDeclaration | PropertySignature | Decorator | EnumDeclaration | EnumMember | TypeParameterDeclaration | VariableStatement | TypeAliasDeclaration, fmxScope: Famix.NamedEntity): void {
-        console.info(`processComments: ---------- Finding Comments:`);
+        logger.debug(`Process comments:`);
         e.getLeadingCommentRanges().forEach(c => {
             const fmxComment = this.processComment(c, fmxScope);
-            fmxScope.addComment(fmxComment);
+            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);
+            logger.debug(`trailing comments, addComment: '${c.getText()}'`);
             fmxScope.addComment(fmxComment);
         });
     }
@@ -642,15 +645,10 @@ export class ProcessFiles {
      * @returns A Famix.Comment representing the comment
      */
     private processComment(c: CommentRange, fmxScope: Famix.NamedEntity): Famix.Comment {
-        let isJSDoc = false;
-        if (c.getText().substring(0, 3) === "/**") {
-            isJSDoc = true;
-        }
-
+        const isJSDoc = c.getText().startsWith("/**");
+        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/src/analyze_functions/processImportClauses.ts

@@ -1,5 +1,6 @@
 import { ImportDeclaration, SourceFile, ExportedDeclarations } from "ts-morph";
 import { FamixFunctions } from "../famix_functions/famix_functions";
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the import clauses
@@ -22,13 +23,13 @@ export class ProcessImportClauses {
      * @param exports An array of maps of exported declarations
      */
     public processImportClauses(modules: Array<SourceFile>, exports: Array<ReadonlyMap<string, ExportedDeclarations[]>>): void {
-        console.info(`processImportClauses: Creating import clauses:`);
+        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()}`);
+                    logger.debug(`processImportClauses: Importing (named) ${namedImport.getName()} from ${impDecl.getModuleSpecifierValue()}`);
                     const importedEntityName = namedImport.getName();
                     let importFoundInExports = false;
                     exports.forEach(e => {
@@ -36,19 +37,36 @@ export 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);
+                    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);
+                    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/src/analyze_functions/processInheritances.ts

@@ -1,5 +1,6 @@
 import { ClassDeclaration, InterfaceDeclaration, ExpressionWithTypeArguments } from "ts-morph";
 import { FamixFunctions } from "../famix_functions/famix_functions";
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the inheritances
@@ -22,32 +23,32 @@ export class ProcessInheritances {
      * @param interfaces An array of interfaces
      */
     public processInheritances(classes: ClassDeclaration[], interfaces: InterfaceDeclaration[]): void {
-        console.info(`processInheritances: Creating inheritances:`);
+        logger.info(`processInheritances: Creating inheritances:`);
         classes.forEach(cls => {
-            console.info(`processInheritances: Checking class inheritance for ${cls.getName()}`);
+            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()})`);
+                logger.debug(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), extClass: ${extClass.getName()}, (${extClass.getType().getText()})`);
             }
 
-            console.info(`processInheritances: Checking interface inheritance for ${cls.getName()}`);
+            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 InterfaceDeclaration) ? impInter.getName() : impInter.getExpression().getText()}, (${(impInter instanceof InterfaceDeclaration) ? impInter.getType().getText() : impInter.getExpression().getText()})`);
+                logger.debug(`processInheritances: class: ${cls.getName()}, (${cls.getType().getText()}), impInter: ${(impInter instanceof InterfaceDeclaration) ? impInter.getName() : impInter.getExpression().getText()}, (${(impInter instanceof InterfaceDeclaration) ? impInter.getType().getText() : impInter.getExpression().getText()})`);
             });
         });
 
         interfaces.forEach(inter => {
-            console.info(`processInheritances: Checking interface inheritance for ${inter.getName()}`);
+            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 InterfaceDeclaration) ? extInter.getName() : extInter.getExpression().getText()}, (${(extInter instanceof InterfaceDeclaration) ? extInter.getType().getText() : extInter.getExpression().getText()})`);
+                logger.debug(`processInheritances: inter: ${inter.getName()}, (${inter.getType().getText()}), extInter: ${(extInter instanceof InterfaceDeclaration) ? extInter.getName() : extInter.getExpression().getText()}, (${(extInter instanceof InterfaceDeclaration) ? extInter.getType().getText() : extInter.getExpression().getText()})`);
             });
         });
     }

package/src/analyze_functions/processInvocations.ts

@@ -1,5 +1,6 @@
 import { MethodDeclaration, FunctionDeclaration, Identifier, ConstructorDeclaration, GetAccessorDeclaration, SetAccessorDeclaration, FunctionExpression } from "ts-morph";
 import { FamixFunctions } from "../famix_functions/famix_functions";
+import { logger } from "../analyze";
 
 /**
  * This class is used to build a Famix model for the invocations
@@ -21,14 +22,14 @@ export class ProcessInvocations {
      * @param methodsAndFunctionsWithId A map of methods and functions with their id
      */
     public processInvocations(methodsAndFunctionsWithId: Map<number, MethodDeclaration | ConstructorDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | FunctionDeclaration | FunctionExpression>): void {
-        console.info(`Creating invocations:`);
+        logger.info(`Creating invocations:`);
         methodsAndFunctionsWithId.forEach((m, id) => {
-            console.info(`Invocations to ${(m instanceof MethodDeclaration || m instanceof GetAccessorDeclaration || m instanceof SetAccessorDeclaration || m instanceof FunctionDeclaration) ? m.getName() : ((m instanceof ConstructorDeclaration) ? 'constructor' : (m.getName() ? m.getName() : 'anonymous'))}`);
+            logger.debug(`Invocations to ${(m instanceof MethodDeclaration || m instanceof GetAccessorDeclaration || m instanceof SetAccessorDeclaration || m instanceof FunctionDeclaration) ? m.getName() : ((m instanceof ConstructorDeclaration) ? 'constructor' : (m.getName() ? m.getName() : 'anonymous'))}`);
             try {
                 const temp_nodes = m.findReferencesAsNodes() as Array<Identifier>;
                 temp_nodes.forEach(node => this.processNodeForInvocations(node, m, id));
             } catch (error) {
-                console.error(`> WARNING: got exception ${error}. Continuing...`);
+                logger.error(`> WARNING: got exception ${error}. Continuing...`);
             }
         });
     }
@@ -43,9 +44,9 @@ export class ProcessInvocations {
         try {
             this.famixFunctions.createFamixInvocation(n, m, id);
 
-            console.info(`node: node, (${n.getType().getText()})`);
+            logger.debug(`node: node, (${n.getType().getText()})`);
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
         }
     }
 }

package/src/famix_functions/famix_functions.ts

@@ -1,10 +1,11 @@
-import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments } from "ts-morph";
+import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments, ImportDeclaration } from "ts-morph";
 import * as Famix from "../lib/famix/src/model/famix";
 import { FamixRepository } from "../lib/famix/src/famix_repository";
 import { FQNFunctions } from "../fqn";
 import { FamixFunctionsIndex } from "./famix_functions_index";
 import { FamixFunctionsAssociations } from "./famix_functions_associations";
 import { FamixFunctionsTypes } from "./famix_functions_types";
+import { logger } from "../analyze";
 
 /**
  * This class contains all the functions needed to create Famix entities
@@ -97,7 +98,7 @@ export class FamixFunctions {
             fmxAlias = new Famix.Alias(this.famixRep);
             fmxAlias.setName(a.getName());
             const aliasNameWithGenerics = aliasName + (a.getTypeParameters().length ? ("<" + a.getTypeParameters().map(tp => tp.getName()).join(", ") + ">") : "");
-            console.info(`> NOTE: alias ${aliasName} has fully qualified name ${aliasFullyQualifiedName} and name with generics ${aliasNameWithGenerics}.`);
+            logger.debug(`> NOTE: alias ${aliasName} has fully qualified name ${aliasFullyQualifiedName} and name with generics ${aliasNameWithGenerics}.`);
 
             const fmxType = this.createOrGetFamixType(aliasNameWithGenerics, a);
             fmxAlias.setAliasedEntity(fmxType);
@@ -189,7 +190,7 @@ export class FamixFunctions {
         try {
             propTypeName = property.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for property: ${property.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(propTypeName, property);
@@ -288,7 +289,7 @@ export class FamixFunctions {
         try {
             methodTypeName = method.getReturnType().getText().trim();            
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of method: ${fmxMethod.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of method: ${fmxMethod.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(methodTypeName, method);
@@ -332,7 +333,7 @@ export class FamixFunctions {
         try {
             functionTypeName = func.getReturnType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of function: ${func.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for return type of function: ${func.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(functionTypeName, func);
@@ -359,7 +360,7 @@ export class FamixFunctions {
         try {
             paramTypeName = param.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for parameter: ${param.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(paramTypeName, param);
@@ -376,13 +377,13 @@ export class FamixFunctions {
      * @param tp A type parameter
      * @returns The Famix model of the type parameter
      */
-    public createFamixTypeParameter(tp: TypeParameterDeclaration): Famix.TypeParameter {
-        const fmxTypeParameter = new Famix.TypeParameter(this.famixRep);
-        fmxTypeParameter.setName(tp.getName());
+    public createFamixParameterType(tp: TypeParameterDeclaration): Famix.ParameterType {
+        const fmxParameterType = new Famix.ParameterType(this.famixRep);
+        fmxParameterType.setName(tp.getName());
 
-        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxTypeParameter);
+        this.famixFunctionsIndex.makeFamixIndexFileAnchor(tp, fmxParameterType);
 
-        return fmxTypeParameter;
+        return fmxParameterType;
     }
 
     /**
@@ -397,7 +398,7 @@ export class FamixFunctions {
         try {
             variableTypeName = variable.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for variable: ${variable.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(variableTypeName, variable);
@@ -435,7 +436,7 @@ export class FamixFunctions {
         try {
             enumValueTypeName = enumMember.getType().getText().trim();
         } catch (error) {
-            console.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
+            logger.error(`> WARNING: got exception ${error}. Failed to get usable name for enum value: ${enumMember.getName()}. Continuing...`);
         }
 
         const fmxType = this.createOrGetFamixType(enumValueTypeName, enumMember);
@@ -477,9 +478,9 @@ export class FamixFunctions {
      * @returns The Famix model of the comment
      */
     public createFamixComment(comment: CommentRange, fmxScope: Famix.NamedEntity, isJSDoc: boolean): Famix.Comment {
+        logger.debug(`> NOTE: creating comment ${comment.getText()} in scope ${fmxScope.getName()}.`);
         const fmxComment = new Famix.Comment(this.famixRep);
-        fmxComment.setContent(comment.getText());
-        fmxComment.setContainer(fmxScope);
+        fmxComment.setContainer(fmxScope);  // adds comment to the container's comments collection
         fmxComment.setIsJSDoc(isJSDoc);
 
         this.famixFunctionsIndex.makeFamixIndexFileAnchor(comment, fmxComment);
@@ -527,6 +528,8 @@ export class FamixFunctions {
 
     /**
      * Creates a Famix import clause
+     * @param importClauseInfo An import clause
+     * @param importDeclaration An import declaration (optional)
      * @param importer A source file which is a module
      * @param moduleSpecifier The name of the module where the export declaration is
      * @param moduleSpecifierFilePath The path of the module where the export declaration is
@@ -534,14 +537,8 @@ export class FamixFunctions {
      * @param isInExports A boolean indicating if the imported entity is in the exports
      * @param isDefaultExport A boolean indicating if the imported entity is a default export
      */    
-    public createFamixImportClause(importer: SourceFile, moduleSpecifier: string, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean): void {
-        this.famixFunctionsAssociations.createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport);
-    }
-
-    // create the same function as createFamixImportClause but with a signature that has a single object parameter that has all the parameters
-    // this way we can call this function from the processImportClauses.ts file
-    public createFamixImportClause2(importClause: {importer: SourceFile, moduleSpecifier: string, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean}): void {
-        this.famixFunctionsAssociations.createFamixImportClause(importClause.importer, importClause.moduleSpecifier, importClause.moduleSpecifierFilePath, importClause.importElement, importClause.isInExports, importClause.isDefaultExport);
+    public createFamixImportClause(importClauseInfo: {importDeclaration?: ImportDeclaration, importer: SourceFile, moduleSpecifierFilePath: string, importElement: ImportSpecifier | Identifier, isInExports: boolean, isDefaultExport: boolean}): void {
+        this.famixFunctionsAssociations.createFamixImportClause(importClauseInfo);
     }
 
     /**