monocart-reporter 1.7.3 → 1.7.4

package/lib/plugins/coverage/coverage.js

@@ -2,13 +2,14 @@ const fs = require('fs');
 const path = require('path');
 
 const Util = require('../../utils/util.js');
-const { saveIstanbulReport } = require('./istanbul/istanbul.js');
+const {
+    initIstanbulData, mergeIstanbulCoverage, saveIstanbulReport
+} = require('./istanbul/istanbul.js');
 const {
     initV8ListAndSourcemap, mergeV8Coverage, saveV8Report
 } = require('./v8/v8.js');
 
 const { convertV8List } = require('./converter/converter.js');
-const { initIstanbulSourcePath } = require('./converter/source-path.js');
 
 const artifactsDirName = '.artifacts';
 
@@ -85,17 +86,9 @@ const saveReportAttachment = (testInfo, report, htmlDir) => {
 
 // ========================================================================================================
 
-const generateIstanbulReport = (coverageData, testInfo, options) => {
-
-    // force to istanbul, true is defaults to html-spa
-    if (!options.toIstanbul) {
-        options.toIstanbul = true;
-    }
-
-    const fileSources = options.fileSources || {};
-
-    coverageData = initIstanbulSourcePath(coverageData, fileSources, options.sourcePath);
+const generateIstanbulReport = (istanbulData, testInfo, options) => {
 
+    const { coverageData, fileSources } = initIstanbulData(istanbulData, options);
     const report = saveIstanbulReport(coverageData, fileSources, options);
 
     saveReportAttachment(testInfo, report, options.htmlDir);
@@ -121,13 +114,13 @@ const generateV8Coverage = async (v8list, testInfo, options) => {
     return report;
 };
 
-const attachCoverageReport = (coverageInput, testInfo, options = {}) => {
+const attachCoverageReport = (data, testInfo, options = {}) => {
 
     const reporterOptions = Util.resolveReporterOptions(testInfo);
     Util.initLoggingLevel(reporterOptions.logging, 'coverage-attach');
 
-    if (!coverageInput) {
-        Util.logError('invalid coverage input');
+    if (!data) {
+        Util.logError(`invalid coverage data: ${testInfo.title}`);
         return;
     }
 
@@ -152,23 +145,26 @@ const attachCoverageReport = (coverageInput, testInfo, options = {}) => {
     Util.initDir(htmlDir);
     options.htmlDir = htmlDir;
 
-    if (Array.isArray(coverageInput)) {
-        return generateV8Coverage(coverageInput, testInfo, options);
+    const dataType = Array.isArray(data) ? 'v8' : 'istanbul';
+    // console.log('data type', dataType);
+
+    if (dataType === 'v8') {
+        return generateV8Coverage(data, testInfo, options);
     }
 
-    return generateIstanbulReport(coverageInput, testInfo, options);
+    return generateIstanbulReport(data, testInfo, options);
 };
 
 // ========================================================================================================
 
 //  add coverage report to global, v8list only
-const addCoverageReport = async (v8list, testInfo) => {
+const addCoverageReport = async (data, testInfo) => {
 
     const reporterOptions = Util.resolveReporterOptions(testInfo);
     Util.initLoggingLevel(reporterOptions.logging, 'coverage-add');
 
-    if (!Util.isList(v8list)) {
-        Util.logError(`invalid v8 list for test: ${testInfo.title}`);
+    if (!data) {
+        Util.logError(`invalid coverage data: ${testInfo.title}`);
         return;
     }
 
@@ -196,18 +192,19 @@ const addCoverageReport = async (v8list, testInfo) => {
     const filename = `coverage-${Util.resolveTestIdWithRetry(testInfo)}.json`;
     const jsonPath = path.resolve(artifactsDir, filename);
 
-    // init v8list and unpack sourcemap
-    const inlineSourceMap = false;
-    v8list = await initV8ListAndSourcemap(v8list, options, inlineSourceMap);
-
-    // console.log('addCoverageReport', coverageInput.map((it) => it.url));
-
     const report = {
-        title: testInfo.title,
-        // merge with data
-        data: v8list
+        title: testInfo.title
     };
 
+    if (Array.isArray(data)) {
+        // init v8list and unpack sourcemap
+        const inlineSourceMap = false;
+        report.data = await initV8ListAndSourcemap(data, options, inlineSourceMap);
+    } else {
+        // istanbul
+        report.data = data;
+    }
+
     const artifactContent = JSON.stringify({
         type: 'coverage',
         data: report
@@ -229,15 +226,27 @@ const addCoverageReport = async (v8list, testInfo) => {
 
 const getGlobalCoverageData = async (dataList, options) => {
 
-    // merge v8list first
-    const v8list = await mergeV8Coverage(dataList, options);
-    // console.log('after merge', v8list.map((it) => it.url));
+    // get first and check v8list or istanbul data
+    const firstData = dataList[0].data;
+    const dataType = Array.isArray(firstData) ? 'v8' : 'istanbul';
+    // console.log('data type', dataType);
 
-    const { coverageData, fileSources } = await convertV8List(v8list, options);
+    // v8list
+    if (dataType === 'v8') {
+        // merge v8list first
+        const v8list = await mergeV8Coverage(dataList, options);
+        // console.log('after merge', v8list.map((it) => it.url));
 
-    const report = await generateV8ListReport(v8list, coverageData, fileSources, options);
+        const { coverageData, fileSources } = await convertV8List(v8list, options);
+        return generateV8ListReport(v8list, coverageData, fileSources, options);
+
+    }
+
+    // istanbul data
+    const istanbulData = mergeIstanbulCoverage(dataList, options);
+    const { coverageData, fileSources } = initIstanbulData(istanbulData, options);
+    return saveIstanbulReport(coverageData, fileSources, options);
 
-    return report;
 };
 
 // global coverage report, run different process with addCoverageReport
@@ -259,8 +268,8 @@ const generateGlobalCoverageReport = async (dataList, reporterOptions) => {
     };
 
     const reportDir = path.resolve(options.outputDir, options.outputName);
-    // empty dir except artifacts dir
 
+    // empty dir except artifacts dir
     if (fs.existsSync(reportDir)) {
         fs.readdirSync(reportDir).forEach((itemName) => {
             if (itemName === artifactsDirName) {

package/lib/plugins/coverage/istanbul/istanbul.js

@@ -8,6 +8,8 @@ const IstanbulSummary = require('./istanbul-summary.js');
 
 const { istanbulLibReport, istanbulLibCoverage } = require('../../../runtime/monocart-coverage.js');
 
+const { initIstanbulSourcePath } = require('../converter/source-path.js');
+
 const saveIstanbulReport = (coverageData, fileSources, options) => {
 
     const coverageMap = istanbulLibCoverage.createCoverageMap(coverageData);
@@ -96,6 +98,36 @@ const saveIstanbulReport = (coverageData, fileSources, options) => {
     return report;
 };
 
+const mergeIstanbulCoverage = (dataList, options) => {
+    const coverageMap = istanbulLibCoverage.createCoverageMap();
+    dataList.forEach((item) => {
+        coverageMap.merge(item.data);
+    });
+
+    const istanbulData = coverageMap.toJSON();
+
+    return istanbulData;
+};
+
+const initIstanbulData = (istanbulData, options) => {
+
+    // force to istanbul, true is defaults to html-spa
+    if (!options.toIstanbul) {
+        options.toIstanbul = true;
+    }
+
+    const fileSources = options.fileSources || {};
+
+    const coverageData = initIstanbulSourcePath(istanbulData, fileSources, options.sourcePath);
+
+    return {
+        fileSources,
+        coverageData
+    };
+};
+
 module.exports = {
-    saveIstanbulReport
+    saveIstanbulReport,
+    mergeIstanbulCoverage,
+    initIstanbulData
 };

package/lib/plugins/state/state.js

@@ -76,34 +76,41 @@ const getActions = (stateData) => {
     };
 };
 
+const getResponseData = async (data, options) => {
+    let res;
+    // first argument is action name always
+    const action = data.shift();
+    if (action === 'send') {
+        // EC.logCyan('send', data[0]);
+        // send handler
+        if (typeof options.onReceive === 'function') {
+            res = await options.onReceive(... data);
+        }
+        return res;
+    }
+
+    // get/set/remove handler
+    const actions = getActions(options.data);
+    const handler = actions[action];
+    if (handler) {
+        res = handler.apply(options, data);
+    }
+    return res;
+};
+
 const onMessage = async (ws, buf, options) => {
     const message = JSON.parse(buf.toString());
     if (!message) {
+        Util.logDebug(EC.red('invalid message buffer'));
         return;
     }
     const { id, data } = message;
     if (!id || !Array.isArray(data)) {
+        Util.logDebug(EC.red('invalid message id or data'));
         return;
     }
 
-    // first argument is action name always
-    const action = data.shift();
-
-    let resData;
-    if (action === 'send') {
-        // send handler
-        if (typeof options.onReceive === 'function') {
-            resData = await options.onReceive(... data);
-        }
-    } else {
-        // get/set/remove handler
-        const actions = getActions(options.data);
-        const handler = actions[action];
-        if (handler) {
-            resData = handler.apply(options, data);
-        }
-    }
-
+    const resData = await getResponseData(data, options);
     const response = JSON.stringify({
         id,
         data: resData
@@ -157,6 +164,8 @@ const createStateServer = (stateOptions) => {
 
     wss.on('connection', (ws) => {
 
+        // Util.logDebug('a client connected');
+
         // data {Buffer|ArrayBuffer|Buffer[]}
         ws.on('message', (data) => {
             // console.log(data, isBinary);