monocart-coverage-reports 2.6.2 → 2.6.4

package/lib/utils/source-path.js

@@ -154,6 +154,13 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
     sourceMap.sourceRoot = '';
 
     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);
 
         let sourcePath = getSourcePath(sourceUrl, i + 1);

package/lib/v8/v8.js

@@ -62,75 +62,82 @@ const initV8ListAndSourcemap = async (v8list, options) => {
     // filter no source or text
     // init type and css source from text
     // keep functions
-    v8list = v8list.filter((item) => {
+    v8list = v8list.filter((entry) => {
 
         // filter entry
-        if (!entryFilter(item)) {
-            // console.log('-', item.url);
+        if (!entryFilter(entry)) {
+            // console.log('-', entry.url);
             return false;
         }
-        // console.log(item.url);
+        // console.log(entry.url);
 
-        if (typeof item.source === 'string' && item.functions) {
-            item.type = 'js';
+        if (typeof entry.source === 'string' && entry.functions) {
+            entry.type = 'js';
             return true;
         }
-        if (typeof item.text === 'string' && item.ranges) {
-            item.type = 'css';
+        if (typeof entry.text === 'string' && entry.ranges) {
+            entry.type = 'css';
             return true;
         }
         // allow empty coverage
-        if (item.empty) {
-            if (!['js', 'css'].includes(item.type)) {
-                item.type = 'js';
+        if (entry.empty) {
+            if (!['js', 'css'].includes(entry.type)) {
+                entry.type = 'js';
             }
             return true;
         }
         // 404 css, text will be empty
-        // Util.logError(`Invalid source: ${item.url}`);
-        // console.log(item);
+        // Util.logError(`Invalid source: ${entry.url}`);
+        // console.log(entry);
     });
 
 
-    // do not change original v8list, to work for multiple APIs
+    // onEntry hook
+    // after filter but before init, because id depends source and sourcePath
+    const onEntry = options.onEntry;
+    if (typeof onEntry === 'function') {
+        for (const entry of v8list) {
+            await onEntry(entry);
+        }
+    }
 
     const sourcePathHandler = getSourcePathHandler(options);
 
     // init id, sourcePath
-    v8list = v8list.map((item, i) => {
+    v8list = v8list.map((entry, i) => {
 
         // it could be a empty file
-        let source = `${item.source || item.text || ''}`;
+        let source = `${entry.source || entry.text || ''}`;
 
         // fix source with script offset
         let scriptOffset;
-        const offset = Util.toNum(item.scriptOffset, true);
+        const offset = Util.toNum(entry.scriptOffset, true);
         if (offset > 0) {
             scriptOffset = offset;
             source = getWrapperSource(offset, source);
         }
 
         const data = {
-            url: item.url,
-            type: item.type,
+            url: entry.url,
+            type: entry.type,
             source,
             // script offset >= 0, for vm script
             scriptOffset,
             // Manually Resolve the Sourcemap
-            sourceMap: item.sourceMap,
+            sourceMap: entry.sourceMap,
             // fake source with `lineLengths`
-            fake: item.fake,
+            fake: entry.fake,
             // empty coverage
-            empty: item.empty,
+            empty: entry.empty,
             // match source if using empty coverage
-            distFile: item.distFile
+            distFile: entry.distFile
         };
 
         // coverage
         if (data.type === 'js') {
-            data.functions = item.functions;
+            data.functions = entry.functions;
         } else {
-            data.ranges = item.ranges;
+            data.ranges = entry.ranges;
         }
 
         // resolve source path
@@ -335,7 +342,7 @@ const handleV8HtmlReport = async (reportData, reportOptions, options) => {
     return htmlPath;
 };
 
-const saveV8Report = async (v8list, options) => {
+const saveV8Report = async (v8list, options, istanbulReportPath) => {
 
     const defaultWatermarks = {
         bytes: [50, 80],
@@ -378,9 +385,13 @@ const saveV8Report = async (v8list, options) => {
         }
     }
 
+    if (istanbulReportPath) {
+        outputs.istanbul = istanbulReportPath;
+    }
+
     // outputPath, should be html or json
     const reportPath = Util.resolveReportPath(options, () => {
-        return outputs.v8 || outputs['v8-json'] || Object.values(outputs).filter((it) => it && typeof it === 'string').shift();
+        return outputs.v8 || outputs.istanbul || Object.values(outputs).filter((it) => it && typeof it === 'string').shift();
     });
 
     const coverageResults = {

package/package.json

@@ -1,81 +1,81 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.6.2",
-    "description": "Monocart coverage 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/test-node-env.js -o docs/cli -c test/cli-options.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-options.js",
-        "test:snap": "cross-env TEST_SNAPSHOT=true npm run test",
-        "dev": "sf d v8",
-        "open": "node ./scripts/open.js",
-        "patch": "npm run build && 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.1",
-        "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": "^15.11.0",
-        "stylelint-config-plus": "^1.0.4",
-        "supports-color": "^9.4.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.6.4",
+    "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.1",
+        "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": "^15.11.0",
+        "stylelint-config-plus": "^1.0.4",
+        "supports-color": "^9.4.0"
+    }
+}