monocart-coverage-reports 2.9.0 → 2.9.2

package/README.md

@@ -585,6 +585,20 @@ const coverageOptions = {
     }
 };
 ```
+Normalize the full path of the file:
+```js
+const path = require("path")
+
+// MCR coverage options
+const coverageOptions = {
+    sourcePath: (filePath, info)=> {
+        if (!filePath.includes('/') && info.distFile) {
+            return `${path.dirname(info.distFile)}/${filePath}`;
+        }
+        return filePath;
+    }
+}
+```
 
 ## Adding Empty Coverage for Untested Files
 By default the untested files will not be included in the coverage report, we can add empty coverage data for all files with option `all`, the untested files will show 0% coverage.
@@ -1021,8 +1035,9 @@ const coverageOptions = {
 - Github actions:
 ```yml
 - name: Codecov
-    uses: codecov/codecov-action@v3
+    uses: codecov/codecov-action@v4
     with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         files: ./coverage-reports/codecov.json
 ```
 

package/README.zh-Hans.md

@@ -588,6 +588,20 @@ const coverageOptions = {
     }
 };
 ```
+解决文件路径不完整的问题：
+```js
+const path = require("path")
+
+// MCR coverage options
+const coverageOptions = {
+    sourcePath: (filePath, info)=> {
+        if (!filePath.includes('/') && info.distFile) {
+            return `${path.dirname(info.distFile)}/${filePath}`;
+        }
+        return filePath;
+    }
+}
+```
 
 ## Adding Empty Coverage for Untested Files
 默认，未测试的文件是不会包含到覆盖率报告的，需要使用`all`选项来为这些文件添加一个空的覆盖率，也就是0%
