monocart-coverage-reports 2.7.6 → 2.7.8

package/lib/converter/converter.js

@@ -5,8 +5,8 @@
  */
 
 const EC = require('eight-colors');
-const { Locator } = require('monocart-formatter');
 
+const { Locator } = require('monocart-locator');
 const Util = require('../utils/util.js');
 
 const findOriginalRange = require('./find-original-range.js');
@@ -984,9 +984,13 @@ const initOriginalList = (state, originalDecodedMap, options) => {
 
     const { sources, sourcesContent } = state.sourceMap;
 
+    const lengthBefore = sources.length;
+    let lengthAfter = 0;
+
     sources.forEach((sourcePath, sourceIndex) => {
 
         // filter
+        // do not change for sourceIndex
         if (!sourceFilter(sourcePath)) {
             // console.log('-', sourcePath);
             return;
@@ -1034,8 +1038,11 @@ const initOriginalList = (state, originalDecodedMap, options) => {
         };
 
         originalStateMap.set(sourceIndex, originalState);
+        lengthAfter += 1;
     });
 
+    Util.logFilter(`source filter (${state.sourcePath}):`, lengthBefore, lengthAfter);
+
     return originalStateMap;
 };
 
@@ -1044,6 +1051,8 @@ const collectOriginalList = (state, originalStateMap) => {
     const { fileUrls } = state;
     const distFile = state.sourcePath;
 
+    let added = 0;
+
     // collect original files
     originalStateMap.forEach((originalState) => {
 
@@ -1070,8 +1079,11 @@ const collectOriginalList = (state, originalStateMap) => {
         // save v8 data and add to originalList
         originalState.v8Data = sourceItem;
         state.originalList.push(originalState);
+        added += 1;
     });
 
+    Util.logDebug(`added source files: ${EC.yellow(added)}`);
+
 };
 
 // ========================================================================================================

package/lib/generate.js

@@ -686,6 +686,7 @@ const getInputData = async (inputList, all, cacheDir, addHandler) => {
     // dataList for data type, before `add` we don't which one is tested, because using hash id
     const emptyData = getEmptyData(all, dataList);
     if (emptyData) {
+        Util.logDebug(`added empty files for all: ${EC.yellow(emptyData.length)}`);
         const coverageResults = await addHandler(emptyData);
         // after `add`
         if (coverageResults) {
@@ -782,7 +783,11 @@ const readCoverageData = (filePath, entryFilter, sourceCache) => {
 
     // filter node internal files, should no anonymous for nodejs
     coverageData = coverageData.filter((entry) => entry.url && entry.url.startsWith('file:'));
+
+    const lengthBefore = coverageData.length;
     coverageData = coverageData.filter(entryFilter);
+    const lengthAfter = coverageData.length;
+    Util.logFilter('entry filter (addFromDir):', lengthBefore, lengthAfter);
 
     if (!Util.isList(coverageData)) {
         // Util.logDebug('No coverage data after filter');

package/lib/index.d.ts

@@ -119,7 +119,7 @@ declare namespace MCR {
             outputDir?: string;
         }] |
         [string] | [string, {
-            type?: "v8" | "istanbul" | "both";
+            type?: "v8" | "istanbul" | "both" | string;
             [key: string]: any;
         }];
 
@@ -192,7 +192,7 @@ declare namespace MCR {
             ignores?: IgnoredRange[];
             /** codecov json format */
             lines: {
-                [key: string]: number | string
+                [key: string]: number | string;
             };
         }
     }
@@ -287,7 +287,7 @@ declare namespace MCR {
             */
             filter?: string | {
                 [pattern: string]: "js" | "css" | boolean;
-            } | ((filePath: string) => "js" | "css" | boolean)
+            } | ((filePath: string) => "js" | "css" | boolean);
         };
 
         /** (V8 only) {boolean} Enable/Disable ignoring uncovered codes with the special comments: v8 ignore next/next N/start/stop */
@@ -320,6 +320,7 @@ declare namespace MCR {
         /** {function} onEnd hook */
         onEnd?: (coverageResults: CoverageResults) => Promise<void>;
 
+        [key: string]: any;
     }
 
     export interface McrCliOptions extends CoverageReportOptions {
@@ -441,15 +442,19 @@ declare namespace MCR {
         stopCoverage: () => Promise<V8CoverageEntry[]>;
 
         /** write the coverage started by NODE_V8_COVERAGE to disk on demand, returns v8 coverage dir */
-        writeCoverage: () => Promise<string>
+        writeCoverage: () => Promise<string>;
 
+        /** get istanbul coverage data
+         * @param coverageKey defaults to `__coverage__`
+         */
+        getIstanbulCoverage: (coverageKey?: string) => Promise<any>;
     }
 
     /** Adapt to the CDPSession of Playwright or Puppeteer */
     export interface CDPSession {
         send: (method: string, params?: any) => Promise<any>;
         on: (type: string, handler: (e: any) => void) => void;
-        detach: () => Promise<void>
+        detach: () => Promise<void>;
     }
 
     /** custom websocket CDPSession */
@@ -457,7 +462,7 @@ declare namespace MCR {
         constructor(ws: any);
         send: (method: string, params?: any) => Promise<any>;
         on: (type: string, handler: (e: any) => void) => void;
-        detach: () => Promise<void>
+        detach: () => Promise<void>;
     }
 
     export interface CDPOptions {
@@ -472,7 +477,7 @@ declare namespace MCR {
         /** enable https, defaults to false (http) */
         secure?: boolean;
         /** target filter, defaults to first page */
-        target?: (targets) => any;
+        target?: (targets: any) => any;
         /** websocket options */
         ws?: any;
         /** timeout, defaults to 10 * 1000 */

package/lib/index.js

@@ -61,6 +61,9 @@ class CoverageReport {
             return;
         }
 
+        // before clean cache, do no call initOptions again in hasCache
+        this.fixedOptions = true;
+
         // init logging for clean after generated
         this.logging = Util.initLoggingLevel(this.options.logging);
 
@@ -79,7 +82,6 @@ class CoverageReport {
             this.cleanCache();
         }
 
-        this.fixedOptions = true;
     }
 
     // add coverage data: {array} V8 format, {object} Istanbul format