monocart-coverage-reports 2.10.3 → 2.10.5

package/lib/reports/custom.js

@@ -1,34 +1,34 @@
-const { pathToFileURL } = require('url');
-const Util = require('../utils/util.js');
-
-const customReport = async (reportName, reportData, reportOptions, globalOptions) => {
-    let CustomReporter;
-    let err;
-    try {
-        CustomReporter = await import(reportName);
-    } catch (e) {
-        err = e;
-        try {
-            CustomReporter = await import(pathToFileURL(reportName));
-        } catch (ee) {
-            err = ee;
-        }
-    }
-
-    if (!CustomReporter) {
-        Util.logError(err.message);
-        return;
-    }
-
-    CustomReporter = CustomReporter.default || CustomReporter;
-
-    const reporter = new CustomReporter(reportOptions, globalOptions);
-
-    const results = await reporter.generate(reportData);
-
-    return results;
-};
-
-module.exports = {
-    customReport
-};
+const { pathToFileURL } = require('url');
+const Util = require('../utils/util.js');
+
+const customReport = async (reportName, reportData, reportOptions, globalOptions) => {
+    let CustomReporter;
+    let err;
+    try {
+        CustomReporter = await import(reportName);
+    } catch (e) {
+        err = e;
+        try {
+            CustomReporter = await import(pathToFileURL(reportName));
+        } catch (ee) {
+            err = ee;
+        }
+    }
+
+    if (!CustomReporter) {
+        Util.logError(err.message);
+        return;
+    }
+
+    CustomReporter = CustomReporter.default || CustomReporter;
+
+    const reporter = new CustomReporter(reportOptions, globalOptions);
+
+    const results = await reporter.generate(reportData);
+
+    return results;
+};
+
+module.exports = {
+    customReport
+};

package/lib/reports/v8-json.js

@@ -1,22 +1,22 @@
-const path = require('path');
-const Util = require('../utils/util.js');
-
-const v8JsonReport = async (reportData, reportOptions, options) => {
-    const v8JsonOptions = {
-        outputFile: 'coverage-report.json',
-        ... reportOptions
-    };
-
-    // console.log(mergedOptions);
-    const jsonPath = path.resolve(options.outputDir, v8JsonOptions.outputFile);
-    const reportPath = Util.relativePath(jsonPath);
-
-    reportData.reportPath = reportPath;
-
-    await Util.writeFile(jsonPath, JSON.stringify(reportData));
-    return reportPath;
-};
-
-module.exports = {
-    v8JsonReport
-};
+const path = require('path');
+const Util = require('../utils/util.js');
+
+const v8JsonReport = async (reportData, reportOptions, options) => {
+    const v8JsonOptions = {
+        outputFile: 'coverage-report.json',
+        ... reportOptions
+    };
+
+    // console.log(mergedOptions);
+    const jsonPath = path.resolve(options.outputDir, v8JsonOptions.outputFile);
+    const reportPath = Util.relativePath(jsonPath);
+
+    reportData.reportPath = reportPath;
+
+    await Util.writeFile(jsonPath, JSON.stringify(reportData));
+    return reportPath;
+};
+
+module.exports = {
+    v8JsonReport
+};

package/lib/reports/v8.js

