fix uncovered groups

cenfun · Sep 14, 2024 · 62974d6 · 62974d6
1 parent 1b8713e
commit 62974d6
Showing 1 changed file with 32 additions and 10 deletions.
diff --git a/lib/converter/converter.js b/lib/converter/converter.js
@@ -1339,7 +1339,7 @@ const mergeV8Data = (state, stateList) => {
     // console.log(stateList);
 
     // let debug = false;
-    // if (state.sourcePath.endsWith('component.js')) {
+    // if (state.sourcePath.endsWith('counter.tsx')) {
     //     debug = true;
     //     console.log('merge v8 data ===================================', state.sourcePath);
     //     console.log('bytes before ============', stateList.map((it) => it.bytes));
@@ -1356,7 +1356,7 @@ const mergeV8Data = (state, stateList) => {
     const uncoveredMap = new Map();
     const uncoveredGroups = [];
     stateList.forEach((st) => {
-        const group = new Map();
+        const groupMap = new Map();
         const bytes = dedupeCountRanges(st.bytes);
         bytes.forEach((range) => {
             const key = `${range.start}_${range.end}`;
@@ -1365,10 +1365,10 @@ const mergeV8Data = (state, stateList) => {
                 coveredMap.set(key, true);
             } else {
                 uncoveredMap.set(key, range);
-                group.set(key, true);
+                groupMap.set(key, range);
             }
         });
-        uncoveredGroups.push(group);
+        uncoveredGroups.push(groupMap);
     });
 
     // if (debug) {
@@ -1377,19 +1377,41 @@ const mergeV8Data = (state, stateList) => {
     //     console.log('uncoveredGroups ============', uncoveredGroups);
     // }
 
+    const isInUncoveredGroup = (range, key) => {
+
+        let num = 0;
+        uncoveredGroups.forEach((groupMap) => {
+            if (groupMap.has(key)) {
+                num += 1;
+                return;
+            }
+
+            for (const item of groupMap.values()) {
+                if (range.start >= item.start && range.end <= item.end) {
+                    num += 1;
+                    return;
+                }
+            }
+
+        });
+
+        if (num >= uncoveredGroups.length) {
+            return true;
+        }
+
+        return false;
+
+    };
+
     uncoveredMap.forEach((range, key) => {
         if (coveredMap.has(key)) {
             return;
         }
 
-        for (const group of uncoveredGroups) {
-            if (!group.has(key)) {
-                return;
-            }
+        if (isInUncoveredGroup(range, key)) {
+            mergedBytes.push(range);
         }
 
-        mergedBytes.push(range);
-
     });
 
     // will be dedupeCountRanges in collectFileCoverage