monocart-coverage-reports 2.11.0 → 2.11.2

package/lib/reports/raw.js

@@ -5,14 +5,14 @@ const { ZipFile } = require('../packages/monocart-coverage-vendor.js');
 const { mergeIstanbulDataList } = require('../istanbul/istanbul.js');
 const { mergeV8DataList } = require('../v8/v8.js');
 
-const getMergedData = (type, dataList) => {
+const getMergedData = (type, dataList, options) => {
     if (type === 'istanbul') {
-        return mergeIstanbulDataList(dataList);
+        return mergeIstanbulDataList(dataList, options);
     }
-    return mergeV8DataList(dataList);
+    return mergeV8DataList(dataList, options);
 };
 
-const mergeReport = async (rawDir, rawParent) => {
+const mergeReport = async (rawDir, options) => {
     const coverageFiles = fs.readdirSync(rawDir).filter((n) => n.endsWith('.json') && n.startsWith('coverage-'));
     // console.log(coverageFiles);
 
@@ -29,7 +29,7 @@ const mergeReport = async (rawDir, rawParent) => {
         Util.rmSync(jsonPath);
     }
 
-    const mergedData = await getMergedData(type, dataList);
+    const mergedData = await getMergedData(type, dataList, options);
 
     const dataId = Util.uid();
     const results = {
@@ -99,7 +99,7 @@ const rawReport = async (reportData, reportOptions, options) => {
 
     // merge
     if (rawOptions.merge) {
-        await mergeReport(rawDir, rawParent);
+        await mergeReport(rawDir, options);
     }
 
     // zip

package/lib/utils/gc.js

@@ -0,0 +1,9 @@
+const v8 = require('node:v8');
+const vm = require('node:vm');
+
+if (typeof global.gc !== 'function') {
+    v8.setFlagsFromString('--expose_gc');
+    global.gc = vm.runInNewContext('gc');
+}
+
+module.exports = global.gc;

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');
@@ -12,6 +13,7 @@ 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
@@ -37,6 +39,10 @@ const Util = {
     markdownGrid,
     mergeV8Coverage,
 
+    forceGC: () => {
+        gc();
+    },
+
     relativePath: function(p, root) {
         p = `${p}`;
         root = `${root || Util.root}`;
@@ -863,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;
         }
@@ -872,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

@@ -164,7 +164,7 @@ const mergeCssRanges = (itemList) => {
         // ranges: [ {start, end} ]
         const ranges = dedupeFlatRanges(concatRanges);
 
-        resolve(ranges || []);
+        resolve(ranges);
     });
 };
 
@@ -173,14 +173,19 @@ const mergeJsFunctions = async (itemList) => {
     return res.functions;
 };
 
-const mergeV8DataList = async (dataList) => {
-    let allList = [];
-    dataList.forEach((d) => {
-        allList = allList.concat(d.data);
-    });
+const mergeV8DataList = async (dataList, options) => {
+    const allList = dataList.map((d) => d.data).flat();
 
-    // remove empty items
-    const coverageList = allList.filter((it) => !it.empty);
+    // separate coverage and empty items
+    const coverageList = [];
+    const allEmptyList = [];
+    allList.forEach((it) => {
+        if (it.empty) {
+            allEmptyList.push(it);
+        } else {
+            coverageList.push(it);
+        }
+    });
 
     // connect all functions and ranges
     const itemMap = {};
@@ -215,7 +220,7 @@ const mergeV8DataList = async (dataList) => {
 
     // 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;
         }
@@ -225,16 +230,15 @@ const mergeV8DataList = async (dataList) => {
         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);
+    const mergedList = await mergeV8DataList(dataList, options);
 
     // try to load coverage and source by id
     for (const entry of mergedList) {
@@ -254,6 +258,9 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
     }
 
+    // GC
+    sourceCache.clear();
+
     return mergedList;
 };
 
@@ -301,7 +308,7 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
             } else {
                 outputs[reportName] = await customReport(reportName, reportData, reportOptions, options);
             }
-            Util.logTime(`┌ [generate] saved report: ${reportName}`, t1);
+            Util.logTime(`${EC.magenta('├')} [generate] saved report: ${reportName}`, t1);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.11.0",
+    "version": "2.11.2",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -59,7 +59,7 @@
         "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",
+        "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": [
@@ -75,7 +75,7 @@
         "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
     },
     "dependencies": {
-        "acorn": "^8.12.1",
+        "acorn": "^8.14.0",
         "acorn-loose": "^8.4.0",
         "acorn-walk": "^8.3.4",
         "commander": "^12.1.0",
@@ -95,10 +95,10 @@
         "convert-source-map": "^2.0.0",
         "diff-sequences": "^29.6.3",
         "esbuild": "^0.24.0",
-        "eslint": "~9.11.1",
+        "eslint": "~9.14.0",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.2",
-        "eslint-plugin-vue": "^9.28.0",
+        "eslint-plugin-vue": "^9.30.0",
         "find-up": "^7.0.0",
         "minimatch": "^9.0.5",
         "monocart-code-viewer": "^1.1.4",
@@ -106,13 +106,13 @@
         "node-stream-zip": "^1.15.0",
         "postcss": "^8.4.47",
         "starfall-cli": "^2.0.20",
-        "stylelint": "^16.9.0",
+        "stylelint": "^16.10.0",
         "stylelint-config-plus": "^1.1.3",
         "supports-color": "^9.4.0",
-        "tsx": "^4.19.1",
+        "tsx": "^4.19.2",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",
         "ws": "^8.18.0",
-        "yazl": "^2.5.1"
+        "yazl": "^3.2.1"
     }
 }