ts2famix 1.0.1 → 1.0.5

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

@@ -0,0 +1,83 @@
+"use strict";
+/*
+Portions of this file:
+
+MIT License
+
+Copyright (c) 2018 Anand Undavia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculate = void 0;
+const typescript_1 = require("typescript");
+const tsutils_1 = require("tsutils");
+const fs_1 = require("fs");
+const { isIdentifier } = require('typescript');
+const getNodeName = (node) => {
+    const { name, pos, end } = node;
+    const key = name !== undefined && isIdentifier(name) ? name.text : JSON.stringify({ pos, end });
+    return key;
+};
+const increasesComplexity = (node) => {
+    /* eslint-disable indent */
+    switch (node.kind) {
+        case typescript_1.SyntaxKind.CaseClause:
+            return node.statements.length > 0;
+        case typescript_1.SyntaxKind.CatchClause:
+        case typescript_1.SyntaxKind.ConditionalExpression:
+        case typescript_1.SyntaxKind.DoStatement:
+        case typescript_1.SyntaxKind.ForStatement:
+        case typescript_1.SyntaxKind.ForInStatement:
+        case typescript_1.SyntaxKind.ForOfStatement:
+        case typescript_1.SyntaxKind.IfStatement:
+        case typescript_1.SyntaxKind.WhileStatement:
+            return true;
+        case typescript_1.SyntaxKind.BinaryExpression:
+            switch (node.operatorToken.kind) {
+                case typescript_1.SyntaxKind.BarBarToken:
+                case typescript_1.SyntaxKind.AmpersandAmpersandToken:
+                    return true;
+                default:
+                    return false;
+            }
+        default:
+            return false;
+    }
+    /* eslint-enable indent */
+};
+const calculateFromSource = (ctx) => {
+    let complexity = 0;
+    const output = {};
+    (0, typescript_1.forEachChild)(ctx, function cb(node) {
+        var _a;
+        if ((0, tsutils_1.isFunctionWithBody)(node)) {
+            const old = complexity;
+            complexity = 1;
+            (0, typescript_1.forEachChild)(node, cb);
+            const name = (_a = getNodeName(node)) === null || _a === void 0 ? void 0 : _a.toString();
+            output[name] = complexity;
+            complexity = old;
+        }
+        else {
+            if (increasesComplexity(node)) {
+                complexity += 1;
+            }
+            (0, typescript_1.forEachChild)(node, cb);
+        }
+    });
+    return output;
+};
+const calculate = (filePath) => {
+    if (!(0, fs_1.existsSync)(filePath)) {
+        throw new Error(`File "${filePath}" does not exists`);
+    }
+    const sourceText = (0, fs_1.readFileSync)(filePath).toString();
+    const source = (0, typescript_1.createSourceFile)(filePath, sourceText, isIdentifier.ES2015);
+    return calculateFromSource(source);
+};
+exports.calculate = calculate;

package/dist/ts2famix-cli.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const yargs_1 = __importDefault(require("yargs"));
+const analyze_1 = require("./analyze");
+const importer = new analyze_1.Importer();
+const argv = yargs_1.default
+    .example(`ts-node src/ts2famix-cli.ts -i "../path/to/project/**/*.ts" -o JSONModels/projectName.json`, 'creates a JSON-format model of a typescript project')
+    .alias('i', 'input')
+    .nargs('i', 1)
+    .alias('o', 'output')
+    .nargs('o', 1)
+    .demandOption('input').demandOption('output').parseSync();
+const paths = new Array();
+paths.push(argv.input);
+const famixRep = importer.famixRepFromPaths(paths);
+const jsonOutput = famixRep.getJSON();
+const jsonFilePath = argv.output;
+fs.writeFile(jsonFilePath, jsonOutput, (err) => {
+    if (err) {
+        throw err;
+    }
+});
+console.info(`Created: ${jsonFilePath}`);

package/dist/ts2famix-tsconfig.js

