fix: use halstead.volume for JavaScript files + add missing tests

Author: Simon Renoult

src/lib/complexity/halstead.ts

@@ -30,7 +30,7 @@ function fromJavaScript(path: string): number {
   });
   if (!babelResult) throw new Error(`Error while parsing file ${path}`);
   const result = escomplex.analyse(babelResult.code, {});
-  return result.aggregate.halstead;
+  return result.aggregate.halstead.volume;
 }
 
 function fromTypeScript(path: string): number {

test/lib/statistics.test.ts

@@ -183,6 +183,10 @@ describe("Statistics", () => {
             name: "a.ts",
             content: "if (true) if (true) console.log();",
           })
+          .addFile({
+            name: "b.js",
+            content: "if (true) if (true) console.log();",
+          })
           .writeOnDisk();
 
         // When
@@ -197,6 +201,12 @@ describe("Statistics", () => {
             path: "a.ts",
             score: 3,
           },
+          {
+            churn: 1,
+            complexity: 3,
+            path: "b.js",
+            score: 3,
+          },
         ]);
       });
     });
@@ -214,6 +224,10 @@ describe("Statistics", () => {
             name: "a.ts",
             content: "if (true) if (true) console.log();",
           })
+          .addFile({
+            name: "b.js",
+            content: "if (true) if (true) console.log();",
+          })
           .writeOnDisk();
 
         // When
@@ -228,46 +242,86 @@ describe("Statistics", () => {
             path: "a.ts",
             score: 25.26619429851844,
           },
+          {
+            churn: 1,
+            complexity: 25.26619429851844,
+            path: "b.js",
+            score: 25.26619429851844,
+          },
         ]);
       });
     });
 
     context("when using sloc strategy", () => {
-      it("returns the appropriate elements", async () => {
-        // Given
-        const options: Options = { ...defaultOptions, sort: "complexity" };
-        await new TestRepositoryFixture()
-          .addFile({ name: "a.js", lines: 8 })
-          .addFile({ name: "b.js", lines: 6 })
-          .addFile({ name: "c.js", lines: 2 })
-          .addFile({ name: "d.js", lines: 4 })
-          .writeOnDisk();
-
-        // When
-        const result = await Statistics.compute(options);
-        const statistics = Array.from(result.values());
+      context("when analyzed file is supported by node-sloc", () => {
+        it("returns the appropriate elements", async () => {
+          // Given
+          const options: Options = {
+            ...defaultOptions,
+            complexityStrategy: "sloc",
+            sort: "complexity",
+          };
+          await new TestRepositoryFixture()
+            .addFile({ name: "a.js", lines: 8 })
+            .addFile({ name: "b.js", lines: 6 })
+            .addFile({ name: "c.js", lines: 2 })
+            .addFile({ name: "d.js", lines: 4 })
+            .writeOnDisk();
+
+          // When
+          const result = await Statistics.compute(options);
+          const statistics = Array.from(result.values());
+
+          // Then
+          expect(statistics).to.deep.equal([
+            {
+              churn: 1,
+              complexity: 8,
+              path: "a.js",
+              score: 8,
+            },
+            {
+              churn: 1,
+              complexity: 6,
+              path: "b.js",
+              score: 6,
+            },
+            {
+              churn: 1,
+              complexity: 4,
+              path: "d.js",
+              score: 4,
+            },
+          ]);
+        });
+      });
 
-        // Then
-        expect(statistics).to.deep.equal([
-          {
-            churn: 1,
-            complexity: 8,
-            path: "a.js",
-            score: 8,
-          },
-          {
-            churn: 1,
-            complexity: 6,
-            path: "b.js",
-            score: 6,
-          },
-          {
-            churn: 1,
-            complexity: 4,
-            path: "d.js",
-            score: 4,
-          },
-        ]);
+      context("when analyzed file is not supported by node-sloc", () => {
+        it("returns the appropriate elements", async () => {
+          // Given
+          const options: Options = {
+            ...defaultOptions,
+            complexityStrategy: "sloc",
+            sort: "complexity",
+          };
+          await new TestRepositoryFixture()
+            .addFile({ name: "a.txt", lines: 8 })
+            .writeOnDisk();
+
+          // When
+          const result = await Statistics.compute(options);
+          const statistics = Array.from(result.values());
+
+          // Then
+          expect(statistics).to.deep.equal([
+            {
+              churn: 1,
+              complexity: 7,
+              path: "a.txt",
+              score: 7,
+            },
+          ]);
+        });
       });
     });
   });