monocart-coverage-reports 2.10.9 → 2.11.0

package/lib/generate.js

@@ -5,6 +5,7 @@ const { fileURLToPath } = require('url');
 const Util = require('./utils/util.js');
 const { convertV8List } = require('./converter/converter.js');
 const { resolveSourceMap } = require('./converter/collect-source-maps.js');
+const { StreamZip } = require('./packages/monocart-coverage-vendor.js');
 
 // ========================================================================================================
 // built-in reports
@@ -229,7 +230,7 @@ const getInputList = (mcr) => {
         const hasDir = fs.existsSync(dir);
         if (!hasDir) {
             // could be empty
-            Util.logInfo(`Not found coverage data dir: ${Util.relativePath(dir)}`);
+            Util.logInfo(`Input coverage not exists: ${Util.relativePath(dir)}`);
         }
         return hasDir;
     });
@@ -241,17 +242,16 @@ const getInputList = (mcr) => {
     return inputList;
 };
 
-const addJsonData = async (mcr, dataList, sourceCache, dir, filename) => {
+const addJsonData = async (mcr, dataList, sourceCache, input, filename) => {
     const isCoverage = filename.startsWith('coverage-');
     const isSource = filename.startsWith('source-');
     if (isCoverage || isSource) {
-        let json;
-        if (mcr.fileCache.has(filename)) {
-            json = mcr.fileCache.get(filename);
-        } else {
-            const content = await Util.readFile(path.resolve(dir, filename));
-            if (content) {
-                json = JSON.parse(content);
+        let json = input;
+        if (typeof input === 'string') {
+            if (mcr.fileCache.has(filename)) {
+                json = mcr.fileCache.get(filename);
+            } else {
+                json = await Util.readJson(path.resolve(input, filename));
             }
         }
         if (json) {
@@ -264,6 +264,41 @@ const addJsonData = async (mcr, dataList, sourceCache, dir, filename) => {
     }
 };
 
+const addDirData = async (mcr, dataList, sourceCache, dir) => {
+    const allFiles = fs.readdirSync(dir);
+    if (!allFiles.length) {
+        return;
+    }
+    for (const filename of allFiles) {
+        // only json file
+        if (filename.endsWith('.json')) {
+            await addJsonData(mcr, dataList, sourceCache, dir, filename);
+        }
+    }
+};
+
+const addZipData = async (mcr, dataList, sourceCache, dir) => {
+    const zip = new StreamZip({
+        file: dir
+    });
+    const entries = await zip.entries();
+    for (const entry of Object.values(entries)) {
+        if (entry.isDirectory) {
+            continue;
+        }
+        const entryName = entry.name;
+        const filename = path.basename(entryName);
+        // console.log('============================', filename);
+        if (filename.endsWith('.json')) {
+            const buf = await zip.entryData(entryName);
+            const json = JSON.parse(buf.toString('utf-8'));
+            await addJsonData(mcr, dataList, sourceCache, json, filename);
+        }
+
+    }
+    // Do not forget to close the file once you're done
+    await zip.close();
+};
 
 const getInputData = async (mcr) => {
 
@@ -275,16 +310,15 @@ const getInputData = async (mcr) => {
 
     for (const dir of inputList) {
 
-        const allFiles = fs.readdirSync(dir);
-        if (!allFiles.length) {
-            continue;
-        }
-        for (const filename of allFiles) {
-            // only json file
-            if (filename.endsWith('.json')) {
-                await addJsonData(mcr, dataList, sourceCache, dir, filename);
-            }
+        const info = fs.statSync(dir);
+        if (info.isDirectory()) {
+            await addDirData(mcr, dataList, sourceCache, dir);
+        } else if (info.isFile()) {
+            await addZipData(mcr, dataList, sourceCache, dir);
+        } else {
+            Util.logError(`Invalid input: ${dir}`);
         }
+
     }
 
     if (!dataList.length) {

package/lib/index.d.ts

@@ -156,6 +156,8 @@ declare namespace MCR {
             outputFile?: string;
         }] |
         ['raw'] | ['raw', {
+            merge?: boolean;
+            zip?: boolean;
             outputDir?: string;
         }] |
         [string] | [string, {

package/lib/istanbul/istanbul.js

@@ -144,16 +144,19 @@ const addUntestedFiles = async (istanbulData, options) => {
 
 };
 
-const mergeIstanbulCoverage = async (dataList, options) => {
+const mergeIstanbulDataList = (dataList) => {
     const istanbulCoverageList = dataList.map((it) => it.data);
     const coverageMap = istanbulLibCoverage.createCoverageMap();
     istanbulCoverageList.forEach((coverage) => {
         coverageMap.merge(coverage);
     });
     const istanbulData = coverageMap.toJSON();
+    return istanbulData;
+};
 
+const mergeIstanbulCoverage = async (dataList, options) => {
+    const istanbulData = mergeIstanbulDataList(dataList);
     await addUntestedFiles(istanbulData, options);
-
     return istanbulData;
 };
 
@@ -169,6 +172,7 @@ const initIstanbulData = (istanbulData, options) => {
 
 module.exports = {
     saveIstanbulReports,
+    mergeIstanbulDataList,
     mergeIstanbulCoverage,
     initIstanbulData
 };