@@ -0,0 +1,53 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const yargs_1 = __importDefault(require("yargs"));
+const analyze_1 = require("./analyze");
+const ts_morph_1 = require("ts-morph");
+const importer = new analyze_1.Importer();
+const argv = yargs_1.default
+    .example(`ts-node src/ts2famix-tsconfig.ts -i ../path/to/project/tsconfig.json -o JSONModels/projectName.json`, 'creates a JSON-format model of a typescript project')
+    .alias('i', 'input')
+    .nargs('i', 1)
+    .alias('o', 'output')
+    .nargs('o', 1)
+    .demandOption('input').demandOption('output').parseSync();
+const tsConfigFilePath = argv.input;
+const project = new ts_morph_1.Project({
+    tsConfigFilePath
+});
+const famixRep = importer.famixRepFromProject(project);
+const jsonOutput = famixRep.getJSON();
+const jsonFilePath = argv.output;
+fs.writeFile(jsonFilePath, jsonOutput, (err) => {
+    if (err) {
+        throw err;
+    }
+});
+console.info(`Created: ${jsonFilePath}`);

package/jest.config.json

@@ -0,0 +1,10 @@
+{
+  "collectCoverage": false,
+  "coverageDirectory": "coverage",
+  "coverageProvider": "babel",
+  "transform": {
+    "^.+\\.tsx?$": ["ts-jest", { "isolatedModules": true }]
+  },
+  "testEnvironment": "jest-environment-node",
+  "verbose": true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Examples of the TypeScript compiler API usage",
   "main": "dist/ts2famix-cli.js",
   "scripts": {

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     "target": "ES2017",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "module": "CommonJS",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "lib": [],                             /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */

package/.github/workflows/node.js.yml

@@ -1,60 +0,0 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Node.js CI
-
-permissions: write-all
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-  
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        # node-version: [12.x, 14.x, 16.x]
-        node-version: [16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ts-graphviz/setup-graphviz@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'npm'
-      - run: npm ci
-      - run: npm test
-      - run: npm run uml
-
-      - name: Init new repo in doc-uml folder and commit generated files
-        run: |
-          cd doc-uml/
-          git init
-          git add -A
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git commit -m 'update doc'
-
-      # Careful, this can kill your project, because it force pushes to the destination branch
-      - name: Force push to destination branch
-        uses: ad-m/github-push-action@master
-        with:
-          # Token for the repo. Can be passed in using $\{{ secrets.GITHUB_TOKEN }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          force: true
-          # Destination branch to push changes
-          branch: v1/doc
-          # We have to push from the folder where files were generated.
-          # Same were the new repo was initialized in the previous step
-          directory: ./doc-uml

package/doc-metamodel/skins.include.puml

@@ -1,2 +0,0 @@
-' put skinparam customizations here
-hide members

package/test/abstractClassWithComments.test.ts

@@ -1,58 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Comment } from '../src/lib/famix/src/model/famix/comment';
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("abstractClassWithComments", 
-    '// before\n\
-abstract class MyAbstractClass {} // a comment\n\
-// after\n\
-/* test */\n\
-/**\n\
- * test2\n\
- */\n\
-function tst() {}\n\
-');
-
-describe('Tests for abstract class with comments', () => {
-    
-    it("should contain one class", () => {
-        expect(fmxRep._getAllEntitiesWithType("Class").size).toBe(1);
-    });
-
-    const theAbstractClass = fmxRep._getFamixClass("MyAbstractClass");
-    it("should contain an abstract class MyAbstractClass", () => {
-        expect(theAbstractClass).toBeTruthy();
-        if (theAbstractClass) {
-            expect(theAbstractClass.getIsAbstract()).toBe(true);
-        }
-    });
-
-    it("should have two comments for the abstract class", () => {
-        expect(theAbstractClass?.getComments().size).toBe(2);
-        const comments = Array.from(theAbstractClass?.getComments() as Set<Comment>);
-        expect(comments[0]?.getContent()).toBe("// before");
-        expect(comments[0]?.getContainer()).toBe(theAbstractClass);
-        expect(comments[1]?.getContent()).toBe("// a comment");
-        expect(comments[1]?.getContainer()).toBe(theAbstractClass);
-    });
-
-    it("should contain one function", () => {
-        expect(fmxRep._getAllEntitiesWithType("Function").size).toBe(1);
-    });
-
-    const theFunction = fmxRep._getFamixFunction("tst");
-    it("should have three comments for the function", () => {
-        expect(theFunction?.getComments().size).toBe(3);
-        const comments = Array.from(theFunction?.getComments() as Set<Comment>);
-        expect(comments[0]?.getContent()).toBe("// after");
-        expect(comments[0]?.getContainer()).toBe(theFunction);
-        expect(comments[0]?.getIsJSDoc()).toBe(false);
-        expect(comments[1]?.getContent()).toBe("/* test */");
-        expect(comments[1]?.getContainer()).toBe(theFunction);
-        expect(comments[1]?.getIsJSDoc()).toBe(false);
-        expect(comments[2]?.getContent()).toBe("/**\n * test2\n */");
-        expect(comments[2]?.getContainer()).toBe(theFunction); 
-        expect(comments[2]?.getIsJSDoc()).toBe(true);
-    });
-});

package/test/abstracts.test.ts

@@ -1,53 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Method } from '../src/lib/famix/src/model/famix';
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("abstracts", 
-    'abstract class MyAbstractClass {\n\
-    public abstract abstractMethod1();\n\
-    public abstract abstractMethod2();\n\
-    public concreteMethod() {}\n\
-}\n\
-');
-
-describe('Abstract classes and methods', () => {
-
-    const theClass = fmxRep._getFamixClass("MyAbstractClass");
-    const theMethods = theClass?.getMethods();
-
-    it("should contain an abstract class MyAbstractClass", () => {
-        expect(theClass).toBeTruthy();
-        if (theClass) expect(theClass.getIsAbstract()).toBe(true);
-    });
-
-    it("should contain an abstract method MyAbstractClass.abstractMethod1", () => {
-        expect(theMethods).toBeTruthy();
-        if (theMethods) {
-            expect(theMethods.size).toBe(3);
-            if (theMethods) {
-                expect(theMethods.size).toBe(3);
-                const foundMethodName = fmxRep._getFamixMethod("abstractMethod1") as Method;
-                expect(foundMethodName.getIsAbstract()).toBe(true);
-            }
-        }
-    });
-
-    it("should contain an abstract method MyAbstractClass.abstractMethod2", () => {
-        expect(theMethods).toBeTruthy();
-        if (theMethods) {
-            expect(theMethods.size).toBe(3);
-            const foundMethodName = fmxRep._getFamixMethod("abstractMethod2") as Method;
-            expect(foundMethodName.getIsAbstract()).toBe(true);
-        }
-    });
-
-    it("should contain a concrete method MyAbstractClass.concreteMethod", () => {
-        expect(theMethods).toBeTruthy();
-        if (theMethods) {
-            expect(theMethods.size).toBe(3);
-            const foundMethodName = fmxRep._getFamixMethod("concreteMethod") as Method;
-            expect(foundMethodName.getIsAbstract()).toBe(false);
-        }
-    });
-});

package/test/access.test.ts

@@ -1,62 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Property, Method } from "../src/lib/famix/src/model/famix";
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("access", 
-    'class AccessClassForTesting {\n\
-    private privateAttribute;\n\
-    public publicAttribute;\n\
-    \n\
-    public returnAccessName() {\n\
-        return this.publicAttribute;\n\
-    }\n\
-    \n\
-    private privateMethod() {\n\
-        return this.privateAttribute;\n\
-    }\n\
-}\n\
-');
-
-describe('Accesses', () => {
-
-    const jsonOutput = fmxRep.getJSON();
-    const parsedModel = JSON.parse(jsonOutput);
-    let testAccessCls;
-    let accessClsMethods;
-    let accessClsAttributes;
-
-    it("should have a class with two methods and two attributes", () => {
-        const expectedAttributeNames: Array<string> = ['privateAttribute', 'publicAttribute'];
-        const expectedMethodNames: Array<string> = ['privateMethod', 'returnAccessName'];
-        testAccessCls = parsedModel.filter(el => (el.FM3 === "FamixTypeScript.Class" && el.name === "AccessClassForTesting"))[0];
-        expect(testAccessCls.properties.length).toBe(expectedAttributeNames.length);
-        expect(testAccessCls.methods.length).toBe(expectedMethodNames.length);
-        accessClsMethods = parsedModel.filter(e => testAccessCls.methods.some(m => m.ref === e.id));
-        expect(accessClsMethods.length).toBeGreaterThan(0);
-        const checkMethodName = accessClsMethods.every(m => expectedMethodNames.includes(m.name));
-        expect(checkMethodName).toBe(true);
-        accessClsAttributes = parsedModel.filter(e => testAccessCls.properties.some(a => a.ref === e.id));
-        expect(accessClsAttributes.length).toBeGreaterThan(0);
-        const checkAttributeName = accessClsAttributes.every(a => expectedAttributeNames.includes(a.name));
-        expect(checkAttributeName).toBe(true);
-    });
-
-    it("should have an access to privateAttribute in privateMethod", () => {
-        const famixAccess = parsedModel.filter(el =>
-            (el.accessor !== undefined && el.variable !== undefined && el.FM3 === "FamixTypeScript.Access"
-                && ((fmxRep.getFamixEntityById(el.accessor.ref) as Method).getName() === "privateMethod") 
-                && ((fmxRep.getFamixEntityById(el.variable.ref) as Property).getName() === "privateAttribute")
-                ))[0];
-        expect(famixAccess).toBeTruthy();
-    });
-
-    it("should have an access to publicAttribute in returnAccessName", () => {
-        const famixAccess = parsedModel.filter(el =>
-            (el.accessor !== undefined && el.variable !== undefined && el.FM3 === "FamixTypeScript.Access"
-                && ((fmxRep.getFamixEntityById(el.accessor.ref) as Method).getName() === "returnAccessName") 
-                && ((fmxRep.getFamixEntityById(el.variable.ref) as Property).getName() === "publicAttribute")
-                ))[0];
-        expect(famixAccess).toBeTruthy();
-    });
-});

