fix(coverage): remove work-around for implicit else (#6014)

AriPerkkio · web-flow · commit 368c13728149 · 2024-07-02T13:14:20.000+02:00
diff --git a/packages/coverage-istanbul/package.json b/packages/coverage-istanbul/package.json
@@ -49,7 +49,7 @@
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-report": "^3.0.1",
-    "istanbul-lib-source-maps": "^5.0.5",
+    "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.1.7",
     "magicast": "^0.3.4",
     "picocolors": "^1.0.1",
diff --git a/packages/coverage-istanbul/src/provider.ts b/packages/coverage-istanbul/src/provider.ts
@@ -415,8 +415,6 @@ export class IstanbulCoverageProvider
 }
 
 async function transformCoverage(coverageMap: CoverageMap) {
-  includeImplicitElseBranches(coverageMap)
-
   const sourceMapStore = libSourceMaps.createSourceMapStore()
   return await sourceMapStore.transformCoverage(coverageMap)
 }
@@ -429,44 +427,3 @@ async function transformCoverage(coverageMap: CoverageMap) {
 function removeQueryParameters(filename: string) {
   return filename.split('?')[0]
 }
-
-/**
- * Work-around for #1887 and #2239 while waiting for https://github.com/istanbuljs/istanbuljs/pull/706
- *
- * Goes through all files in the coverage map and checks if branchMap's have
- * if-statements with implicit else. When finds one, copies source location of
- * the if-statement into the else statement.
- */
-function includeImplicitElseBranches(coverageMap: CoverageMap) {
-  for (const file of coverageMap.files()) {
-    const fileCoverage = coverageMap.fileCoverageFor(file)
-
-    for (const branchMap of Object.values(fileCoverage.branchMap)) {
-      if (branchMap.type === 'if') {
-        const lastIndex = branchMap.locations.length - 1
-
-        if (lastIndex > 0) {
-          const elseLocation = branchMap.locations[lastIndex]
-
-          if (elseLocation && isEmptyCoverageRange(elseLocation)) {
-            const ifLocation = branchMap.locations[0]
-
-            elseLocation.start = { ...ifLocation.start }
-            elseLocation.end = { ...ifLocation.end }
-          }
-        }
-      }
-    }
-  }
-}
-
-function isEmptyCoverageRange(range: libCoverage.Range) {
-  return (
-    range.start === undefined
-    || range.start.line === undefined
-    || range.start.column === undefined
-    || range.end === undefined
-    || range.end.line === undefined
-    || range.end.column === undefined
-  )
-}
diff --git a/packages/coverage-v8/package.json b/packages/coverage-v8/package.json
@@ -49,7 +49,7 @@
     "debug": "^4.3.5",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.1",
-    "istanbul-lib-source-maps": "^5.0.5",
+    "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.1.7",
     "magic-string": "^0.30.10",
     "magicast": "^0.3.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/coverage-test/test/__snapshots__/pre-transpiled-istanbul.snapshot.json b/test/coverage-test/test/__snapshots__/pre-transpiled-istanbul.snapshot.json
@@ -156,14 +156,8 @@
             }
           },
           {
-            "start": {
-              "line": 2,
-              "column": 2
-            },
-            "end": {
-              "line": 5,
-              "column": 3
-            }
+            "start": {},
+            "end": {}
           }
         ]
       },
@@ -191,14 +185,8 @@
             }
           },
           {
-            "start": {
-              "line": 10,
-              "column": 2
-            },
-            "end": {
-              "line": 13,
-              "column": 3
-            }
+            "start": {},
+            "end": {}
           }
         ]
       },
@@ -226,14 +214,8 @@
             }
           },
           {
-            "start": {
-              "line": 15,
-              "column": 2
-            },
-            "end": {
-              "line": 18,
-              "column": 3
-            }
+            "start": {},
+            "end": {}
           }
         ]
       }
diff --git a/test/coverage-test/test/__snapshots__/results-istanbul.snapshot.json b/test/coverage-test/test/__snapshots__/results-istanbul.snapshot.json
@@ -438,14 +438,8 @@
             }
           },
           {
-            "start": {
-              "line": 33,
-              "column": 2
-            },
-            "end": {
-              "line": 36,
-              "column": null
-            }
+            "start": {},
+            "end": {}
           }
         ]
       },
@@ -473,14 +467,8 @@
             }
           },
           {
-            "start": {
-              "line": 39,
-              "column": 2
-            },
-            "end": {
-              "line": 42,
-              "column": null
-            }
+            "start": {},
+            "end": {}
           }
         ]
       }

Original file line number	Diff line number	Diff line change
`@@ -156,14 +156,8 @@`
`156`	`156`	`}`
`157`	`157`	`},`
`158`	`158`	`{`
`159`		`- "start": {`
`160`		`- "line": 2,`
`161`		`- "column": 2`
`162`		`- },`
`163`		`- "end": {`
`164`		`- "line": 5,`
`165`		`- "column": 3`
`166`		`- }`
	`159`	`+ "start": {},`
	`160`	`+ "end": {}`
`167`	`161`	`}`
`168`	`162`	`]`
`169`	`163`	`},`
`@@ -191,14 +185,8 @@`
`191`	`185`	`}`
`192`	`186`	`},`
`193`	`187`	`{`
`194`		`- "start": {`
`195`		`- "line": 10,`
`196`		`- "column": 2`
`197`		`- },`
`198`		`- "end": {`
`199`		`- "line": 13,`
`200`		`- "column": 3`
`201`		`- }`
	`188`	`+ "start": {},`
	`189`	`+ "end": {}`
`202`	`190`	`}`
`203`	`191`	`]`
`204`	`192`	`},`
`@@ -226,14 +214,8 @@`
`226`	`214`	`}`
`227`	`215`	`},`
`228`	`216`	`{`
`229`		`- "start": {`
`230`		`- "line": 15,`
`231`		`- "column": 2`
`232`		`- },`
`233`		`- "end": {`
`234`		`- "line": 18,`
`235`		`- "column": 3`
`236`		`- }`
	`217`	`+ "start": {},`
	`218`	`+ "end": {}`
`237`	`219`	`}`
`238`	`220`	`]`
`239`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,14 +438,8 @@`
`438`	`438`	`}`
`439`	`439`	`},`
`440`	`440`	`{`
`441`		`- "start": {`
`442`		`- "line": 33,`
`443`		`- "column": 2`
`444`		`- },`
`445`		`- "end": {`
`446`		`- "line": 36,`
`447`		`- "column": null`
`448`		`- }`
	`441`	`+ "start": {},`
	`442`	`+ "end": {}`
`449`	`443`	`}`
`450`	`444`	`]`
`451`	`445`	`},`
`@@ -473,14 +467,8 @@`
`473`	`467`	`}`
`474`	`468`	`},`
`475`	`469`	`{`
`476`		`- "start": {`
`477`		`- "line": 39,`
`478`		`- "column": 2`
`479`		`- },`
`480`		`- "end": {`
`481`		`- "line": 42,`
`482`		`- "column": null`
`483`		`- }`
	`470`	`+ "start": {},`
	`471`	`+ "end": {}`
`484`	`472`	`}`
`485`	`473`	`]`
`486`	`474`	`}`