compiler update

Author: wclr

lib/compiler.js

@@ -12,51 +12,54 @@ var tsHandler
 var getCompiledPath = require('./get-compiled-path')
 var tmpDir = '.ts-node'
 
-var sourceMapSupportPath = require.resolve('source-map-support').replace(/\\/g, '/')
+var sourceMapSupportPath = require
+  .resolve('source-map-support')
+  .replace(/\\/g, '/')
 
 var extensions = ['.ts', '.tsx']
-var empty = function() {}
+var empty = function () {}
 var cwd = process.cwd()
-var compilationInstanceStamp = Math.random()
-  .toString()
-  .slice(2)
+var compilationInstanceStamp = Math.random().toString().slice(2)
+
+var originalJsHandler = require.extensions['.js']
+
+var extHandlers = {}
 
 var compiler = {
   allowJs: false,
   tsConfigPath: '',
-  getCompilationId: function() {
+  getCompilationId: function () {
     return compilationInstanceStamp
-  },    
-  createCompiledDir: function() {    
+  },
+  createCompiledDir: function () {
     var compiledDir = compiler.getCompiledDir()
     if (!fs.existsSync(compiledDir)) {
       mkdirp.sync(compiler.getCompiledDir())
-    }    
+    }
   },
-  getCompiledDir: function() {    
+  getCompiledDir: function () {
     return path.join(tmpDir, 'compiled').replace(/\\/g, '/')
   },
-  getCompileReqFilePath: function() {
+  getCompileReqFilePath: function () {
     return path.join(
       compiler.getCompiledDir(),
       compiler.getCompilationId() + '.req'
     )
   },
-  getCompilerReadyFilePath: function() {
+  getCompilerReadyFilePath: function () {
     return path
       .join(os.tmpdir(), 'ts-node-dev-ready-' + compilationInstanceStamp)
       .replace(/\\/g, '/')
   },
-  getChildHookPath: function() {
+  getChildHookPath: function () {
     return path
       .join(os.tmpdir(), 'ts-node-dev-hook-' + compilationInstanceStamp + '.js')
       .replace(/\\/g, '/')
   },
-  writeReadyFile: function() {
+  writeReadyFile: function () {
     var fileData = fs.writeFileSync(compiler.getCompilerReadyFilePath(), '')
   },
-  writeChildHookFile: function(options) {
-    
+  writeChildHookFile: function (options) {
     var fileData = fs.readFileSync(
       path.join(__dirname, 'child-require-hook.js'),
       'utf-8'
@@ -73,8 +76,8 @@ var compiler = {
     }
     if (options['exec-check']) {
       fileData = fileData.replace('execCheck = false', 'execCheck = true')
-    }   
-    
+    }
+
     if (options['exit-child']) {
       fileData = fileData.replace('exitChild = false', 'exitChild = true')
     }
@@ -85,7 +88,7 @@ var compiler = {
           ? 'false'
           : '[' +
             (Array.isArray(ignore) ? ignore : ignore.split(/, /))
-              .map(ignore => 'new RegExp("' + ignore + '")')
+              .map((ignore) => 'new RegExp("' + ignore + '")')
               .join(', ') +
             ']'
       fileData = fileData.replace(
@@ -112,25 +115,48 @@ var compiler = {
     fileData = fileData.replace(
       'var sourceMapSupportPath',
       'var sourceMapSupportPath = "' + sourceMapSupportPath + '"'
-    )    
+    )
     fileData = fileData.replace(
       /__dirname/,
       '"' + __dirname.replace(/\\/g, '/') + '"'
     )
     fs.writeFileSync(compiler.getChildHookPath(), fileData)
   },
-  init: function(options) {
+  init: function (options) {
+    compiler.options = options
     var project = options['project']
     compiler.log = options.log
     compiler.tsConfigPath =
       resolveSync(cwd, typeof project === 'string' ? project : undefined) || ''
 
-    var originalJsHandler = require.extensions['.js']
+    //var originalJsHandler = require.extensions['.js']
     require.extensions['.ts'] = empty
     require.extensions['.tsx'] = empty
     tmpDir = options['cache-directory']
       ? path.resolve(options['cache-directory'])
       : fs.mkdtempSync(path.join(os.tmpdir(), '.ts-node'))
+
+    compiler.registerTsNode()
+
+    /* clean up compiled on each new init*/
+    rimraf.sync(compiler.getCompiledDir())
+    compiler.createCompiledDir()
+    /* check if `allowJs` compiler option enable */
+    var allowJsEnabled = require.extensions['.js'] !== originalJsHandler
+    if (allowJsEnabled) {
+      compiler.allowJs = true
+      require.extensions['.js'] = originalJsHandler
+      extensions.push('.js')
+    }
+
+    compiler.writeChildHookFile(options)
+  },
+  registerTsNode: function () {
+    var options = compiler.options
+    extensions.forEach(function (ext) {
+      require.extensions[ext] = originalJsHandler
+    })
+
     var compilerOptionsArg =
       options['compilerOptions'] || options['compiler-options']
     var compilerOptions
@@ -145,7 +171,6 @@ var compiler = {
         console.log(e)
       }
     }
-
     let ignore = options['ignore'] || process.env['TS_NODE_IGNORE']
     if (ignore && typeof ignore === 'string') {
       ignore = [ignore]
@@ -171,45 +196,43 @@ var compiler = {
         options['ignoreDiagnostics'] || options['ignore-diagnostics'],
       logError: options['log-error'],
       disableWarnings: options['disableWarnings'],
-      preferTsExts: options['prefer-ts-exts'],      
+      preferTsExts: options['prefer-ts-exts'],
       compilerOptions: compilerOptions,
-      files: options['files'] || true
+      files: options['files'] || true,
     }
     try {
-      register(tsNodeOptions)
+      // if (compiler.service && compiler.service.enable) {
+      //   compiler.service.enable(false)
+      // }
+      compiler.service = register(tsNodeOptions)
     } catch (e) {
       console.log(e)
       return
     }
-
-    /* clean up compiled on each new init*/
-    rimraf.sync(compiler.getCompiledDir())
-    compiler.createCompiledDir()
-    /* check if `allowJs` compiler option enable */
-    var allowJsEnabled = require.extensions['.js'] !== originalJsHandler
-    if (allowJsEnabled) {
-      compiler.allowJs = true
-      require.extensions['.js'] = originalJsHandler
-      extensions.push('.js')
-    }
-    tsHandler = require.extensions['.ts']
-    compiler.writeChildHookFile(options)
+    extensions.forEach(function (ext) {
+      extHandlers[ext] = require.extensions[ext]
+      require.extensions[ext] = originalJsHandler
+    })
   },
-  compileChanged: function(fileName) {
+  compileChanged: function (fileName) {
     var ext = path.extname(fileName)
     if (extensions.indexOf(ext) < 0) return
     try {
       var code = fs.readFileSync(fileName, 'utf-8')
       compiler.compile({
         code: code,
         compile: fileName,
-        compiledPath: getCompiledPath(code, fileName, compiler.getCompiledDir())
+        compiledPath: getCompiledPath(
+          code,
+          fileName,
+          compiler.getCompiledDir()
+        ),
       })
     } catch (e) {
       console.error(e)
     }
   },
-  compile: function(params) {
+  compile: function (params) {
     var fileName = params.compile
     var code = fs.readFileSync(fileName, 'utf-8')
     var compiledPath = params.compiledPath
@@ -222,10 +245,12 @@ var compiler = {
     }
     var starTime = new Date().getTime()
     var m = {
-      _compile: writeCompiled
+      _compile: writeCompiled,
     }
-    tsHandler(m, fileName)
     try {
+      var ext = path.extname(fileName)
+      var extHandler = extHandlers[ext]
+      extHandler(m, fileName)
       m._compile(code, fileName)
       compiler.log.debug(
         fileName,
@@ -234,10 +259,12 @@ var compiler = {
         'ms'
       )
     } catch (e) {
+      console.log('Compilation error in', fileName)
       code = 'throw ' + 'new Error(' + JSON.stringify(e.message) + ')' + ';'
       writeCompiled(code)
+      compiler.registerTsNode()
     }
-  }
+  },
 }
 
 module.exports = compiler

lib/index.js

@@ -54,7 +54,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     if (cfg.deps) log.info('... or add `--no-deps` to use less file handles.')
   })
 
-  // Read for "rs" from command line  
+  // Read for "rs" from command line
   if (opts.rs !== false) {
     const rl = readline.createInterface({
       input: process.stdin,
@@ -67,7 +67,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
         restart('', true)
       }
     })
-  }  
+  }
 
   /**
    * Run the wrapped script.
@@ -187,7 +187,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       compiler.init(opts)
     }
     /* eslint-disable no-octal-escape */
-    if (cfg.clear) process.stdout.write('\033[2J\033[H')    
+    if (cfg.clear) process.stdout.write('\033[2J\033[H')
     if (isManualRestart === true) {
       notify('Restarting', 'manual restart from user')
     } else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-node-dev",
-  "version": "1.0.0-pre.43",
+  "version": "1.0.0-pre.44",
   "description": "Compiles your TS app and restarts when files are modified.",
   "keywords": [
     "restart",
@@ -52,7 +52,7 @@
     "resolve": "^1.0.0",
     "rimraf": "^2.6.1",
     "source-map-support": "^0.5.12",
-    "tree-kill": "^1.2.1",
+    "tree-kill": "^1.2.2",
     "ts-node": "*",
     "tsconfig": "^7.0.0"
   },
@@ -66,6 +66,6 @@
     "tap": "^5.2.0",
     "touch": "^1.0.0",
     "tsconfig-paths": "^3.3.1",
-    "typescript": "^2.3.4"
+    "typescript": "^3.7.4"
   }
 }

test.ts

@@ -0,0 +1,3 @@
+import {fn} from './util'
+
+console.log(fn(1))

test/ts/test-script.ts

@@ -6,7 +6,7 @@ const obj: A = {
   b: 2
 }
 
-fn(1)
+fn(1))
 console.log('test', str)
 
 

util.ts

@@ -0,0 +1,4 @@
+
+export const fn = (x: number) => {
+  return x
+}