monocart-coverage-reports 2.9.3 → 2.10.1

package/lib/v8/v8.js

@@ -1,8 +1,5 @@
-const path = require('path');
 const EC = require('eight-colors');
-const { minimatch } = require('minimatch');
 const { mergeScriptCovs } = require('@bcoe/v8-coverage');
-
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
@@ -10,7 +7,11 @@ const {
     resolveAnonymousUrl, normalizeSourcePath, getSourcePathReplacer
 } = require('../utils/source-path.js');
 const { collectSourceMaps } = require('../converter/collect-source-maps.js');
-const version = require('../../package.json').version;
+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
@@ -313,68 +314,6 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
 // ============================================================
 
-const handleV8JsonReport = async (reportData, reportOptions, options) => {
-    const v8JsonOptions = {
-        outputFile: 'coverage-report.json',
-        ... reportOptions
-    };
-
-    // console.log(mergedOptions);
-    const jsonPath = path.resolve(options.outputDir, v8JsonOptions.outputFile);
-    await Util.writeFile(jsonPath, JSON.stringify(reportData));
-    return Util.relativePath(jsonPath);
-};
-
-
-const handleV8HtmlReport = async (reportData, reportOptions, options) => {
-
-    // V8 only options, merged with root options
-    const v8HtmlOptions = {
-        outputFile: options.outputFile,
-        inline: options.inline,
-        assetsPath: options.assetsPath,
-        metrics: options.metrics,
-        ... reportOptions
-    };
-
-    // add metrics to data for UI
-    reportData.metrics = v8HtmlOptions.metrics;
-
-    const {
-        outputFile, inline, assetsPath
-    } = v8HtmlOptions;
-
-    // resolve full report path
-    const reportPath = path.resolve(options.outputDir, outputFile);
-    const outputDir = path.dirname(reportPath);
-    const htmlFile = path.basename(reportPath);
-
-    // deps
-    const jsFiles = ['monocart-code-viewer', 'monocart-formatter', 'turbogrid'].map((id) => {
-        return Util.resolveNodeModule(id);
-    });
-
-    // package app ui
-    jsFiles.push(Util.resolvePackage('monocart-coverage-app.js'));
-
-    // console.log(jsFiles);
-
-    const htmlOptions = {
-        reportData,
-        jsFiles,
-        inline,
-        assetsPath,
-        outputDir,
-        htmlFile,
-
-        reportDataFile: 'coverage-data.js'
-    };
-
-    const htmlPath = await Util.saveHtmlReport(htmlOptions);
-
-    return htmlPath;
-};
-
 const saveV8Report = async (v8list, options, istanbulReportPath) => {
 
     const defaultWatermarks = {
@@ -389,8 +328,11 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
     const summary = getV8Summary(v8list, watermarks);
 
     const reportData = {
+        type: 'v8',
+        // override with saved file path
+        reportPath: '',
+        version: Util.version,
         name: options.name,
-        version,
         watermarks,
         summary,
         files: v8list
@@ -398,23 +340,21 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
 
     // v8 only reports
     const buildInV8Reports = {
-        'v8': handleV8HtmlReport,
-        'v8-json': handleV8JsonReport
+        'v8': v8Report,
+        'v8-json': v8JsonReport
     };
 
     const outputs = {};
-    const v8Group = options.reportGroup.v8;
+    const v8Group = options.reportGroup.get('v8');
     // could be no v8 only reports, but have `both` data reports
     if (v8Group) {
-        const v8Reports = Object.keys(v8Group);
-        for (const reportName of v8Reports) {
-            const reportOptions = v8Group[reportName];
+        for (const [reportName, reportOptions] of v8Group) {
             const buildInHandler = buildInV8Reports[reportName];
             const t1 = Date.now();
             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);
         }
@@ -431,7 +371,9 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
 
     const coverageResults = {
         type: 'v8',
+        // html or json
         reportPath,
+        version: Util.version,
         name: options.name,
         watermarks,
         summary,

package/package.json

@@ -1,112 +1,116 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.9.3",
-    "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": "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": [
-        "packages/*",
-        "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",
-        "diff-sequences": "^29.6.3",
-        "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.0.2",
-        "minimatch": "9.0.5",
-        "monocart-code-viewer": "^1.1.4",
-        "monocart-formatter": "^3.0.0",
-        "monocart-locator": "^1.0.2",
-        "turbogrid": "^3.2.0"
-    },
-    "devDependencies": {
-        "esbuild": "^0.23.0",
-        "eslint": "~9.7.0",
-        "eslint-config-plus": "^2.0.2",
-        "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.27.0",
-        "find-up": "^7.0.0",
-        "starfall-cli": "^2.0.20",
-        "stylelint": "^16.7.0",
-        "stylelint-config-plus": "^1.1.2",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.16.2",
-        "ws": "^8.18.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.10.1",
+    "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.40",
+        "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"
+    }
+}