move source map info from coverage object to jest-runtime

integration_tests/coverage-remapping/typescript-preprocessor.js

@@ -24,8 +24,8 @@ module.exports = {
         }
       );
       return {
-        content: result.outputText,
-        sourceMap: JSON.parse(result.sourceMapText),
+        code: result.outputText,
+        map: JSON.parse(result.sourceMapText),
       };
     }
     return src;

packages/jest-cli/src/TestRunner.js

@@ -523,6 +523,7 @@ const buildFailureTestResult = (
       unmatched: 0,
       updated: 0,
     },
+    sourceMaps: {},
     testExecError: err,
     testFilePath: testPath,
     testResults: [],

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

@@ -39,5 +39,5 @@ it('generates an empty coverage object for a file without running it', () => {
     baseCacheDir: os.tmpdir(),
     cacheDirectory: os.tmpdir(),
     rootDir: os.tmpdir(),
-  })).toMatchSnapshot();
+  }).coverage).toMatchSnapshot();
 });

packages/jest-cli/src/generateEmptyCoverage.js

@@ -20,10 +20,13 @@ module.exports = function(source: string, filename: Path, config: Config) {
   if (shouldInstrument(filename, config)) {
     // Transform file without instrumentation first, to make sure produced
     // source code is ES6 (no flowtypes etc.) and can be instrumented
-    source = transformSource(filename, config, source, false);
+    const transformResult = transformSource(filename, config, source, false);
     const instrumenter = IstanbulInstrument.createInstrumenter();
-    instrumenter.instrumentSync(source, filename);
-    return instrumenter.fileCoverage;
+    instrumenter.instrumentSync(transformResult.code, filename);
+    return {
+      coverage: instrumenter.fileCoverage,
+      sourceMapPath: transformResult.sourceMapPath,
+    };
   } else {
     return null;
   }

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

@@ -45,18 +45,16 @@ class CoverageReporter extends BaseReporter {
     aggregatedResults: AggregatedResult,
   ) {
     if (testResult.coverage) {
-      if (config.mapCoverage) {
-        Object.keys(testResult.coverage).map(path => {
-          // $FlowFixMe - ignores null check above
-          const {inputSourceMapPath} = testResult.coverage[path];
-          if (inputSourceMapPath) {
-            this._sourceMapStore.registerURL(path, inputSourceMapPath);
-          }
-        });
-      }
       this._coverageMap.merge(testResult.coverage);
       // Remove coverage data to free up some memory.
       delete testResult.coverage;
+
+      Object.keys(testResult.sourceMaps).forEach(sourcePath => {
+        this._sourceMapStore.registerURL(
+          sourcePath,
+          testResult.sourceMaps[sourcePath]
+        );
+      });
     }
   }
 
@@ -117,9 +115,15 @@ class CoverageReporter extends BaseReporter {
         if (!this._coverageMap.data[filename]) {
           try {
             const source = fs.readFileSync(filename).toString();
-            const coverage = generateEmptyCoverage(source, filename, config);
-            if (coverage) {
-              this._coverageMap.addFileCoverage(coverage);
+            const result = generateEmptyCoverage(source, filename, config);
+            if (result) {
+              this._coverageMap.addFileCoverage(result.coverage);
+              if (result.sourceMapPath) {
+                this._sourceMapStore.registerURL(
+                  filename,
+                  result.sourceMapPath
+                );
+              }
             }
           } catch (e) {
             console.error(chalk.red(`

packages/jest-cli/src/runTest.js

@@ -59,6 +59,7 @@ function runTest(path: Path, config: Config, resolver: Resolver) {
       result.perfStats = {end: Date.now(), start};
       result.testFilePath = path;
       result.coverage = runtime.getAllCoverageInfo();
+      result.sourceMaps = runtime.getSourceMapInfo();
       result.console = testConsole.getBuffer();
       result.skipped = testCount === result.numPendingTests;
       return result;

packages/jest-runtime/src/__tests__/__snapshots__/transform-test.js.snap

@@ -1,20 +1,3 @@
-exports[`transform does not instrument with source map if mapCoverage config option is false 1`] = `
-"({\\"Object.<anonymous>\\":function(module,exports,require,__dirname,__filename,global,jest){/* istanbul ignore next */var cov_25u22311x4 = function () {var path = \\"/fruits/banana.js\\",hash = \\"4a81f91764b586e5729481ba491440a08d658002\\",global = new Function('return this')(),gcv = \\"__coverage__\\",coverageData = { path: \\"/fruits/banana.js\\", statementMap: { \\"0\\": { start: { line: 1, column: 0 }, end: { line: 1, column: 7 } } }, fnMap: {}, branchMap: {}, s: { \\"0\\": 0 }, f: {}, b: {}, _coverageSchema: \\"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c\\" },coverage = global[gcv] || (global[gcv] = {});if (coverage[path] && coverage[path].hash === hash) {return coverage[path];}coverageData.hash = hash;return coverage[path] = coverageData;}();++cov_25u22311x4.s[0];content;
-}});"
-`;
-
-exports[`transform instruments with source map if preprocessor inlines it 1`] = `
-"({\\"Object.<anonymous>\\":function(module,exports,require,__dirname,__filename,global,jest){/* istanbul ignore next */var cov_25u22311x4 = function () {var path = \\"/fruits/banana.js\\",hash = \\"051b2f7208d7f64ba1cda9a8fec8ebb925b6a32a\\",global = new Function('return this')(),gcv = \\"__coverage__\\",coverageData = { path: \\"/fruits/banana.js\\", statementMap: { \\"0\\": { start: { line: 1, column: 8 }, end: { line: 1, column: 9 } } }, fnMap: {}, branchMap: {}, s: { \\"0\\": 0 }, f: {}, b: {}, _coverageSchema: \\"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c\\" },coverage = global[gcv] || (global[gcv] = {});if (coverage[path] && coverage[path].hash === hash) {return coverage[path];}coverageData.hash = hash;return coverage[path] = coverageData;}();var x = /* istanbul ignore next */(++cov_25u22311x4.s[0], 1);
-;global.__coverage__['/fruits/banana.js'].inputSourceMapPath = '/cache/jest-transform-cache-test/ab/banana_ab.map';
-}});"
-`;
-
-exports[`transform instruments with source map if preprocessor supplies it 1`] = `
-"({\\"Object.<anonymous>\\":function(module,exports,require,__dirname,__filename,global,jest){/* istanbul ignore next */var cov_25u22311x4 = function () {var path = \\"/fruits/banana.js\\",hash = \\"4a81f91764b586e5729481ba491440a08d658002\\",global = new Function('return this')(),gcv = \\"__coverage__\\",coverageData = { path: \\"/fruits/banana.js\\", statementMap: { \\"0\\": { start: { line: 1, column: 0 }, end: { line: 1, column: 7 } } }, fnMap: {}, branchMap: {}, s: { \\"0\\": 0 }, f: {}, b: {}, _coverageSchema: \\"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c\\" },coverage = global[gcv] || (global[gcv] = {});if (coverage[path] && coverage[path].hash === hash) {return coverage[path];}coverageData.hash = hash;return coverage[path] = coverageData;}();++cov_25u22311x4.s[0];content;
-;global.__coverage__['/fruits/banana.js'].inputSourceMapPath = '/cache/jest-transform-cache-test/ab/banana_ab.map';
-}});"
-`;
-
 exports[`transform transforms a file properly 1`] = `
 "({\\"Object.<anonymous>\\":function(module,exports,require,__dirname,__filename,global,jest){/* istanbul ignore next */var cov_25u22311x4 = function () {var path = \\"/fruits/banana.js\\",hash = \\"04636d4ae73b4b3e24bf6fba39e08c946fd0afb5\\",global = new Function('return this')(),gcv = \\"__coverage__\\",coverageData = { path: \\"/fruits/banana.js\\", statementMap: { \\"0\\": { start: { line: 1, column: 0 }, end: { line: 1, column: 26 } } }, fnMap: {}, branchMap: {}, s: { \\"0\\": 0 }, f: {}, b: {}, _coverageSchema: \\"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c\\" },coverage = global[gcv] || (global[gcv] = {});if (coverage[path] && coverage[path].hash === hash) {return coverage[path];}coverageData.hash = hash;return coverage[path] = coverageData;}();++cov_25u22311x4.s[0];module.exports = \\"banana\\";
 }});"

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

