monocart-reporter 1.6.28 → 1.6.30

package/README.md

@@ -126,7 +126,7 @@ Separated metadata file (Already included in the above HTML and compressed, it c
     //     entryFilter: (entry) => true,
     //     unpackSourceMap: true,
     //     excludeDistFile: true,
-    //     sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
+    //     sourceFilter: (sourceName) => sourceName.search(/src\/.+/) !== -1,
     // },
 
     // trend data handler
@@ -493,6 +493,7 @@ module.exports = {
     ]
 };
 ```
+see example [remove-secrets](https://github.com/cenfun/monocart-reporter-test/tree/main/tests/remove-secrets)
 
 ## Style Tags
 * Add tag to test/describe title ( starts with `@` )
@@ -742,7 +743,8 @@ const report = await attachCoverageReport(coverageList, test.info(), {
 | Input data format | Istanbul (Object) | V8 (Array) | V8 (Array) |
 | Options  | `watermarks: {}`  | `watermarks: [50, 80]` | `toIstanbul: true, watermarks: {}` |
 | Output report | [Istanbul HTML report](https://cenfun.github.io/monocart-reporter/coverage-4ffdff9b89e7b58476cf/index.html) | [V8 HTML report](https://cenfun.github.io/monocart-reporter/coverage-f8ad4b6741d60f9e7b81/index.html)  | [Istanbul HTML report](https://cenfun.github.io/monocart-reporter/coverage-391e7054ca1e6d944895/index.html) |
-| Indicators | Covered Lines, Branches, Statements and Functions, Execution Counts | Covered Bytes, Execution Counts | Covered Lines, Branches, Statements and Functions, Execution Counts |
+| Indicators | Covered Lines, Branches, Statements and Functions, Execution Counts | Covered Bytes, Lines (after formatted) Execution Counts | Covered Lines, Branches, Statements and Functions, Execution Counts |
+| Source code without [instrumentation](https://github.com/istanbuljs/babel-plugin-istanbul) | ❌ | ✅ | ✅ |
 | CSS coverage | ❌ | ✅ | ❌ |
 | Minified code | N/A | ✅ | ❌ |
 | Code formatting | N/A | ✅ | ❌ |
@@ -761,7 +763,7 @@ module.exports = {
                 entryFilter: (entry) => true,
                 unpackSourceMap: true,
                 excludeDistFile: true,
-                sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
+                sourceFilter: (sourceName) => sourceName.search(/src\/.+/) !== -1,
             }
         }]
     ]

package/lib/default/options.js

@@ -17,7 +17,7 @@ module.exports = {
     //     entryFilter: (entry) => true,
     //     unpackSourceMap: true,
     //     excludeDistFile: true,
-    //     sourceFilter: (sourceName) => sourceName.search(/\/src\/.+/) !== -1,
+    //     sourceFilter: (sourceName) => sourceName.search(/src\/.+/) !== -1,
     // },
 
     // trend data handler

package/lib/generate-report.js

@@ -55,22 +55,26 @@ const showTestResults = (reportData) => {
 
     const summary = reportData.summary;
 
-    const colorHandler = (item, v) => {
-        if (item.id === 'failed') {
-            if (item.value > 0) {
-                v = EC.red(v);
-            }
+    const colorHandler = (item, row) => {
 
-        } else if (item.id === 'flaky') {
-            if (item.value > 0) {
-                v = EC.yellow(v);
-            }
-        } else if (item.id === 'passed') {
+        if (['failed', 'errors'].includes(item.id) && item.value > 0) {
+            row.name = EC.red(row.name);
+            row.value = EC.red(row.value);
+            return;
+        }
+
+        if (['flaky', 'retries'].includes(item.id) && item.value > 0) {
+            row.name = EC.yellow(row.name);
+            row.value = EC.yellow(row.value);
+            return;
+        }
+
+        if (item.id === 'passed') {
             if (summary.failed.value === 0 && summary.passed.value > 0) {
-                v = EC.green(v);
+                row.name = EC.green(row.name);
+                row.value = EC.green(row.value);
             }
         }
-        return v;
     };
 
     let rows = [];
@@ -82,9 +86,12 @@ const showTestResults = (reportData) => {
         if (caseTypes.includes(item.id) || suiteSubs.includes(item.id)) {
             return;
         }
-        rows.push({
+
+        const row = {
             ... item
-        });
+        };
+        colorHandler(item, row);
+        rows.push(row);
     });
 
     const tests = rows.find((it) => it.id === 'tests');
@@ -94,10 +101,12 @@ const showTestResults = (reportData) => {
         };
         const value = `${item.value}`.padEnd(`${tests.value}`.length, ' ');
         const percent = `(${item.percent})`;
-        return {
-            name: colorHandler(item, item.name),
-            value: colorHandler(item, `${value} ${percent}`)
+        const row = {
+            name: item.name,
+            value: `${value} ${percent}`
         };
+        colorHandler(item, row);
+        return row;
     });
 
     const suites = rows.find((it) => it.id === 'suites');

package/lib/index.js

@@ -43,6 +43,10 @@ class Reporter {
         this.tickStart();
     }
 
+    printsToStdio() {
+        return false;
+    }
+
     tickStart() {
         this.tick_time_id = setTimeout(async () => {
             const tickInfo = await getTickInfo();

package/lib/plugins/coverage/coverage-utils.js

@@ -67,6 +67,13 @@ const getSourcePath = (url, index = '', type = '') => {
     return filterPath(relPath);
 };
 
+const mergeSourceRoot = (sourceRoot, sourceName) => {
+    if (sourceName.startsWith(sourceRoot)) {
+        return sourceName;
+    }
+    return sourceRoot + sourceName;
+};
+
 // ================================================================================================
 
 const request = async (options) => {
@@ -150,5 +157,6 @@ const collectSourceMaps = async (v8list) => {
 module.exports = {
     sortRanges,
     getSourcePath,
+    mergeSourceRoot,
     collectSourceMaps
 };

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

@@ -18,7 +18,9 @@ const {
 // const istanbulLibCoverage = require('istanbul-lib-coverage');
 // const istanbulLibReport = require('istanbul-lib-report');
 
-const { getSourcePath, collectSourceMaps } = require('../coverage-utils.js');
+const {
+    getSourcePath, mergeSourceRoot, collectSourceMaps
+} = require('../coverage-utils.js');
 
 
 const saveIstanbulReport = (coverageData, fileSources, options) => {
@@ -149,9 +151,14 @@ const getConversionSources = (item, fileSources) => {
     // 'webpack://monocart-v8/external umd "monocart-code-viewer"'
     // format the url to sourcePath
 
+    // reset sourceRoot
+    const sourceRoot = sourceMap.sourceRoot || '';
+    sourceMap.sourceRoot = '';
+
     // resolve source path and add to file sources cache for html report sourceFinder
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
-        const newSourceName = getSourcePath(sourceName, i + 1);
+        const sourceUrl = mergeSourceRoot(sourceRoot, sourceName);
+        const newSourceName = getSourcePath(sourceUrl, i + 1);
         fileSources[newSourceName] = sourceMap.sourcesContent[i];
         return newSourceName;
     });

package/lib/plugins/coverage/v8/position-mapping.js

@@ -29,10 +29,6 @@ class PositionMapping {
         this.sourceName = sourceName;
         this.lines = this.getLines(source);
         this.ranges = [];
-        this.range = {
-            start: 0,
-            end: 0
-        };
     }
 
     // =============================================================================

package/lib/plugins/coverage/v8/source-map.js

@@ -4,8 +4,12 @@ const { SourceMapConsumer } = require('source-map');
 
 const PositionMapping = require('./position-mapping.js');
 const { dedupeCountRanges } = require('./dedupe.js');
-const { getSourcePath, collectSourceMaps } = require('../coverage-utils.js');
+const {
+    getSourcePath, mergeSourceRoot, collectSourceMaps
+} = require('../coverage-utils.js');
 
+// SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
+// SourceMapConsumer.LEAST_UPPER_BOUND = 2;
 const BIAS = {
     left: SourceMapConsumer.GREATEST_LOWER_BOUND,
     right: SourceMapConsumer.LEAST_UPPER_BOUND
@@ -13,7 +17,7 @@ const BIAS = {
 
 // =========================================================================================================
 
-const getOriginalPosition = (consumer, line, column, sides) => {
+const findOriginalPosition = (consumer, line, column, sides) => {
     let original;
     for (const side of sides) {
         original = consumer.originalPositionFor({
@@ -30,42 +34,58 @@ const getOriginalPosition = (consumer, line, column, sides) => {
     }
 };
 
-const getOriginalStartPosition = (consumer, line, column) => {
-    return getOriginalPosition(consumer, line, column, ['right', 'left']);
+const findOriginalStartPosition = (consumer, sLoc) => {
+    const { line, column } = sLoc;
+    return findOriginalPosition(consumer, line, column, ['right', 'left']);
 };
 
-const getOriginalEndPosition = (consumer, line, column) => {
+const findOriginalEndInRange = (consumer, generatedMapping, range) => {
+    const { start, end } = range;
+    // from -2 (already -1)
+    // > start (no need equal)
+    for (let i = end - 2; i > start; i--) {
+        const loc = generatedMapping.offsetToLocation(i);
+        const op = findOriginalPosition(consumer, loc.line, loc.column, ['left', 'right']);
+        if (op) {
+            return op;
+        }
+    }
+};
+
+const findOriginalEndPosition = (consumer, eLoc, generatedMapping, range) => {
+    const { line, column } = eLoc;
 
     // before end column must be >= 0
-    if (column > 0) {
-        column -= 1;
-    }
+    const currentColumn = Math.max(column - 1, 0);
 
-    const beforeEnd = getOriginalPosition(consumer, line, column, ['left', 'right']);
-    if (!beforeEnd) {
-        return;
+    let ep = findOriginalPosition(consumer, line, currentColumn, ['left', 'right']);
+    if (!ep) {
+        ep = findOriginalEndInRange(consumer, generatedMapping, range);
+        if (!ep) {
+            return;
+        }
     }
 
     const afterEndMapping = consumer.generatedPositionFor({
-        source: beforeEnd.source,
-        line: beforeEnd.line,
-        column: beforeEnd.column + 1,
+        source: ep.source,
+        line: ep.line,
+        column: ep.column + 1,
         bias: BIAS.right
     });
 
     if (afterEndMapping.line === null) {
         return {
-            source: beforeEnd.source,
-            line: beforeEnd.line,
+            source: ep.source,
+            line: ep.line,
             column: Infinity
         };
     }
 
     const mapping = consumer.originalPositionFor(afterEndMapping);
-    if (mapping.line !== beforeEnd.line) {
+    if (mapping.line !== ep.line) {
         return {
-            source: beforeEnd.source,
-            line: beforeEnd.line,
+            source: ep.source,
+            line: ep.line,
             column: Infinity
         };
     }
@@ -75,98 +95,6 @@ const getOriginalEndPosition = (consumer, line, column) => {
 
 // =========================================================================================================
 
-const getOriginalFileStart = (consumer, sourceName, lines) => {
-    const len = lines.length;
-    for (let i = 0; i < len; i++) {
-        const list = consumer.allGeneratedPositionsFor({
-            source: sourceName,
-            line: i + 1
-        });
-        if (list.length) {
-            return list[0];
-        }
-    }
-};
-
-const getOriginalFileEnd = (consumer, sourceName, lines) => {
-    const len = lines.length;
-    for (let i = len - 1; i >= 0; i--) {
-        const list = consumer.allGeneratedPositionsFor({
-            source: sourceName,
-            line: i + 1
-        });
-        if (list.length) {
-            return list[list.length - 1];
-        }
-    }
-};
-
-const calculateOriginalFileRange = (generatedMapping, consumer, originalMapping) => {
-    const { sourceName, lines } = originalMapping;
-
-    // consumer.computeColumnSpans();
-
-    const gs = getOriginalFileStart(consumer, sourceName, lines);
-    const ge = getOriginalFileEnd(consumer, sourceName, lines);
-
-    // console.log('file range', sourceName, sLoc, eLoc);
-
-    if (!gs || !ge) {
-        // console.log('failed to get file range', sourceName, sLoc, eLoc);
-        return;
-    }
-
-    const generatedStart = generatedMapping.locationToOffset({
-        line: gs.line,
-        column: gs.column
-    });
-    const generatedEnd = generatedMapping.locationToOffset({
-        line: ge.line,
-        column: ge.column
-    });
-
-    const os = consumer.originalPositionFor({
-        line: gs.line,
-        column: gs.column
-    });
-    const oe = consumer.originalPositionFor({
-        line: ge.line,
-        column: ge.column
-    });
-    const originalStart = originalMapping.locationToOffset({
-        line: os.line,
-        column: os.column
-    });
-    const originalEnd = originalMapping.locationToOffset({
-        line: oe.line,
-        column: oe.column
-    });
-
-    const range = {
-        generatedStart,
-        generatedEnd,
-        originalStart,
-        originalEnd
-    };
-
-    if (generatedStart > generatedEnd) {
-        range.generatedStart = generatedEnd;
-        range.generatedEnd = generatedStart;
-    }
-
-    if (originalStart > originalEnd) {
-        range.originalStart = originalEnd;
-        range.originalEnd = originalStart;
-    }
-
-    originalMapping.range = range;
-
-    // console.log('file range', sourceName, range);
-
-    // EC.logCyan(JSON.stringify(generatedMapping.getSlice(range.start, range.end)));
-
-};
-
 const getOriginalMappings = (generatedMapping, consumer, options) => {
 
     // source filter
@@ -188,7 +116,6 @@ const getOriginalMappings = (generatedMapping, consumer, options) => {
         }
 
         const mapping = new PositionMapping(sourceContent, sourceName);
-        calculateOriginalFileRange(generatedMapping, consumer, mapping);
         originalMappings.set(sourceName, mapping);
     }
 
@@ -213,10 +140,16 @@ const unpackJsSourceMap = async (item, v8list, options) => {
     // console.log(Object.keys(item));
 
     const sourceMap = item.sourceMap;
+
+    // reset sourceRoot
+    const sourceRoot = sourceMap.sourceRoot || '';
+    sourceMap.sourceRoot = '';
+
     const urlMap = {};
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
-        const newSourceName = getSourcePath(sourceName, i + 1);
-        urlMap[newSourceName] = sourceName;
+        const sourceUrl = mergeSourceRoot(sourceRoot, sourceName);
+        const newSourceName = getSourcePath(sourceUrl, i + 1);
+        urlMap[newSourceName] = sourceUrl;
         return newSourceName;
     });
 
@@ -226,12 +159,16 @@ const unpackJsSourceMap = async (item, v8list, options) => {
 
     // generated ranges to original ranges
     item.ranges.forEach((range) => {
+
+        // find start location
         const sLoc = generatedMapping.offsetToLocation(range.start);
-        const oSLoc = getOriginalStartPosition(consumer, sLoc.line, sLoc.column);
+        const oSLoc = findOriginalStartPosition(consumer, sLoc);
         if (!oSLoc) {
+            // not found start
             return;
         }
 
+        // if source excluded
         const currentSource = oSLoc.source;
         const originalMapping = originalMappings.get(currentSource);
         if (!originalMapping) {
@@ -242,16 +179,18 @@ const unpackJsSourceMap = async (item, v8list, options) => {
 
         const originalStart = originalMapping.locationToOffset(oSLoc);
 
+        // find end location
         const eLoc = generatedMapping.offsetToLocation(range.end);
-        const oELoc = getOriginalEndPosition(consumer, eLoc.line, eLoc.column);
-
+        const oELoc = findOriginalEndPosition(consumer, eLoc, generatedMapping, range);
         if (!oELoc) {
 
-            // console.log('not found end', originalMapping.sourceName, eLoc);
+            // console.log(EC.red('not found end'));
+            // console.log(item.url);
+            // console.log(originalMapping.sourceName);
+            // console.log('generated start', sLoc.line, sLoc.column, 'original start', oSLoc.line, oSLoc.column);
+            // console.log('generated end', eLoc.line, eLoc.column);
 
-            // to original end
-            const originalEnd = originalMapping.range.originalEnd;
-            addOriginalRange(originalMapping, originalStart, originalEnd, range.count);
+            // can NOT use file end
 
             return;
         }
@@ -277,10 +216,13 @@ const unpackJsSourceMap = async (item, v8list, options) => {
     // append to v8list
     originalMappings.forEach((originalMapping, currentSource) => {
 
+        const url = urlMap[currentSource] || currentSource;
         const ranges = dedupeCountRanges(originalMapping.ranges);
 
+        //  console.log('add source url', url);
+
         v8list.push({
-            url: urlMap[currentSource],
+            url,
             type: item.type,
             sourcePath: currentSource,
             distFile: item.sourceMap.file,