Merge pull request #2 from pilotpirxie/v1.2

Fix calling function on a path

jest.config.js

@@ -1,4 +1,5 @@
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
+  testMatch: ["./src/**/*.ts?(x)", "**/?(*.)+(spec|test).ts?(x)"],
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyclomatic-complexity",
   "description": "Tool for calculating cyclomatic complexity of a JavaScript and TypeScript code.",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "main": "./bin/index.js",
   "repository": "https://github.com/pilotpirxie/cyclomatic-complexity.git",
   "author": "pilotpirxie <10637666+pilotpirxie@users.noreply.github.com>",

src/complexity.spec.ts

@@ -35,7 +35,7 @@ describe("complexity", () => {
     ]);
   });
 
-  test("should return 1 for a function with a function call", () => {
+  test("should return 2 for a function with a function call", () => {
     const code = `function a() {
       if (true) {
         return 1;
@@ -45,7 +45,7 @@ describe("complexity", () => {
     const result = calculateComplexity(code);
     expect(result).toEqual([
       { name: "global", complexity: 0 },
-      { name: "a", complexity: 1 },
+      { name: "a", complexity: 2 },
     ]);
   });
 
@@ -73,8 +73,8 @@ describe("complexity", () => {
     const result = calculateComplexity(code);
     expect(result).toEqual([
       { name: "global", complexity: 0 },
-      { name: "anonymous", complexity: 1 },
-      { name: "anonymous", complexity: 1 },
+      { name: "anonymous", complexity: 3 },
+      { name: "anonymous", complexity: 3 },
     ]);
   });
 });

src/complexity.ts

@@ -42,10 +42,7 @@ export function calculateComplexity(code: string): FunctionComplexity[] {
             const functionDetail = functionStack.find(
               (f) => f.name === functionName,
             );
-            if (functionDetail) {
-              functionDetail.complexity++;
-            } else if (!definedFunctions.has(functionName)) {
-              // Handle external function calls
+            if (!definedFunctions.has(functionName)) {
               functionStack[functionStack.length - 1].complexity++;
             }
           }