monocart-coverage-reports 2.4.1 → 2.4.3

package/lib/converter/converter.js

@@ -826,7 +826,6 @@ const getOriginalDecodedMappings = (originalDecodedMap, sourceIndex, locator) =>
 
     // add offset and index
     decodedMappings.forEach((item, i) => {
-        item.originalIndex = i;
         item.originalOffset = locator.locationToOffset({
             line: item.originalLine + 1,
             column: item.originalColumn

package/lib/converter/find-original-range.js

@@ -266,13 +266,13 @@ const getOriginalEndOffset = (m, rangeInfo) => {
     return m.originalEndOffset;
 };
 
-const getOriginalText = (m1, m2, rangeInfo) => {
+const getOriginalText = (m1, m2, rangeInfo, direction) => {
     const originalLocator = rangeInfo.originalState.locator;
 
     const o1 = m1.originalOffset;
     const o2 = m2.originalOffset;
 
-    // most of time o1 < o2
+    // o1 < o2: most of time
     if (o1 < o2) {
         // could be multiple lines for original text
         return {
@@ -291,10 +291,28 @@ const getOriginalText = (m1, m2, rangeInfo) => {
         };
     }
 
-    // o1 > o2
+    // o1 > o2: should be wrong sourcemap
+
+    // just reverse offsets if few cross lines
+    const crossLines = m1.originalLine - m2.originalLine;
+    if (crossLines < 2) {
+        return {
+            originalOffset: o2,
+            originalText: originalLocator.getSlice(o2, o1)
+        };
+    }
+
+    // if (direction === 'start') {
+    // should be m2 ?
+    // console.log(direction, rangeInfo.originalState.sourcePath);
+    // console.log(m1, m2);
+    // }
+
+    // should be wrong, ignore m2
+    const originalEndOffset = getOriginalEndOffset(m1, rangeInfo);
     return {
-        originalOffset: o2,
-        originalText: originalLocator.getSlice(o2, o1)
+        originalOffset: o1,
+        originalText: originalLocator.getSlice(o1, originalEndOffset)
     };
 
 };
@@ -350,29 +368,6 @@ const getGeneratedText = (m1, m2, state, offset) => {
 
 };
 
-const checkOriginalMappings = (m1, m2, direction) => {
-    // check original offset order
-    if (m1.originalOffset <= m2.originalOffset) {
-        return;
-    }
-
-    // just reverse offsets if few cross lines
-    const crossLines = m1.originalLine - m2.originalLine;
-    if (crossLines < 2) {
-        return;
-    }
-
-    // console.log('================================================');
-    // console.log(crossLines);
-    // console.log(m1, m2);
-
-    // should be mistake
-    return {
-        error: true,
-        errors: [`invalid original ${direction}: ${EC.yellow(m1.originalOffset)} > ${EC.yellow(m2.originalOffset)}`]
-    };
-};
-
 // ========================================================================================================
 
 const getFixedOriginalStart = (start, mappings, state, rangeInfo) => {
@@ -387,12 +382,7 @@ const getFixedOriginalStart = (start, mappings, state, rangeInfo) => {
     }
 
     const direction = 'start';
-    const errorInfo = checkOriginalMappings(m1, m2, direction);
-    if (errorInfo) {
-        return errorInfo;
-    }
-
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, start);
 
     const originalPos = getFixedPosition({
@@ -402,6 +392,17 @@ const getFixedOriginalStart = (start, mappings, state, rangeInfo) => {
         originalState
     }, direction);
 
+    // if (start === 2660) {
+    //     console.log('=====================================================');
+    //     console.log('fixed start', originalState.sourcePath);
+    //     console.log({
+    //         generatedText,
+    //         generatedPos,
+    //         originalText,
+    //         originalPos
+    //     });
+    // }
+
     return {
         originalStart: originalOffset + originalPos
     };
@@ -431,12 +432,7 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
     }
 
     const direction = 'end';
-    const errorInfo = checkOriginalMappings(m1, m2, direction);
-    if (errorInfo) {
-        return errorInfo;
-    }
-
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, end);
 
     const originalPos = getFixedPosition({
@@ -446,6 +442,17 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
         originalState
     }, direction);
 
+    // if (end === 2858) {
+    //     console.log('=====================================================');
+    //     console.log('fixed end', originalState.sourcePath);
+    //     console.log({
+    //         generatedText,
+    //         generatedPos,
+    //         originalText,
+    //         originalPos
+    //     });
+    // }
+
     return {
         originalEnd: originalOffset + originalPos
     };

package/lib/generate.js

@@ -39,11 +39,6 @@ const getReportGroup = (reports, lcov, dataType) => {
 
     const reportMap = {};
 
-    // add lcovonly report
-    if (lcov) {
-        reportMap.lcovonly = {};
-    }
-
     const reportList = Util.toList(reports, ',');
     reportList.forEach((it) => {
         if (Util.isList(it)) {
@@ -67,6 +62,11 @@ const getReportGroup = (reports, lcov, dataType) => {
         reportMap[defaultReport] = {};
     }
 
+    // add lcovonly report after default report
+    if (lcov && !reportMap.lcovonly) {
+        reportMap.lcovonly = {};
+    }
+
     const allBuildInReports = {
         // v8
         'v8': 'v8',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.4.1",
+    "version": "2.4.3",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {