Removed usage of mapCoverage from codebase

jestjs · cpojer · Feb 15, 2018 · Jan 21, 2018 · Feb 7, 2018 · Feb 10, 2018
commit f927798ba637352ae29d08ff00e60561a1494764
diff --git a/TestUtils.js b/TestUtils.js
@@ -32,7 +32,6 @@ const DEFAULT_GLOBAL_CONFIG: GlobalConfig = {
   lastCommit: false,
   listTests: false,
   logHeapUsage: false,
-  mapCoverage: false,
   maxWorkers: 2,
   noSCM: null,
   noStackTrace: false,

diff --git a/integration-tests/__tests__/__snapshots__/coverage_remapping_inline_sourcemap.test.js.snap b/integration-tests/__tests__/__snapshots__/coverage_remapping_inline_sourcemap.test.js.snap
@@ -3,6 +3,7 @@
 exports[`maps code coverage against original source 1`] = `
 Object {
   "covered.js": Object {
+    "_coverageSchema": "332fd63041d2c1bcb487cc26dd0d5f7d97098a6c",
     "b": Object {},
     "branchMap": Object {},
     "f": Object {
@@ -12,18 +13,19 @@ Object {
       "0": Object {
         "decl": Object {
           "end": Object {
-            "column": 17,
+            "column": 36,
             "line": 2,
           },
           "start": Object {
             "column": 26,
             "line": 2,
           },
         },
+        "line": 2,
         "loc": Object {
           "end": Object {
-            "column": 0,
-            "line": 2,
+            "column": 1,
+            "line": 5,
           },
           "start": Object {
             "column": 58,
@@ -42,8 +44,8 @@ Object {
     "statementMap": Object {
       "0": Object {
         "end": Object {
-          "column": -1,
-          "line": null,
+          "column": 2,
+          "line": 5,
         },
         "start": Object {
           "column": 0,
@@ -52,18 +54,18 @@ Object {
       },
       "1": Object {
         "end": Object {
-          "column": 24,
+          "column": 41,
           "line": 3,
         },
         "start": Object {
-          "column": 9,
+          "column": 34,
           "line": 3,
         },
       },
       "2": Object {
         "end": Object {
-          "column": -1,
-          "line": null,
+          "column": 33,
+          "line": 4,
         },
         "start": Object {
           "column": 2,

diff --git a/integration-tests/__tests__/__snapshots__/show_config.test.js.snap b/integration-tests/__tests__/__snapshots__/show_config.test.js.snap
@@ -75,7 +75,6 @@ exports[`--showConfig outputs config info and exits 1`] = `
     \\"globalSetup\\": null,
     \\"globalTeardown\\": null,
     \\"listTests\\": false,
-    \\"mapCoverage\\": false,
     \\"maxWorkers\\": \\"[maxWorkers]\\",
     \\"noStackTrace\\": false,
     \\"nonFlagArgs\\": [],

diff --git a/packages/babel-jest/src/index.js b/packages/babel-jest/src/index.js
@@ -8,7 +8,12 @@
  */
 
 import type {Path, ProjectConfig} from 'types/Config';
-import type {CacheKeyOptions, TransformOptions} from 'types/Transform';
+import type {
+  CacheKeyOptions,
+  Transformer,
+  TransformOptions,
+  TransformedSource,
+} from 'types/Transform';
 
 import crypto from 'crypto';
 import fs from 'fs';
@@ -23,7 +28,7 @@ const BABEL_CONFIG_KEY = 'babel';
 const PACKAGE_JSON = 'package.json';
 const THIS_FILE = fs.readFileSync(__filename);
 
-const createTransformer = (options: any) => {
+const createTransformer = (options: any): Transformer => {
   const cache = Object.create(null);
 
   const getBabelRC = filename => {
@@ -69,8 +74,6 @@ const createTransformer = (options: any) => {
   options = Object.assign({}, options, {
     plugins: (options && options.plugins) || [],
     presets: ((options && options.presets) || []).concat([jestPreset]),
-    retainLines: true,
-    sourceMaps: 'inline',
   });
   delete options.cacheDirectory;
   delete options.filename;
@@ -102,16 +105,23 @@ const createTransformer = (options: any) => {
       src: string,
       filename: Path,
       config: ProjectConfig,
-      transformOptions: TransformOptions,
-    ): string {
+      transformOptions?: TransformOptions,
+    ): string | TransformedSource {
       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);
+      const theseOptions = Object.assign({filename}, options, sourceMapOpts);
       if (transformOptions && transformOptions.instrument) {
         theseOptions.auxiliaryCommentBefore = ' istanbul ignore next ';
         // Copied from jest-runtime transform.js
@@ -129,7 +139,12 @@ const createTransformer = (options: any) => {
 
       // babel v7 might return null in the case when the file has been ignored.
       const transformResult = babelTransform(src, theseOptions);
-      return transformResult ? transformResult.code : src;
+
+      if (!transformResult) {
+        return src;
+      }
+
+      return shouldUseInline ? transformResult.code : transformResult;
     },
   };
 };

diff --git a/packages/jest-cli/src/generate_empty_coverage.js b/packages/jest-cli/src/generate_empty_coverage.js
@@ -27,14 +27,13 @@ export default function(
     collectCoverage: globalConfig.collectCoverage,
     collectCoverageFrom: globalConfig.collectCoverageFrom,
     collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
-    mapCoverage: globalConfig.mapCoverage,
   };
   if (Runtime.shouldInstrument(filename, coverageOptions, config)) {
     // Transform file without instrumentation first, to make sure produced
     // source code is ES6 (no flowtypes etc.) and can be instrumented
     const transformResult = new Runtime.ScriptTransformer(
       config,
-    ).transformSource(filename, source, false, globalConfig.mapCoverage);
+    ).transformSource(filename, source, false);
     const instrumenter = createInstrumenter();
     instrumenter.instrumentSync(transformResult.code, filename);
     return {

diff --git a/packages/jest-cli/src/reporters/coverage_reporter.js b/packages/jest-cli/src/reporters/coverage_reporter.js
@@ -83,7 +83,15 @@ export default class CoverageReporter extends BaseReporter {
     await this._addUntestedFiles(this._globalConfig, contexts);
     let map = this._coverageMap;
     let sourceFinder: Object;
-    ({map, sourceFinder} = this._sourceMapStore.transformCoverage(map)); //eslint-disable-line
+    const transformedCoverage = this._sourceMapStore.transformCoverage(map);
+
+    if (
+      transformedCoverage.map &&
+      transformedCoverage.map.data &&
+      Object.keys(transformedCoverage.map.data).length > 0
+    ) {
+      ({map, sourceFinder} = transformedCoverage);
+    }
 
     const reporter = createReporter();
     try {

diff --git a/packages/jest-config/src/index.js b/packages/jest-config/src/index.js
@@ -112,7 +112,6 @@ const getConfigs = (
       lastCommit: options.lastCommit,
       listTests: options.listTests,
       logHeapUsage: options.logHeapUsage,
-      mapCoverage: options.mapCoverage,
       maxWorkers: options.maxWorkers,
       noSCM: undefined,
       noStackTrace: options.noStackTrace,

diff --git a/packages/jest-runner/src/run_test.js b/packages/jest-runner/src/run_test.js
@@ -105,7 +105,6 @@ async function runTestInternal(
     collectCoverage: globalConfig.collectCoverage,
     collectCoverageFrom: globalConfig.collectCoverageFrom,
     collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
-    mapCoverage: globalConfig.mapCoverage,
   });
 
   const start = Date.now();

diff --git a/packages/jest-runtime/src/__tests__/__snapshots__/script_transformer.test.js.snap b/packages/jest-runtime/src/__tests__/__snapshots__/script_transformer.test.js.snap
@@ -3,7 +3,6 @@
 exports[`ScriptTransformer passes expected transform options to getCacheKey 1`] = `
 Object {
   "instrument": true,
-  "mapCoverage": true,
   "rootDir": "/",
 }
 `;

diff --git a/packages/jest-runtime/src/index.js b/packages/jest-runtime/src/index.js
@@ -55,7 +55,6 @@ type CoverageOptions = {
   collectCoverage: boolean,
   collectCoverageFrom: Array<Glob>,
   collectCoverageOnlyFrom: ?{[key: string]: boolean, __proto__: null},
-  mapCoverage: boolean,
 };
 
 type ModuleRegistry = {[key: string]: Module, __proto__: null};
@@ -181,7 +180,6 @@ class Runtime {
         collectCoverage: options.collectCoverage,
         collectCoverageFrom: options.collectCoverageFrom,
         collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
-        mapCoverage: options.mapCoverage,
       },
       config,
     );
@@ -529,7 +527,6 @@ class Runtime {
         collectCoverageFrom: this._coverageOptions.collectCoverageFrom,
         collectCoverageOnlyFrom: this._coverageOptions.collectCoverageOnlyFrom,
         isInternalModule,
-        mapCoverage: this._coverageOptions.mapCoverage,
       },
       this._cacheFS[filename],
     );

diff --git a/packages/jest-runtime/src/script_transformer.js b/packages/jest-runtime/src/script_transformer.js
@@ -36,7 +36,6 @@ export type Options = {|
   collectCoverageOnlyFrom: ?{[key: string]: boolean, __proto__: null},
   isCoreModule?: boolean,
   isInternalModule?: boolean,
-  mapCoverage: boolean,
 |};
 
 const cache: Map<string, TransformResult> = new Map();
@@ -57,12 +56,7 @@ export default class ScriptTransformer {
     this._transformCache = new Map();
   }
 
-  _getCacheKey(
-    fileData: string,
-    filename: Path,
-    instrument: boolean,
-    mapCoverage: boolean,
-  ): string {
+  _getCacheKey(fileData: string, filename: Path, instrument: 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.
@@ -77,7 +71,6 @@ export default class ScriptTransformer {
         .update(
           transformer.getCacheKey(fileData, filename, configString, {
             instrument,
-            mapCoverage,
             rootDir: this._config.rootDir,
           }),
         )
@@ -89,7 +82,6 @@ export default class ScriptTransformer {
         .update(fileData)
         .update(configString)
         .update(instrument ? 'instrument' : '')
-        .update(mapCoverage ? 'mapCoverage' : '')
         .update(CACHE_VERSION)
         .digest('hex');
     }
@@ -99,19 +91,13 @@ export default class ScriptTransformer {
     filename: Path,
     content: string,
     instrument: boolean,
-    mapCoverage: boolean,
   ): Path {
     const baseCacheDir = HasteMap.getCacheFilePath(
       this._config.cacheDirectory,
       'jest-transform-cache-' + this._config.name,
       VERSION,
     );
-    const cacheKey = this._getCacheKey(
-      content,
-      filename,
-      instrument,
-      mapCoverage,
-    );
+    const cacheKey = this._getCacheKey(content, filename, instrument);
     // Create sub folders based on the cacheKey to avoid creating one
     // directory with many files.
     const cacheDir = path.join(baseCacheDir, cacheKey[0] + cacheKey[1]);
@@ -191,20 +177,10 @@ export default class ScriptTransformer {
     }
   }
 
-  transformSource(
-    filepath: Path,
-    content: string,
-    instrument: boolean,
-    mapCoverage: boolean,
-  ) {
+  transformSource(filepath: Path, content: string, instrument: boolean) {
     const filename = this._getRealPath(filepath);
     const transform = this._getTransformer(filename);
-    const cacheFilePath = this._getFileCachePath(
-      filename,
-      content,
-      instrument,
-      mapCoverage,
-    );
+    const cacheFilePath = this._getFileCachePath(filename, content, instrument);
     let sourceMapPath = cacheFilePath + '.map';
     // Ignore cache if `config.cache` is set (--no-cache)
     let code = this._config.cache ? readCodeCacheFile(cacheFilePath) : null;
@@ -228,6 +204,7 @@ export default class ScriptTransformer {
     if (transform && shouldTransform(filename, this._config)) {
       const processed = transform.process(content, filename, this._config, {
         instrument,
+        returnSourceString: false,
       });
 
       if (typeof processed === 'string') {
@@ -305,7 +282,6 @@ export default class ScriptTransformer {
           filename,
           content,
           instrument,
-          !!(options && options.mapCoverage),
         );
 
         wrappedCode = wrap(transformedSource.code);

diff --git a/types/Config.js b/types/Config.js
@@ -183,7 +183,6 @@ export type GlobalConfig = {|
   lastCommit: boolean,
   logHeapUsage: boolean,
   listTests: boolean,
-  mapCoverage: boolean,
   maxWorkers: number,
   noStackTrace: boolean,
   nonFlagArgs: Array<string>,

diff --git a/types/Transform.js b/types/Transform.js
@@ -22,17 +22,17 @@ export type TransformResult = {|
 
 export type TransformOptions = {|
   instrument: boolean,
+  returnSourceString?: boolean,
 |};
 
 export type CacheKeyOptions = {|
   instrument: boolean,
-  mapCoverage: boolean,
   rootDir: string,
 |};
 
 export type Transformer = {|
   canInstrument?: boolean,
-  createTransformer(options: any): Transformer,
+  createTransformer?: (options: any) => Transformer,
 
   getCacheKey: (
     fileData: string,