monocart-coverage-reports 2.7.4 → 2.7.5

package/lib/converter/ast-visitor.js

@@ -8,6 +8,12 @@ const BranchTypes = {
     AssignmentPattern: 'AssignmentPattern'
 };
 
+const setGeneratedOnly = (block, generatedOnly) => {
+    if (block && generatedOnly) {
+        block.generatedOnly = true;
+    }
+};
+
 const getParentFunctionState = (reverseParents) => {
     const parentFunction = reverseParents.find((it) => it._state && it._state.isFunction);
     if (!parentFunction) {
@@ -266,6 +272,7 @@ const updateBranchCount = (group) => {
     const groupBlock = getFunctionBlock(group.start, group.end, functionState);
     if (groupBlock) {
         parentCount = groupBlock.count;
+        setGeneratedOnly(groupBlock, group.generatedOnly);
     }
 
     // calculate branches count
@@ -277,6 +284,7 @@ const updateBranchCount = (group) => {
             return;
         }
         item.block = getFunctionBlock(start, end, functionState);
+        setGeneratedOnly(item.block, group.generatedOnly);
     });
 
 
@@ -314,12 +322,16 @@ const generateBranches = (branchMap) => {
             }
         });
 
-        branches.push({
+        const branch = {
             type: group.type,
             start: group.start,
             end: group.end,
             locations: group.locations
-        });
+        };
+
+        setGeneratedOnly(branch, group.generatedOnly);
+
+        branches.push(branch);
     });
 
     // sort branches
@@ -395,6 +407,34 @@ const generateStatements = (statementNodes) => {
     return statements;
 };
 
