monocart-coverage-reports 2.6.5 → 2.7.1

package/lib/utils/request.js

@@ -2,16 +2,17 @@ const http = require('http');
 const https = require('https');
 
 // minimal http request for get sourcemap json
+// https://nodejs.org/docs/latest/api/http.html#httprequesturl-options-callback
 const request = (options) => {
 
     const url = `${options.url}`;
+    const HTTP = url.startsWith('https') ? https : http;
     // console.log('request', url);
 
     return new Promise((resolve) => {
 
-        const HTTP = url.startsWith('https') ? https : http;
-
-        HTTP.get(url, (res) => {
+        // get method only
+        HTTP.get(url, options, (res) => {
             const { statusCode } = res;
 
             // Any 2xx status code signals a successful response but here we're only checking for 200.
@@ -19,7 +20,7 @@ const request = (options) => {
                 // Consume response data to free up memory
                 res.resume();
                 const resErr = new Error(`Request Failed. Status Code: ${statusCode}`);
-                resolve([resErr, null]);
+                resolve([resErr]);
                 return;
             }
 
@@ -52,7 +53,7 @@ const request = (options) => {
 
         }).on('error', (httpErr) => {
 
-            resolve([httpErr, null]);
+            resolve([httpErr]);
 
         });
 

package/lib/utils/snapshot.js

@@ -248,6 +248,10 @@ const getSnapshot = (reportData) => {
     addPercent(snapshot.summary, summary);
 
     files.forEach((file) => {
+        // do NOT add debug file
+        if (file.debug) {
+            return;
+        }
         const fileSummary = {};
         addPercent(fileSummary, file.summary);
         fileSummary.uncoveredLines = getUncoveredLines(file);

package/lib/utils/source-path.js

@@ -119,7 +119,7 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
         }
 
         // new source path, second is source url
-        const newSourcePath = sourcePathHandler(sourcePath, '');
+        const newSourcePath = sourcePathHandler(sourcePath, item);
         if (typeof newSourcePath === 'string' && newSourcePath) {
             sourcePath = newSourcePath;
         }
@@ -148,7 +148,7 @@ const mergeSourceRoot = (sourceRoot, sourceName) => {
     return sourceRoot + sourceName;
 };
 
-const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
+const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
     // reset sourceRoot
     const sourceRoot = sourceMap.sourceRoot || '';
     sourceMap.sourceRoot = '';
@@ -165,7 +165,11 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
 
         let sourcePath = getSourcePath(sourceUrl, i + 1);
         if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, sourceUrl);
+            // sourcePath could be a filename only, may using distFile to get full path
+            const newSourcePath = sourcePathHandler(sourcePath, {
+                url: sourceUrl,
+                distFile
+            });
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/lib/v8/v8.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const EC = require('eight-colors');
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
@@ -87,7 +88,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
             return true;
         }
         // 404 css, text will be empty
-        // Util.logError(`Invalid source: ${entry.url}`);
+        Util.logDebug(EC.red(`Invalid source or coverage data: ${entry.url}`));
         // console.log(entry);
     });
 
@@ -143,7 +144,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         // resolve source path
         let sourcePath = getSourcePath(data.url, i + 1, data.type);
         if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, data.url);
+            const newSourcePath = sourcePathHandler(sourcePath, data);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/package.json

@@ -1,81 +1,83 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.6.5",
-    "description": "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"
-        },
-        "./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": "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 && npm run test-node-vm",
-        "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-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-node-vm": "node ./test/test-node-vm.js",
-        "test-istanbul": "node ./test/test-istanbul.js",
-        "test-v8": "node ./test/test-v8.js",
-        "test-puppeteer": "node ./test/test-puppeteer.js",
-        "test-browser": "node ./test/test-browser.js && npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css",
-        "test-anonymous": "node ./test/test-anonymous.js",
-        "test-css": "node ./test/test-css.js",
-        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
-        "test-merge": "node ./test/test-merge.js",
-        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
-        "test-all": "npm run test-browser && npm run test-node && npm run test-cli && 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",
-        "eslint": "^8.57.0",
-        "eslint-config-plus": "^1.0.6",
-        "eslint-plugin-html": "^8.0.0",
-        "eslint-plugin-vue": "^9.22.0",
-        "minimatch": "^9.0.3",
-        "stylelint": "^16.2.1",
-        "stylelint-config-plus": "^1.1.0",
-        "supports-color": "^9.4.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.7.1",
+    "description": "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"
+        },
+        "./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": "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 && npm run test-node-vm",
+        "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-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-node-vm": "node ./test/test-node-vm.js",
+        "test-istanbul": "node ./test/test-istanbul.js",
+        "test-v8": "node ./test/test-v8.js",
+        "test-puppeteer": "node ./test/test-puppeteer.js",
+        "test-browser": "node ./test/test-browser.js && npm run test-istanbul && npm run test-v8 && npm run test-puppeteer && npm run test-anonymous && npm run test-css",
+        "test-anonymous": "node ./test/test-anonymous.js",
+        "test-css": "node ./test/test-css.js",
+        "test-client": "node ./test/test-client.js",
+        "test-cli": "npx mcr node ./test/specs/node.test.js -c test/mcr.config.cli.js",
+        "test-merge": "node ./test/test-merge.js",
+        "test-merge-istanbul": "node ./test/test-merge-istanbul.js",
+        "test-all": "npm run test-browser && npm run test-node && npm run test-cli && 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",
+        "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",
+        "ws": "^8.16.0"
+    }
+}