[WIP] Remove usage of retainLines

.babelrc

@@ -8,6 +8,5 @@
     "transform-async-to-generator",
     "transform-strict-mode",
     ["transform-es2015-modules-commonjs", {"allowTopLevelThis": true}]
-  ],
-  "retainLines": true
+  ]
 }

integration-tests/__tests__/__snapshots__/failures.test.js.snap

@@ -118,7 +118,7 @@ exports[`works with async failures 1`] = `
     +   \\"foo\\": \\"bar\\",
       }
 
-      at ../../packages/expect/build/index.js:145:57
+      at ../../packages/expect/build/index.js:104:76
 
 "
 `;

integration-tests/__tests__/location_in_results.test.js

@@ -28,6 +28,6 @@ it('adds correct location info when provided with flag', () => {
   const assertions = result.testResults[0].assertionResults;
   expect(result.success).toBe(true);
   expect(result.numTotalTests).toBe(2);
-  expect(assertions[0].location).toEqual({column: 1, line: 9});
-  expect(assertions[1].location).toEqual({column: 3, line: 14});
+  expect(assertions[0].location).toEqual({column: 1, line: 10});
+  expect(assertions[1].location).toEqual({column: 2, line: 15});
 });

integration-tests/location-in-results/__tests__/test.js

@@ -4,7 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';
+// This file is missing 'use strict' to force babel into doing something
+// as we have `transform-strict-mode`
 
 it('no ancestors', () => {
   expect(true).toBeTruthy();

packages/babel-jest/src/index.js

@@ -74,7 +74,6 @@ const createTransformer = (options: any): Transformer => {
   options = Object.assign({}, options, {
     plugins: (options && options.plugins) || [],
     presets: ((options && options.presets) || []).concat([jestPreset]),
-    retainLines: true,
     sourceMaps: 'both',
   });
   delete options.cacheDirectory;

packages/jest-jasmine2/package.json

@@ -18,6 +18,7 @@
     "jest-matcher-utils": "^22.2.0",
     "jest-message-util": "^22.2.0",
     "jest-snapshot": "^22.2.0",
+    "source-map": "^0.6.0",
     "source-map-support": "^0.5.0"
   },
   "devDependencies": {

packages/jest-jasmine2/src/index.js

@@ -15,13 +15,48 @@ import type {TestResult} from 'types/TestResult';
 import type Runtime from 'jest-runtime';
 
 import path from 'path';
-import fs from 'fs';
 import callsites from 'callsites';
+import {SourceMapConsumer} from 'source-map';
 import JasmineReporter from './reporter';
 import {install as jasmineAsyncInstall} from './jasmine_async';
 
 const JASMINE = require.resolve('./jasmine/jasmine_light.js');
 
+// Copied from https://github.com/rexxars/sourcemap-decorate-callsites/blob/5b9735a156964973a75dc62fd2c7f0c1975458e8/lib/index.js#L113-L158
+function extendCallsite(callsite, consumer) {
+  const getLineNumber = callsite.getLineNumber;
+  const getColumnNumber = callsite.getColumnNumber;
+  let position = null;
+
+  function getPosition() {
+    if (!position) {
+      position = consumer.originalPositionFor({
+        column: getColumnNumber.call(callsite),
+        line: getLineNumber.call(callsite),
+      });
+    }
+
+    return position;
+  }
+
+  Object.defineProperties(callsite, {
+    getColumnNumber: {
+      value() {
+        return getPosition().column || getColumnNumber.call(callsite);
+      },
+      writable: false,
+    },
+    getLineNumber: {
+      value() {
+        return getPosition().line || getLineNumber.call(callsite);
+      },
+      writable: false,
+    },
+  });
+
+  return callsite;
+}
+
 async function jasmine2(
   globalConfig: GlobalConfig,
   config: ProjectConfig,
@@ -53,6 +88,17 @@ async function jasmine2(
     environment.global.it = (...args) => {
       const stack = callsites()[1];
       const it = originalIt(...args);
+      const sourceMapForFile = runtime.getSourceMapForFile(stack.getFileName());
+
+      if (sourceMapForFile) {
+        try {
+          const consumer = new SourceMapConsumer(sourceMapForFile);
+
+          extendCallsite(stack, consumer);
+        } catch (e) {
+          // ignored
+        }
+      }
 
       it.result.__callsite = stack;
 
@@ -125,12 +171,11 @@ async function jasmine2(
       environment: 'node',
       handleUncaughtExceptions: false,
       retrieveSourceMap: source => {
-        if (runtime._sourceMapRegistry[source]) {
+        const sourceMap = runtime.getSourceMapForFile(source);
+        if (sourceMap) {
           try {
             return {
-              map: JSON.parse(
-                fs.readFileSync(runtime._sourceMapRegistry[source]),
-              ),
+              map: JSON.parse(sourceMap),
               url: source,
             };
           } catch (e) {}

packages/jest-runtime/src/index.js

@@ -449,6 +449,16 @@ class Runtime {
     }, {});
   }
 
+  getSourceMapForFile(filename: string): ?string {
+    const sourceMap = this._sourceMapRegistry[filename];
+
+    if (sourceMap && fs.existsSync(sourceMap)) {
+      return fs.readFileSync(sourceMap, 'utf8');
+    }
+
+    return null;
+  }
+
   setMock(
     from: string,
     moduleName: string,

packages/jest-util/src/buffered_console.js

@@ -41,6 +41,7 @@ export default class BufferedConsole extends Console {
     message: LogMessage,
     level: ?number,
   ) {
+    // TODO: This callsite needs to read sourcemaps
     const call = callsites()[level != null ? level : 2];
     const origin = call.getFileName() + ':' + call.getLineNumber();