Fix source map output for .tsx files (#395)

Closes #393

Author: blakeembrey

package.json

@@ -49,11 +49,13 @@
   },
   "homepage": "https://github.com/TypeStrong/ts-node",
   "devDependencies": {
+    "@types/react": "^15.0.38",
     "chai": "^4.0.1",
     "istanbul": "^0.4.0",
     "mocha": "^3.0.0",
     "ntypescript": "^1.201507091536.1",
     "proxyquire": "^1.7.2",
+    "react": "^15.6.1",
     "rimraf": "^2.5.4",
     "semver": "^5.1.0",
     "tslint": "^5.0.0",

src/index.spec.ts

@@ -10,6 +10,8 @@ const testDir = join(__dirname, '../tests')
 const EXEC_PATH = join(__dirname, '../dist/bin')
 const BIN_EXEC = `node "${EXEC_PATH}" --project "${testDir}"`
 
+const SOURCE_MAP_REGEXP = /\/\/# sourceMappingURL=data:application\/json;charset=utf\-8;base64,[\w\+]+=*$/
+
 describe('ts-node', function () {
   this.timeout(10000)
 
@@ -177,7 +179,7 @@ describe('ts-node', function () {
     })
 
     it('should pipe into an eval script', function (done) {
-      const cp = exec(`${BIN_EXEC} -p 'declare var process: any\nprocess.stdin.isTTY'`, function (err, stdout) {
+      const cp = exec(`${BIN_EXEC} --fast -p 'process.stdin.isTTY'`, function (err, stdout) {
         expect(err).to.equal(null)
         expect(stdout).to.equal('undefined\n')
 
@@ -204,6 +206,15 @@ describe('ts-node', function () {
         return done()
       })
     })
+
+    it.skip('should use source maps with react tsx', function (done) {
+      exec(`${BIN_EXEC} -r ./tests/emit-compiled.ts tests/jsx-react.tsx`, function (err, stdout) {
+        expect(err).to.equal(null)
+        expect(stdout).to.equal('todo')
+
+        return done()
+      })
+    })
   })
 
   describe('register', function () {
@@ -259,6 +270,7 @@ describe('ts-node', function () {
             compiled = code
             return _compile.call(this, code, fileName)
           }
+
           return old(m, fileName)
         }
       })
@@ -272,8 +284,11 @@ describe('ts-node', function () {
           require('../tests/with-jsx.tsx')
         } catch (error) {
           expect(error.stack).to.contain('SyntaxError: Unexpected token <\n')
-          done()
         }
+
+        expect(compiled).to.match(SOURCE_MAP_REGEXP)
+
+        done()
       })
     })
   })

src/index.ts

@@ -510,7 +510,7 @@ function updateOutput (outputText: string, fileName: string, sourceMap: string)
   const base64Map = new Buffer(updateSourceMap(sourceMap, fileName), 'utf8').toString('base64')
   const sourceMapContent = `data:application/json;charset=utf-8;base64,${base64Map}`
 
-  return outputText.slice(0, -1 * (basename(fileName).length + 4)) + sourceMapContent
+  return outputText.replace(/[^=]+$/, sourceMapContent)
 }
 
 /**

tests/emit-compiled.ts

@@ -0,0 +1,16 @@
+const extensions = ['.tsx']
+
+extensions.forEach(ext => {
+  const old = require.extensions[ext]
+
+  require.extensions[ext] = (m, path) => {
+    const _compile = m._compile
+
+    m._compile = (code, path) => {
+      console.log(code)
+      return _compile.call(this, code, path)
+    }
+
+    return old(m, path)
+  }
+})

tests/jsx-react.tsx

@@ -0,0 +1,7 @@
+import * as React from 'react'
+
+const Component = props => {
+  return <div />
+}
+
+export default Component

tests/tsconfig.json

@@ -1,3 +1,8 @@
 {
-  "files": []
+  "compilerOptions": {
+    "jsx": "react"
+  },
+  "files": [
+    "../typings/globals/node/index.d.ts"
+  ]
 }

tsconfig.json

@@ -12,7 +12,8 @@
     "noUnusedParameters": true,
     "moduleResolution": "node",
     "sourceMap": true,
-    "inlineSources": true
+    "inlineSources": true,
+    "types": []
   },
   "include": [
     "src/**/*",