@@ -1,51 +1,51 @@
-const path = require('path');
-const Assets = require('../assets.js');
-
-const v8Report = async (reportData, reportOptions, options) => {
-
-    // V8 only options, merged with root options
-    const v8HtmlOptions = {
-        outputFile: options.outputFile,
-        inline: options.inline,
-        assetsPath: options.assetsPath,
-        metrics: options.metrics,
-        ... reportOptions
-    };
-
-    // add metrics to data for UI
-    reportData.metrics = v8HtmlOptions.metrics;
-
-    const {
-        outputFile, inline, assetsPath
-    } = v8HtmlOptions;
-
-    // resolve full report path
-    const reportPath = path.resolve(options.outputDir, outputFile);
-    const outputDir = path.dirname(reportPath);
-    const htmlFile = path.basename(reportPath);
-
-    const jsFiles = ['monocart-coverage-app'];
-    // console.log(jsFiles);
-
-    const htmlOptions = {
-        reportData,
-        jsFiles,
-        inline,
-        assetsPath,
-        outputDir,
-        htmlFile,
-
-        saveReportPath: 'reportPath',
-
-        reportDataFile: 'coverage-data.js'
-    };
-
-    // compress json data for html
-    const htmlPath = await Assets.saveHtmlReport(htmlOptions);
-
-    return htmlPath;
-};
-
-module.exports = {
-    v8Report
-};
+const path = require('path');
+const Assets = require('../assets.js');
+
+const v8Report = async (reportData, reportOptions, options) => {
+
+    // V8 only options, merged with root options
+    const v8HtmlOptions = {
+        outputFile: options.outputFile,
+        inline: options.inline,
+        assetsPath: options.assetsPath,
+        metrics: options.metrics,
+        ... reportOptions
+    };
+
+    // add metrics to data for UI
+    reportData.metrics = v8HtmlOptions.metrics;
+
+    const {
+        outputFile, inline, assetsPath
+    } = v8HtmlOptions;
+
+    // resolve full report path
+    const reportPath = path.resolve(options.outputDir, outputFile);
+    const outputDir = path.dirname(reportPath);
+    const htmlFile = path.basename(reportPath);
+
+    const jsFiles = ['monocart-coverage-app'];
+    // console.log(jsFiles);
+
+    const htmlOptions = {
+        reportData,
+        jsFiles,
+        inline,
+        assetsPath,
+        outputDir,
+        htmlFile,
+
+        saveReportPath: 'reportPath',
+
+        reportDataFile: 'coverage-data.js'
+    };
+
+    // compress json data for html
+    const htmlPath = await Assets.saveHtmlReport(htmlOptions);
+
+    return htmlPath;
+};
+
+module.exports = {
+    v8Report
+};

package/lib/utils/util.js

@@ -161,6 +161,25 @@ const Util = {
         };
     },
 
