monocart-coverage-reports 2.8.4 → 2.8.6

package/lib/platform/share.js

@@ -347,12 +347,13 @@ const Util = {
             // 2, uncovered entire and pieces
             if (count > 0) {
                 lineItem.coveredCount = Math.max(lineItem.coveredCount, count);
+                return;
+            }
+
+            if (it.entire) {
+                lineItem.uncoveredEntire = it;
             } else {
-                if (it.entire) {
-                    lineItem.uncoveredEntire = it;
-                } else {
-                    lineItem.uncoveredPieces.push(it);
-                }
+                lineItem.uncoveredPieces.push(it);
             }
 
         });
@@ -458,11 +459,7 @@ const Util = {
         }
 
         if (ms < 60 * 1000) {
-            const ss = Math.floor(ms / 1000);
-            const sms = Math.round((ms - ss * 1000) / 100);
-            if (sms) {
-                return `${ss}.${sms}${space}s`;
-            }
+            const ss = parseFloat((ms / 1000).toFixed(1));
             return `${ss}${space}s`;
         }
 

package/lib/utils/snapshot.js

@@ -247,6 +247,9 @@ const getSnapshot = (reportData) => {
 
     addPercent(snapshot.summary, summary);
 
+    files.sort((a, b) => {
+        return a.sourcePath - b.sourcePath;
+    });
     files.forEach((file) => {
         // do NOT add debug file
         if (file.debug) {

package/lib/utils/util.js

@@ -117,12 +117,6 @@ const Util = {
         return url;
     },
 
-    resolveCacheSourcePath: (cacheDir, id) => {
-        const filename = `source-${id}.json`;
-        const sourcePath = path.resolve(cacheDir, filename);
-        return sourcePath;
-    },
-
     resolveWatermarks: (defaultWatermarks, watermarks) => {
         if (watermarks) {
             if (Array.isArray(watermarks)) {
@@ -191,6 +185,15 @@ const Util = {
         return path.resolve(__dirname, '../packages', p);
     },
 
+    getCacheFileInfo: (type, id, cacheDir) => {
+        const cacheName = `${type}-${id}.json`;
+        const cachePath = path.resolve(cacheDir, cacheName);
+        return {
+            cacheName,
+            cachePath
+        };
+    },
+
     findUpConfig: (customConfigFile) => {
         if (customConfigFile) {
             if (fs.existsSync(customConfigFile)) {
@@ -548,6 +551,9 @@ const Util = {
             info: 'info',
             debug: 'debug'
         };
+
+        level = level || process.env.MCR_LOGGING;
+
         const type = types[level] || types.info;
         Util.loggingType = type;
         Util.loggingLevel = Util.loggingLevels[type];
@@ -600,7 +606,7 @@ const Util = {
 
     // time is debug level, fix the log info, for checking snapshot
     logTime: (message, time_start) => {
-        if (Util.loggingLevel < Util.loggingLevels.debug) {
+        if (Util.loggingLevel < Util.loggingLevels.debug && !process.env.MCR_LOG_TIME) {
             return;
         }
         const duration = Date.now() - time_start;

package/lib/v8/v8.js

@@ -65,7 +65,9 @@ const getEntryFilter = (options) => {
     return () => true;
 };
 
-const initV8ListAndSourcemap = async (v8list, options) => {
+const initV8ListAndSourcemap = async (mcr, v8list) => {
+
+    const { options } = mcr;
 
     // entry filter
     const entryFilter = getEntryFilter(options);
@@ -172,13 +174,28 @@ const initV8ListAndSourcemap = async (v8list, options) => {
 
     // collect sourcemap first
     const time_start = Date.now();
-    const smList = await collectSourceMaps(v8list, options);
-    if (smList.length) {
+    const { sourceList, sourcemapList } = await collectSourceMaps(v8list, options);
+    if (sourcemapList.length) {
         // debug level time
-        Util.logTime(`loaded sourcemaps: ${smList.length}`, time_start);
+        Util.logTime(`loaded sourcemaps: ${sourcemapList.length}`, time_start);
         // console.log(smList);
     }
 
+    // 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));
+        // }
+    }
+
     return v8list;
 };
 
@@ -391,11 +408,13 @@ const saveV8Report = async (v8list, options, istanbulReportPath) => {
         for (const reportName of v8Reports) {
             const reportOptions = v8Group[reportName];
             const buildInHandler = buildInV8Reports[reportName];
+            const t1 = Date.now();
             if (buildInHandler) {
                 outputs[reportName] = await buildInHandler(reportData, reportOptions, options);
             } else {
                 outputs[reportName] = await Util.runCustomReporter(reportName, reportData, reportOptions, options);
             }
+            Util.logTime(`┌ [generate] saved report: ${reportName}`, t1);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.8.4",
+    "version": "2.8.6",
     "description": "A code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -25,7 +25,7 @@
     "types": "./lib/index.d.ts",
     "scripts": {
         "build-test": "node ./test/build/build-test.js",
-        "build": "sf lint && sf b -p && npm run build-test",
+        "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",
@@ -55,10 +55,10 @@
         "test-all": "node ./test/test.js && node ./scripts/docs.js",
         "test": "npm run test-unit && 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 app",
+        "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 && sf publish patch -r"
+        "patch": "npm run build && npm run test && npx sf publish patch -r"
     },
     "workspaces": [
         "packages/*",
@@ -83,21 +83,22 @@
         "monocart-code-viewer": "^1.1.4",
         "monocart-formatter": "^3.0.0",
         "monocart-locator": "^1.0.0",
-        "turbogrid": "^3.1.0"
+        "turbogrid": "^3.2.0"
     },
     "devDependencies": {
         "commander": "^12.1.0",
         "esbuild": "^0.21.5",
-        "eslint": "~9.5.0",
+        "eslint": "~9.6.0",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-vue": "^9.26.0",
         "find-up": "^7.0.0",
-        "minimatch": "^9.0.4",
+        "minimatch": "^9.0.5",
+        "starfall-cli": "^2.0.19",
         "stylelint": "^16.6.1",
         "stylelint-config-plus": "^1.1.2",
         "supports-color": "^9.4.0",
-        "tsx": "^4.15.5",
-        "ws": "^8.17.0"
+        "tsx": "^4.16.0",
+        "ws": "^8.17.1"
     }
 }