monocart-coverage-reports 2.5.4 → 2.5.5

package/README.md

@@ -65,8 +65,8 @@ console.log(coverageResults.summary);
 ## Available Reports
 > V8 build-in reports (V8 data only):
 - `v8`
-    - Browser: Build with webpack [V8](https://cenfun.github.io/monocart-coverage-reports/v8) and [V8 Minify](https://cenfun.github.io/monocart-coverage-reports/v8-minify); Build with [Rollup](https://cenfun.github.io/monocart-coverage-reports/v8-rollup) and [Esbuild](https://cenfun.github.io/monocart-coverage-reports/v8-esbuild); Collect with [puppeteer](https://cenfun.github.io/monocart-coverage-reports/puppeteer/); [anonymous](https://cenfun.github.io/monocart-coverage-reports/anonymous/) and [css](https://cenfun.github.io/monocart-coverage-reports/css/)
-    - Node.js: Collect with [env](https://cenfun.github.io/monocart-coverage-reports/v8-node-env), and also V8 [API](https://cenfun.github.io/monocart-coverage-reports/v8-node-api), [Inspector](https://cenfun.github.io/monocart-coverage-reports/v8-node-ins) and [CDP](https://cenfun.github.io/monocart-coverage-reports/v8-node-cdp); Web server example: [koa](https://cenfun.github.io/monocart-coverage-reports/v8-node-koa/)
+    - Browser: Build with webpack [V8](https://cenfun.github.io/monocart-coverage-reports/v8) and [Minify](https://cenfun.github.io/monocart-coverage-reports/minify); Build with [Rollup](https://cenfun.github.io/monocart-coverage-reports/rollup) and [Esbuild](https://cenfun.github.io/monocart-coverage-reports/esbuild); Collect with [puppeteer](https://cenfun.github.io/monocart-coverage-reports/puppeteer/); [anonymous](https://cenfun.github.io/monocart-coverage-reports/anonymous/) and [css](https://cenfun.github.io/monocart-coverage-reports/css/)
+    - Node.js: Collect with [env](https://cenfun.github.io/monocart-coverage-reports/node-env), and also V8 [API](https://cenfun.github.io/monocart-coverage-reports/node-api), [Inspector](https://cenfun.github.io/monocart-coverage-reports/node-ins) and [CDP](https://cenfun.github.io/monocart-coverage-reports/node-cdp); Web server example: [koa](https://cenfun.github.io/monocart-coverage-reports/node-koa/)
 
 ![](./assets/v8.gif)
 

package/lib/converter/ast.js

@@ -306,7 +306,7 @@ const addCssRules = (list, coverageList, coveredRanges, empty) => {
 const getCssAstInfo = (item, coverageList) => {
 
     const {
-        source, sourcePath, ranges, empty
+        source, ranges, empty
     } = item;
 
     // sort covered ranges
@@ -320,9 +320,7 @@ const getCssAstInfo = (item, coverageList) => {
         };
     });
 
-    const time_start_parse = new Date();
     const ast = parseCss(source);
-    Util.logTime(`parse css: ${sourcePath}`, time_start_parse);
 
     addCssRules(ast.nodes, coverageList, coveredRanges, empty);
 

package/lib/converter/collect-source-maps.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const path = require('path');
 const EC = require('eight-colors');
 const { fileURLToPath, pathToFileURL } = require('url');
 const Concurrency = require('../platform/concurrency.js');
@@ -66,16 +67,49 @@ const getSourceMapUrl = (content, url) => {
     }
 };
 
-const resolveSourceMap = (data) => {
-    if (data) {
-        const {
-            sources, sourcesContent, mappings
-        } = data;
-        if (!sources || !sourcesContent || !mappings) {
-            return;
+const resolveSourcesContent = async (sources, url) => {
+    const list = [];
+    for (const file of sources) {
+        const sourceUrl = Util.resolveUrl(file, url);
+        if (sourceUrl) {
+            const sourcePath = sourceUrl.toString();
+            if (sourcePath.startsWith('file:')) {
+                const content = await Util.readFile(path.resolve(fileURLToPath(sourcePath)));
+                list.push(content);
+                continue;
+            }
         }
+        Util.logDebug(EC.red(`failed to load source content ${file}`));
+    }
+    if (list.length === sources.length) {
+        return list;
+    }
+};
+
+const resolveSourceMap = async (data, url) => {
+    if (!data) {
+        return;
+    }
+    const {
+        sources, sourcesContent, mappings
+    } = data;
+
+    if (!sources || !mappings) {
+        return;
+    }
+
+    // exists sources content
+    if (sourcesContent && sourcesContent.length === sources.length) {
         return data;
     }
+
+    // load sources content by sources
+    const contents = await resolveSourcesContent(sources, url);
+    if (contents) {
+        data.sourcesContent = contents;
+        return data;
+    }
+
 };
 
 const saveSourceFile = async (filePath, data) => {
@@ -92,7 +126,7 @@ const saveSourceFile = async (filePath, data) => {
 
 const collectSourceMaps = async (v8list, options) => {
 
-    let count = 0;
+    const smList = [];
     const concurrency = new Concurrency();
     for (const item of v8list) {
 
@@ -130,8 +164,11 @@ const collectSourceMaps = async (v8list, options) => {
             // from inline sync
             const smc = convertSourceMap.fromSource(source);
             if (smc) {
-                sourceData.sourceMap = resolveSourceMap(smc.sourcemap);
-                count += 1;
+                sourceData.sourceMap = await resolveSourceMap(smc.sourcemap, url);
+                smList.push({
+                    url,
+                    inline: true
+                });
                 await saveSourceFile(sourcePath, sourceData);
                 continue;
             }
@@ -154,16 +191,20 @@ const collectSourceMaps = async (v8list, options) => {
 
     // from url concurrency
     await concurrency.start(async (item) => {
-        const sourceData = item.sourceData;
-        const data = await loadSourceMap(item.sourceMapUrl);
+        const { sourceMapUrl, sourceData } = item;
+        const { url } = sourceData;
+        const data = await loadSourceMap(sourceMapUrl);
         if (data) {
-            sourceData.sourceMap = resolveSourceMap(data);
-            count += 1;
+            sourceData.sourceMap = await resolveSourceMap(data, url);
+            smList.push({
+                url,
+                sourceMapUrl
+            });
         }
         await saveSourceFile(item.sourcePath, sourceData);
     });
 
-    return count;
+    return smList;
 
 };
 

package/lib/converter/converter.js

@@ -1300,6 +1300,7 @@ const convertV8List = (v8list, options) => {
         }
 
         // ============================
+        const time_start_ast = Date.now();
         // move functions and ranges to coverageList
         let coverageList = [];
         let astInfo;
@@ -1318,6 +1319,7 @@ const convertV8List = (v8list, options) => {
                 delete item.ranges;
             }
         }
+        Util.logTime(`- parsed ast: ${sourcePath}`, time_start_ast);
 
         // console.log(sourcePath, astInfo.statements.length);
         // ============================
@@ -1345,14 +1347,19 @@ const convertV8List = (v8list, options) => {
             v8Data: item
         };
 
+        const time_start_unpack = Date.now();
         unpackDistFile(item, state, options);
+        Util.logTime(`- unpacked dist: ${sourcePath}`, time_start_unpack);
 
         stateList.push(state);
 
     }
 
-    return generateV8DataList(stateList, options);
+    const time_start_convert = Date.now();
+    const dataList = generateV8DataList(stateList, options);
+    Util.logTime('- generated v8 data list', time_start_convert);
 
+    return dataList;
 };
 
 module.exports = {

package/lib/generate.js

@@ -247,7 +247,7 @@ const getCoverageResults = async (dataList, sourceCache, options) => {
         const {
             v8DataList, coverageData, fileSources
         } = results;
-        Util.logTime(`converted v8 data: ${v8DataList.length}`, time_start);
+        Util.logTime(`converted v8 list: ${v8DataList.length}`, time_start);
 
         return generateV8ListReports(v8DataList, coverageData, fileSources, options);
     }