+    saveSourceCacheFile: async (sourceData, options, fileCache) => {
+        const { cacheName, cachePath } = Util.getCacheFileInfo('source', sourceData.id, options.cacheDir);
+
+        // file cache for add() to generate()
+        if (fileCache) {
+            fileCache.set(cacheName, sourceData);
+        }
+
+        await Util.writeFile(cachePath, JSON.stringify(sourceData));
+
+        // save source and sourcemap file for debug
+        // https://evanw.github.io/source-map-visualization
+        if (options.sourceMap && sourceData.sourceMap) {
+            const filePath = cachePath.slice(0, -5);
+            await Util.writeFile(`${filePath}.js`, sourceData.source);
+            await Util.writeFile(`${filePath}.js.map`, JSON.stringify(sourceData.sourceMap));
+        }
+    },
+
     findUpConfig: (customConfigFile) => {
         if (customConfigFile) {
             if (fs.existsSync(customConfigFile)) {

package/lib/v8/v8.js

@@ -70,7 +70,7 @@ const getEntryFilter = (options) => {
 
 const initV8ListAndSourcemap = async (mcr, v8list) => {
 
-    const { options } = mcr;
+    const { options, fileCache } = mcr;
 
     // entry filter
     const entryFilter = getEntryFilter(options);
@@ -102,6 +102,7 @@ const initV8ListAndSourcemap = async (mcr, v8list) => {
             }
             return true;
         }
+
         // 404 css, text will be empty
         Util.logDebug(EC.red(`Invalid source or coverage data: ${entry.url}`));
         // console.log(entry);
@@ -186,17 +187,7 @@ const initV8ListAndSourcemap = async (mcr, v8list) => {
 
     // save source list
     for (const sourceData of sourceList) {
-
-        const { cacheName, cachePath } = Util.getCacheFileInfo('source', sourceData.id, options.cacheDir);
-        mcr.fileCache.set(cacheName, sourceData);
-        await Util.writeFile(cachePath, JSON.stringify(sourceData));
-
-        // save source and sourcemap file for debug
-        // https://evanw.github.io/source-map-visualization
-        // if (sourceData.sourceMap) {
-        //     await Util.writeFile(`${sourcePath}.js`, sourceData.source);
-        //     await Util.writeFile(`${sourcePath}.js.map`, JSON.stringify(sourceData.sourceMap));
-        // }
+        await Util.saveSourceCacheFile(sourceData, options, fileCache);
     }
 
     return v8list;
@@ -242,9 +233,10 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
     // connect all functions and ranges
     const itemMap = {};
+    const sourcePathMap = {};
     const mergeMap = {};
     coverageList.forEach((item) => {
-        const { id } = item;
+        const { id, sourcePath } = item;
         const prev = itemMap[id];
         if (prev) {
             if (mergeMap[id]) {
@@ -254,6 +246,7 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
             }
         } else {
             itemMap[id] = item;
+            sourcePathMap[sourcePath] = item;
         }
     });
 
@@ -271,16 +264,22 @@ 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) => !itemMap[it.id]);
+    const emptyList = allList.filter((it) => it.empty).filter((it) => {
+        if (itemMap[it.id]) {
+            return false;
+        }
+        if (sourcePathMap[it.sourcePath]) {
+            return false;
+        }
+        return true;
+    });
 
     // empty list + merged list
     const mergedList = emptyList.concat(Object.values(itemMap));
 
     // try to load coverage and source by id
     for (const item of mergedList) {
-        const {
-            id, type, empty
-        } = item;
+        const { id } = item;
         const json = sourceCache.get(id);
         if (json) {
             item.source = json.source;
@@ -289,24 +288,6 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
             Util.logError(`Not found source data: ${Util.relativePath(item.sourcePath)}`);
             item.source = '';
         }
-
-        // add empty coverage after merged
-        if (empty) {
-            if (type === 'js') {
-                item.functions = [{
-                    functionName: '',
-                    ranges: [{
-                        startOffset: 0,
-                        endOffset: item.source.length,
-                        count: 0
-                    }]
-                }];
-            } else {
-                // empty css
-                item.ranges = [];
-            }
-        }
-
     }
 
     return mergedList;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.10.3",
+    "version": "2.10.5",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -10,13 +10,11 @@
         ".": {
             "types": "./lib/index.d.ts",
             "import": "./lib/index.mjs",
-            "require": "./lib/index.js",
-            "default": "./lib/index.js"
+            "require": "./lib/index.js"
         },
         "./register": {
             "import": "./lib/register/register.mjs",
-            "require": "./lib/register/register.js",
-            "default": "./lib/register/register.js"
+            "require": "./lib/register/register.js"
         },
         "./converter": "./lib/converter/converter.js",
         "./util": "./lib/utils/util.js",
@@ -79,7 +77,7 @@
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "acorn": "^8.12.1",
         "acorn-loose": "^8.4.0",
-        "acorn-walk": "^8.3.3",
+        "acorn-walk": "^8.3.4",
         "commander": "^12.1.0",
         "console-grid": "^2.2.2",
         "eight-colors": "^1.3.0",
@@ -94,21 +92,21 @@
         "async-tick": "^1.0.0",
         "convert-source-map": "^2.0.0",
         "diff-sequences": "^29.6.3",
-        "esbuild": "^0.23.0",
-        "eslint": "~9.9.0",
+        "esbuild": "^0.23.1",
+        "eslint": "~9.10.0",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.1",
-        "eslint-plugin-vue": "^9.27.0",
+        "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.41",
+        "postcss": "^8.4.47",
         "starfall-cli": "^2.0.20",
-        "stylelint": "^16.8.1",
-        "stylelint-config-plus": "^1.1.2",
+        "stylelint": "^16.9.0",
+        "stylelint-config-plus": "^1.1.3",
         "supports-color": "^9.4.0",
-        "tsx": "^4.17.0",
+        "tsx": "^4.19.1",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",
         "ws": "^8.18.0"