monocart-coverage-reports 2.0.10 → 2.2.0

package/lib/utils/source-path.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const { fileURLToPath } = require('url');
 const Util = require('./util.js');
 
 const resolveUrl = (input) => {
@@ -38,23 +39,27 @@ const getSourcePath = (url, index = '', type = '') => {
         url = ['file://anonymous', index ? `-${index}` : '', type ? `.${type}` : ''].join('');
     }
 
-    const u = resolveUrl(url);
-    if (u) {
-        const host = [u.hostname, u.port].filter((it) => it).join('-');
+    if (url.startsWith('file:')) {
+        const relPath = Util.relativePath(fileURLToPath(url));
+        return filterPath(relPath);
+    }
+
+    const urlObj = resolveUrl(url);
+    if (urlObj) {
+        const host = [urlObj.hostname, urlObj.port].filter((it) => it).join('-');
         // always start with '/'
-        const pathname = u.pathname;
+        const pathname = urlObj.pathname;
 
         let p = host + pathname;
         // webpack://monocart-v8/packages/v8/src/app.vue?5cc4
-        if (u.search) {
-            p += `/${u.search}`;
+        if (urlObj.search) {
+            p += `/${urlObj.search}`;
         }
 
         return filterPath(p);
     }
 
-    const relPath = Util.relativePath(url);
-    return filterPath(relPath);
+    return filterPath(url);
 };
 
 const getSourceType = (sourcePath) => {

package/lib/v8/v8.js

@@ -55,7 +55,13 @@ const initV8ListAndSourcemap = async (v8list, options) => {
             data.source = item.text;
         }
 
-        data.id = Util.calculateSha1(data.url + data.source);
+        const idList = [];
+        // could be existed
+        const distFile = item.distFile;
+        if (distFile) {
+            data.distFile = distFile;
+            idList.push(distFile);
+        }
 
         let sourcePath = getSourcePath(data.url, i + 1, data.type);
         if (typeof sourcePathHandler === 'function') {
@@ -67,6 +73,11 @@ const initV8ListAndSourcemap = async (v8list, options) => {
 
         data.sourcePath = sourcePath;
 
+        idList.push(sourcePath);
+        idList.push(data.source);
+
+        data.id = Util.calculateSha1(idList.join(''));
+
         return data;
     });
 
@@ -275,15 +286,13 @@ const saveV8Report = async (v8list, options) => {
         return outputPath;
     });
 
-    const summaryList = v8list.map((entry) => entry.summary);
-
     const coverageResults = {
         type: 'v8',
         reportPath,
         name: options.name,
         watermarks,
         summary,
-        files: summaryList
+        files: v8list
     };
 
     return coverageResults;

package/package.json

@@ -1,8 +1,11 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.0.10",
+    "version": "2.2.0",
     "description": "Monocart coverage reports",
-    "main": "lib/index.js",
+    "main": "./lib/index.js",
+    "bin": {
+        "mcr": "./lib/cli.js"
+    },
     "exports": {
         ".": {
             "types": "./lib/index.d.ts",
@@ -17,14 +20,16 @@
         "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": "npm run test-node-env && npm run test-node-api && npm run test-node-ins && npm run test-node-cdp",
+        "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-koa",
         "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-env node ./test/test-node-env.js && node ./test/generate-node-report.js",
         "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage-api node ./test/test-node-api.js",
         "test-node-fgc": "node ./test/test-node-fgc.js",
         "test-node-ins": "node ./test/test-node-ins.js",
         "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
+        "test-node-koa": "node ./test/test-node-koa.js",
         "test-browser": "node ./test/test.js",
-        "test": "npm run test-browser && npm run test-node && npm run build-docs",
+        "test-cli": "npx mcr \"node ./test/test-node-env.js\" -o docs/cli -r v8,console-summary --lcov -c test/cli-options.js",
+        "test": "npm run test-browser && npm run test-node && npm run test-cli && npm run build-docs",
         "dev": "sf d v8",
         "open": "node ./scripts/open.js",
         "patch": "npm run build && sf publish patch -r"
@@ -42,21 +47,22 @@
         "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
     },
     "dependencies": {
-        "console-grid": "~2.0.1",
-        "eight-colors": "~1.0.3",
+        "console-grid": "~2.1.0",
+        "eight-colors": "~1.2.1",
         "istanbul-lib-coverage": "~3.2.2",
         "istanbul-lib-report": "~3.0.1",
         "istanbul-reports": "~3.1.6",
-        "lz-utils": "~2.0.1",
+        "lz-utils": "~2.0.2",
         "monocart-code-viewer": "~1.0.13",
         "monocart-formatter": "~2.3.0",
-        "turbogrid": "~3.0.12"
+        "turbogrid": "^3.0.13"
     },
     "devDependencies": {
+        "commander": "^11.1.0",
         "eslint": "^8.56.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",
-        "eslint-plugin-vue": "^9.19.2",
+        "eslint-plugin-vue": "^9.20.1",
         "stylelint": "^15.11.0",
         "stylelint-config-plus": "^1.0.4"
     }