+// =======================================================================================
+// handle special generated codes for original coverage
+
+const webpackWrapHandler = (node) => {
+    // ignore webpack wrap for original function
+    // id: { type: 'Identifier', name: '__webpack_modules__' },
+    const name = node.id && node.id.name;
+    if (name === '__webpack_modules__' && node.init && node.init.properties) {
+        // mark all as wrap function
+        node.init.properties.forEach((it) => {
+            it.value._webpackWrapKey = it.key && it.key.value;
+        });
+        // console.log('==========================', node.type);
+        // console.log(name, parents.length);
+    }
+};
+
+const viteImportDefaultHandler = (node, group) => {
+    // ignore vite conditional expression for __esModule default
+    const testObj = node.test.object;
+    const testName = testObj && testObj.name;
+    if (testName && testName.startsWith('__vite__cjsImport')) {
+        setGeneratedOnly(group, true);
+    }
+
+};
+
+
 // =======================================================================================
 
 const collectNodes = (ast) => {
@@ -409,18 +449,7 @@ const collectNodes = (ast) => {
 
         VariableDeclarator(node, parents) {
 
-            // =============================================================
-            // id: { type: 'Identifier', name: '__webpack_modules__' },
-            const name = node.id && node.id.name;
-            if (name === '__webpack_modules__' && node.init && node.init.properties) {
-                // mark all as wrap function
-                node.init.properties.forEach((it) => {
-                    it.value._wrapKey = it.key && it.key.value;
-                });
-                // console.log('==========================', node.type);
-                // console.log(name, parents.length);
-            }
-            // =============================================================
+            webpackWrapHandler(node);
 
         },
 
@@ -473,10 +502,14 @@ const collectNodes = (ast) => {
         // Ternary
         // var b = a ? 'consequent' : 'alternate';
         ConditionalExpression: (node, parents) => {
+
             const { consequent, alternate } = node;
             const group = createBranchGroup(BranchTypes.ConditionalExpression, node, parents, branchMap);
             addBranch(group, consequent, locationMap);
             addBranch(group, alternate, locationMap);
+
+            viteImportDefaultHandler(node, group);
+
         },
 
         // if an if statement; can also be else if.
@@ -619,7 +652,7 @@ const collectAstInfo = (ast, coverageInfo) => {
         const bodyStart = node.body.start;
         const bodyEnd = node.body.end;
         const functionName = id && id.name;
-        const isWrap = Boolean(node._wrapKey);
+        const _webpackWrapKey = node._webpackWrapKey;
 
         const functionItem = {
             start,
@@ -629,9 +662,9 @@ const collectAstInfo = (ast, coverageInfo) => {
             functionName,
             count: rootState.count
         };
-        if (isWrap) {
-            functionItem.wrap = true;
-        }
+
+        setGeneratedOnly(functionItem, _webpackWrapKey);
+
         functions.push(functionItem);
 
         const functionState = {
@@ -641,9 +674,9 @@ const collectAstInfo = (ast, coverageInfo) => {
 
         const functionRange = findFunctionRange(item, coverageInfo);
         if (functionRange) {
-            if (isWrap) {
-                functionRange.wrap = true;
-            }
+
+            setGeneratedOnly(functionRange, _webpackWrapKey);
+
             functionState.range = functionRange;
             functionState.count = functionRange.count;
             functionItem.count = functionRange.count;

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

@@ -28,7 +28,14 @@ const loadSourceMap = async (url = '') => {
         return;
     }
 
-    return res.data;
+    const content = res.data;
+
+    // could be string not json, if Content-Type is application/octet-stream
+    if (typeof content === 'string') {
+        return JSON.parse(content);
+    }
+
+    return content;
 };
 
 const getSourceMapUrl = (content, url) => {

package/lib/converter/converter.js

@@ -510,6 +510,11 @@ const handleOriginalBytesCoverage = (state) => {
 
 const handleGeneratedBytesCoverage = (state) => {
 
+    // it could be a dist file, do not handle twice
+    if (state.addedGeneratedBytes) {
+        return;
+    }
+
     const { js, coverageList } = state;
 
     if (js) {
@@ -524,6 +529,8 @@ const handleGeneratedBytesCoverage = (state) => {
         });
     }
 
+    state.addedGeneratedBytes = true;
+
 };
 
 // ========================================================================================================
@@ -551,15 +558,16 @@ const handleOriginalFunctionsCoverage = (state, originalStateMap) => {
 
     // function count
     state.astInfo.functions.forEach((it) => {
-        const {
-            start, end, bodyStart, bodyEnd, wrap
-        } = it;
 
         // remove webpack wrap functions for functions count, not for ranges here
-        if (wrap) {
+        if (it.generatedOnly) {
             return;
         }
 
+        const {
+            start, end, bodyStart, bodyEnd
+        } = it;
+
         const result = findOriginalRange(start, end, state, originalStateMap);
         if (result.error) {
             logMappingErrors('function', result);
@@ -598,6 +606,10 @@ const handleOriginalBranchesCoverage = (state, originalStateMap) => {
     // function count
     state.astInfo.branches.forEach((group) => {
 
+        if (group.generatedOnly) {
+            return;
+        }
+
         const { type, locations } = group;
 
         // start
@@ -668,6 +680,11 @@ const handleOriginalStatementsCoverage = (state, originalStateMap) => {
 
     // statement count
     state.astInfo.statements.forEach((it) => {
+
+        if (it.generatedOnly) {
+            return;
+        }
+
         const { start, end } = it;
 
         const result = findOriginalRange(start, end, state, originalStateMap);
@@ -799,11 +816,10 @@ const handleAllOriginalBytesCoverage = (state, originalStateMap) => {
 
     // v8 coverage
     coverageList.forEach((block) => {
-        block.ranges.forEach((range, index) => {
+        block.ranges.forEach((range) => {
 
             // remove wrap functions for original files
-            if (range.wrap) {
-                // console.log(range);
+            if (range.generatedOnly) {
                 return;
             }
 

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

@@ -119,8 +119,32 @@ const alignText = (gt, ot) => {
     return gl;
 };
 
+const getWordEndPosition = (list, gp, direction) => {
+    // for end only
+    if (direction !== 'end') {
+        return;
+    }
+
+    const prev = list[gp - 1];
+    if (prev && prev.original && prev.wordEnd) {
+        const op = prev.original.index + 1;
+        // console.log(gp, JSON.stringify(gt));
+        // console.log(op, JSON.stringify(ot));
+        return {
+            pos: op
+        };
+    }
+};
+
 const getAlignPosition = (gt, gp, ot, direction) => {
 
+    // there is no need to align for long text
+    const maxLength = 500;
+    if (gt.length > maxLength || ot.length > maxLength) {
+        // console.log(gt.length, ot.length, gp);
+        return;
+    }
+
     // generatedText: '"false";\n',
     // originalText: "'false';\r\n    ",
     // generatedPos: 7
@@ -147,20 +171,7 @@ const getAlignPosition = (gt, gp, ot, direction) => {
     }
 
     // inclusive, for end only
-    if (gp && direction === 'end') {
-        const prev = list[gp - 1];
-        if (prev && prev.original && prev.wordEnd) {
-            // console.log(direction, '=====================================================================');
-            const op = prev.original.index + 1;
-            // console.log(gp, JSON.stringify(gt));
-            // console.log(op, JSON.stringify(ot));
-
-            return {
-                pos: op
-            };
-
-        }
-    }
+    return getWordEndPosition(list, gp, direction);
 
 };
 
@@ -252,13 +263,19 @@ const getComparedPosition = (info, direction) => {
     const gt = info.generatedText;
     const gp = info.generatedPos;
     const ot = info.originalText;
+    const olt = info.originalLineText;
+
+    // seems direction is start only
+    if (gp === 0) {
+        return;
+    }
 
     // whole generated text
     if (gp >= gt.length) {
         // console.log(JSON.stringify(gt), gt.length, gp);
         // console.log(JSON.stringify(ot));
         return {
-            pos: info.originalLineText.length
+            pos: olt.length
         };
     }
 

package/package.json

@@ -1,97 +1,98 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.7.4",
-    "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
-    "main": "./lib/index.js",
-    "bin": {
-        "mcr": "./lib/cli.js"
-    },
-    "exports": {
-        ".": {
-            "types": "./lib/index.d.ts",
-            "import": "./lib/index.mjs",
-            "require": "./lib/index.js",
-            "default": "./lib/index.js"
-        },
-        "./register": {
-            "import": "./lib/register/register.mjs",
-            "require": "./lib/register/register.js",
-            "default": "./lib/register/register.js"
-        },
-        "./converter": "./lib/converter/converter.js",
-        "./util": "./lib/utils/util.js",
-        "./package.json": "./package.json"
-    },
-    "types": "./lib/index.d.ts",
-    "scripts": {
-        "build-docs": "node ./scripts/build-docs.js",
-        "build-test": "node ./scripts/build-test.js",
-        "build": "sf lint && sf b -p && npm run build-test",
-        "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-env node ./test/test-node-env.js && node ./test/generate-report.js",
-        "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-api node ./test/test-node-api.js",
-        "test-node-ins": "node ./test/test-node-ins.js",
-        "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
-        "test-node-vm": "node ./test/test-node-vm.js",
-        "test-node-koa": "node ./test/test-node-koa.js",
-        "test-node-fgc": "node ./test/test-node-fgc.js",
-        "test-node": "npm run test-node-env && npm run test-node-api && npm run test-node-ins && npm run test-node-cdp && npm run test-node-vm && npm run test-node-koa",
-        "test-istanbul": "node ./test/test-istanbul.js",
-        "test-v8": "node ./test/test-v8.js",
-        "test-puppeteer": "node ./test/test-puppeteer.js",
-        "test-anonymous": "node ./test/test-anonymous.js",
-        "test-css": "node ./test/test-css.js",
-        "test-minify": "node ./test/test-minify.js",
-        "test-esbuild": "node ./test/test-esbuild.js",
-        "test-rollup": "node ./test/test-rollup.js",
-        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
-        "test-browser": "npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css && npm run test-minify && npm run test-esbuild && npm run test-rollup && npm run test-v8-and-istanbul",
-        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
-        "test-tsx": "npx mcr tsx ./test/specs/tsx.test.ts -c test/mcr.config.tsx.js",
-        "test-merge": "node ./test/test-merge.js",
-        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
-        "test-client": "node ./test/test-client.js",
-        "test-all": "npm run test-node && npm run test-browser && npm run test-cli && npm run test-tsx && npm run test-merge && npm run build-docs",
-        "test": "npx mcr npm run test-all -c test/mcr.config.mcr.js",
-        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
-        "dev": "sf d v8",
-        "open": "node ./scripts/open.js",
-        "patch": "npm run build && npm run test && sf publish patch -r"
-    },
-    "workspaces": [
-        "packages/*",
-        "test"
-    ],
-    "files": [
-        "lib"
-    ],
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
-    },
-    "dependencies": {
-        "console-grid": "^2.2.2",
-        "eight-colors": "^1.3.0",
-        "istanbul-lib-coverage": "^3.2.2",
-        "istanbul-lib-report": "^3.0.1",
-        "istanbul-reports": "^3.1.7",
-        "lz-utils": "^2.0.2",
-        "monocart-code-viewer": "^1.1.2",
-        "monocart-formatter": "^2.3.2",
-        "turbogrid": "^3.0.13"
-    },
-    "devDependencies": {
-        "commander": "^12.0.0",
-        "esbuild": "^0.20.2",
-        "eslint": "^8.57.0",
-        "eslint-config-plus": "^1.0.6",
-        "eslint-plugin-html": "^8.0.0",
-        "eslint-plugin-vue": "^9.23.0",
-        "minimatch": "^9.0.3",
-        "stylelint": "^16.2.1",
-        "stylelint-config-plus": "^1.1.0",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.7.1",
-        "ws": "^8.16.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.7.5",
+    "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
+    "main": "./lib/index.js",
+    "bin": {
+        "mcr": "./lib/cli.js"
+    },
+    "exports": {
+        ".": {
+            "types": "./lib/index.d.ts",
+            "import": "./lib/index.mjs",
+            "require": "./lib/index.js",
+            "default": "./lib/index.js"
+        },
+        "./register": {
+            "import": "./lib/register/register.mjs",
+            "require": "./lib/register/register.js",
+            "default": "./lib/register/register.js"
+        },
+        "./converter": "./lib/converter/converter.js",
+        "./util": "./lib/utils/util.js",
+        "./package.json": "./package.json"
+    },
+    "types": "./lib/index.d.ts",
+    "scripts": {
+        "build-docs": "node ./scripts/build-docs.js",
+        "build-test": "node ./scripts/build-test.js",
+        "build": "sf lint && sf b -p && npm run build-test",
+        "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-env node ./test/test-node-env.js && node ./test/generate-report.js",
+        "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-api node ./test/test-node-api.js",
+        "test-node-ins": "node ./test/test-node-ins.js",
+        "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
+        "test-node-vm": "node ./test/test-node-vm.js",
+        "test-node-koa": "node ./test/test-node-koa.js",
+        "test-node-fgc": "node ./test/test-node-fgc.js",
+        "test-node": "npm run test-node-env && npm run test-node-api && npm run test-node-ins && npm run test-node-cdp && npm run test-node-vm && npm run test-node-koa",
+        "test-istanbul": "node ./test/test-istanbul.js",
+        "test-v8": "node ./test/test-v8.js",
+        "test-puppeteer": "node ./test/test-puppeteer.js",
+        "test-anonymous": "node ./test/test-anonymous.js",
+        "test-css": "node ./test/test-css.js",
+        "test-minify": "node ./test/test-minify.js",
+        "test-esbuild": "node ./test/test-esbuild.js",
+        "test-rollup": "node ./test/test-rollup.js",
+        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
+        "test-browser": "npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css && npm run test-minify && npm run test-esbuild && npm run test-rollup && npm run test-v8-and-istanbul",
+        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
+        "test-tsx": "npx mcr tsx ./test/specs/tsx.test.ts -c test/mcr.config.tsx.js",
+        "test-demo": "node ./test/test-demo.js",
+        "test-merge": "node ./test/test-merge.js",
+        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
+        "test-client": "node ./test/test-client.js",
+        "test-all": "npm run test-node && npm run test-browser && npm run test-cli && npm run test-tsx && npm run test-merge && npm run build-docs",
+        "test": "npx mcr npm run test-all -c test/mcr.config.mcr.js",
+        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
+        "dev": "sf d v8",
+        "open": "node ./scripts/open.js",
+        "patch": "npm run build && npm run test && sf publish patch -r"
+    },
+    "workspaces": [
+        "packages/*",
+        "test"
+    ],
+    "files": [
+        "lib"
+    ],
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
+    },
+    "dependencies": {
+        "console-grid": "^2.2.2",
+        "eight-colors": "^1.3.0",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.7",
+        "lz-utils": "^2.0.2",
+        "monocart-code-viewer": "^1.1.2",
+        "monocart-formatter": "^2.3.2",
+        "turbogrid": "^3.0.13"
+    },
+    "devDependencies": {
+        "commander": "^12.0.0",
+        "esbuild": "^0.20.2",
+        "eslint": "^8.57.0",
+        "eslint-config-plus": "^1.0.6",
+        "eslint-plugin-html": "^8.0.0",
+        "eslint-plugin-vue": "^9.23.0",
+        "minimatch": "^9.0.3",
+        "stylelint": "^16.2.1",
+        "stylelint-config-plus": "^1.1.0",
+        "supports-color": "^9.4.0",
+        "tsx": "^4.7.1",
+        "ws": "^8.16.0"
+    }
+}