monocart-reporter 1.7.1 → 1.7.2

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

@@ -1,47 +1,16 @@
 const fs = require('fs');
 const path = require('path');
-const EC = require('eight-colors');
 
 const istanbulReports = require('istanbul-reports');
 
 const Util = require('../../../utils/util.js');
 const IstanbulSummary = require('./istanbul-summary.js');
 
-const {
-    V8toIstanbul,
-    istanbulLibReport,
-    istanbulLibCoverage,
-    convertSourceMap
-} = require('../../../runtime/monocart-coverage.js');
-
-const { initSourceMapRootAndUrl } = require('../coverage-utils.js');
-
-// const V8toIstanbul = require('v8-to-istanbul');
-// const istanbulLibCoverage = require('istanbul-lib-coverage');
-// const istanbulLibReport = require('istanbul-lib-report');
+const { istanbulLibReport, istanbulLibCoverage } = require('../../../runtime/monocart-coverage.js');
 
 const saveIstanbulReport = (coverageData, fileSources, options) => {
 
-    // source path handler
-    let data = coverageData;
-    if (typeof options.sourcePath === 'function') {
-        data = {};
-        Object.keys(coverageData).forEach((sourcePath) => {
-            const d = coverageData[sourcePath];
-            const s = fileSources[sourcePath];
-            const newSourcePath = options.sourcePath(sourcePath);
-            if (newSourcePath && newSourcePath !== sourcePath) {
-                sourcePath = newSourcePath;
-                // related updates
-                fileSources[sourcePath] = s;
-                d.path = sourcePath;
-            }
-            data[sourcePath] = d;
-        });
-    }
-
-
-    const coverageMap = istanbulLibCoverage.createCoverageMap(data);
+    const coverageMap = istanbulLibCoverage.createCoverageMap(coverageData);
 
     const { watermarks, defaultSummarizer } = options;
     const istanbulOptions = {
@@ -96,16 +65,24 @@ const saveIstanbulReport = (coverageData, fileSources, options) => {
     // create a context for report generation
     const context = istanbulLibReport.createContext(contextOptions);
 
-    const htmlReport = istanbulReports.create('html-spa', {});
-    htmlReport.execute(context);
-
-    const htmlPath = Util.relativePath(path.resolve(options.htmlDir, 'index.html'));
+    // html
+    if (options.toIstanbul) {
+        let reportName = 'html-spa';
+        if (options.toIstanbul === 'html') {
+            reportName = 'html';
+        }
+        const htmlReport = istanbulReports.create(reportName, {});
+        htmlReport.execute(context);
+    }
 
+    // lcov
     if (options.lcov) {
         const lcovReport = istanbulReports.create('lcovonly', {});
         lcovReport.execute(context);
     }
 
+    const htmlPath = Util.relativePath(path.resolve(options.htmlDir, 'index.html'));
+
     // add watermarks and color
     const coverageReport = new IstanbulSummary();
     coverageReport.execute(context);
@@ -119,142 +96,6 @@ const saveIstanbulReport = (coverageData, fileSources, options) => {
     return report;
 };
 
-// ===================================================================================================
-
-const getConversionSources = (item, fileSources) => {
-
-    const { source, sourceMap } = item;
-
-    fileSources[item.sourcePath] = source;
-
-    const sources = {
-        //  remove map file
-        source: convertSourceMap.removeComments(source)
-    };
-
-    if (!sourceMap) {
-        return sources;
-    }
-
-    // =======================================================
-    // append sourceMap
-
-    // 'webpack://monocart-v8/external umd "monocart-code-viewer"'
-    // format the url to sourcePath
-
-    const fileUrls = {};
-    initSourceMapRootAndUrl(sourceMap, fileUrls, fileSources);
-
-    // console.log(sourceMap.sources);
-
-    // =======================================================
-    sources.sourceMap = {
-        sourcemap: sourceMap
-    };
-
-    return sources;
-};
-
-const convertV8ToIstanbul = async (v8list, options) => {
-
-    // console.log('v8list before', v8list.map((it) => it.url));
-
-    // only js with source (without css)
-    v8list = v8list.filter((item) => item.type === 'js');
-
-    // console.log('v8list after', v8list.map((it) => it.url));
-    // console.log('has map', v8list.filter((it) => it.sourceMap));
-
-    // sourceFilter to excludePath
-    const excludePath = typeof options.sourceFilter === 'function' ? (sourceName) => {
-        return !options.sourceFilter(sourceName);
-    } : () => {
-        return false;
-    };
-
-    // file sources for istanbul html report sourceFinder in memory
-    const fileSources = {};
-
-    // https://github.com/istanbuljs/istanbuljs/tree/master/packages/istanbul-lib-coverage
-    const coverageMap = istanbulLibCoverage.createCoverageMap();
-
-    for (const item of v8list) {
-
-        const sources = getConversionSources(item, fileSources);
-
-        // console.log('sources', Object.keys(sources));
-
-        const v8toIstanbul = new V8toIstanbul(item.sourcePath, 0, sources, excludePath);
-        // stop resolve source path, already resolved
-        v8toIstanbul._resolveSource = (m, p) => {
-            return p;
-        };
-
-        let failed = false;
-        await v8toIstanbul.load().catch((e) => {
-            EC.logRed(`[MCR] ${item.sourcePath} v8toIstanbul.load:`, e.message);
-            failed = true;
-        });
-
-        if (failed) {
-            continue;
-        }
-
-        try {
-            v8toIstanbul.applyCoverage(item.functions);
-        } catch (e) {
-            EC.logRed(`[MCR] ${item.sourcePath} v8toIstanbul.applyCoverage:`, e.message);
-            failed = true;
-        }
-
-        if (failed) {
-            continue;
-        }
-
-        const istanbulData = v8toIstanbul.toIstanbul();
-        // console.log('istanbulData', istanbulData);
-
-        coverageMap.merge(istanbulData);
-
-    }
-
-    const coverageData = coverageMap.toJSON();
-
-    // console.log('coverageData', Object.keys(coverageData));
-
-    return {
-        coverageData,
-        fileSources
-    };
-
-};
-
-// ===================================================================================================
-
-const mergeIstanbulList = (istanbulList) => {
-
-    const fileSources = {};
-
-    const coverageMap = istanbulLibCoverage.createCoverageMap();
-    for (const item of istanbulList) {
-        Object.assign(fileSources, item.fileSources);
-        coverageMap.merge(item.coverageData);
-    }
-
-    const coverageData = coverageMap.toJSON();
-
-    // console.log('merged data', coverageData);
-
-    return {
-        coverageData,
-        fileSources
-    };
-
-};
-
-
 module.exports = {
-    saveIstanbulReport,
-    convertV8ToIstanbul,
-    mergeIstanbulList
+    saveIstanbulReport
 };

package/lib/plugins/coverage/v8/v8.js

@@ -1,14 +1,9 @@
-const EC = require('eight-colors');
-
 const Util = require('../../../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
-const { dedupeRanges } = require('./dedupe.js');
-const { getSourcePath } = require('../coverage-utils.js');
-const { collectSourceMaps } = require('./source-map.js');
+const { dedupeRanges } = require('../converter/dedupe.js');
+const { getSourcePath } = require('../converter/source-path.js');
 const { mergeScriptCovs } = require('../../../runtime/monocart-coverage.js');
-
-
-// ========================================================================================================
+const collectSourceMaps = require('../converter/collect-source-maps.js');
 
 const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
 
@@ -30,13 +25,15 @@ const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
             return true;
         }
         // 404 css, text will be empty
-        // EC.logRed(`[MCR] Invalid source: ${item.url}`);
+        // Util.logError(`Invalid source: ${item.url}`);
         // console.log(item);
     });
 
 
     // do not change original v8list, to work for multiple APIs
 
+    const sourcePathHandler = options.sourcePath;
+
     // init id, sourcePath
     v8list = v8list.map((item, i) => {
 
@@ -57,13 +54,26 @@ const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
         }
 
         data.id = Util.calculateSha1(data.url + data.source);
-        data.sourcePath = getSourcePath(data.url, i + 1, data.type);
+
+        let sourcePath = getSourcePath(data.url, i + 1, data.type);
+        if (typeof sourcePathHandler === 'function') {
+            const newSourcePath = sourcePathHandler(sourcePath);
+            if (typeof newSourcePath === 'string' && newSourcePath) {
+                sourcePath = newSourcePath;
+            }
+        }
+
+        data.sourcePath = sourcePath;
 
         return data;
     });
 
     // collect sourcemap first