package/test/accesses.test.ts

@@ -1,42 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Access } from '../src/lib/famix/src/model/famix/access';
-import { Parameter } from '../src/lib/famix/src/model/famix/parameter';
-import { Variable } from '../src/lib/famix/src/model/famix/variable';
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("accesses",
-    'var b = 2;\n\
-\n\
-var x = b;\n\
-\n\
-class P {\n\
-    m(param) {\n\
-        var z = param;\n\
-    }\n\
-}\n\
-');
-
-describe('Tests for accesses', () => {
-    
-    it("should contain one class", () => {
-        expect(fmxRep._getAllEntitiesWithType("Class").size).toBe(1);
-    });
-
-    const theFile = fmxRep._getFamixFile("accesses.ts");
-    const theMethod = fmxRep._getFamixMethod("m");
-
-    it("should contain one access to 'b'", () => {
-        const theVariable = Array.from(fmxRep._getAllEntitiesWithType("Variable") as Set<Variable>).find(v => v.getName() === "b");
-        const theAccess = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theVariable && a.getAccessor() === theFile);
-        expect(theAccess).toBeTruthy();
-        expect(theAccess?.getIsWrite()).toBe(undefined);
-    });
-
-    it("should contain one access to 'param'", () => {
-        const theParam = Array.from(fmxRep._getAllEntitiesWithType("Parameter") as Set<Parameter>).find(v => v.getName() === "param");
-        const theAccess = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theParam && a.getAccessor() === theMethod);
-        expect(theAccess).toBeTruthy();
-        expect(theAccess?.getIsWrite()).toBe(undefined);
-    });
-});

