monocart-coverage-reports 2.5.6 → 2.5.8

package/lib/utils/request.js

@@ -0,0 +1,62 @@
+const http = require('http');
+const https = require('https');
+
+// minimal http request for get sourcemap json
+const request = (options) => {
+
+    const url = `${options.url}`;
+    // console.log('request', url);
+
+    return new Promise((resolve) => {
+
+        const HTTP = url.startsWith('https') ? https : http;
+
+        HTTP.get(url, (res) => {
+            const { statusCode } = res;
+
+            // Any 2xx status code signals a successful response but here we're only checking for 200.
+            if (statusCode !== 200) {
+                // Consume response data to free up memory
+                res.resume();
+                const resErr = new Error(`Request Failed. Status Code: ${statusCode}`);
+                resolve([resErr, null]);
+                return;
+            }
+
+            res.setEncoding('utf8');
+
+            let rawData = '';
+            res.on('data', (chunk) => {
+                rawData += chunk;
+            });
+
+            res.on('end', () => {
+
+                let dataErr;
+                let data = rawData;
+
+                // parse json
+                const contentType = res.headers['content-type'];
+                if ((/^application\/json/).test(contentType)) {
+                    try {
+                        data = JSON.parse(rawData);
+                    } catch (e) {
+                        dataErr = e;
+                    }
+                }
+
+                res.data = data;
+                resolve([dataErr, res]);
+
+            });
+
+        }).on('error', (httpErr) => {
+
+            resolve([httpErr, null]);
+
+        });
+
+    });
+};
+
+module.exports = request;

package/lib/utils/source-path.js

@@ -72,10 +72,32 @@ const getSourceType = (sourcePath) => {
     return type;
 };
 
+
+// ========================================================================================================
+
+const getSourcePathHandler = (options) => {
+    const input = options.sourcePath;
+    if (typeof input === 'function') {
+        return input;
+    }
+    // object replace key with value
+    if (input && typeof input === 'object') {
+        const keys = Object.keys(input).filter((k) => typeof input[k] === 'string');
+        if (keys.length) {
+            return (filePath) => {
+                keys.forEach((k) => {
+                    filePath = filePath.replace(k, input[k]);
+                });
+                return filePath;
+            };
+        }
+    }
+};
+
 // ========================================================================================================
 
 const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) => {
-    if (typeof sourcePathHandler !== 'function') {
+    if (!sourcePathHandler) {
         return coverageData;
     }
 
@@ -121,7 +143,7 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
         const sourceUrl = mergeSourceRoot(sourceRoot, sourceName);
 
         let sourcePath = getSourcePath(sourceUrl, i + 1);
-        if (typeof sourcePathHandler === 'function') {
+        if (sourcePathHandler) {
             const newSourcePath = sourcePathHandler(sourcePath, sourceUrl);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
@@ -137,6 +159,7 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
 module.exports = {
     getSourcePath,
     getSourceType,
+    getSourcePathHandler,
     initIstanbulSourcePath,
     initSourceMapSourcePath
 };

package/lib/utils/util.js

@@ -7,6 +7,7 @@ const crypto = require('crypto');
 const EC = require('eight-colors');
 const CG = require('console-grid');
 const Share = require('../platform/share.js');
+const request = require('./request.js');
 const { deflateSync } = require('lz-utils');
 
 const { acornWalk, supportsColor } = require('../packages/monocart-coverage-vendor.js');
@@ -25,6 +26,8 @@ const Util = {
 
     root: process.cwd(),
 
+    request,
+
     relativePath: function(p, root) {
         p = `${p}`;
         root = `${root || Util.root}`;
@@ -499,20 +502,12 @@ const Util = {
         console.log(`[MCR] ${message}`);
     },
 
-    // time is debug level
+    // time is debug level, fix the log info, for checking snapshot
     logTime: (message, time_start) => {
-        if (Util.loggingLevel < Util.loggingLevels.info) {
+        if (Util.loggingLevel < Util.loggingLevels.debug) {
             return;
         }
-
-        const slowDuration = 1000;
         const duration = Date.now() - time_start;
-        if (Util.loggingLevel < Util.loggingLevels.debug) {
-            if (duration < slowDuration) {
-                return;
-            }
-        }
-
         const durationH = Util.TSF(duration);
         const ls = [`[MCR] ${message}`, ' ('];
         if (duration <= 100) {

package/lib/v8/v8-summary.js

@@ -5,6 +5,14 @@ const getV8SummaryBytes = (item) => {
     const source = item.source;
     const total = source.length;
 
+    // for empty coverage
+    if (item.empty) {
+        return {
+            total,
+            covered: 0
+        };
+    }
+
     const uncoveredBytes = item.data.bytes.filter((range) => range.count === 0);
 
     let uncovered = 0;

package/lib/v8/v8.js

@@ -4,7 +4,7 @@ const EC = require('eight-colors');
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
-const { getSourcePath } = require('../utils/source-path.js');
+const { getSourcePath, getSourcePathHandler } = require('../utils/source-path.js');
 const { mergeScriptCovs, minimatch } = require('../packages/monocart-coverage-vendor.js');
 const { collectSourceMaps } = require('../converter/collect-source-maps.js');
 const version = require('../../package.json').version;
@@ -24,17 +24,35 @@ const getWrapperSource = (offset, source) => {
 };
 
 const getEntryFilter = (options) => {
-    const entryFilter = options.entryFilter;
-    if (typeof entryFilter === 'function') {
-        return entryFilter;
+    const input = options.entryFilter;
+
+    // for function handler
+    if (typeof input === 'function') {
+        return input;
     }
 
-    if (entryFilter && typeof entryFilter === 'string') {
+    // for single minimatch pattern
+    if (input && typeof input === 'string') {
         return (entry) => {
-            return minimatch(entry.url, entryFilter);
+            return minimatch(entry.url, input);
+        };
+    }
+
+    // for patterns
+    if (input && typeof input === 'object') {
+        const patterns = Object.keys(input);
+        return (entry) => {
+            const url = entry.url;
+            for (const pattern of patterns) {
+                if (minimatch(url, pattern)) {
+                    return input[pattern];
+                }
+            }
+            // false if not matched
         };
     }
 
+    // default
     return () => true;
 };
 
@@ -78,7 +96,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
 
     // do not change original v8list, to work for multiple APIs
 
-    const sourcePathHandler = options.sourcePath;
+    const sourcePathHandler = getSourcePathHandler(options);
 
     // init id, sourcePath
     v8list = v8list.map((item, i) => {
@@ -119,7 +137,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
 
         // resolve source path
         let sourcePath = getSourcePath(data.url, i + 1, data.type);
-        if (typeof sourcePathHandler === 'function') {
+        if (sourcePathHandler) {
             const newSourcePath = sourcePathHandler(sourcePath, data.url);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.5.6",
+    "version": "2.5.8",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {
@@ -31,7 +31,7 @@
         "test-istanbul": "node ./test/test-istanbul.js",
         "test-v8": "node ./test/test-v8.js",
         "test-puppeteer": "node ./test/test-puppeteer.js",
-        "test-browser": "node ./test/test.js && npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css",
+        "test-browser": "node ./test/test-browser.js && npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css",
         "test-anonymous": "node ./test/test-anonymous.js",
         "test-css": "node ./test/test-css.js",
         "test-cli": "npx mcr \"node ./test/test-node-env.js\" -o docs/cli -c test/cli-options.js",