-    await collectSourceMaps(v8list, options, inlineSourceMap);
+    const time_start = Date.now();
+    const count = await collectSourceMaps(v8list, options, inlineSourceMap);
+    if (count) {
+        Util.logTime(`loaded ${count} sourcemaps`, time_start);
+    }
 
     return v8list;
 };
@@ -146,7 +156,7 @@ const mergeV8Coverage = async (dataList, options) => {
             item.source = json.source;
             item.sourceMap = json.sourceMap;
         } else {
-            EC.logRed(`[MCR] failed to read source: ${item.url}`);
+            Util.logError(`failed to read source: ${item.url}`);
             item.source = '';
         }
     }
@@ -171,7 +181,6 @@ const saveV8HtmlReport = async (reportData, _options) => {
 
         outputDir,
         reportDataFile: 'coverage-data.js',
-        assetsName: 'assets',
         assetsRelative: '../'
     };
 

package/lib/plugins/network/network.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const EC = require('eight-colors');
 const Util = require('../../utils/util.js');
 
 const getHarData = (har) => {
@@ -121,9 +120,12 @@ const saveNetworkHtmlReport = async (reportData, _options) => {
 
 const attachNetworkReport = async (har, testInfo, options = {}) => {
 
+    const reporterOptions = Util.resolveReporterOptions(testInfo);
+    Util.initLoggingLevel(reporterOptions.logging, 'network');
+
     const harData = getHarData(har);
     if (!harData || !harData.log) {
-        EC.logRed(`[MCR] failed to load HAR: ${har}`);
+        Util.logError(`failed to load HAR: ${har}`);
         return;
     }
 
@@ -177,17 +179,6 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
     return report;
 };
 
-// TODO
-const addNetworkReport = async () => {
-
-};
-
-const generateGlobalNetworkReport = async () => {
-
-};
-
 module.exports = {
-    addNetworkReport,
-    generateGlobalNetworkReport,
     attachNetworkReport
 };

package/lib/plugins/state/client.js

@@ -1,4 +1,3 @@
-const EC = require('eight-colors');
 const { WebSocket } = require('../../runtime/monocart-vendor.js');
 const Util = require('../../utils/util.js');
 
@@ -29,7 +28,7 @@ class Client {
                 });
                 this.resolves = null;
             } else {
-                EC.logRed(`[SWS] websocket error: ${err.message}`);
+                Util.logError(`websocket error: ${err.message}`);
             }
 
         });
