monocart-coverage-reports 2.11.5 → 2.12.0

package/lib/cli.js

@@ -206,6 +206,7 @@ program
     .version(version, '-v, --version', 'output the current version')
     .argument('[command]', 'command to execute')
     .allowUnknownOption()
+    .allowExcessArguments()
     .option('-c, --config <path>', 'custom config file path')
     .option('-l, --logging <logging>', 'off, error, info, debug')
 

package/lib/converter/converter.js

@@ -1441,7 +1441,7 @@ const mergeV8Data = (state, stateList) => {
     // console.log(stateList);
 
     // let debug = false;
-    // if (state.sourcePath.endsWith('counter.tsx')) {
+    // if (state.sourcePath.endsWith('counter')) {
     //     debug = true;
     //     console.log('merge v8 data ===================================', state.sourcePath);
     //     console.log('bytes before ============', stateList.map((it) => it.bytes));

package/lib/generate.js

@@ -12,9 +12,7 @@ const { StreamZip } = require('./packages/monocart-coverage-vendor.js');
 // built-in reports
 
 // istanbul
-const {
-    initIstanbulData, mergeIstanbulCoverage, saveIstanbulReports
-} = require('./istanbul/istanbul.js');
+const { mergeIstanbulCoverage, saveIstanbulReports } = require('./istanbul/istanbul.js');
 
 // v8
 const { mergeV8Coverage, saveV8Report } = require('./v8/v8.js');
@@ -189,9 +187,9 @@ const getCoverageResults = async (dataList, sourceCache, options) => {
     // istanbul data
     const t3 = Date.now();
     const istanbulData = await mergeIstanbulCoverage(dataList, options);
-    const { coverageData, fileSources } = initIstanbulData(istanbulData, options);
     Util.logTime(`${EC.magenta('├')} [generate] prepared istanbul coverage data`, t3);
-    const results = await saveIstanbulReports(coverageData, fileSources, options);
+    const fileSources = options.fileSources || {};
+    const results = await saveIstanbulReports(istanbulData, fileSources, options);
     return results;
 };
 

package/lib/index.d.ts

@@ -544,6 +544,8 @@ declare namespace MCR {
          * @param coverageKey defaults to `__coverage__`
          */
         getIstanbulCoverage: (coverageKey?: string) => Promise<any>;
+
+        close: () => Promise<void>
     }
 
     /** Adapt to the CDPSession of Playwright or Puppeteer */

package/lib/istanbul/istanbul.js

@@ -37,6 +37,8 @@ const findHtmlPath = (outputDir) => {
 
 const saveIstanbulReports = (coverageData, fileSources, options) => {
 
+    coverageData = initIstanbulSourcePath(coverageData, fileSources, options);
+
     const coverageMap = istanbulLibCoverage.createCoverageMap(coverageData);
 
     const defaultWatermarks = {
@@ -139,7 +141,7 @@ const addUntestedFiles = async (istanbulData, options) => {
     // console.log('istanbul untestedList', untestedList);
     untestedList.forEach((item) => {
         if (!istanbulData[item.path]) {
-            istanbulData[item.path] = item;
+            istanbulData[item.path] = istanbulLibCoverage.createFileCoverage(item);
         }
     });
 
@@ -161,19 +163,8 @@ const mergeIstanbulCoverage = async (dataList, options) => {
     return istanbulData;
 };
 
-const initIstanbulData = (istanbulData, options) => {
-    const fileSources = options.fileSources || {};
-    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, options);
-
-    return {
-        fileSources,
-        coverageData
-    };
-};
-
 module.exports = {
     saveIstanbulReports,
     mergeIstanbulDataList,
-    mergeIstanbulCoverage,
-    initIstanbulData
+    mergeIstanbulCoverage
 };