monocart-coverage-reports 2.3.3 → 2.4.0

package/lib/platform/share.js

@@ -248,6 +248,41 @@ const Util = {
         return false;
     },
 
+    findInRanges: (startPos, endPos, rangeList, startKey = 'start', endKey = 'end') => {
+        if (!Util.isList(rangeList)) {
+            return;
+        }
+
+        const quickFindRange = (position, ranges) => {
+            let start = 0;
+            let end = ranges.length - 1;
+            while (end - start > 1) {
+                const i = Math.floor((start + end) * 0.5);
+                const item = ranges[i];
+                if (position < item[startKey]) {
+                    end = i;
+                    continue;
+                }
+                if (position > item[endKey]) {
+                    start = i;
+                    continue;
+                }
+                return ranges[i];
+            }
+            // last two items, less is start
+            const endItem = ranges[end];
+            if (position < endItem[startKey]) {
+                return ranges[start];
+            }
+            return ranges[end];
+        };
+
+        const range = quickFindRange(startPos, rangeList);
+        if (startPos >= range[startKey] && endPos <= range[endKey]) {
+            return range;
+        }
+    },
+
     getRangeLines: (sLoc, eLoc) => {
 
         const lines = [];
@@ -273,7 +308,7 @@ const Util = {
             lines.push({
                 line: sLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: sLoc.column,
                     end: sLoc.length
                 }
@@ -289,7 +324,7 @@ const Util = {
             lines.push({
                 line: sLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: sLoc.column,
                     end: eLoc.column
                 }
@@ -307,7 +342,7 @@ const Util = {
             lines.push({
                 line: eLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: eLoc.indent,
                     end: eLoc.column
                 }
@@ -332,7 +367,7 @@ const Util = {
                     lines.push({
                         line: i,
                         entire: true
-                        // no range for entire line
+                        // no pieces for entire line
                     });
                 }
             }

package/lib/utils/util.js

@@ -12,10 +12,12 @@ const { deflateSync } = require('lz-utils');
 const { acornWalk } = require('../packages/monocart-coverage-vendor.js');
 
 const Util = {
+    ... Share,
 
-    root: process.cwd(),
+    EC,
+    CG,
 
-    ... Share,
+    root: process.cwd(),
 
     relativePath: function(p, root) {
         p = `${p}`;
@@ -416,6 +418,10 @@ const Util = {
         debug: 30
     },
 
+    isDebug: () => {
+        return Util.loggingType === 'debug';
+    },
+
     initLoggingLevel: (level) => {
 
         const types = {

package/lib/v8/v8-summary.js

@@ -75,7 +75,7 @@ const getV8Summary = (v8list, watermarks) => {
             total: 0,
             covered: 0
         },
-        functions: {
+        statements: {
             total: 0,
             covered: 0
         },
@@ -83,6 +83,10 @@ const getV8Summary = (v8list, watermarks) => {
             total: 0,
             covered: 0
         },
+        functions: {
+            total: 0,
+            covered: 0
+        },
         lines: {
             total: 0,
             covered: 0,

package/lib/v8/v8.js

@@ -79,6 +79,8 @@ const initV8ListAndSourcemap = async (v8list, options) => {
             scriptOffset,
             // Manually Resolve the Sourcemap
             sourceMap: item.sourceMap,
+            // fake source with `lineLengths`
+            fake: item.fake,
             // empty coverage
             empty: item.empty,
             // match source if using empty coverage
@@ -319,8 +321,9 @@ const saveV8Report = async (v8list, options) => {
 
     const defaultWatermarks = {
         bytes: [50, 80],
-        functions: [50, 80],
+        statements: [50, 80],
         branches: [50, 80],
+        functions: [50, 80],
         lines: [50, 80]
     };
     const watermarks = Util.resolveWatermarks(defaultWatermarks, options.watermarks);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {
@@ -65,11 +65,11 @@
         "turbogrid": "^3.0.13"
     },
     "devDependencies": {
-        "commander": "^11.1.0",
+        "commander": "^12.0.0",
         "eslint": "^8.56.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",
-        "eslint-plugin-vue": "^9.20.1",
+        "eslint-plugin-vue": "^9.21.1",
         "stylelint": "^15.11.0",
         "stylelint-config-plus": "^1.0.4"
     }

package/lib/converter/branches.js

@@ -1,429 +0,0 @@
-const Util = require('../utils/util.js');
-const findInRanges = require('./find-in-ranges.js');
-
-const findBranchBlock = (start, end, functionInfo) => {
-    const { range } = functionInfo;
-    if (range) {
-        const { blockMap, blockRanges } = range;
-        if (blockMap) {
-            // exact matched a block
-            const block = blockMap.get(start);
-            if (block) {
-                return block;
-            }
-
-            // support for tf2 || a || 1;
-            // "a" is in "|| a"
-            const blockItem = findInRanges(start, end, blockRanges);
-            if (blockItem) {
-                return blockItem;
-            }
-        }
-    }
-
-};
-
-// =======================================================================================
-
-const createBranchGroup = (type, branchStart, parents, branchMap, functionInfo) => {
-    // clone and reverse parents
-    const reverseParents = [].concat(parents).reverse();
-    const group = {
-        type,
-
-        start: branchStart,
-        // could be updated if multiple locations
-        end: branchStart,
-
-        locations: [],
-        reverseParents,
-        functionInfo
-    };
-    branchMap.set(branchStart, group);
-    return group;
-};
-
-const addBranch = (group, node, locationMap, functionInfo) => {
-    const { start, end } = node;
-
-    const branchStart = group.start;
-
-    // the block is not exact correct, if there is a block wrapped
-    // [x8]{ var a = b || [x4]c }, b is no block, but it can be found in x8 block
-    const block = findBranchBlock(start, end, functionInfo);
-
-    const branchInfo = {
-        // for get previous group for LogicalExpression
-        branchStart,
-        start,
-        end,
-        // cache block
-        block,
-        // branch count default to 0
-        count: 0
-    };
-
-    group.locations.push(branchInfo);
-
-    // update group end
-    group.end = end;
-
-    locationMap.set(start, branchInfo);
-
-    return branchInfo;
-};
-
-const addNoneBranch = (group) => {
-    group.locations.push({
-        none: true,
-        count: 0
-    });
-};
-
-// =======================================================================================
-
-const hasFunctionBlock = (functionInfo) => {
-    const { range } = functionInfo;
-    if (range) {
-        const { blockMap } = range;
-        if (blockMap) {
-            return true;
-        }
-    }
-    return false;
-};
-
-const addNodeCount = (node, parents, functionInfo) => {
-
-    const { start, end } = node;
-
-    if (hasFunctionBlock(functionInfo)) {
-        const { range } = functionInfo;
-        const { blockMap, blockRanges } = range;
-        const block = blockMap.get(start);
-        if (block) {
-            node._state = {
-                count: block.count
-            };
-            return;
-        }
-
-        const blockItem = findInRanges(start, end, blockRanges);
-        if (blockItem) {
-            node._state = {
-                count: blockItem.count
-            };
-            return;
-        }
-
-        // continue find in reverseParents
-
-    } else {
-
-        // default to 1 if no function block
-        node._state = {
-            count: 1
-        };
-        return;
-    }
-
-    const reverseParents = [].concat(parents).reverse();
-    for (const parent of reverseParents) {
-        if (parent._state) {
-            node._state = {
-                count: parent._state.count
-            };
-            return;
-        }
-    }
-
-    // function count
-    node._state = {
-        count: functionInfo.count
-    };
-
-};
-
-// =======================================================================================
-
-const addAssignmentPattern = (params, parents, functionInfo, branchMap, locationMap) => {
-    if (!Util.isList(params)) {
-        return;
-    }
-
-    params.forEach((param) => {
-        if (param.type !== 'AssignmentPattern') {
-            return;
-        }
-        const start = param.start;
-        const group = createBranchGroup('AssignmentPattern', start, parents, branchMap, functionInfo);
-        addBranch(group, param, locationMap, functionInfo);
-    });
-};
-
-const createBranches = (functionInfo, branchMap, body, params, functionParents = []) => {
-
-    // locationMap for chain LogicalExpression locations
-    const locationMap = new Map();
-
-    // function's arguments
-    addAssignmentPattern(params, functionParents, functionInfo, branchMap, locationMap);
-
-    Util.visitAst(body, {
-
-        Function() {
-            return 'break';
-        },
-
-        Statement: (node, parents) => {
-            addNodeCount(node, parents, functionInfo);
-        },
-
-        // cond-expr Ternary
-        // var b = a ? 'consequent' : 'alternate';
-        ConditionalExpression: (node, parents) => {
-            addNodeCount(node, parents, functionInfo);
-            const { consequent, alternate } = node;
-            const start = consequent.start;
-            const group = createBranchGroup('ConditionalExpression', start, parents, branchMap, functionInfo);
-            addBranch(group, consequent, locationMap, functionInfo);
-            addBranch(group, alternate, locationMap, functionInfo);
-        },
-
-        // if
-        // An IF statement always has exactly two branches:
-        // one where the condition is FALSE and one where the condition is TRUE
-        IfStatement: (node, parents) => {
-            addNodeCount(node, parents, functionInfo);
-            const { consequent, alternate } = node;
-            const start = consequent.start;
-            const group = createBranchGroup('IfStatement', start, parents, branchMap, functionInfo);
-            addBranch(group, consequent, locationMap, functionInfo);
-
-            // console.log('if type', consequent.type);
-
-            if (alternate) {
-                addBranch(group, alternate, locationMap, functionInfo);
-            } else {
-                // add none branch
-                addNoneBranch(group);
-                // no need update group end, there is no end
-            }
-        },
-
-        // binary-expr
-        // var b = a || b || c;
-        // do not use BinaryExpression
-        LogicalExpression: (node, parents) => {
-            addNodeCount(node, parents, functionInfo);
-
-            const { left, right } = node;
-            const start = left.start;
-
-            // console.log(left.start, right.start);
-
-            let group;
-            // link to same branch start if LogicalExpression
-            const prevLocation = locationMap.get(start);
-            if (prevLocation) {
-                // console.log('link branch ==================', type);
-                group = branchMap.get(prevLocation.branchStart);
-            } else {
-                group = createBranchGroup('LogicalExpression', start, parents, branchMap, functionInfo);
-                addBranch(group, left, locationMap, functionInfo);
-            }
-
-            addBranch(group, right, locationMap, functionInfo);
-
-            // console.log(group.locations.map((it) => it.start));
-
-            // sort branch locations
-            // a || b || c
-            // first, left a and right c
-            // then, left a and right b
-            if (prevLocation) {
-                const { locations } = group;
-                locations.sort((a, b) => {
-                    return a.start - b.start;
-                });
-                // update group end after sorted
-                group.end = locations[locations.length - 1].end;
-            }
-        },
-
-        // switch
-        SwitchStatement: (node, parents) => {
-            addNodeCount(node, parents, functionInfo);
-            const start = node.start;
-            const group = createBranchGroup('SwitchStatement', start, parents, branchMap, functionInfo);
-            const cases = node.cases;
-            cases.forEach((switchCase) => {
-                // console.log('switchCase', switchCase.start);
-                addBranch(group, switchCase, locationMap, functionInfo);
-            });
-        }
-
-    });
-
-};
-
-
-// =======================================================================================
-
-// const a = tf1 ? 'true' : 'false';
-const ConditionalExpression = (group, parentCount, noBlockList, blockCount) => {
-    if (!noBlockList.length) {
-        return;
-    }
-    let count = parentCount - blockCount;
-    noBlockList.forEach((item) => {
-        item.count = count;
-        count = 0;
-    });
-};
-
-const IfStatement = (group, parentCount, noBlockList, blockCount) => {
-    if (!noBlockList.length) {
-        return;
-    }
-    // console.log(parentCount, 'uncovered list', noBlockList.length, group.start);
-    let count = parentCount - blockCount;
-    noBlockList.forEach((item) => {
-        item.count = count;
-        count = 0;
-    });
-
-};
-
-// const b = tf2 || tf1 || a;
-const LogicalExpression = (group, parentCount, noBlockList, blockCount) => {
-    if (!noBlockList.length) {
-        return;
-    }
-    const count = parentCount - blockCount;
-    noBlockList.forEach((item) => {
-        item.count = count;
-    });
-
-    // const start = group.start;
-    // if (start > 7874 && start < 7922) {
-    //     console.log(group.type, parentCount, 'locations', group.locations);
-    // }
-
-};
-
-const SwitchStatement = (group, parentCount, noBlockList, blockCount) => {
-    if (!noBlockList.length) {
-        return;
-    }
-    const count = parentCount - blockCount;
-    noBlockList.forEach((item) => {
-        item.count = count;
-    });
-};
-
-// =======================================================================================
-
-const getBranchParentCount = (reverseParents, functionCount) => {
-    // parent count
-    for (const parent of reverseParents) {
-        if (parent._state) {
-            return parent._state.count;
-        }
-    }
-
-    // root function count
-    return functionCount;
-};
-
-const updateBranchCount = (group) => {
-
-    const {
-        type, locations, reverseParents, functionInfo
-    } = group;
-
-    const functionCount = functionInfo.count;
-
-    // default is 0, no need continue
-    if (functionCount === 0) {
-        return;
-    }
-
-    const parentCount = getBranchParentCount(reverseParents, functionCount);
-    // console.log(functionInfo.start, 'function count', functionCount, 'parent count', parentCount);
-
-    if (!hasFunctionBlock(functionInfo)) {
-        // default to parent if no function range
-        locations.forEach((item) => {
-            item.count = parentCount;
-        });
-        return;
-    }
-
-    // calculate branches count
-    // > 1
-
-    const noBlockList = [];
-    let blockCount = 0;
-    locations.forEach((item) => {
-        if (item.block) {
-            item.count = item.block.count;
-            blockCount += item.count;
-            return;
-        }
-        noBlockList.push(item);
-    });
-
-    const handlers = {
-        ConditionalExpression,
-        IfStatement,
-        LogicalExpression,
-        SwitchStatement
-    };
-
-    const handler = handlers[type];
-    if (handler) {
-        handler(group, parentCount, noBlockList, blockCount);
-    }
-
-};
-
-const collectBranches = (branchMap) => {
-
-    // calculate count for all branches
-    branchMap.forEach((group) => {
-        updateBranchCount(group);
-    });
-
-    // init branches
-    const branches = [];
-    branchMap.forEach((group) => {
-
-        // add start/end for none with group start/end
-        group.locations.forEach((item) => {
-            if (item.none) {
-                item.start = group.start;
-                item.end = group.end;
-            }
-        });
-
-        branches.push({
-            type: group.type,
-            start: group.start,
-            end: group.end,
-            locations: group.locations
-        });
-    });
-
-    // sort branches
-    branches.sort((a, b) => {
-        return a.start - b.start;
-    });
-
-    return branches;
-};
-
-module.exports = {
-    createBranches,
-    collectBranches
-};

package/lib/converter/find-in-ranges.js

@@ -1,39 +0,0 @@
-const Util = require('../utils/util.js');
-
-const quickFindRange = (position, ranges, startKey, endKey) => {
-    let start = 0;
-    let end = ranges.length - 1;
-    while (end - start > 1) {
-        const i = Math.floor((start + end) * 0.5);
-        const item = ranges[i];
-        if (position < item[startKey]) {
-            end = i;
-            continue;
-        }
-        if (position > item[endKey]) {
-            start = i;
-            continue;
-        }
-        return ranges[i];
-    }
-    // last two items, less is start
-    const endItem = ranges[end];
-    if (position < endItem[startKey]) {
-        return ranges[start];
-    }
-    return ranges[end];
-};
-
-
-const findInRanges = (start, end, ranges, startKey = 'startOffset', endKey = 'endOffset') => {
-    if (!Util.isList(ranges)) {
-        return;
-    }
-    const range = quickFindRange(start, ranges, startKey, endKey);
-    if (start >= range[startKey] && end <= range[endKey]) {
-        return range;
-    }
-};
-
-
-module.exports = findInRanges;

package/lib/converter/info-line.js

@@ -1,23 +0,0 @@
-module.exports = class InfoLine {
-    constructor(line, column, count = 1) {
-        // 1 based
-        this.line = line;
-        this.column = column;
-        this.count = count;
-        // covered full line, could be false even count > 0
-        this.covered = count > 0;
-    }
-
-    generate() {
-        return {
-            start: {
-                line: this.line,
-                column: 0
-            },
-            end: {
-                line: this.line,
-                column: this.column
-            }
-        };
-    }
-};