monocart-coverage-reports 2.6.4 → 2.6.5

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

@@ -97,6 +97,7 @@ const getBlockEndPosition = (originalLineText) => {
     // generatedPos: 17,
     // originalText: ' }}</slot>'
 
+    // end marks
     const list = ['>', '}', ')'];
     for (const s of list) {
         const endBlockIndex = originalLineText.lastIndexOf(s);
@@ -116,7 +117,11 @@ const getBlockEndPosition = (originalLineText) => {
 
 };
 
-const getComparedPosition = (gt, gp, ot, direction) => {
+const getComparedPosition = (info, direction) => {
+
+    let gt = info.generatedText;
+    const gp = info.generatedPos;
+    let ot = info.originalText;
 
     // before trim
     const oLen = ot.length;
@@ -175,45 +180,54 @@ const getComparedPosition = (gt, gp, ot, direction) => {
 
     // ============================
     // right matched
+    // only for original first line text
 
+    const olt = info.originalLineText;
     const right = gt.slice(gp);
-    if (ot.endsWith(right)) {
+    if (olt.endsWith(right)) {
         return {
-            pos: ot.length - right.length
+            pos: olt.length - right.length
         };
     }
 
 };
 
+const initOriginalLineText = (info) => {
+    const originalText = info.originalText;
+    // never cross line, using first line of original text
+    // trim end remove \r\n and \n
+    const originalLines = originalText.split(/\n/);
+    if (originalLines.length === 1) {
+        // already single line
+        info.originalLineText = originalText.trimEnd();
+        info.originalSingle = true;
+        return;
+    }
+    // multiple liens
+    info.originalLineText = originalLines[0].trimEnd();
+};
+
 const getSimilarPosition = (info, direction) => {
 
-    const {
-        generatedText, generatedPos, originalText
-    } = info;
+    initOriginalLineText(info);
 
-    const textPos = getComparedPosition(generatedText, generatedPos, originalText, direction);
+    const textPos = getComparedPosition(info, direction);
     if (textPos) {
         return textPos;
     }
 
-    // never cross line, using first line of original text
-    // trim end remove \r\n and \n
-    const originalLines = originalText.split(/\n/);
-    if (originalLines.length === 1) {
-        // already single line
-        info.originalLineText = originalText;
+    if (info.originalSingle) {
         return;
     }
 
-    const originalLineText = originalLines[0].trimEnd();
-    info.originalLineText = originalLineText;
-
+    // multiple lines
+    const { generatedPos, originalLineText } = info;
     // generatedPos not in first line
     if (generatedPos > originalLineText.length) {
         return;
     }
 
-    const linePos = getComparedPosition(generatedText, generatedPos, originalLineText, direction);
+    const linePos = getComparedPosition(info, direction);
     if (linePos) {
         return linePos;
     }
@@ -236,6 +250,7 @@ const getFixedPosition = (info, direction) => {
         return similarPos.pos;
     }
 
+
     // generatedText: never cross lines
     // originalText: could be multiple lines
     // originalLineText: single line originalText
@@ -266,7 +281,7 @@ const getOriginalEndOffset = (m, rangeInfo) => {
     return m.originalEndOffset;
 };
 
-const getOriginalText = (m1, m2, rangeInfo, direction) => {
+const getOriginalText = (m1, m2, rangeInfo) => {
     const originalLocator = rangeInfo.originalState.locator;
 
     const o1 = m1.originalOffset;
@@ -383,15 +398,17 @@ const getFixedOriginalStart = (start, mappings, state, rangeInfo) => {
     }
 
     const direction = 'start';
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, start);
 
-    const originalPos = getFixedPosition({
+    const info = {
         generatedText,
         generatedPos,
         originalText,
         originalState
-    }, direction);
+    };
+
+    const originalPos = getFixedPosition(info, direction);
 
     // if (start === 2660) {
     //     console.log('=====================================================');
@@ -437,7 +454,8 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
         const gt = state.locator.source[end];
         const oi = m2.originalOffset - 1;
         const ot = originalState.locator.source[oi];
-        if (gt === ot) {
+        // it could be ; but it quite far away
+        if (gt === ot && [';', ','].includes(gt)) {
             return {
                 originalEnd: oi
             };
@@ -456,24 +474,28 @@ const getFixedOriginalEnd = (end, mappings, state, rangeInfo) => {
     }
 
     const direction = 'end';
-    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo, direction);
+    const { originalText, originalOffset } = getOriginalText(m1, m2, rangeInfo);
     const { generatedText, generatedPos } = getGeneratedText(m1, m2, state, end);
 
-    const originalPos = getFixedPosition({
+    const info = {
+        offset: end,
         generatedText,
         generatedPos,
         originalText,
         originalState
-    }, direction);
+    };
 
-    // if (end === 2858) {
+    const originalPos = getFixedPosition(info, direction);
+
+    // if (end === 1304578) {
     //     console.log('=====================================================');
     //     console.log('fixed end', originalState.sourcePath);
     //     console.log({
     //         generatedText,
     //         generatedPos,
     //         originalText,
-    //         originalPos
+    //         originalPos,
+    //         originalLineText: info.originalLineText
     //     });
     // }