@@ -63,7 +62,7 @@ class Client {
                     reject
                 });
             } else {
-                reject(new Error('[SWS] an error occurs when connecting websocket server'));
+                reject(new Error('an error occurs when connecting websocket server'));
             }
         });
     }
@@ -108,7 +107,7 @@ class Client {
             const timeout = this.options.timeout;
             const timeout_id = setTimeout(() => {
                 this.requests.delete(id);
-                reject(new Error(`[SWS] Timed out receiving message from websocket server: ${timeout}ms`));
+                reject(new Error(`timed out receiving message from websocket server: ${timeout}ms`));
             }, timeout);
 
             this.requests.set(id, {

package/lib/plugins/state/state.js

@@ -40,6 +40,9 @@ const useState = (options = {}) => {
         ... options
     };
 
+    // when used in global-setup will be override reporter (main process)
+    Util.initLoggingLevel(clientOptions.logging, 'state');
+
     const clientKey = Object.keys(defaultClientOptions).map((k) => clientOptions[k]).join('-');
     // console.log('client key', clientKey);
 
@@ -142,10 +145,10 @@ const createStateServer = (stateOptions) => {
     const wss = new WebSocketServer(serverOptions);
 
     wss.on('error', (e) => {
-        EC.logRed(`[SWS] websocket server error: ${e.message}`);
+        Util.logError(`websocket server error: ${e.message}`);
     });
     wss.on('wsClientError', (e) => {
-        EC.logRed(`[SWS] websocket client error: ${e.message}`);
+        Util.logError(`websocket client error: ${e.message}`);
     });
 
     wss.on('connection', (ws) => {
@@ -159,7 +162,7 @@ const createStateServer = (stateOptions) => {
 
     wss.on('listening', () => {
         const serverUrl = getServerUrl(serverOptions);
-        console.log(`[SWS] state websocket server listening on ${EC.cyan(serverUrl)}`);
+        Util.logInfo(`state websocket server listening on ${EC.cyan(serverUrl)}`);
     });
 
     return {