c8 7.7.1 → 7.7.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.7.2](https://www.github.com/bcoe/c8/compare/v7.7.1...v7.7.2) (2021-05-02)
+
+
+### Bug Fixes
+
+* address bugs with source remapping on Windows ([#301](https://www.github.com/bcoe/c8/issues/301)) ([c817902](https://www.github.com/bcoe/c8/commit/c81790262f843c01b3d14390fde81dbdbcf2226f))
+
 ### [7.7.1](https://www.github.com/bcoe/c8/compare/v7.7.0...v7.7.1) (2021-04-07)
 
 

package/lib/report.js

@@ -1,10 +1,10 @@
 const Exclude = require('test-exclude')
-const furi = require('furi')
 const libCoverage = require('istanbul-lib-coverage')
 const libReport = require('istanbul-lib-report')
 const reports = require('istanbul-reports')
 const { readdirSync, readFileSync, statSync } = require('fs')
 const { isAbsolute, resolve, extname } = require('path')
+const { pathToFileURL, fileURLToPath } = require('url')
 const getSourceMapFromFile = require('./source-map-from-file')
 // TODO: switch back to @c88/v8-coverage once patch is landed.
 const v8toIstanbul = require('v8-to-istanbul')
@@ -139,8 +139,8 @@ class Report {
    */
   _getSourceMap (v8ScriptCov) {
     const sources = {}
-    if (this.sourceMapCache[`file://${v8ScriptCov.url}`]) {
-      const sourceMapAndLineLengths = this.sourceMapCache[`file://${v8ScriptCov.url}`]
+    const sourceMapAndLineLengths = this.sourceMapCache[pathToFileURL(v8ScriptCov.url).href]
+    if (sourceMapAndLineLengths) {
       // See: https://github.com/nodejs/node/pull/34305
       if (!sourceMapAndLineLengths.data) return
       sources.sourceMap = {
@@ -173,7 +173,7 @@ class Report {
     for (const v8ProcessCov of this._loadReports()) {
       if (this._isCoverageObject(v8ProcessCov)) {
         if (v8ProcessCov['source-map-cache']) {
-          Object.assign(this.sourceMapCache, v8ProcessCov['source-map-cache'])
+          Object.assign(this.sourceMapCache, this._normalizeSourceMapCache(v8ProcessCov['source-map-cache']))
         }
         v8ProcessCovs.push(this._normalizeProcessCov(v8ProcessCov, fileIndex))
       }
@@ -194,7 +194,7 @@ class Report {
               const stat = statSync(fullPath)
               const sourceMap = getSourceMapFromFile(fullPath)
               if (sourceMap) {
-                this.sourceMapCache[`file://${fullPath}`] = { data: sourceMap }
+                this.sourceMapCache[pathToFileURL(fullPath)] = { data: sourceMap }
               }
               emptyReports.push({
                 scriptId: 0,
@@ -275,7 +275,7 @@ class Report {
       }
       if (/^file:\/\//.test(v8ScriptCov.url)) {
         try {
-          v8ScriptCov.url = furi.toSysPath(v8ScriptCov.url)
+          v8ScriptCov.url = fileURLToPath(v8ScriptCov.url)
           fileIndex.add(v8ScriptCov.url)
         } catch (err) {
           debuglog(`${err.stack}`)
@@ -290,6 +290,23 @@ class Report {
     }
     return { result }
   }
+
+  /**
+   * Normalizes a V8 source map cache.
+   *
+   * This function normalizes file URLs to a system-independent format.
+   *
+   * @param v8SourceMapCache V8 source map cache to normalize.
+   * @return {v8SourceMapCache} Normalized V8 source map cache.
+   * @private
+   */
+  _normalizeSourceMapCache (v8SourceMapCache) {
+    const cache = {}
+    for (const fileURL of Object.keys(v8SourceMapCache)) {
+      cache[pathToFileURL(fileURLToPath(fileURL)).href] = v8SourceMapCache[fileURL]
+    }
+    return cache
+  }
 }
 
 module.exports = function (opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c8",
-  "version": "7.7.1",
+  "version": "7.7.2",
   "description": "output coverage reports using Node.js' built in coverage",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -37,7 +37,6 @@
     "@istanbuljs/schema": "^0.1.2",
     "find-up": "^5.0.0",
     "foreground-child": "^2.0.0",
-    "furi": "^2.0.0",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",