monocart-coverage-reports 2.10.0 → 2.10.2

package/lib/platform/share.js

@@ -338,6 +338,12 @@ const Util = {
         return lines;
     },
 
+    initLineCoverage: (lineItem) => {
+        lineItem.coveredCount = 1;
+        lineItem.uncoveredEntire = null;
+        lineItem.uncoveredPieces = [];
+    },
+
     updateLinesCoverage: (lines, count, lineMap) => {
         lines.forEach((it) => {
             const lineItem = lineMap.get(it.line);

package/lib/reports/custom.js

@@ -0,0 +1,34 @@
+const { pathToFileURL } = require('url');
+const Util = require('../utils/util.js');
+
+const customReport = async (reportName, reportData, reportOptions, globalOptions) => {
+    let CustomReporter;
+    let err;
+    try {
+        CustomReporter = await import(reportName);
+    } catch (e) {
+        err = e;
+        try {
+            CustomReporter = await import(pathToFileURL(reportName));
+        } catch (ee) {
+            err = ee;
+        }
+    }
+
+    if (!CustomReporter) {
+        Util.logError(err.message);
+        return;
+    }
+
+    CustomReporter = CustomReporter.default || CustomReporter;
+
+    const reporter = new CustomReporter(reportOptions, globalOptions);
+
+    const results = await reporter.generate(reportData);
+
+    return results;
+};
+
+module.exports = {
+    customReport
+};

package/lib/reports/markdown-details.js

@@ -1,5 +1,4 @@
 const path = require('path');
-const generateMarkdownGrid = require('../utils/markdown.js');
 const Util = require('../utils/util.js');
 
 const { getRowData, getFilteredFiles } = require('./console-details.js');
@@ -103,7 +102,7 @@ const markdownDetailsReport = async (reportData, reportOptions, options) => {
         name: 'Uncovered Lines'
     }];
 
-    const markdownGrid = generateMarkdownGrid({
+    const markdownGrid = Util.markdownGrid({
         options: {
             name: reportData.name
         },

package/lib/reports/markdown-summary.js

@@ -1,5 +1,4 @@
 const path = require('path');
-const generateMarkdownGrid = require('../utils/markdown.js');
 const Util = require('../utils/util.js');
 
 const { getSummaryColumns } = require('./console-summary.js');
@@ -28,7 +27,7 @@ const markdownSummaryReport = async (reportData, reportOptions, options) => {
 
     const columns = getSummaryColumns(color);
 
-    const markdownGrid = generateMarkdownGrid({
+    const markdownGrid = Util.markdownGrid({
         options: {
             name: reportData.name
         },

package/lib/utils/markdown.js

@@ -52,7 +52,7 @@ const renderHyphen = (column) => {
     return ':'.padEnd(width, '-');
 };
 
-const generateMarkdownGrid = (data) => {
+const markdownGrid = (data) => {
 
     const options = {
         name: '',
@@ -129,4 +129,4 @@ const generateMarkdownGrid = (data) => {
 };
 
 
-module.exports = generateMarkdownGrid;
+module.exports = markdownGrid;

package/lib/utils/util.js

@@ -1,15 +1,17 @@
 const fs = require('fs');
 const { writeFile, readFile } = require('fs/promises');
 const path = require('path');
-const { pathToFileURL } = require('url');
 const os = require('os');
 const crypto = require('crypto');
 const EC = require('eight-colors');
 const CG = require('console-grid');
+const acornWalk = require('acorn-walk');
+
 const Share = require('../platform/share.js');
 const request = require('./request.js');
 const version = require('../../package.json').version;
-const acornWalk = require('acorn-walk');
+const markdownGrid = require('./markdown.js');
+
 const { findUpSync, supportsColor } = require('../packages/monocart-coverage-vendor.js');
 
 // https://github.com/chalk/supports-color
@@ -29,6 +31,7 @@ const Util = {
     root: process.cwd(),
 
     request,
+    markdownGrid,
 
     relativePath: function(p, root) {
         p = `${p}`;
@@ -183,34 +186,6 @@ const Util = {
         // default config not found
     },
 
-    runCustomReporter: async (reportName, reportData, reportOptions, globalOptions) => {
-        let CustomReporter;
-        let err;
-        try {
-            CustomReporter = await import(reportName);
-        } catch (e) {
-            err = e;
-            try {
-                CustomReporter = await import(pathToFileURL(reportName));
-            } catch (ee) {
-                err = ee;
-            }
-        }
-
-        if (!CustomReporter) {
-            Util.logError(err.message);
-            return;
-        }
-
-        CustomReporter = CustomReporter.default || CustomReporter;
-
-        const reporter = new CustomReporter(reportOptions, globalOptions);
-
-        const results = await reporter.generate(reportData);
-
-        return results;
-    },
-
     getEOL: function(content) {
         if (!content) {
             return os.EOL;
@@ -557,6 +532,87 @@ const Util = {
         return lines.join(',');
     },
 
+    // skip \s and comments
+    fixSourceRange: (locator, start, end) => {
+
+        let fixedStart = start;
+        let fixedEnd = end;
+
+        const rangeText = locator.getSlice(start, end);
+
+        let text = rangeText;
+
+        // =======================================
+        // handle end first
+        const oldLen = text.length;
+        text = text.trimEnd();
+        const newLen = text.length;
+        if (newLen < oldLen) {
+            fixedEnd -= oldLen - newLen;
+        }
+
+        // =======================================
+        // handle start
+
+        const comments = locator.lineParser.commentParser.comments;
+
+        let startOffset = 0;
+
+        // never start in a comment, skip to comment end
+        const inComment = comments.find((it) => start > it.start && start < it.end);
+        if (inComment) {
+            startOffset = inComment.end - start;
+            // next text
+            text = text.slice(startOffset);
+        }
+
+        while (startOffset < newLen) {
+
+            const beforeLen = text.length;
+            text = text.trimStart();
+            const afterLen = text.length;
+            if (afterLen === beforeLen) {
+                // no indent
+                break;
+            }
+
+            const indentLen = beforeLen - afterLen;
+
+            startOffset += indentLen;
+
+            // no comments
+            if (!comments.length) {
+                break;
+            }
+
+            const nextPos = start + startOffset;
+            const comment = comments.find((it) => it.start === nextPos);
+            if (!comment) {
+                break;
+            }
+
+            const commentLen = comment.end - comment.start;
+
+            startOffset += commentLen;
+
+            // next text
+            text = text.slice(commentLen);
+
+        }
+
+        // It should never be possible to start with }
+        if (rangeText[startOffset] === '}') {
+            startOffset += 1;
+        }
+
+        fixedStart = start + startOffset;
+
+        return {
+            fixedStart,
+            fixedEnd
+        };
+    },
+
     cmpVersion: (v1, v2) => {
         const [strMajor1, strMinor1, strPatch1] = `${v1}`.split('.');
         const [strMajor2, strMinor2, strPatch2] = `${v2}`.split('.');

package/lib/v8/v8.js

@@ -11,6 +11,7 @@ const { minimatch } = require('../packages/monocart-coverage-vendor.js');
 
 const { v8Report } = require('../reports/v8.js');
 const { v8JsonReport } = require('../reports/v8-json.js');
+const { customReport } = require('../reports/custom.js');
 
 const getWrapperSource = (offset, source) => {
     // NO \n because it break line number in mappings
@@ -353,7 +354,7 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
             if (buildInHandler) {
                 outputs[reportName] = await buildInHandler(reportData, reportOptions, options);
             } else {
-                outputs[reportName] = await Util.runCustomReporter(reportName, reportData, reportOptions, options);
+                outputs[reportName] = await customReport(reportName, reportData, reportOptions, options);
             }
             Util.logTime(`┌ [generate] saved report: ${reportName}`, t1);
         }

package/package.json

@@ -1,116 +1,116 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.10.0",
-    "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-test": "node ./test/build/build-test.js",
-        "build": "npx sf lint && npx sf b -p && npm run build-test",
-        "test-unit": "mocha --parallel test/unit/*.test.js",
-        "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": "node ./test/test.js --node",
-        "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-sections": "node ./test/test-sections.js",
-        "test-swc": "node ./test/test-swc.js",
-        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
-        "test-browser": "node ./test/test.js --browser",
-        "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": "node ./test/test.js && node ./scripts/docs.js",
-        "test-pr": "node --inspect=9230 ./test/test-pr.js",
-        "test": "npm run test-unit && npx mcr npm run test-all -c test/mcr.config.mcr.js",
-        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
-        "dev": "npx sf d app",
-        "open": "node ./scripts/open.js",
-        "eol": "git rm -rf --cached . && git reset --hard HEAD",
-        "patch": "npm run build && npm run test && npx sf publish patch -r"
-    },
-    "workspaces": [
-        "test"
-    ],
-    "files": [
-        "lib",
-        "README.zh-Hans.md"
-    ],
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
-    },
-    "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "acorn": "^8.12.1",
-        "acorn-loose": "^8.4.0",
-        "acorn-walk": "^8.3.3",
-        "commander": "^12.1.0",
-        "console-grid": "^2.2.2",
-        "eight-colors": "^1.3.0",
-        "foreground-child": "^3.2.1",
-        "istanbul-lib-coverage": "^3.2.2",
-        "istanbul-lib-report": "^3.0.1",
-        "istanbul-reports": "^3.1.7",
-        "lz-utils": "^2.1.0",
-        "monocart-locator": "^1.0.2"
-    },
-    "devDependencies": {
-        "async-tick": "^1.0.0",
-        "convert-source-map": "^2.0.0",
-        "diff-sequences": "^29.6.3",
-        "esbuild": "^0.23.0",
-        "eslint": "~9.8.0",
-        "eslint-config-plus": "^2.0.2",
-        "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.27.0",
-        "find-up": "^7.0.0",
-        "minimatch": "^9.0.5",
-        "monocart-code-viewer": "^1.1.4",
-        "monocart-formatter": "^3.0.0",
-        "postcss": "^8.4.40",
-        "starfall-cli": "^2.0.20",
-        "stylelint": "^16.7.0",
-        "stylelint-config-plus": "^1.1.2",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.16.2",
-        "turbogrid": "^3.2.0",
-        "vine-ui": "^3.1.16",
-        "ws": "^8.18.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.10.2",
+    "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-test": "node ./test/build/build-test.js",
+        "build": "npx sf lint && npx sf b -p && npm run build-test",
+        "test-unit": "mocha --parallel test/unit/*.test.js",
+        "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": "node ./test/test.js --node",
+        "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-sections": "node ./test/test-sections.js",
+        "test-swc": "node ./test/test-swc.js",
+        "test-v8-and-istanbul": "node ./test/test-v8-and-istanbul.js",
+        "test-browser": "node ./test/test.js --browser",
+        "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": "node ./test/test.js",
+        "test-pr": "node --inspect=9230 ./test/test-pr.js",
+        "test": "npm run test-unit && npx mcr npm run test-all -c test/mcr.config.mcr.js && node ./scripts/docs.js",
+        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
+        "dev": "npx sf d app",
+        "open": "node ./scripts/open.js",
+        "eol": "git rm -rf --cached . && git reset --hard HEAD",
+        "patch": "npm run build && npm run test && npx sf publish patch -r"
+    },
+    "workspaces": [
+        "test"
+    ],
+    "files": [
+        "lib",
+        "README.zh-Hans.md"
+    ],
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
+    },
+    "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "acorn": "^8.12.1",
+        "acorn-loose": "^8.4.0",
+        "acorn-walk": "^8.3.3",
+        "commander": "^12.1.0",
+        "console-grid": "^2.2.2",
+        "eight-colors": "^1.3.0",
+        "foreground-child": "^3.2.1",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.7",
+        "lz-utils": "^2.1.0",
+        "monocart-locator": "^1.0.2"
+    },
+    "devDependencies": {
+        "async-tick": "^1.0.0",
+        "convert-source-map": "^2.0.0",
+        "diff-sequences": "^29.6.3",
+        "esbuild": "^0.23.0",
+        "eslint": "~9.8.0",
+        "eslint-config-plus": "^2.0.2",
+        "eslint-plugin-html": "^8.1.1",
+        "eslint-plugin-vue": "^9.27.0",
+        "find-up": "^7.0.0",
+        "minimatch": "^9.0.5",
+        "monocart-code-viewer": "^1.1.4",
+        "monocart-formatter": "^3.0.0",
+        "postcss": "^8.4.41",
+        "starfall-cli": "^2.0.20",
+        "stylelint": "^16.8.1",
+        "stylelint-config-plus": "^1.1.2",
+        "supports-color": "^9.4.0",
+        "tsx": "^4.16.5",
+        "turbogrid": "^3.2.0",
+        "vine-ui": "^3.1.16",
+        "ws": "^8.18.0"
+    }
+}