ts2famix 1.0.14 → 1.0.16

package/dist/analyze_functions/processImportClauses.js

@@ -19,29 +19,29 @@ class ProcessImportClauses {
      */
     processImportClauses(modules, exports) {
         console.info(`processImportClauses: Creating import clauses:`);
-        modules.forEach(f => {
-            f.getImportDeclarations().forEach(i => {
-                const path = this.getModulePath(i);
-                i.getNamedImports().forEach(ni => {
-                    console.info(`processImportClauses: Importing (named) ${ni.getName()} from ${i.getModuleSpecifierValue()}`);
-                    const importedEntityName = ni.getName();
-                    let bool = false;
+        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()}`);
+                    const importedEntityName = namedImport.getName();
+                    let importFoundInExports = false;
                     exports.forEach(e => {
                         if (e.has(importedEntityName)) {
-                            bool = true;
+                            importFoundInExports = true;
                         }
                     });
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, ni, bool, false);
+                    this.famixFunctions.createFamixImportClause2({ importer: module, moduleSpecifier: impDecl.getModuleSpecifierValue(), moduleSpecifierFilePath: path, importElement: namedImport, isInExports: importFoundInExports, isDefaultExport: false });
                 });
-                const defaultImport = i.getDefaultImport();
+                const defaultImport = impDecl.getDefaultImport();
                 if (defaultImport !== undefined) {
-                    console.info(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${i.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, defaultImport, false, true);
+                    console.info(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, defaultImport, false, true);
                 }
-                const namespaceImport = i.getNamespaceImport();
+                const namespaceImport = impDecl.getNamespaceImport();
                 if (namespaceImport !== undefined) {
-                    console.info(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${i.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, namespaceImport, false, false);
+                    console.info(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, namespaceImport, false, false);
                 }
             });
         });

package/dist/famix_functions/famix_functions.js

@@ -499,6 +499,11 @@ class FamixFunctions {
     createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport) {
         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
+    createFamixImportClause2(importClause) {
+        this.famixFunctionsAssociations.createFamixImportClause(importClause.importer, importClause.moduleSpecifier, importClause.moduleSpecifierFilePath, importClause.importElement, importClause.isInExports, importClause.isDefaultExport);
+    }
     /**
      * Gets a Famix entity by fully qualified name
      * @param fullyQualifiedName A fully qualified name

package/dist/famix_functions/famix_functions_associations.js

@@ -28,6 +28,7 @@ const ts_morph_1 = require("ts-morph");
 const Famix = __importStar(require("../lib/famix/src/model/famix"));
 const fqn_1 = require("../fqn");
 const famix_functions_index_1 = require("./famix_functions_index");
+const famix_1 = require("../lib/famix/src/model/famix");
 /**
  * This class is used to build a Famix model for the associations
  */
@@ -144,6 +145,8 @@ class FamixFunctionsAssociations {
      * @param isDefaultExport A boolean indicating if the imported entity is a default export
      */
     createFamixImportClause(importer, moduleSpecifier, moduleSpecifierFilePath, importElement, isInExports, isDefaultExport) {
+        var _a, _b;
+        console.info(`createFamixImportClause: Creating import clause:`);
         const fmxImportClause = new Famix.ImportClause(this.famixRep);
         let importedEntity;
         let importedEntityName;
@@ -179,11 +182,18 @@ class FamixFunctionsAssociations {
         }
         const importerFullyQualifiedName = this.FQNFunctions.getFQN(importer);
         const fmxImporter = this.getFamixEntityByFullyQualifiedName(importerFullyQualifiedName);
-        fmxImportClause.setImporter(fmxImporter);
+        fmxImportClause.setImportingEntity(fmxImporter);
         fmxImportClause.setImportedEntity(importedEntity);
         fmxImportClause.setModuleSpecifier(moduleSpecifier);
+        console.info(`createFamixImportClause: ${(_a = fmxImportClause.getImportedEntity()) === null || _a === void 0 ? void 0 : _a.getName()} (of type ${fmxImportClause.getImportedEntity() instanceof famix_1.Class ? 'Class' :
+            fmxImportClause.getImportedEntity() instanceof famix_1.Interface ? 'Interface' :
+                fmxImportClause.getImportedEntity() instanceof Function ? 'Function' :
+                    fmxImportClause.getImportedEntity() instanceof famix_1.Enum ? 'Enum' :
+                        fmxImportClause.getImportedEntity() instanceof famix_1.Alias ? 'Alias' :
+                            fmxImportClause.getImportedEntity() instanceof famix_1.Variable ? 'Variable' :
+                                'NamedEntity'}) is imported by ${(_b = fmxImportClause.getImportingEntity()) === null || _b === void 0 ? void 0 : _b.getName()}`);
         this.famixFunctionsIndex.makeFamixIndexFileAnchor(null, fmxImportClause);
-        fmxImporter.addImportClause(fmxImportClause);
+        fmxImporter.addOutgoingImport(fmxImportClause);
     }
     /**
      * Gets a Famix entity by id

package/dist/famix_functions/famix_functions_types.js

@@ -52,14 +52,14 @@ class FamixFunctionsTypes {
         let fmxType;
         let isPrimitiveType = false;
         let isParameterizedType = false;
-        console.info("Creating (or getting) type: " + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
+        console.info("Creating (or getting) type: '" + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
         const typeAncestor = this.findTypeAncestor(element);
         const ancestorFullyQualifiedName = this.FQNFunctions.getFQN(typeAncestor);
         const ancestor = this.getFamixEntityByFullyQualifiedName(ancestorFullyQualifiedName);
         if (!ancestor) {
             throw new Error(`Ancestor ${ancestorFullyQualifiedName} not found.`);
         }
-        if (typeName === "number" || typeName === "string" || typeName === "boolean" || typeName === "bigint" || typeName === "symbol" || typeName === "undefined" || typeName === "null") {
+        if (typeName === "number" || typeName === "string" || typeName === "boolean" || typeName === "bigint" || typeName === "symbol" || typeName === "undefined" || typeName === "null" || typeName === "any" || typeName === "unknown" || typeName === "never" || typeName === "void") {
             isPrimitiveType = true;
         }
         if (!isPrimitiveType && typeName.includes("<") && typeName.includes(">") && !(typeName.includes("=>"))) {

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

@@ -12,6 +12,7 @@ class FamixRepository {
         this.famixInterfaces = new Set(); // All Famix interfaces
         this.famixNamespaces = new Set(); // All Famix namespaces
         this.famixMethods = new Set(); // All Famix methods
+        this.famixVariables = new Set(); // All Famix variables
         this.famixFunctions = new Set(); // All Famix functions
         this.famixFiles = new Set(); // All Famix files
         this.idCounter = 1; // Id counter
@@ -83,6 +84,14 @@ class FamixRepository {
     _getFamixFunction(name) {
         return Array.from(this.famixFunctions.values()).find(ns => ns.getName() === name);
     }
+    /**
+     * 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);
+    }
     /**
      * Gets a Famix namespace by name
      * @param name A namespace name
@@ -158,6 +167,9 @@ class FamixRepository {
         else if (element instanceof famix_1.Namespace) {
             this.famixNamespaces.add(element);
         }
+        else if (element instanceof famix_1.Variable) {
+            this.famixVariables.add(element);
+        }
         else if (element instanceof famix_1.Method) {
             this.famixMethods.add(element);
         }

package/dist/lib/famix/src/model/famix/container_entity.js

@@ -109,7 +109,7 @@ class ContainerEntity extends named_entity_1.NamedEntity {
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
-        exporter.addProperty("parentContainerEntity", this.getParentContainerEntity());
+        exporter.addProperty("parentBehaviouralEntity", this.getParentContainerEntity());
         exporter.addProperty("childrenContainerEntities", this.getChildrenContainerEntities());
         exporter.addProperty("cyclomaticComplexity", this.getCyclomaticComplexity());
         exporter.addProperty("numberOfStatements", this.getNumberOfStatements());

package/dist/lib/famix/src/model/famix/import_clause.js

@@ -4,19 +4,19 @@ exports.ImportClause = void 0;
 const famix_JSON_exporter_1 = require("../../famix_JSON_exporter");
 const association_1 = require("./association");
 class ImportClause extends association_1.Association {
-    getImporter() {
-        return this.importer;
+    getImportingEntity() {
+        return this.importingEntity;
     }
-    setImporter(importer) {
-        this.importer = importer;
-        importer.addImportClause(this);
+    setImportingEntity(importer) {
+        this.importingEntity = importer;
+        importer.addOutgoingImport(this); // opposite
     }
     getImportedEntity() {
         return this.importedEntity;
     }
     setImportedEntity(importedEntity) {
         this.importedEntity = importedEntity;
-        importedEntity.addImport(this);
+        importedEntity.addIncomingImport(this); // incomingImports in Famix TImportable/TImport
     }
     getModuleSpecifier() {
         return this.moduleSpecifier;
@@ -31,7 +31,7 @@ class ImportClause extends association_1.Association {
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
-        exporter.addProperty("importer", this.getImporter());
+        exporter.addProperty("importingEntity", this.getImportingEntity());
         exporter.addProperty("importedEntity", this.getImportedEntity());
         exporter.addProperty("moduleSpecifier", this.getModuleSpecifier());
     }

package/dist/lib/famix/src/model/famix/module.js

@@ -6,15 +6,16 @@ const script_entity_1 = require("./script_entity");
 class Module extends script_entity_1.ScriptEntity {
     constructor() {
         super(...arguments);
-        this.importClauses = new Set();
+        // incomingImports are in NamedEntity
+        this.outgoingImports = new Set();
     }
-    getImportClauses() {
-        return this.importClauses;
+    getOutgoingImports() {
+        return this.outgoingImports;
     }
-    addImportClause(importClause) {
-        if (!this.importClauses.has(importClause)) {
-            this.importClauses.add(importClause);
-            importClause.setImporter(this);
+    addOutgoingImport(importClause) {
+        if (!this.outgoingImports.has(importClause)) {
+            this.outgoingImports.add(importClause);
+            importClause.setImportingEntity(this); // opposite
         }
     }
     getJSON() {
@@ -24,7 +25,7 @@ class Module extends script_entity_1.ScriptEntity {
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
-        exporter.addProperty("importClauses", this.getImportClauses());
+        exporter.addProperty("outgoingImports", this.getOutgoingImports());
     }
 }
 exports.Module = Module;

package/dist/lib/famix/src/model/famix/named_entity.js

@@ -7,7 +7,7 @@ class NamedEntity extends sourced_entity_1.SourcedEntity {
     constructor() {
         super(...arguments);
         this.receivedInvocations = new Set();
-        this.imports = new Set();
+        this.incomingImports = new Set();
         this.aliases = new Set();
         this.decorators = new Set();
     }
@@ -26,13 +26,13 @@ class NamedEntity extends sourced_entity_1.SourcedEntity {
             receivedInvocation.setReceiver(this);
         }
     }
-    getImports() {
-        return this.imports;
+    getIncomingImports() {
+        return this.incomingImports;
     }
-    addImport(anImport) {
-        if (!this.imports.has(anImport)) {
-            this.imports.add(anImport);
-            anImport.setImportedEntity(this);
+    addIncomingImport(anImport) {
+        if (!this.incomingImports.has(anImport)) {
+            this.incomingImports.add(anImport);
+            anImport.setImportedEntity(this); // opposite
         }
     }
     getName() {
@@ -68,7 +68,7 @@ class NamedEntity extends sourced_entity_1.SourcedEntity {
         super.addPropertiesToExporter(exporter);
         exporter.addProperty("fullyQualifiedName", this.getFullyQualifiedName());
         exporter.addProperty("receivedInvocations", this.getReceivedInvocations());
-        exporter.addProperty("imports", this.getImports());
+        exporter.addProperty("incomingImports", this.getIncomingImports());
         exporter.addProperty("name", this.getName());
         exporter.addProperty("aliases", this.getAliases());
         exporter.addProperty("decorators", this.getDecorators());

package/dist/lib/famix/src/model/famix/scoping_entity.js

@@ -13,9 +13,13 @@ class ScopingEntity extends container_entity_1.ContainerEntity {
     }
     addNamespace(childNamespace) {
         if (!this.childrenNamespaces.has(childNamespace)) {
+            console.info("Adding namespace " + childNamespace.getName() + " to " + this.getName());
             this.childrenNamespaces.add(childNamespace);
             childNamespace.setParentScope(this);
         }
+        else {
+            console.info("Namespace " + childNamespace.getName() + " already added to " + this.getName());
+        }
     }
     getJSON() {
         const mse = new famix_JSON_exporter_1.FamixJSONExporter("ScopingEntity", this);

package/dist/lib/famix/src/model/famix/variable.js

@@ -17,7 +17,7 @@ class Variable extends structural_entity_1.StructuralEntity {
     }
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
-        exporter.addProperty("parentContainerEntity", this.getParentContainerEntity());
+        exporter.addProperty("parentBehaviouralEntity", this.getParentContainerEntity());
     }
 }
 exports.Variable = Variable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "A TypeScript to JSON importer for Moose 10.",
   "main": "dist/ts2famix-cli.js",
   "scripts": {
@@ -26,13 +26,13 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^29.5.4",
-    "@types/node": "^20.6.0",
+    "@types/jest": "^29.5.5",
+    "@types/node": "^20.6.3",
     "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
     "eslint": "^8.49.0",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "tplant": "^3.1.2",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",

package/src/analyze_functions/processImportClauses.ts

@@ -23,32 +23,32 @@ export class ProcessImportClauses {
      */
     public processImportClauses(modules: Array<SourceFile>, exports: Array<ReadonlyMap<string, ExportedDeclarations[]>>): void {
         console.info(`processImportClauses: Creating import clauses:`);
-        modules.forEach(f => {
-            f.getImportDeclarations().forEach(i => {
-                const path = this.getModulePath(i);
+        modules.forEach(module => {
+            module.getImportDeclarations().forEach(impDecl => {
+                const path = this.getModulePath(impDecl);
 
-                i.getNamedImports().forEach(ni => {
-                    console.info(`processImportClauses: Importing (named) ${ni.getName()} from ${i.getModuleSpecifierValue()}`);
-                    const importedEntityName = ni.getName();
-                    let bool = false;
+                impDecl.getNamedImports().forEach(namedImport => {
+                    console.info(`processImportClauses: Importing (named) ${namedImport.getName()} from ${impDecl.getModuleSpecifierValue()}`);
+                    const importedEntityName = namedImport.getName();
+                    let importFoundInExports = false;
                     exports.forEach(e => {
                         if (e.has(importedEntityName)) {
-                            bool = true;
+                            importFoundInExports = true;
                         }
                     });
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, ni, bool, false);
+                    this.famixFunctions.createFamixImportClause2({importer: module, moduleSpecifier: impDecl.getModuleSpecifierValue(), moduleSpecifierFilePath: path, importElement: namedImport, isInExports: importFoundInExports, isDefaultExport: false});
                 });
 
-                const defaultImport = i.getDefaultImport();
+                const defaultImport = impDecl.getDefaultImport();
                 if (defaultImport !== undefined) {
-                    console.info(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${i.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, defaultImport, false, true);
+                    console.info(`processImportClauses: Importing (default) ${defaultImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, defaultImport, false, true);
                 }
 
-                const namespaceImport = i.getNamespaceImport();
+                const namespaceImport = impDecl.getNamespaceImport();
                 if (namespaceImport !== undefined) {
-                    console.info(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${i.getModuleSpecifierValue()}`);
-                    this.famixFunctions.createFamixImportClause(f, i.getModuleSpecifierValue(), path, namespaceImport, false, false);
+                    console.info(`processImportClauses: Importing (namespace) ${namespaceImport.getText()} from ${impDecl.getModuleSpecifierValue()}`);
+                    this.famixFunctions.createFamixImportClause(module, impDecl.getModuleSpecifierValue(), path, namespaceImport, false, false);
                 }
             }); 
         });

package/src/famix_functions/famix_functions.ts

@@ -533,11 +533,17 @@ export class FamixFunctions {
      * @param importElement The imported entity
      * @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);
+    }
+
     /**
      * Gets a Famix entity by fully qualified name
      * @param fullyQualifiedName A fully qualified name

package/src/famix_functions/famix_functions_associations.ts

@@ -3,6 +3,7 @@ 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 { Alias, Class, Enum, Interface, Variable } from "../lib/famix/src/model/famix";
 
 /**
  * This class is used to build a Famix model for the associations
@@ -140,6 +141,7 @@ export class FamixFunctionsAssociations {
      * @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 {
+        console.info(`createFamixImportClause: Creating import clause:`);
         const fmxImportClause = new Famix.ImportClause(this.famixRep);
 
         let importedEntity: Famix.NamedEntity;
@@ -177,13 +179,21 @@ export class FamixFunctionsAssociations {
 
         const importerFullyQualifiedName = this.FQNFunctions.getFQN(importer);
         const fmxImporter = this.getFamixEntityByFullyQualifiedName(importerFullyQualifiedName) as Famix.Module;
-        fmxImportClause.setImporter(fmxImporter);
+        fmxImportClause.setImportingEntity(fmxImporter);
         fmxImportClause.setImportedEntity(importedEntity);
         fmxImportClause.setModuleSpecifier(moduleSpecifier);
 
+        console.info(`createFamixImportClause: ${fmxImportClause.getImportedEntity()?.getName()} (of type ${fmxImportClause.getImportedEntity() instanceof Class ? 'Class' :
+        fmxImportClause.getImportedEntity() instanceof Interface ? 'Interface' :
+        fmxImportClause.getImportedEntity() instanceof Function ? 'Function' :
+        fmxImportClause.getImportedEntity() instanceof Enum ? 'Enum' :
+        fmxImportClause.getImportedEntity() instanceof Alias ? 'Alias' :
+        fmxImportClause.getImportedEntity() instanceof Variable ? 'Variable' :
+            'NamedEntity'}) is imported by ${fmxImportClause.getImportingEntity()?.getName()}`);
+
         this.famixFunctionsIndex.makeFamixIndexFileAnchor(null, fmxImportClause);
 
-        fmxImporter.addImportClause(fmxImportClause);
+        fmxImporter.addOutgoingImport(fmxImportClause);
     }
 
     /**

package/src/famix_functions/famix_functions_types.ts

@@ -34,7 +34,7 @@ export class FamixFunctionsTypes {
         let isPrimitiveType = false;
         let isParameterizedType = false;
 
-        console.info("Creating (or getting) type: " + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
+        console.info("Creating (or getting) type: '" + typeName + "' of element: " + element.getText() + " of kind: " + element.getKindName());
 
         const typeAncestor = this.findTypeAncestor(element);
         const ancestorFullyQualifiedName = this.FQNFunctions.getFQN(typeAncestor);
@@ -43,7 +43,7 @@ export class FamixFunctionsTypes {
             throw new Error(`Ancestor ${ancestorFullyQualifiedName} not found.`);
         }
 
-        if (typeName === "number" || typeName === "string" || typeName === "boolean" || typeName === "bigint" || typeName === "symbol" || typeName === "undefined" || typeName === "null") {
+        if (typeName === "number" || typeName === "string" || typeName === "boolean" || typeName === "bigint" || typeName === "symbol" || typeName === "undefined" || typeName === "null" || typeName === "any" || typeName === "unknown" || typeName === "never" || typeName === "void") {
             isPrimitiveType = true;
         }
 

package/src/lib/famix/src/famix_repository.ts

@@ -1,5 +1,5 @@
 import { FamixBaseElement } from "./famix_base_element";
-import { Class, Interface, Namespace, Method, Function, Type, NamedEntity, ScriptEntity, Module } from "./model/famix";
+import { Class, Interface, Namespace, Variable, Method, Function as FamixFunctionEntity, Type, NamedEntity, ScriptEntity, Module } from "./model/famix";
 
 /**
  * This class is used to store all Famix elements
@@ -11,7 +11,8 @@ export class FamixRepository {
   private famixInterfaces = new Set<Interface>(); // All Famix interfaces
   private famixNamespaces = new Set<Namespace>(); // All Famix namespaces
   private famixMethods = new Set<Method>(); // All Famix methods
-  private famixFunctions = new Set<Function>(); // All Famix functions
+  private famixVariables = new Set<Variable>(); // All Famix variables
+  private famixFunctions = new Set<FamixFunctionEntity>(); // All Famix functions
   private famixFiles = new Set<ScriptEntity | Module>(); // All Famix files
   private idCounter = 1; // Id counter
 
@@ -88,10 +89,20 @@ export class FamixRepository {
    * @param name A function name
    * @returns The Famix function corresponding to the name or undefined if it doesn't exist
    */
-  public _getFamixFunction(name: string): Function | undefined {
+  public _getFamixFunction(name: string): FamixFunctionEntity | undefined {
     return Array.from(this.famixFunctions.values()).find(ns => ns.getName() === name);
   }
 
+
+/**
+ * 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
+ */
+  public _getFamixVariable(name: string): Variable | undefined {
+    return Array.from(this.famixVariables.values()).find(v => v.getName() === name);
+  }
+
   /**
    * Gets a Famix namespace by name
    * @param name A namespace name
@@ -172,9 +183,11 @@ export class FamixRepository {
       this.famixInterfaces.add(element);
     } else if (element instanceof Namespace) {
       this.famixNamespaces.add(element);
+    } else if (element instanceof Variable) {
+      this.famixVariables.add(element);
     } else if (element instanceof Method) {
       this.famixMethods.add(element);
-    } else if (element instanceof Function) {
+    } else if (element instanceof FamixFunctionEntity) {
       this.famixFunctions.add(element);
     } else if (element instanceof ScriptEntity || element instanceof Module) {
       this.famixFiles.add(element);

package/src/lib/famix/src/model/famix/container_entity.ts

@@ -150,7 +150,7 @@ export class ContainerEntity extends NamedEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("parentContainerEntity", this.getParentContainerEntity());
+    exporter.addProperty("parentBehaviouralEntity", this.getParentContainerEntity());
     exporter.addProperty("childrenContainerEntities", this.getChildrenContainerEntities());
     exporter.addProperty("cyclomaticComplexity", this.getCyclomaticComplexity());
     exporter.addProperty("numberOfStatements", this.getNumberOfStatements());

package/src/lib/famix/src/model/famix/import_clause.ts

@@ -5,15 +5,15 @@ import { NamedEntity } from "./named_entity";
 
 export class ImportClause extends Association {
 
-  private importer: Module;
+  private importingEntity: Module;
 
-  public getImporter(): Module {
-    return this.importer;
+  public getImportingEntity(): Module {
+    return this.importingEntity;
   }
 
-  public setImporter(importer: Module): void {
-    this.importer = importer;
-    importer.addImportClause(this);
+  public setImportingEntity(importer: Module): void {
+    this.importingEntity = importer;
+    importer.addOutgoingImport(this); // opposite
   }
 
   private importedEntity: NamedEntity;
@@ -24,7 +24,7 @@ export class ImportClause extends Association {
 
   public setImportedEntity(importedEntity: NamedEntity): void {
     this.importedEntity = importedEntity;
-    importedEntity.addImport(this);
+    importedEntity.addIncomingImport(this); // incomingImports in Famix TImportable/TImport
   }
 
   private moduleSpecifier: string;
@@ -46,7 +46,7 @@ export class ImportClause extends Association {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("importer", this.getImporter());
+    exporter.addProperty("importingEntity", this.getImportingEntity());
     exporter.addProperty("importedEntity", this.getImportedEntity());
     exporter.addProperty("moduleSpecifier", this.getModuleSpecifier());
   }

package/src/lib/famix/src/model/famix/module.ts

@@ -4,20 +4,20 @@ import { ImportClause } from "./import_clause";
 
 export class Module extends ScriptEntity {
 
-  private importClauses: Set<ImportClause> = new Set();
-
-  public getImportClauses(): Set<ImportClause> {
-    return this.importClauses;
+  // incomingImports are in NamedEntity
+  private outgoingImports: Set<ImportClause> = new Set();
+  
+  getOutgoingImports() {
+    return this.outgoingImports;
   }
 
-  public addImportClause(importClause: ImportClause): void {
-    if (!this.importClauses.has(importClause)) {
-      this.importClauses.add(importClause);
-      importClause.setImporter(this);
+  addOutgoingImport(importClause: ImportClause) {
+    if (!this.outgoingImports.has(importClause)) {
+      this.outgoingImports.add(importClause);
+      importClause.setImportingEntity(this);  // opposite
     }
   }
 
-
   public getJSON(): string {
     const mse: FamixJSONExporter = new FamixJSONExporter("Module", this);
     this.addPropertiesToExporter(mse);
@@ -26,6 +26,6 @@ export class Module extends ScriptEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("importClauses", this.getImportClauses());
+    exporter.addProperty("outgoingImports", this.getOutgoingImports());
   }
 }

package/src/lib/famix/src/model/famix/named_entity.ts

@@ -30,16 +30,16 @@ export class NamedEntity extends SourcedEntity {
     }
   }
 
-  private imports: Set<ImportClause> = new Set();
+  private incomingImports: Set<ImportClause> = new Set();
 
-  public getImports(): Set<ImportClause> {
-    return this.imports;
+  public getIncomingImports(): Set<ImportClause> {
+    return this.incomingImports;
   }
 
-  public addImport(anImport: ImportClause): void {
-    if (!this.imports.has(anImport)) {
-      this.imports.add(anImport);
-      anImport.setImportedEntity(this);
+  public addIncomingImport(anImport: ImportClause): void {
+    if (!this.incomingImports.has(anImport)) {
+      this.incomingImports.add(anImport);
+      anImport.setImportedEntity(this);  // opposite
     }
   }
 
@@ -90,7 +90,7 @@ export class NamedEntity extends SourcedEntity {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("fullyQualifiedName", this.getFullyQualifiedName());
     exporter.addProperty("receivedInvocations", this.getReceivedInvocations());
-    exporter.addProperty("imports", this.getImports());
+    exporter.addProperty("incomingImports", this.getIncomingImports());
     exporter.addProperty("name", this.getName());
     exporter.addProperty("aliases", this.getAliases());
     exporter.addProperty("decorators", this.getDecorators());

package/src/lib/famix/src/model/famix/scoping_entity.ts

@@ -12,8 +12,11 @@ export class ScopingEntity extends ContainerEntity {
 
   public addNamespace(childNamespace: Namespace): void {
     if (!this.childrenNamespaces.has(childNamespace)) {
+      console.info("Adding namespace " + childNamespace.getName() + " to " + this.getName());
       this.childrenNamespaces.add(childNamespace);
       childNamespace.setParentScope(this);
+    } else {
+      console.info("Namespace " + childNamespace.getName() + " already added to " + this.getName());
     }
   }
 

package/src/lib/famix/src/model/famix/variable.ts

@@ -23,6 +23,6 @@ export class Variable extends StructuralEntity {
 
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
-    exporter.addProperty("parentContainerEntity", this.getParentContainerEntity());
+    exporter.addProperty("parentBehaviouralEntity", this.getParentContainerEntity());
   }
 }