monocart-coverage-reports 2.7.0 → 2.7.1

package/README.md

@@ -324,9 +324,10 @@ Options:
     - `mcr.config.json` - json format
     - `.mcrrc.js`
     - `.mcrrc` - json format
-    - `mcr.config.ts` - it requires `NODE_OPTIONS="--loader ts-node/esm"`
+    - `mcr.config.ts`
 
 - Working with `ts-node`, see [mcr-ts-node](https://github.com/cenfun/mcr-ts-node)
+- Working with `tsx`, see [mcr-tsx](https://github.com/cenfun/mcr-tsx)
 
 ## Compare Reports
 | | Istanbul | V8 | V8 to Istanbul |

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

@@ -54,22 +54,37 @@ const getSourceMapUrl = (content, url) => {
     }
 };
 
-const resolveSourcesContent = (sources, url) => {
-    const list = [];
-    for (const file of sources) {
+const resolveSourcesContent = (data, url) => {
+
+    const { sources, sourcesContent } = data;
+
+    let failed = false;
+    sources.forEach((file, i) => {
+        if (typeof sourcesContent[i] === 'string') {
+            return;
+        }
+
         const sourceUrl = Util.resolveUrl(file, url);
         if (sourceUrl) {
-            const sourcePath = sourceUrl.toString();
+            let sourcePath = sourceUrl.toString();
+            // could be no `file:`
             if (sourcePath.startsWith('file:')) {
-                const content = Util.readFileSync(path.resolve(fileURLToPath(sourcePath)));
-                list.push(content);
-                continue;
+                sourcePath = fileURLToPath(sourcePath);
+            }
+            const content = Util.readFileSync(path.resolve(sourcePath));
+            if (typeof content === 'string') {
+                sourcesContent[i] = content;
+                return;
             }
         }
+
         Util.logDebug(EC.red(`failed to load source content ${file}`));
-    }
-    if (list.length === sources.length) {
-        return list;
+        failed = true;
+    });
+
+
+    if (!failed) {
+        return data;
     }
 };
 
@@ -85,17 +100,19 @@ const resolveSourceMap = (data, url) => {
         return;
     }
 
-    // exists sources content
-    if (sourcesContent && sourcesContent.length === sources.length) {
-        return data;
+    // check sources content
+    if (sourcesContent) {
+        // all should be string, could be [null]
+        const contents = sourcesContent.filter((content) => typeof content === 'string');
+        if (contents.length === sources.length) {
+            return data;
+        }
+    } else {
+        data.sourcesContent = [];
     }
 
     // load sources content by sources
-    const contents = resolveSourcesContent(sources, url);
-    if (contents) {
-        data.sourcesContent = contents;
-        return data;
-    }
+    return resolveSourcesContent(data, url);
 
 };
 

package/lib/converter/converter.js

@@ -1069,12 +1069,12 @@ const generateCoverageForDist = (state) => {
 
 const unpackSourceMap = (state, options) => {
 
-    const { sourceMap } = state;
+    const { sourceMap, sourcePath } = state;
 
     // keep original urls
     const fileUrls = {};
     const sourcePathHandler = getSourcePathHandler(options);
-    initSourceMapSourcePath(sourceMap, fileUrls, sourcePathHandler);
+    initSourceMapSourcePath(sourceMap, fileUrls, sourcePath, sourcePathHandler);
     state.fileUrls = fileUrls;
 
     // ===============================================

package/lib/index.d.ts

@@ -255,7 +255,7 @@ declare namespace MCR {
          * 
          * {object} Replace key with value.
          * */
-        sourcePath?: ((filePath: string) => string) | {
+        sourcePath?: ((filePath: string, info: any) => string) | {
             [key: string]: string;
         };
 

package/lib/utils/source-path.js

@@ -119,7 +119,7 @@ const initIstanbulSourcePath = (coverageData, fileSources, sourcePathHandler) =>
         }
 
         // new source path, second is source url
-        const newSourcePath = sourcePathHandler(sourcePath, '');
+        const newSourcePath = sourcePathHandler(sourcePath, item);
         if (typeof newSourcePath === 'string' && newSourcePath) {
             sourcePath = newSourcePath;
         }
@@ -148,7 +148,7 @@ const mergeSourceRoot = (sourceRoot, sourceName) => {
     return sourceRoot + sourceName;
 };
 
-const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
+const initSourceMapSourcePath = (sourceMap, fileUrls, distFile, sourcePathHandler) => {
     // reset sourceRoot
     const sourceRoot = sourceMap.sourceRoot || '';
     sourceMap.sourceRoot = '';
@@ -165,7 +165,11 @@ const initSourceMapSourcePath = (sourceMap, fileUrls, sourcePathHandler) => {
 
         let sourcePath = getSourcePath(sourceUrl, i + 1);
         if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, sourceUrl);
+            // sourcePath could be a filename only, may using distFile to get full path
+            const newSourcePath = sourcePathHandler(sourcePath, {
+                url: sourceUrl,
+                distFile
+            });
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/lib/v8/v8.js

@@ -144,7 +144,7 @@ const initV8ListAndSourcemap = async (v8list, options) => {
         // resolve source path
         let sourcePath = getSourcePath(data.url, i + 1, data.type);
         if (sourcePathHandler) {
-            const newSourcePath = sourcePathHandler(sourcePath, data.url);
+            const newSourcePath = sourcePathHandler(sourcePath, data);
             if (typeof newSourcePath === 'string' && newSourcePath) {
                 sourcePath = newSourcePath;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.7.0",
+    "version": "2.7.1",
     "description": "Code coverage tool to generate native V8 reports or Istanbul reports.",
     "main": "./lib/index.js",
     "bin": {
@@ -58,22 +58,22 @@
         "url": "git+https://github.com/cenfun/monocart-coverage-reports.git"
     },
     "dependencies": {
-        "console-grid": "~2.2.2",
-        "eight-colors": "~1.3.0",
-        "istanbul-lib-coverage": "~3.2.2",
-        "istanbul-lib-report": "~3.0.1",
-        "istanbul-reports": "~3.1.7",
-        "lz-utils": "~2.0.2",
-        "monocart-code-viewer": "~1.1.2",
-        "monocart-formatter": "~2.3.2",
-        "turbogrid": "~3.0.13"
+        "console-grid": "^2.2.2",
+        "eight-colors": "^1.3.0",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.7",
+        "lz-utils": "^2.0.2",
+        "monocart-code-viewer": "^1.1.2",
+        "monocart-formatter": "^2.3.2",
+        "turbogrid": "^3.0.13"
     },
     "devDependencies": {
         "commander": "^12.0.0",
         "eslint": "^8.57.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^8.0.0",
-        "eslint-plugin-vue": "^9.22.0",
+        "eslint-plugin-vue": "^9.23.0",
         "minimatch": "^9.0.3",
         "stylelint": "^16.2.1",
         "stylelint-config-plus": "^1.1.0",