@@ -28,7 +28,7 @@ it('instruments files', () => {
     collectCoverage: true,
     rootDir: '/',
   };
-  const instrumented = transform(FILE_PATH_TO_INSTRUMENT, config);
+  const instrumented = transform(FILE_PATH_TO_INSTRUMENT, config).script;
   expect(instrumented instanceof vm.Script).toBe(true);
   // We can't really snapshot the resulting coverage, because it depends on
   // absolute path of the file, which will be different on different

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

@@ -156,7 +156,7 @@ describe('transform', () => {
 
   it('transforms a file properly', () => {
     config.collectCoverage = true;
-    const response = transform('/fruits/banana.js', config);
+    const response = transform('/fruits/banana.js', config).script;
 
     expect(response instanceof vm.Script).toBe(true);
     expect(vm.Script.mock.calls[0][0]).toMatchSnapshot();
@@ -166,7 +166,7 @@ describe('transform', () => {
     expect(fs.readFileSync).toBeCalledWith('/fruits/banana.js', 'utf8');
 
     // in-memory cache
-    const response2 = transform('/fruits/banana.js', config);
+    const response2 = transform('/fruits/banana.js', config).script;
     expect(response2).toBe(response);
 
     transform('/fruits/kiwi.js', config);
@@ -227,40 +227,32 @@ describe('transform', () => {
   });
 
   it('instruments with source map if preprocessor supplies it', () => {
-    if (skipOnWindows.test()) { //snapshot has os-dependent path separators
-      return;
-    }
-
     config = Object.assign(config, {
       collectCoverage: true,
       mapCoverage: true,
       transform: [['^.+\\.js$', 'preprocessor-with-sourcemaps']],
     });
 
-    const sourceMap = { 
+    const map = { 
       mappings: ';AAAA', 
       version: 3, 
     };
 
     require('preprocessor-with-sourcemaps').process.mockReturnValue({
-      content: 'content',
-      sourceMap,
+      code: 'content',
+      map,
     });
 
-    transform('/fruits/banana.js', config);
-    expect(vm.Script.mock.calls[0][0]).toMatchSnapshot();
+    const result = transform('/fruits/banana.js', config);
+    expect(result.sourceMapPath).toEqual(expect.any(String));
     expect(fs.writeFileSync).toBeCalledWith(
-      '/cache/jest-transform-cache-test/ab/banana_ab.map',
-      JSON.stringify(sourceMap),
+      result.sourceMapPath,
+      JSON.stringify(map),
       'utf8',
     );
   });
 
   it('instruments with source map if preprocessor inlines it', () => {
-    if (skipOnWindows.test()) { //snapshot has os-dependent path separators
-      return;
-    }
-
     config = Object.assign(config, {
       collectCoverage: true,
       mapCoverage: true,
@@ -278,10 +270,10 @@ describe('transform', () => {
 
     require('preprocessor-with-sourcemaps').process.mockReturnValue(content);
 
-    transform('/fruits/banana.js', config);
-    expect(vm.Script.mock.calls[0][0]).toMatchSnapshot();
+    const result = transform('/fruits/banana.js', config);
+    expect(result.sourceMapPath).toEqual(expect.any(String));
     expect(fs.writeFileSync).toBeCalledWith(
-      '/cache/jest-transform-cache-test/ab/banana_ab.map',
+      result.sourceMapPath,
       sourceMap,
       'utf8',
     );
@@ -304,8 +296,9 @@ describe('transform', () => {
       sourceMap,
     });
 
-    transform('/fruits/banana.js', config);
-    expect(vm.Script.mock.calls[0][0]).toMatchSnapshot();
+    const result = transform('/fruits/banana.js', config);
+    expect(result.sourceMapPath).toBeFalsy();
+    expect(fs.writeFileSync).toHaveBeenCalledTimes(1);
   });
 
   it('reads values from the cache', () => {

packages/jest-runtime/src/index.js

@@ -87,6 +87,7 @@ class Runtime {
   _shouldAutoMock: boolean;
   _shouldMockModuleCache: BooleanObject;
   _shouldUnmockTransitiveDependenciesCache: BooleanObject;
+  _sourceMapRegistry: {[key: string]: string};
   _transitiveShouldMock: BooleanObject;
   _unmockList: ?RegExp;
   _virtualMocks: BooleanObject;
@@ -99,6 +100,7 @@ class Runtime {
     this._moduleRegistry = Object.create(null);
     this._internalModuleRegistry = Object.create(null);
     this._mockRegistry = Object.create(null);
+    this._sourceMapRegistry = Object.create(null);
     this._config = config;
     this._environment = environment;
     this._resolver = resolver;
@@ -391,6 +393,15 @@ class Runtime {
     return this._environment.global.__coverage__;
   }
 
+  getSourceMapInfo() {
+    return Object.keys(this._sourceMapRegistry).reduce((result, sourcePath) => {
+      if (fs.existsSync(this._sourceMapRegistry[sourcePath])) {
+        result[sourcePath] = this._sourceMapRegistry[sourcePath];
+      }
+      return result;
+    }, {});
+  }
+
   setMock(
     from: string,
     moduleName: string,
@@ -438,9 +449,17 @@ class Runtime {
     localModule.paths = this._resolver.getModulePaths(dirname);
     localModule.require = this._createRequireImplementation(filename, options);
 
-    const script = transform(filename, this._config, {isInternalModule});
+    const transformedFile = transform(
+      filename,
+      this._config,
+      {isInternalModule}
+    );
+
+    if (transformedFile.sourceMapPath) {
+      this._sourceMapRegistry[filename] = transformedFile.sourceMapPath;
+    }
 
-    const wrapper = this._environment.runScript(script)[
+    const wrapper = this._environment.runScript(transformedFile.script)[
       transform.EVAL_RESULT_VARIABLE
     ];
     wrapper.call(