Moved to json reporter (ArtiomTr#34)

* Refactored code, moved to json reporter

* Updated default test script

* Updated node version in dockerfile

* Fixed coverage formatting

* Rebuild

* Added line coverage info in report

* Fixed line counter

* Added logging

* Additional logging

* Additional counting

* Bug fix

* Covered lines counter fix

* covered lines counter fix

* Removed logging

* Altered report format

* Bug fixes

* Bug fixes

* logging context

* Altered report heading

* Added possibility to report to multiple directories

* commit sha fix

Author: ArtiomTr

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:14
 
 COPY dist/index.js /index.js
 

action.yml

@@ -11,7 +11,7 @@ inputs:
     test_script:
         required: false
         description: 'A custom npm script to get coverage'
-        default: npx jest --silent --ci --coverage --coverageReporters="text" --coverageReporters="text-summary"
+        default: npx jest --silent --ci --coverage --testLocationInResults --json --outputFile="report.json"
     threshold:
         required: false
         description: 'Coverage threshold. If total coverage is less than threshold, PR will be rejected'

dist/index.js

@@ -0,0 +1,5 @@
+declare module '*.md' {
+    const text: string;
+
+    export default text;
+}

index.d.ts

@@ -12,5 +12,5 @@ module.exports = {
     collectCoverage: true,
     collectCoverageFrom: ['src/**/*.ts'],
     coveragePathIgnorePatterns: ['/node_modules/'],
-    coverageReporters: ['text-summary'],
+    coverageReporters: [],
 };

jest.config.js

@@ -6,7 +6,7 @@
     "main": "index.js",
     "scripts": {
         "test": "jest",
-        "test:coverage": "jest --silent --coverage --coverageReporters=\"text\" --coverageReporters=\"text-summary\"",
+        "test:coverage": "jest --silent --testLocationInResults --coverage --json --outputFile=\"report.json\"",
         "test:watch": "jest --watch",
         "start": "webpack --watch --mode development",
         "build": "webpack --mode production",
@@ -19,9 +19,11 @@
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.4",
         "@actions/github": "^4.0.0",
+        "fs-extra": "^10.0.0",
         "markdown-table": "^2.0.0"
     },
     "devDependencies": {
+        "@types/fs-extra": "^9.0.11",
         "@types/jest": "^26.0.20",
         "@types/markdown-table": "^2.0.0",
         "@types/node": "^14.14.20",
@@ -33,6 +35,7 @@
         "eslint-plugin-simple-import-sort": "^7.0.0",
         "jest": "^26.6.3",
         "prettier": "^2.2.1",
+        "raw-loader": "^4.0.2",
         "ts-jest": "^26.4.4",
         "ts-loader": "^8.0.14",
         "typescript": "^4.1.3",

package-lock.json

@@ -1,12 +1,12 @@
 import { getRawCoverage } from './getRawCoverage';
 import { parseCoverage } from './parseCoverage';
-import { ReportData } from '../report/generateReport';
+import { Report } from '../typings/Report';
 
 export const collectCoverage = async (
     testCommand: string,
     branch?: string,
     workingDirectory?: string
-): Promise<ReportData> => {
+): Promise<Report> => {
     const source = await getRawCoverage(testCommand, branch, workingDirectory);
 
     if (typeof source === 'string') {

package.json

@@ -0,0 +1,63 @@
+import { FileCoverage } from '../typings/JsonReport';
+
+export const standardTotalCounter = (key: keyof FileCoverage) => (
+    value: FileCoverage
+) => Object.values(value[key]).length;
+
+export const standardCoveredCounter = (key: keyof FileCoverage) => (
+    value: FileCoverage
+) => Object.values(value[key]).filter((hits) => hits > 0).length;
+
+export const totalBranchesCounter = (value: FileCoverage) =>
+    Object.values(value.b).reduce((acc, branch) => acc + branch.length, 0);
+
+export const coveredBranchesCounter = (value: FileCoverage) =>
+    Object.values(value.b).reduce(
+        (acc, branch) => acc + branch.filter((hits) => hits > 0).length,
+        0
+    );
+
+const lineDiff = (startLine: number, endLine: number, lastEndLine: number) =>
+    Math.max(endLine - Math.max(startLine, lastEndLine), 0);
+
+export const totalLinesCounter = (value: FileCoverage) => {
+    let lastEndLine = 0;
+
+    return Object.values(value.statementMap).reduce((acc, statement) => {
+        const newLines = lineDiff(
+            statement.start.line,
+            statement.end.line,
+            lastEndLine
+        );
+
+        lastEndLine = Math.max(statement.end.line, lastEndLine);
+
+        return acc + newLines;
+    }, 0);
+};
+
+export const coveredLinesCounter = (value: FileCoverage) => {
+    let lastEndLine = 0;
+
+    const totalLines = totalLinesCounter(value);
+
+    const notCoveredLines = Object.entries(value.statementMap).reduce(
+        (acc, [key, statement]) => {
+            if (value.s[+key] <= 0) {
+                const newLines = lineDiff(
+                    statement.start.line,
+                    statement.end.line,
+                    lastEndLine
+                );
+                lastEndLine = Math.max(statement.end.line, lastEndLine);
+
+                return acc + newLines;
+            }
+
+            return acc;
+        },
+        0
+    );
+
+    return Math.max(0, totalLines - notCoveredLines);
+};

src/collect/collectCoverage.ts

@@ -0,0 +1,5 @@
+export const getPercents = (covered: number, total: number): number => {
+    if (total === 0) return 100;
+
+    return (covered / total) * 100;
+};