* Maintaining internal mapCoverage, map only for files which are inst…

…rumented by us

* Feat: Return sourcemap from babel-jest

CHANGELOG.md

@@ -55,12 +55,9 @@
 
 ### Chore & Maintenance
 
-<<<<<<< HEAD
 * `[filenames]` Standardize file names in root
   ([#5500](https://github.com/facebook/jest/pull/5500))
 
-=======
->>>>>>> 429db664... * Removed usage of mapCoverage.
 ## jest 22.2.1
 
 ### Fixes

integration-tests/__tests__/coverage_remapping_inline_sourcemap.test.js

@@ -11,7 +11,7 @@
 
 const {readFileSync} = require('fs');
 const path = require('path');
-const skipOnWindows = require('../../scripts/skip_on_windows');
+const skipOnWindows = require('../../scripts/SkipOnWindows');
 const {cleanup, run} = require('../utils');
 const runJest = require('../runJest');
 

packages/babel-jest/src/index.js

@@ -74,6 +74,7 @@ const createTransformer = (options: any): Transformer => {
   options = Object.assign({}, options, {
     plugins: (options && options.plugins) || [],
     presets: ((options && options.presets) || []).concat([jestPreset]),
+    sourceMaps: 'both',
   });
   delete options.cacheDirectory;
   delete options.filename;
@@ -110,18 +111,11 @@ const createTransformer = (options: any): Transformer => {
       const altExts = config.moduleFileExtensions.map(
         extension => '.' + extension,
       );
-      const shouldUseInline =
-        transformOptions &&
-        (transformOptions.returnSourceString == null ||
-          transformOptions.returnSourceString);
-      const sourceMapOpts = {
-        sourceMaps: shouldUseInline ? 'inline' : true,
-      };
       if (babelUtil && !babelUtil.canCompile(filename, altExts)) {
         return src;
       }
 
-      const theseOptions = Object.assign({filename}, options, sourceMapOpts);
+      const theseOptions = Object.assign({filename}, options);
       if (transformOptions && transformOptions.instrument) {
         theseOptions.auxiliaryCommentBefore = ' istanbul ignore next ';
         // Copied from jest-runtime transform.js
@@ -144,7 +138,12 @@ const createTransformer = (options: any): Transformer => {
         return src;
       }
 
-      return shouldUseInline ? transformResult.code : transformResult;
+      const shouldReturnCodeOnly =
+        transformOptions &&
+        (transformOptions.returnSourceString == null ||
+          transformOptions.returnSourceString);
+
+      return shouldReturnCodeOnly ? transformResult.code : transformResult;
     },
   };
 };

packages/jest-cli/src/reporters/coverage_reporter.js

@@ -58,9 +58,11 @@ export default class CoverageReporter extends BaseReporter {
       delete testResult.coverage;
 
       Object.keys(testResult.sourceMaps).forEach(sourcePath => {
-        let coverage: FileCoverage, inputSourceMap: ?Object;
+        let inputSourceMap: ?Object;
         try {
-          coverage = this._coverageMap.fileCoverageFor(sourcePath);
+          const coverage: FileCoverage = this._coverageMap.fileCoverageFor(
+            sourcePath,
+          );
           ({inputSourceMap} = coverage.toJSON());
         } finally {
           if (inputSourceMap) {
@@ -81,17 +83,9 @@ export default class CoverageReporter extends BaseReporter {
     aggregatedResults: AggregatedResult,
   ) {
     await this._addUntestedFiles(this._globalConfig, contexts);
-    let map = this._coverageMap;
-    let sourceFinder: Object;
-    const transformedCoverage = this._sourceMapStore.transformCoverage(map);
-
-    if (
-      transformedCoverage.map &&
-      transformedCoverage.map.data &&
-      Object.keys(transformedCoverage.map.data).length > 0
-    ) {
-      ({map, sourceFinder} = transformedCoverage);
-    }
+    const {map, sourceFinder} = this._sourceMapStore.transformCoverage(
+      this._coverageMap,
+    );
 
     const reporter = createReporter();
     try {

packages/jest-runner/src/run_test.js

@@ -123,9 +123,7 @@ async function runTestInternal(
     result.perfStats = {end: Date.now(), start};
     result.testFilePath = path;
     result.coverage = runtime.getAllCoverageInfoCopy();
-    result.sourceMaps = runtime.getSourceMapInfo(
-      Object.keys(result.coverage || {}),
-    );
+    result.sourceMaps = runtime.getSourceMapInfo();
     result.console = testConsole.getBuffer();
     result.skipped = testCount === result.numPendingTests;
     result.displayName = config.displayName;

packages/jest-runtime/src/index.js

@@ -95,6 +95,7 @@ class Runtime {
   _mockRegistry: {[key: string]: any, __proto__: null};
   _moduleMocker: ModuleMocker;
   _moduleRegistry: ModuleRegistry;
+  _needsCoverageMapped: string[];
   _resolver: Resolver;
   _shouldAutoMock: boolean;
   _shouldMockModuleCache: BooleanObject;
@@ -129,6 +130,7 @@ class Runtime {
     this._mockRegistry = Object.create(null);
     this._moduleMocker = this._environment.moduleMocker;
     this._moduleRegistry = Object.create(null);
+    this._needsCoverageMapped = [];
     this._resolver = resolver;
     this._scriptTransformer = new ScriptTransformer(config);
     this._shouldAutoMock = config.automock;
@@ -435,10 +437,10 @@ class Runtime {
     return deepCyclicCopy(this._environment.global.__coverage__);
   }
 
-  getSourceMapInfo(coveredFiles: Array<string>) {
+  getSourceMapInfo() {
     return Object.keys(this._sourceMapRegistry).reduce((result, sourcePath) => {
       if (
-        coveredFiles.includes(sourcePath) &&
+        this._needsCoverageMapped.includes(sourcePath) &&
         fs.existsSync(this._sourceMapRegistry[sourcePath])
       ) {
         result[sourcePath] = this._sourceMapRegistry[sourcePath];
@@ -533,6 +535,9 @@ class Runtime {
 
     if (transformedFile.sourceMapPath) {
       this._sourceMapRegistry[filename] = transformedFile.sourceMapPath;
+      if (transformedFile.mapCoverage) {
+        this._needsCoverageMapped.push(filename);
+      }
     }
 
     const wrapper = this._environment.runScript(transformedFile.script)[

packages/jest-runtime/src/script_transformer.js

@@ -185,13 +185,26 @@ export default class ScriptTransformer {
     // Ignore cache if `config.cache` is set (--no-cache)
     let code = this._config.cache ? readCodeCacheFile(cacheFilePath) : null;
 
+    const shouldCallTransform =
+      transform && shouldTransform(filename, this._config);
+
+    // That means that the transform has a custom instrumentation
+    // logic and will handle it based on `config.collectCoverage` option
+    const transformWillInstrument =
+      shouldCallTransform && transform && transform.canInstrument;
+
+    // If we handle the coverage instrumentation, we should try to map code
+    // coverage against original source with any provided source map
+    const mapCoverage = instrument && !transformWillInstrument;
+
     if (code) {
       // This is broken: we return the code, and a path for the source map
       // directly from the cache. But, nothing ensures the source map actually
       // matches that source code. They could have gotten out-of-sync in case
       // two separate processes write concurrently to the same cache files.
       return {
         code,
+        mapCoverage,
         sourceMapPath,
       };
     }
@@ -201,7 +214,7 @@ export default class ScriptTransformer {
       map: null,
     };
 
-    if (transform && shouldTransform(filename, this._config)) {
+    if (transform && shouldCallTransform) {
       const processed = transform.process(content, filename, this._config, {
         instrument,
         returnSourceString: false,
@@ -228,11 +241,7 @@ export default class ScriptTransformer {
       }
     }
 
-    // That means that the transform has a custom instrumentation
-    // logic and will handle it based on `config.collectCoverage` option
-    const transformDidInstrument = transform && transform.canInstrument;
-
-    if (!transformDidInstrument && instrument) {
+    if (!transformWillInstrument && instrument) {
       code = this._instrumentFile(filename, transformed.code);
     } else {
       code = transformed.code;
@@ -252,6 +261,7 @@ export default class ScriptTransformer {
 
     return {
       code,
+      mapCoverage,
       sourceMapPath,
     };
   }
@@ -270,6 +280,7 @@ export default class ScriptTransformer {
 
     let wrappedCode: string;
     let sourceMapPath: ?string = null;
+    let mapCoverage = false;
 
     const willTransform =
       !isInternalModule &&
@@ -286,11 +297,13 @@ export default class ScriptTransformer {
 
         wrappedCode = wrap(transformedSource.code);
         sourceMapPath = transformedSource.sourceMapPath;
+        mapCoverage = transformedSource.mapCoverage;
       } else {
         wrappedCode = wrap(content);
       }
 
       return {
+        mapCoverage,
         script: new vm.Script(wrappedCode, {
           displayErrors: true,
           filename: isCoreModule ? 'jest-nodejs-core-' + filename : filename,

types/Transform.js

@@ -17,6 +17,7 @@ export type TransformedSource = {|
 
 export type TransformResult = {|
   script: Script,
+  mapCoverage: boolean,
   sourceMapPath: ?string,
 |};