monocart-coverage-reports 2.7.0 → 2.7.2

package/lib/register/hooks.js

@@ -0,0 +1,40 @@
+const fs = require('fs');
+const path = require('path');
+const Util = require('../utils/util.js');
+const { convertSourceMap } = require('../packages/monocart-coverage-vendor.js');
+
+async function load(url, context, nextLoad) {
+
+    const loaded = await nextLoad(url, context);
+    const { source, format } = loaded;
+    const dir = process.env.NODE_V8_COVERAGE;
+
+    if (dir && typeof source === 'string' && (format === 'module' || format === 'commonjs')) {
+
+        if (convertSourceMap.mapFileCommentRegex.test(source)) {
+
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, {
+                    recursive: true
+                });
+            }
+
+            const id = Util.calculateSha1(url + source);
+            const filePath = path.resolve(dir, `source-${id}.json`);
+            if (!fs.existsSync(filePath)) {
+                fs.writeFileSync(filePath, JSON.stringify({
+                    url,
+                    source
+                }));
+            }
+
+        }
+
+    }
+
+    return loaded;
+}
+
+module.exports = {
+    load
+};

package/lib/register/hooks.mjs

@@ -0,0 +1,3 @@
+import { load } from './hooks.js';
+
+export { load };

package/lib/register/register.js

@@ -0,0 +1,4 @@
+const { register } = require('module');
+const { pathToFileURL } = require('url');
+
+register('./hooks.js', pathToFileURL(__filename));

package/lib/register/register.mjs

@@ -0,0 +1,3 @@
+import { register } from 'module';
+
+register('./hooks.mjs', import.meta.url);

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;
         }
@@ -141,31 +141,51 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
 
 // ========================================================================================================
 
-const mergeSourceRoot = (sourceRoot, sourceName) => {
-    if (sourceName.startsWith(sourceRoot)) {
-        return sourceName;
+const resolveSourceUrl = (sourceName, sourceRoot) => {
+
+    // could be absolute path
+    // c:\\workspace\test\\selenium.spec.js
+    // a.js false
+    // c://a.js true
+    // ws://a.js false
+
+    if (path.isAbsolute(sourceName)) {
+        return pathToFileURL(sourceName).toString();
+    }
+
+    // webpack://coverage-v8/./test/mock/src/branch/branch.js
+    // webpack://monocart-v8/../starfall-cli/node_modules/css-loader/dist/runtime/api.js
+
+    // as url
+    const urlObj = Util.resolveUrl(sourceName);
+    if (urlObj) {
+        return urlObj.toString();
     }
-    return sourceRoot + sourceName;
+
+    // as relative path, join sourceRoot
+    if (sourceRoot && !sourceName.startsWith(sourceRoot)) {
+        sourceName = path.join(sourceRoot, sourceName);
+    }
+
+    sourceName = path.normalize(sourceName);
+    const sourceUrl = pathToFileURL(sourceName).toString();
+
+    return sourceUrl;
 };
 
-const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
-    // reset sourceRoot
-    const sourceRoot = sourceMap.sourceRoot || '';
-    sourceMap.sourceRoot = '';
+const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
 
     sourceMap.sources = sourceMap.sources.map((sourceName, i) => {
 
-        // the sourceName could be absolute path
-        // c:\\workspace\test\\selenium.spec.js
-        // console.log(sourceName);
-        sourceName = Util.formatPath(sourceName);
-        // console.log(sourceName);
-
-        const sourceUrl = mergeSourceRoot(sourceRoot, sourceName);
+        const sourceUrl = resolveSourceUrl(sourceName, sourceMap.sourceRoot);
 
         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

@@ -144,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,83 +1,91 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.7.0",
-    "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.22.0",
-        "minimatch": "^9.0.3",
-        "stylelint": "^16.2.1",
-        "stylelint-config-plus": "^1.1.0",
-        "supports-color": "^9.4.0",
-        "ws": "^8.16.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.7.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-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",
+        "tsx": "^4.7.1",
+        "ws": "^8.16.0"
+    }
+}