monocart-coverage-reports 2.12.10 → 2.12.12

package/lib/converter/converter.js

@@ -89,7 +89,7 @@ const applyBytesToLines = (bytes, locator, lineMap) => {
         } = lineItem;
 
         // default count to 1, both js and css
-        let count = 1;
+        let count;
         // full covered true/false for entire line
         let covered = true;
 
@@ -288,9 +288,9 @@ const collectFileCoverage = (v8Data, state, options) => {
     sortRanges(data.functions);
 
     // branch group with locations to flat branches
-    data.branches = branches.map((info) => {
+    data.branches = branches.flatMap((info) => {
         return info.getRanges();
-    }).flat();
+    });
     sortRanges(data.branches);
 
     data.statements = statements.map((info) => {
@@ -326,21 +326,36 @@ const collectFileCoverage = (v8Data, state, options) => {
         b: {}
     };
 
-    statements.filter((it) => !it.ignored).forEach((statement, index) => {
+    let index = 0;
+    for (const statement of statements) {
+        if (statement.ignored) {
+            continue;
+        }
         istanbulData.statementMap[`${index}`] = statement.generate(locator);
         istanbulData.s[`${index}`] = statement.count;
-    });
+        index += 1;
+    }
 
-    functions.filter((it) => !it.ignored).forEach((fn, index) => {
+    index = 0;
+    for (const fn of functions) {
+        if (fn.ignored) {
+            continue;
+        }
         istanbulData.fnMap[`${index}`] = fn.generate(locator, index);
         istanbulData.f[`${index}`] = fn.count;
-    });
+        index += 1;
+    }
 
-    branches.filter((it) => !it.ignored).forEach((branch, index) => {
+    index = 0;
+    for (const branch of branches) {
+        if (branch.ignored) {
+            continue;
+        }
         const { map, counts } = branch.generate(locator);
         istanbulData.branchMap[`${index}`] = map;
         istanbulData.b[`${index}`] = counts;
-    });
+        index += 1;
+    }
 
     return istanbulData;
 
@@ -1610,7 +1625,7 @@ const mergeV8Data = (state, stateList) => {
 
     // ===========================================================
     // functions
-    const allFunctions = stateList.map((it) => it.functions).flat();
+    const allFunctions = stateList.flatMap((it) => it.functions);
     const functionComparer = (lastRange, range) => {
         // if (lastRange.start === range.start && lastRange.end === range.end) {
         //     return true;
@@ -1649,7 +1664,7 @@ const mergeV8Data = (state, stateList) => {
 
     // ===========================================================
     // statements
-    const allStatements = stateList.map((it) => it.statements).flat();
+    const allStatements = stateList.flatMap((it) => it.statements);
     const statementComparer = (lastRange, range) => {
         // exact matched because the statement range is generated from ast
         return lastRange.start === range.start && lastRange.end === range.end;
@@ -1663,7 +1678,7 @@ const mergeV8Data = (state, stateList) => {
 
     // ===========================================================
     // branches
-    const allBranches = stateList.map((it) => it.branches).flat();
+    const allBranches = stateList.flatMap((it) => it.branches);
     const branchComparer = (lastRange, range) => {
         // exact matched because the branch range is generated from ast
         return lastRange.start === range.start && lastRange.end === range.end;
@@ -1743,7 +1758,7 @@ const generateV8DataList = (stateList, options) => {
 
     // merge istanbul and v8(converted)
     const mergeMap = new Map();
-    allOriginalList.flat().forEach((originalState) => {
+    allOriginalList.flatMap((arr) => arr).forEach((originalState) => {
         const { v8Data } = originalState;
         const id = v8Data.id;
         // exists item

package/lib/index.d.ts

@@ -36,7 +36,7 @@ declare namespace MCR {
     export type Watermarks = [number, number] | {
         /** V8 only */
         bytes?: [number, number];
-        statements: [number, number];
+        statements?: [number, number];
         branches?: [number, number];
         functions?: [number, number];
         lines?: [number, number];
@@ -134,7 +134,7 @@ declare namespace MCR {
             } | ((file: CoverageFile) => boolean);
         }] |
         ['markdown-summary'] | ['markdown-summary', {
-            color: 'unicode' | 'html' | 'tex' | string;
+            color?: 'unicode' | 'html' | 'tex' | string;
             metrics?: Array<"bytes" | "statements" | "branches" | "functions" | "lines">;
             /**
              * defaults to `coverage-summary.md`
@@ -143,7 +143,7 @@ declare namespace MCR {
         }] |
         ['markdown-details'] | ['markdown-details', {
             baseUrl?: string;
-            color: 'unicode' | 'html' | 'tex' | string;
+            color?: 'unicode' | 'html' | 'tex' | string;
             maxCols?: number;
             skipPercent?: number;
             metrics?: Array<"bytes" | "statements" | "branches" | "functions" | "lines">;
@@ -207,7 +207,7 @@ declare namespace MCR {
          */
         none?: boolean;
         /**  function only, function name */
-        name?: boolean;
+        name?: string;
     }
 
     export interface IgnoredRange {
@@ -422,10 +422,10 @@ declare namespace MCR {
         sourceMapResolver?: (url: string, defaultResolver: Function) => Promise<any>;
 
         /** (V8 only) {function} onEntry hook */
-        onEntry?: (entry: V8CoverageEntry) => Promise<void>;
+        onEntry?: (entry: V8CoverageEntry) => void | Promise<void>;
 
         /** {function} onEnd hook */
-        onEnd?: (coverageResults: CoverageResults | undefined) => Promise<void>;
+        onEnd?: (coverageResults: CoverageResults | undefined) => void | Promise<void>;
 
         [key: string]: any;
     }
@@ -433,13 +433,13 @@ declare namespace MCR {
     export interface McrCliOptions extends CoverageReportOptions {
 
         /** (CLI only) {function} onStart hook */
-        onStart?: (coverageReport: CoverageReport) => Promise<void>;
+        onStart?: (coverageReport: CoverageReport) => void | Promise<void>;
 
         /** (CLI only) {function} onReady hook before adding coverage data.
-         * 
+         *
          * Sometimes, the child process has not yet finished writing the coverage data, and it needs to wait here.
         */
-        onReady?: (coverageReport: CoverageReport, nodeV8CoverageDir: string, subprocess: any) => Promise<void>;
+        onReady?: (coverageReport: CoverageReport, nodeV8CoverageDir: string, subprocess: any) => void | Promise<void>;
 
     }