monocart-coverage-reports 2.10.9 → 2.11.1

package/lib/utils/util.js

@@ -3,6 +3,7 @@ const { writeFile, readFile } = require('fs/promises');
 const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
+
 const EC = require('eight-colors');
 const CG = require('console-grid');
 const acornWalk = require('acorn-walk');
@@ -11,6 +12,8 @@ const Share = require('../platform/share.js');
 const request = require('./request.js');
 const version = require('../../package.json').version;
 const markdownGrid = require('./markdown.js');
+const { mergeV8Coverage } = require('./merge/merge.js');
+const gc = require('./gc.js');
 
 const {
     findUpSync, supportsColor, minimatch
@@ -34,6 +37,11 @@ const Util = {
 
     request,
     markdownGrid,
+    mergeV8Coverage,
+
+    forceGC: () => {
+        gc();
+    },
 
     relativePath: function(p, root) {
         p = `${p}`;
@@ -464,6 +472,13 @@ const Util = {
         }
     },
 
+    readJson: async (jsonPath) => {
+        const content = await Util.readFile(jsonPath);
+        if (content) {
+            return JSON.parse(content);
+        }
+    },
+
     writeFileSync: function(filePath, content) {
         if (!fs.existsSync(filePath)) {
             const p = path.dirname(filePath);
@@ -854,8 +869,28 @@ const Util = {
         console.log(`[MCR] ${message} before ${lengthBefore} => after ${lengthAfter}`);
     },
 
+    setGC: (threshold) => {
+        if (!Util.isNum(threshold)) {
+            threshold = 1024;
+        }
+        Util.gcThreshold = threshold;
+    },
+
+    getMemory: () => {
+        const { heapUsed } = process.memoryUsage();
+        const memory = parseFloat((heapUsed / 1024 ** 2).toFixed(1));
+        return memory;
+    },
+
     // time is debug level, fix the log info, for checking snapshot
     logTime: (message, time_start) => {
+
+        // memory gc
+        let memory = Util.getMemory();
+        if (Util.gcThreshold && Util.gcThreshold < memory) {
+            Util.forceGC();
+        }
+
         if (Util.loggingLevel < Util.loggingLevels.debug && !process.env.MCR_LOG_TIME) {
             return;
         }
@@ -863,9 +898,7 @@ const Util = {
         const durationH = Util.TF(duration);
         const ls = [`[MCR] ${message}`];
 
-        // memory
-        const { heapUsed } = process.memoryUsage();
-        const memory = parseFloat((heapUsed / 1024 ** 2).toFixed(1));
+        memory = Util.getMemory();
         ls.push(` (memory: ${memory}MB)`);
 
         // time

package/lib/v8/v8.js

@@ -1,5 +1,4 @@
 const EC = require('eight-colors');
-const { mergeScriptCovs } = require('@bcoe/v8-coverage');
 const Util = require('../utils/util.js');
 const { getV8Summary } = require('./v8-summary.js');
 const { dedupeFlatRanges } = require('../utils/dedupe.js');
@@ -165,30 +164,29 @@ const mergeCssRanges = (itemList) => {
         // ranges: [ {start, end} ]
         const ranges = dedupeFlatRanges(concatRanges);
 
-        resolve(ranges || []);
+        resolve(ranges);
     });
 };
 
-const mergeJsFunctions = (itemList) => {
-    return new Promise((resolve) => {
-
-        const res = mergeScriptCovs(itemList);
-        const functions = res && res.functions;
-
-        resolve(functions || []);
-    });
+const mergeJsFunctions = async (itemList) => {
+    const res = await Util.mergeV8Coverage(itemList);
+    return res.functions;
 };
 
-const mergeV8Coverage = async (dataList, sourceCache, options) => {
+const mergeV8DataList = async (dataList, options) => {
+    const allList = dataList.map((d) => d.data).flat();
 
-    let allList = [];
-    dataList.forEach((d) => {
-        allList = allList.concat(d.data);
+    // separate coverage and empty items
+    const coverageList = [];
+    const allEmptyList = [];
+    allList.forEach((it) => {
+        if (it.empty) {
+            allEmptyList.push(it);
+        } else {
+            coverageList.push(it);
+        }
     });
 
-    // remove empty items
-    const coverageList = allList.filter((it) => !it.empty);
-
     // connect all functions and ranges
     const itemMap = {};
     const sourcePathMap = {};
@@ -222,7 +220,7 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
     // first time filter for empty, (not for sources)
     // empty and not in item map
-    const emptyList = allList.filter((it) => it.empty).filter((it) => {
+    const emptyList = allEmptyList.filter((it) => {
         if (itemMap[it.id]) {
             return false;
         }
@@ -232,8 +230,15 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
         return true;
     });
 
-    // empty list + merged list
-    const mergedList = emptyList.concat(Object.values(itemMap));
+    // merged list + empty list
+    const mergedList = Object.values(itemMap).concat(emptyList);
+
+    return mergedList;
+};
+
+const mergeV8Coverage = async (dataList, sourceCache, options) => {
+
+    const mergedList = await mergeV8DataList(dataList, options);
 
     // try to load coverage and source by id
     for (const entry of mergedList) {
@@ -253,6 +258,9 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
     }
 
+    // GC
+    sourceCache.clear();
+
     return mergedList;
 };
 
@@ -329,6 +337,7 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
 
 module.exports = {
     initV8ListAndSourcemap,
+    mergeV8DataList,
     mergeV8Coverage,
     saveV8Report
 };

package/package.json

@@ -1,115 +1,118 @@
-{
-    "name": "monocart-coverage-reports",
-    "version": "2.10.9",
-    "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"
-        },
-        "./register": {
-            "import": "./lib/register/register.mjs",
-            "require": "./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 version patch && npm run build && npm run test && npm publish",
-        "beta": "npm version prerelease --preid=beta && npm run build && npm run test && npm publish --tag beta"
-    },
-    "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.4",
-        "commander": "^12.1.0",
-        "console-grid": "^2.2.2",
-        "eight-colors": "^1.3.0",
-        "foreground-child": "^3.3.0",
-        "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.1",
-        "eslint": "~9.10.0",
-        "eslint-config-plus": "^2.0.2",
-        "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.28.0",
-        "find-up": "^7.0.0",
-        "minimatch": "^9.0.5",
-        "monocart-code-viewer": "^1.1.4",
-        "monocart-formatter": "^3.0.0",
-        "postcss": "^8.4.47",
-        "starfall-cli": "^2.0.20",
-        "stylelint": "^16.9.0",
-        "stylelint-config-plus": "^1.1.3",
-        "supports-color": "^9.4.0",
-        "tsx": "^4.19.1",
-        "turbogrid": "^3.2.0",
-        "vine-ui": "^3.1.16",
-        "ws": "^8.18.0"
-    }
-}
+{
+    "name": "monocart-coverage-reports",
+    "version": "2.11.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"
+        },
+        "./register": {
+            "import": "./lib/register/register.mjs",
+            "require": "./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-merge-v8": "node ./test/test-merge-v8.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",
+        "beta": "npm version prerelease --preid=beta && npm run build && npm run test && npm publish --tag beta"
+    },
+    "workspaces": [
+        "test"
+    ],
+    "files": [
+        "lib",
+        "README.zh-Hans.md"
+    ],
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
+    },
+    "dependencies": {
+        "acorn": "^8.12.1",
+        "acorn-loose": "^8.4.0",
+        "acorn-walk": "^8.3.4",
+        "commander": "^12.1.0",
+        "console-grid": "^2.2.2",
+        "eight-colors": "^1.3.1",
+        "foreground-child": "^3.3.0",
+        "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": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "async-tick": "^1.0.0",
+        "convert-source-map": "^2.0.0",
+        "diff-sequences": "^29.6.3",
+        "esbuild": "^0.24.0",
+        "eslint": "~9.12.0",
+        "eslint-config-plus": "^2.0.2",
+        "eslint-plugin-html": "^8.1.2",
+        "eslint-plugin-vue": "^9.28.0",
+        "find-up": "^7.0.0",
+        "minimatch": "^9.0.5",
+        "monocart-code-viewer": "^1.1.4",
+        "monocart-formatter": "^3.0.0",
+        "node-stream-zip": "^1.15.0",
+        "postcss": "^8.4.47",
+        "starfall-cli": "^2.0.20",
+        "stylelint": "^16.9.0",
+        "stylelint-config-plus": "^1.1.3",
+        "supports-color": "^9.4.0",
+        "tsx": "^4.19.1",
+        "turbogrid": "^3.2.0",
+        "vine-ui": "^3.1.16",
+        "ws": "^8.18.0",
+        "yazl": "^2.5.1"
+    }
+}