package/test/accessorsWithDecorators.test.ts

@@ -1,98 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Access } from '../src/lib/famix/src/model/famix/access';
-import { Decorator } from '../src/lib/famix/src/model/famix/decorator';
-import { Property } from '../src/lib/famix/src/model/famix/property';
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("accessorsWithDecorators",
-    'function configurable(value: boolean) {\n\
-    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {\n\
-        descriptor.configurable = value;\n\
-    };\n\
-}\n\
-\n\
-var b = function() {\n\
-    return function(target: any, propertyKey: string, descriptor: PropertyDescriptor) {};\n\
-};\n\
-\n\
-var x = b();\n\
-\n\
-class Point {\n\
-    private _x: number;\n\
-    private _y: number;\n\
-    \n\
-    constructor(x: number, y: number) {\n\
-        this._x = x;\n\
-        this._y = y;\n\
-    }\n\
-    \n\
-    @x\n\
-    @b()\n\
-    @configurable(false)\n\
-    get x() {\n\
-        return this._x;\n\
-    }\n\
-    \n\
-    @x\n\
-    @b()\n\
-    @configurable(false)\n\
-    set y(y: number) {\n\
-        this._y = y;\n\
-    }\n\
-}\n\
-');
-
-describe('Tests for accessors with decorators', () => {
-    
-    it("should contain one class", () => {
-        expect(fmxRep._getAllEntitiesWithType("Class").size).toBe(1);
-    });
-
-    it("should contain six decorators", () => {
-        expect(fmxRep._getAllEntitiesWithType("Decorator").size).toBe(6);
-    });
-
-    const theMethod1 = fmxRep._getFamixMethod("x");
-    const theMethod2 = fmxRep._getFamixMethod("y");
-    const d1 = (Array.from(fmxRep._getAllEntitiesWithType("Decorator")) as Array<Decorator>).filter((d) => d.getName() === "@x");
-    const d2 = (Array.from(fmxRep._getAllEntitiesWithType("Decorator")) as Array<Decorator>).filter((d) => d.getName() === "@b");
-    const d3 = (Array.from(fmxRep._getAllEntitiesWithType("Decorator")) as Array<Decorator>).filter((d) => d.getName() === "@configurable");
-
-    it("should contain two accessors with three decorators for each one", () => {
-        expect(fmxRep._getAllEntitiesWithType("Accessor").size).toBe(2);
-        expect(fmxRep._getAllEntitiesWithType("Decorator").size).toBe(6);
-
-        expect(theMethod1?.getDecorators().size).toBe(3);
-        expect(d1[0]?.getDecoratedEntity()).toBe(theMethod1);
-        expect(d2[0]?.getDecoratedEntity()).toBe(theMethod1);
-        expect(d3[0]?.getDecoratedEntity()).toBe(theMethod1);
-
-        expect(theMethod2?.getDecorators().size).toBe(3);
-        expect(d1[1]?.getDecoratedEntity()).toBe(theMethod2);
-        expect(d2[1]?.getDecoratedEntity()).toBe(theMethod2);
-        expect(d3[1]?.getDecoratedEntity()).toBe(theMethod2);
-    });
-
-    it("should contain two accesses to '_x'", () => {
-        const theProperty = Array.from(fmxRep._getAllEntitiesWithType("Property") as Set<Property>).find(v => v.getName() === "_x");
-        const theMethod1 = fmxRep._getFamixMethod("constructor");
-        const theMethod2 = fmxRep._getFamixMethod("x");
-        expect(theMethod2?.getKind()).toBe("getter");
-        const theAccess1 = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theProperty && a.getAccessor() === theMethod1);
-        const theAccess2 = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theProperty && a.getAccessor() === theMethod2);
-        expect(theAccess1).toBeTruthy();
-        expect(theAccess2).toBeTruthy();
-    });
-
-    it("should contain two accesses to '_y'", () => {
-        const theProperty = Array.from(fmxRep._getAllEntitiesWithType("Property") as Set<Property>).find(v => v.getName() === "_y");
-        const theMethod1 = fmxRep._getFamixMethod("constructor");
-        const theMethod2 = fmxRep._getFamixMethod("y");
-        expect(theMethod2?.getKind()).toBe("setter");
-        const theAccess1 = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theProperty && a.getAccessor() === theMethod1);
-        const theAccess2 = Array.from(fmxRep._getAllEntitiesWithType("Access") as Set<Access>).find(a => a.getVariable() === theProperty && a.getAccessor() === theMethod2);
-        expect(theAccess1).toBeTruthy();
-        expect(theAccess2).toBeTruthy();
-    });
-});

