Coverage mapping

packages/jest-cli/src/__tests__/generateEmptyCoverage-test.js

@@ -36,9 +36,14 @@ module.exports = {
 
 it('generates an empty coverage object for a file without running it', () => {
   expect(
-    generateEmptyCoverage(src, '/sum.js', {}, {
-      cacheDirectory: os.tmpdir(),
-      rootDir: os.tmpdir(),
-    }).coverage,
+    generateEmptyCoverage(
+      src,
+      '/sum.js',
+      {},
+      {
+        cacheDirectory: os.tmpdir(),
+        rootDir: os.tmpdir(),
+      },
+    ).coverage,
   ).toMatchSnapshot();
 });

packages/jest-cli/src/generateEmptyCoverage.js

@@ -26,6 +26,7 @@ module.exports = function(
     collectCoverage: globalConfig.collectCoverage,
     collectCoverageFrom: globalConfig.collectCoverageFrom,
     collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
+    mapCoverage: globalConfig.mapCoverage,
   };
   if (shouldInstrument(filename, coverageOptions, config)) {
     // Transform file without instrumentation first, to make sure produced
@@ -34,6 +35,7 @@ module.exports = function(
       filename,
       source,
       false,
+      globalConfig.mapCoverage,
     );
     const instrumenter = IstanbulInstrument.createInstrumenter();
     instrumenter.instrumentSync(transformResult.code, filename);

packages/jest-cli/src/runTest.js

@@ -12,6 +12,7 @@
 import type {GlobalConfig, Path, ProjectConfig} from 'types/Config';
 import type {TestResult} from 'types/TestResult';
 import type {Resolver} from 'types/Resolve';
+import type RuntimeClass from 'jest-runtime';
 
 const BufferedConsole = require('./lib/BufferedConsole');
 const {Console, NullConsole, setGlobal} = require('jest-util');
@@ -52,7 +53,9 @@ function runTest(
   /* $FlowFixMe */
   const TestRunner = require(config.testRunner);
   /* $FlowFixMe */
-  const Runtime = require(config.moduleLoader || 'jest-runtime');
+  const Runtime = (require(config.moduleLoader || 'jest-runtime'): Class<
+    RuntimeClass
+  >);
 
   const env = new TestEnvironment(config);
   const TestConsole = globalConfig.verbose
@@ -75,6 +78,7 @@ function runTest(
     collectCoverage: globalConfig.collectCoverage,
     collectCoverageFrom: globalConfig.collectCoverageFrom,
     collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
+    mapCoverage: globalConfig.mapCoverage,
   });
   const start = Date.now();
   return TestRunner(globalConfig, config, env, runtime, path)

packages/jest-runtime/src/ScriptTransformer.js

@@ -33,6 +33,7 @@ export type Options = {|
   collectCoverageFrom: Array<Glob>,
   collectCoverageOnlyFrom: ?{[key: string]: boolean},
   isInternalModule?: boolean,
+  mapCoverage: boolean,
 |};
 
 const cache: Map<string, TransformResult> = new Map();
@@ -50,7 +51,12 @@ class ScriptTransformer {
     this._transformCache = new Map();
   }
 
-  _getCacheKey(fileData: string, filename: Path, instrument: boolean): string {
+  _getCacheKey(
+    fileData: string,
+    filename: Path,
+    instrument: boolean,
+    mapCoverage: boolean,
+  ): string {
     if (!configToJsonMap.has(this._config)) {
       // We only need this set of config options that can likely influence
       // cached output instead of all config options.
@@ -69,6 +75,7 @@ class ScriptTransformer {
         .update(fileData)
         .update(configString)
         .update(instrument ? 'instrument' : '')
+        .update(mapCoverage ? 'mapCoverage' : '')
         .digest('hex');
     }
   }
@@ -77,13 +84,19 @@ class ScriptTransformer {
     filename: Path,
     content: string,
     instrument: boolean,
+    mapCoverage: boolean,
   ): Path {
     const baseCacheDir = getCacheFilePath(
       this._config.cacheDirectory,
       'jest-transform-cache-' + this._config.name,
       VERSION,
     );
-    const cacheKey = this._getCacheKey(content, filename, instrument);
+    const cacheKey = this._getCacheKey(
+      content,
+      filename,
+      instrument,
+      mapCoverage,
+    );
     // Create sub folders based on the cacheKey to avoid creating one
     // directory with many files.
     const cacheDir = path.join(baseCacheDir, cacheKey[0] + cacheKey[1]);
@@ -160,9 +173,19 @@ class ScriptTransformer {
     }).code;
   }
 
-  transformSource(filename: Path, content: string, instrument: boolean) {
+  transformSource(
+    filename: Path,
+    content: string,
+    instrument: boolean,
+    mapCoverage: boolean,
+  ) {
     const transform = this._getTransformer(filename);
-    const cacheFilePath = this._getFileCachePath(filename, content, instrument);
+    const cacheFilePath = this._getFileCachePath(
+      filename,
+      content,
+      instrument,
+      mapCoverage,
+    );
     let sourceMapPath = cacheFilePath + '.map';
     // Ignore cache if `config.cache` is set (--no-cache)
     let code = this._config.cache
@@ -193,7 +216,7 @@ class ScriptTransformer {
       }
     }
 
-    if (this._config.mapCoverage) {
+    if (mapCoverage) {
       if (!transformed.map) {
         const convert = require('convert-source-map');
         const inlineSourceMap = convert.fromSource(transformed.code);
@@ -215,7 +238,7 @@ class ScriptTransformer {
       code = transformed.code;
     }
 
-    if (instrument && transformed.map && this._config.mapCoverage) {
+    if (instrument && transformed.map && mapCoverage) {
       const sourceMapContent = typeof transformed.map === 'string'
         ? transformed.map
         : JSON.stringify(transformed.map);
@@ -254,6 +277,7 @@ class ScriptTransformer {
           filename,
           content,
           instrument,
+          !!(options && options.mapCoverage),
         );
 
         wrappedCode = wrap(transformedSource.code);

packages/jest-runtime/src/__tests__/ScriptTransformer-test.js

@@ -220,7 +220,6 @@ describe('ScriptTransformer', () => {
 
   it('writes source map if preprocessor supplies it', () => {
     config = Object.assign(config, {
-      mapCoverage: true,
       transform: [['^.+\\.js$', 'preprocessor-with-sourcemaps']],
     });
     const scriptTransformer = new ScriptTransformer(config);
@@ -237,6 +236,7 @@ describe('ScriptTransformer', () => {
 
     const result = scriptTransformer.transform('/fruits/banana.js', {
       collectCoverage: true,
+      mapCoverage: true,
     });
     expect(result.sourceMapPath).toEqual(expect.any(String));
     expect(fs.writeFileSync).toBeCalledWith(
@@ -248,7 +248,6 @@ describe('ScriptTransformer', () => {
 
   it('writes source map if preprocessor inlines it', () => {
     config = Object.assign(config, {
-      mapCoverage: true,
       transform: [['^.+\\.js$', 'preprocessor-with-sourcemaps']],
     });
     const scriptTransformer = new ScriptTransformer(config);
@@ -267,6 +266,7 @@ describe('ScriptTransformer', () => {
 
     const result = scriptTransformer.transform('/fruits/banana.js', {
       collectCoverage: true,
+      mapCoverage: true,
     });
     expect(result.sourceMapPath).toEqual(expect.any(String));
     expect(fs.writeFileSync).toBeCalledWith(
@@ -276,9 +276,8 @@ describe('ScriptTransformer', () => {
     );
   });
 
-  it('does not write source map if mapCoverage config option is false', () => {
+  it('does not write source map if mapCoverage option is false', () => {
     config = Object.assign(config, {
-      mapCoverage: false,
       transform: [['^.+\\.js$', 'preprocessor-with-sourcemaps']],
     });
     const scriptTransformer = new ScriptTransformer(config);
@@ -295,6 +294,7 @@ describe('ScriptTransformer', () => {
 
     const result = scriptTransformer.transform('/fruits/banana.js', {
       collectCoverage: true,
+      mapCoverage: false,
     });
     expect(result.sourceMapPath).toBeFalsy();
     expect(fs.writeFileSync).toHaveBeenCalledTimes(1);

packages/jest-runtime/src/index.js

@@ -54,6 +54,7 @@ type CoverageOptions = {
   collectCoverage: boolean,
   collectCoverageFrom: Array<Glob>,
   collectCoverageOnlyFrom: ?{[key: string]: boolean},
+  mapCoverage: boolean,
 };
 
 type BooleanObject = {[key: string]: boolean};
@@ -121,6 +122,7 @@ class Runtime {
       collectCoverage: false,
       collectCoverageFrom: [],
       collectCoverageOnlyFrom: null,
+      mapCoverage: false,
     };
     this._currentlyExecutingModulePath = '';
     this._environment = environment;
@@ -186,6 +188,7 @@ class Runtime {
         collectCoverage: options.collectCoverage,
         collectCoverageFrom: options.collectCoverageFrom,
         collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
+        mapCoverage: options.mapCoverage,
       },
       config,
     );
@@ -500,6 +503,7 @@ class Runtime {
         collectCoverageFrom: this._coverageOptions.collectCoverageFrom,
         collectCoverageOnlyFrom: this._coverageOptions.collectCoverageOnlyFrom,
         isInternalModule,
+        mapCoverage: this._coverageOptions.mapCoverage,
       },
       this._cacheFS[filename],
     );