@@ -1025,8 +1039,9 @@ const coverageOptions = {
 - Github actions example:
 ```yml
 - name: Codecov
-    uses: codecov/codecov-action@v3
+    uses: codecov/codecov-action@v4
     with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         files: ./coverage-reports/codecov.json
 ```
 

package/lib/cli.js

@@ -3,10 +3,8 @@
 const path = require('path');
 const EC = require('eight-colors');
 
-const {
-    foregroundChild,
-    program
-} = require('./packages/monocart-coverage-cli.js');
+const { program } = require('commander');
+const { foregroundChild } = require('foreground-child');
 
 const MCR = require('./index.js');
 const Util = require('./utils/util.js');

package/lib/converter/ast.js

@@ -1,6 +1,6 @@
-const {
-    acorn, acornLoose, parseCss
-} = require('../packages/monocart-coverage-vendor.js');
+const acorn = require('acorn');
+const acornLoose = require('acorn-loose');
+const { parseCss } = require('../packages/monocart-coverage-vendor.js');
 const Util = require('../utils/util.js');
 
 const { collectAstInfo } = require('./ast-visitor.js');

package/lib/converter/collect-source-maps.js

@@ -4,6 +4,7 @@ const EC = require('eight-colors');
 const { fileURLToPath, pathToFileURL } = require('url');
 const Concurrency = require('../platform/concurrency.js');
 const { convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
+const { flattenSourceMaps } = require('./flatten-source-maps.js');
 
 const Util = require('../utils/util.js');
 
@@ -100,27 +101,68 @@ const resolveSourcesContent = (data, url) => {
     }
 };
 
+const checkSourcesContent = (data) => {
+    const { sourcesContent, sources } = data;
+
+    if (!sourcesContent) {
+        data.sourcesContent = [];
+        return false;
+    }
+
+    // all should be string, could be [null]
+    const contents = sourcesContent.filter((content) => typeof content === 'string');
+    if (contents.length === sources.length) {
+        return true;
+    }
+
+    return false;
+};
+
+const resolveSectionedSourceMap = (data, url, sections) => {
+
+    let hasSourceContent = false;
+    sections.forEach((item) => {
+        // offset: { line: 1, column: 0 },
+        // map: { sources, sourcesContent  }
+
+        const map = item.map;
+
+        if (checkSourcesContent(map)) {
+            hasSourceContent = true;
+            return;
+        }
+
+        const done = resolveSourcesContent(map, url);
+        if (done) {
+            hasSourceContent = true;
+        }
+
+    });
+
+    if (hasSourceContent) {
+        return flattenSourceMaps(data);
+    }
+};
+
 const resolveSourceMap = (data, url) => {
     if (!data) {
         return;
     }
     const {
-        sources, sourcesContent, mappings
+        sections, sources, mappings
     } = data;
 
+    if (sections) {
+        return resolveSectionedSourceMap(data, url, sections);
+    }
+
     if (!sources || !mappings) {
         return;
     }
 
     // check sources content
-    if (sourcesContent) {
-        // all should be string, could be [null]
-        const contents = sourcesContent.filter((content) => typeof content === 'string');
-        if (contents.length === sources.length) {
-            return data;
-        }
-    } else {
-        data.sourcesContent = [];
+    if (checkSourcesContent(data)) {
+        return data;
     }
 
     // load sources content by sources

package/lib/converter/converter.js

@@ -17,7 +17,9 @@ const {
     sortRanges, dedupeCountRanges, mergeRangesWith
 } = require('../utils/dedupe.js');
 const { getSourceType, initSourceMapSourcesPath } = require('../utils/source-path.js');
-const { decode, minimatch } = require('../packages/monocart-coverage-vendor.js');
+
+const { decode } = require('@jridgewell/sourcemap-codec');
+const { minimatch } = require('minimatch');
 
 const InfoBranch = require('./info-branch.js');
 const InfoFunction = require('./info-function.js');
@@ -839,9 +841,13 @@ const decodeSourceMappings = (state, originalDecodedMap) => {
 
     const generatedLocator = state.locator;
 
-    const { sources, mappings } = state.sourceMap;
+    const {
+        sources, mappings, decodedMappings
+    } = state.sourceMap;
+
+    const decodedList = decodedMappings || decode(mappings);
 
-    const decodedList = decode(mappings);
+    // console.log(decodedList);
 
     sources.forEach((source, i) => {
         originalDecodedMap.set(i, []);

package/lib/converter/find-original-range.js

@@ -1,4 +1,4 @@
-const { diff } = require('../packages/monocart-coverage-vendor');
+const diffSequence = require('diff-sequences').default;
 const Util = require('../utils/util.js');
 const EC = Util.EC;
 
@@ -79,7 +79,7 @@ const alignText = (gt, ot, info) => {
     // console.log(ol);
 
     const commonItems = [];
-    diff(gl.length, ol.length, (gi, oi) => {
+    diffSequence(gl.length, ol.length, (gi, oi) => {
         return gl[gi].value === ol[oi].value;
     }, (len, gi, oi) => {
         commonItems.push([gi, oi, len]);

package/lib/converter/flatten-source-maps.js

@@ -0,0 +1,166 @@
+const { decode } = require('@jridgewell/sourcemap-codec');
+
+function getLine(arr, index) {
+    for (let i = arr.length; i <= index; i++) {
+        arr[i] = [];
+    }
+    return arr[index];
+}
+
+function addMappings(options, sourcesOffset) {
+
+    const {
+        input,
+        lineOffset,
+        columnOffset,
+        stopLine,
+        stopColumn
+    } = options;
+
+    const decoded = decode(input.mappings);
+    const COLUMN = 0;
+    const SOURCES_INDEX = 1;
+    const SOURCE_LINE = 2;
+    const SOURCE_COLUMN = 3;
+
+    for (let i = 0; i < decoded.length; i++) {
+        const lineI = lineOffset + i;
+
+        if (lineI > stopLine) {
+            return;
+        }
+
+        const out = getLine(options.decodedMappings, lineI);
+        const cOffset = i === 0 ? columnOffset : 0;
+
+        const line = decoded[i];
+        for (let j = 0; j < line.length; j++) {
+            const seg = line[j];
+            const column = cOffset + seg[COLUMN];
+
+            if (lineI === stopLine && column >= stopColumn) {
+                return;
+            }
+
+            if (seg.length === 1) {
+                out.push([column]);
+                continue;
+            }
+
+            const sourcesIndex = sourcesOffset + seg[SOURCES_INDEX];
+            const sourceLine = seg[SOURCE_LINE];
+            const sourceColumn = seg[SOURCE_COLUMN];
+            out.push([column, sourcesIndex, sourceLine, sourceColumn]);
+        }
+    }
+}
+
+function addSection(options) {
+
+    const { input } = options;
+
+    const { sections } = input;
+    if (sections) {
+        return flatten(options);
+    }
+
+    const sourcesOffset = options.sources.length;
+
+    if (!input.sourcesContent) {
+        input.sourcesContent = [];
+    }
+    input.sources.forEach((src, i) => {
+        options.sources.push(src);
+        options.sourcesContent.push(input.sourcesContent[i] || null);
+    });
+
+    addMappings(options, sourcesOffset);
+
+}
+
+function flatten(options) {
+
+    const {
+        input,
+        lineOffset,
+        columnOffset,
+        stopLine,
+        stopColumn
+    } = options;
+
+    const { sections } = input;
+
+    for (let i = 0, l = sections.length; i < l; i++) {
+        const { map, offset } = sections[i];
+
+        let sl = stopLine;
+        let sc = stopColumn;
+        if (i + 1 < sections.length) {
+            const nextOffset = sections[i + 1].offset;
+            sl = Math.min(stopLine, lineOffset + nextOffset.line);
+
+            if (sl === stopLine) {
+                sc = Math.min(stopColumn, columnOffset + nextOffset.column);
+            } else if (sl < stopLine) {
+                sc = columnOffset + nextOffset.column;
+            }
+        }
+
+        options.input = map;
+        options.lineOffset = lineOffset + offset.line;
+        options.columnOffset = columnOffset + offset.column;
+        options.stopLine = sl;
+        options.stopColumn = sc;
+
+        addSection(options);
+    }
+}
+
+const flattenSourceMaps = function(indexedMap, mapUrl) {
+
+    const sections = indexedMap.sections;
+    if (!sections) {
+        return indexedMap;
+    }
+
+    const decodedMappings = [];
+    const sources = [];
+    const sourcesContent = [];
+    const names = [];
+    const ignoreList = [];
+
+    const lineOffset = 0;
+    const columnOffset = 0;
+    const stopLine = Infinity;
+    const stopColumn = Infinity;
+
+    flatten({
+        input: indexedMap,
+
+        mapUrl,
+
+        decodedMappings,
+        sources,
+        sourcesContent,
+
+        names,
+        ignoreList,
+
+        lineOffset,
+        columnOffset,
+        stopLine,
+        stopColumn
+    });
+
+    indexedMap.sources = sources;
+    indexedMap.sourcesContent = sourcesContent;
+    indexedMap.decodedMappings = decodedMappings;
+
+    // console.log(decodedMappings);
+
+    return indexedMap;
+};
+
+module.exports = {
+    flattenSourceMaps
+};

package/lib/generate.js

@@ -14,7 +14,7 @@ const { mergeV8Coverage, saveV8Report } = require('./v8/v8.js');
 const { convertV8List } = require('./converter/converter.js');
 const { resolveSourceMap } = require('./converter/collect-source-maps.js');
 
-const { minimatch } = require('./packages/monocart-coverage-vendor.js');
+const { minimatch } = require('minimatch');
 const { getGroupedRows } = require('./utils/snapshot.js');
 const generateMarkdownGrid = require('./utils/markdown.js');