package/test/alias.test.ts

@@ -1,39 +0,0 @@
-import { Importer } from '../src/analyze';
-import { Alias } from '../src/lib/famix/src/model/famix';
-import { Type } from '../src/lib/famix/src/model/famix';
-
-const importer = new Importer();
-
-const fmxRep = importer.famixRepFromSource("alias", 
-    'type Point = {\n\
-    x: number;\n\
-    y: number;\n\
-};\n\
-');
-
-describe('Tests for alias', () => {
-    
-    it("should contain one alias", () => {
-        expect(fmxRep._getAllEntitiesWithType("Alias").size).toBe(1);
-    });
-
-    const theAlias = Array.from(fmxRep._getAllEntitiesWithType("Alias") as Set<Alias>)[0];
-    it("should contain an alias Point", () => {
-        expect(theAlias.getName()).toBe("Point");
-    });
-
-    const theType = Array.from(fmxRep._getAllEntitiesWithType("Type") as Set<Type>)[0];
-    it("should contain a type Point", () => {
-        expect(theType.getName()).toBe("Point");
-    });
-
-    const theFile = fmxRep._getFamixFile("alias.ts");
-    it("should contain an alias on type Point", () => {
-        expect(theFile?.getAliases().size).toBe(1);
-        expect(Array.from(theFile?.getAliases() as Set<Alias>)[0]).toBe(theAlias);
-        expect(theAlias.getAliasedEntity()).toBe(theType);
-        expect(theAlias.getParentEntity()).toBe(theFile);
-        expect(theType.getTypeAliases().size).toBe(1);
-        expect(Array.from(theType.getTypeAliases())[0]).toBe(theAlias);
-    });
-});