ts2famix 1.4.1 → 2.0.0

package/README.md

@@ -106,4 +106,4 @@ ts-node src/famix2puml.ts -i JSONModels/projectName.json -o PUMLModels/projectNa
 
 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/fuhrmanator/FamixTypeScriptImporter/v1/doc/metamodel.svg)
+![FamixTypeScript API Metamodel](doc-uml/famix-typescript-model.svg)

package/dist/analyze.js

@@ -76,12 +76,13 @@ class Importer {
         const classes = processFunctions.classes;
         const interfaces = processFunctions.interfaces;
         const modules = processFunctions.modules;
-        const exports = processFunctions.exportedMap;
+        const exports = processFunctions.listOfExportMaps;
         processFunctions.processImportClausesForImportEqualsDeclarations(project.getSourceFiles(), exports);
         processFunctions.processImportClausesForModules(modules, exports);
         processFunctions.processAccesses(accesses);
         processFunctions.processInvocations(methodsAndFunctionsWithId);
         processFunctions.processInheritances(classes, interfaces);
+        processFunctions.processConcretisations(classes, interfaces, methodsAndFunctionsWithId);
     }
     /**
      * Main method for tests
@@ -115,7 +116,8 @@ function initFamixRep(project) {
     // get compiler options
     const compilerOptions = project.getCompilerOptions();
     // get baseUrl
-    const baseUrl = compilerOptions.baseUrl;
+    const baseUrl = compilerOptions.baseUrl || ".";
     const absoluteBaseUrl = path_1.default.resolve(baseUrl);
     exports.entityDictionary.famixRep.setAbsolutePath(path_1.default.normalize(absoluteBaseUrl));
 }
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"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","sourcesContent":["import { Project } from \"ts-morph\";\nimport * as fs from 'fs';\nimport { FamixRepository } from \"./lib/famix/src/famix_repository\";\nimport { Logger } from \"tslog\";\nimport * as processFunctions from \"./analyze_functions/process_functions\";\nimport { EntityDictionary } from \"./famix_functions/EntityDictionary\";\nimport path from \"path\";\n\nexport const logger = new Logger({ name: \"ts2famix\", minLevel: 3 });\nexport const config = { \"expectGraphemes\": false };\nexport const entityDictionary = new EntityDictionary();\n\n/**\n * This class is used to build a Famix model from a TypeScript source code\n */\nexport class Importer {\n\n    private project = new Project(\n        {\n            compilerOptions: {\n                baseUrl: \"./test_src\"\n            }\n        }\n    ); // The project containing the source files to analyze\n\n    /**\n     * Main method\n     * @param paths An array of paths to the source files to analyze\n     * @returns The Famix repository containing the Famix model\n     */\n    public famixRepFromPaths(paths: Array<string>): FamixRepository {\n\n        //        try {\n        logger.debug(`famixRepFromPaths: paths: ${paths}`);\n\n        this.project.addSourceFilesAtPaths(paths);\n\n        initFamixRep(this.project);\n\n        this.processEntities(this.project);\n\n        const famixRep = entityDictionary.famixRep;\n        //        }\n        //        catch (error) {\n        // logger.error(`> ERROR: got exception ${error}. Exiting...`);\n        // logger.error(error.message);\n        // logger.error(error.stack);\n        // process.exit(1);\n        //        }\n\n        return famixRep;\n    }\n\n    private processEntities(project) {\n        const onlyTypeScriptFiles = project.getSourceFiles().filter(f => f.getFilePath().endsWith('.ts'));\n        processFunctions.processFiles(onlyTypeScriptFiles);\n        const accesses = processFunctions.accessMap;\n        const methodsAndFunctionsWithId = processFunctions.methodsAndFunctionsWithId;\n        const classes = processFunctions.classes;\n        const interfaces = processFunctions.interfaces;\n        const modules = processFunctions.modules;\n        const exports = processFunctions.listOfExportMaps;\n\n        processFunctions.processImportClausesForImportEqualsDeclarations(project.getSourceFiles(), exports);\n        processFunctions.processImportClausesForModules(modules, exports);\n        processFunctions.processAccesses(accesses);\n        processFunctions.processInvocations(methodsAndFunctionsWithId);\n        processFunctions.processInheritances(classes, interfaces);\n        processFunctions.processConcretisations(classes, interfaces, methodsAndFunctionsWithId);\n\n    }\n\n    /**\n     * Main method for tests\n     *\n     * @param filename The name of the file to analyze\n     * @param source A TypeScript source code\n     * @returns The Famix repository containing the Famix model\n     */\n    // TODO: this is slow because it writes the source code to a file and then reads it again - it's possible to just pass the source code to the ts-morph project\n    public famixRepFromSource(filename: string, source: string): FamixRepository {\n        const filePath = `./test_src/${filename}.ts`;\n\n        fs.writeFileSync(filePath, source, 'utf-8');\n\n        const famixRep = this.famixRepFromPaths([filePath]);\n\n        return famixRep;\n    }\n\n    /**\n     * Main method for a ts-morph project\n     * @param project A ts-morph project\n     * @returns The Famix repository containing the Famix model\n     */\n    public famixRepFromProject(project: Project): FamixRepository {\n        //const sourceFileNames = project.getSourceFiles().map(f => f.getFilePath()) as Array<string>;\n\n        //const famixRep = this.famixRepFromPaths(sourceFileNames);\n\n        initFamixRep(project);\n\n        this.processEntities(project);\n\n        return entityDictionary.famixRep;\n    }\n\n}\n\nfunction initFamixRep(project: Project): void {\n    // get compiler options\n    const compilerOptions = project.getCompilerOptions();\n\n    // get baseUrl\n    const baseUrl = compilerOptions.baseUrl || \".\";\n\n    const absoluteBaseUrl = path.resolve(baseUrl);\n\n    entityDictionary.famixRep.setAbsolutePath(path.normalize(absoluteBaseUrl));\n}\n"]}