fix js/ts extension handling

Author: wclr

lib/child-require-hook.js

@@ -62,6 +62,18 @@ function registerExtensions(extensions) {
       return old(m, fileName)
     }
   })
+  if (preferTs) {
+    function reorderRequireExtension (ext) {
+      var old = require.extensions[ext]
+      delete require.extensions[ext]
+      require.extensions[ext] = old 
+    }
+    var order = ['.ts'].concat(Object.keys(require.extensions)
+      .filter(_ => _ !== '.ts'))      
+    order.forEach(function (ext) {
+      reorderRequireExtension(ext)
+    })
+  }
 }
 
 function isFileInNodeModules(fileName) {
@@ -70,19 +82,20 @@ function isFileInNodeModules(fileName) {
 
 function registerJsExtension() {
   var old = require.extensions['.js']  
+  // handling preferTs probably redundant after reordering
   if (allowJs || preferTs) {
     require.extensions['.js'] = function(m, fileName) {
       if (fileName.indexOf(libPath) === 0)  {        
         return old(m, fileName)
-      }
+      }      
       var tsCode
       var tsFileName
-      if (preferTs && !isFileInNodeModules(fileName)) {
-        tsFileName = fileName.replace(/\.js$/, '.ts')
-        if (fs.existsSync(tsFileName)) {
-          tsCode = fs.readFileSync(tsFileName, 'utf-8')
-        }
-      }
+      // if (preferTs && !isFileInNodeModules(fileName)) {
+      //   tsFileName = fileName.replace(/\.js$/, '.ts')
+      //   // if (fs.existsSync(tsFileName)) {
+      //   //   tsCode = fs.readFileSync(tsFileName, 'utf-8')
+      //   // }
+      // }
       var _compile = m._compile
       var isIgnored =
         ignore &&
@@ -99,6 +112,7 @@ function registerJsExtension() {
           return _compile.call(this, compile(code, fileName), fileName)
         }
       }
+      
       return old(m, fileName)
     }
   }

lib/compiler.js

@@ -138,9 +138,9 @@ var compiler = {
     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()
@@ -152,7 +152,7 @@ var compiler = {
       extensions.push('.js')
     }
 
-    compiler.writeChildHookFile(options)
+    compiler.writeChildHookFile(options)    
   },
   registerTsNode: function () {
     var options = compiler.options

lib/index.js

@@ -9,7 +9,8 @@ var tsVersion = require('typescript').version
 var kill = require('tree-kill')
 var readline = require('readline')
 
-module.exports = function(script, scriptArgs, nodeArgs, opts) {
+
+module.exports = function (script, scriptArgs, nodeArgs, opts) {
   if (typeof script !== 'string' || script.length === 0) {
     throw new TypeError('`script` must be a string')
   }
@@ -44,35 +45,37 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
   //   debounce: parseInt(opts.debounce),
   //   recursive: process.platform !== 'linux'
   // })
-  
-  function initWatcher () {
+
+  function initWatcher() {
     var watcher = chokidar.watch([], {
       usePolling: opts.poll,
       interval: parseInt(opts.interval) || undefined,
-          
     })
     watcher.on('change', restart)
 
-    watcher.on('fallback', function(limit) {
-      log.warn('node-dev ran out of file handles after watching %s files.', limit)
+    watcher.on('fallback', function (limit) {
+      log.warn(
+        'node-dev ran out of file handles after watching %s files.',
+        limit
+      )
       log.warn('Falling back to polling which uses more CPU.')
       log.info('Run ulimit -n 10000 to increase the file descriptor limit.')
       if (cfg.deps) log.info('... or add `--no-deps` to use less file handles.')
     })
     return watcher
   }
   var watcher = initWatcher()
-  
+
   var starting = false
-  
+
   // Read for "rs" from command line
   if (opts.rs !== false) {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
-      terminal: false
+      terminal: false,
     })
-    rl.on('line', function(line) {      
+    rl.on('line', function (line) {
       if (line.trim() === 'rs') {
         restart('', true)
       }
@@ -99,22 +102,22 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     log.debug('Starting child process %s', cmd.join(' '))
     child = fork(cmd[0], cmd.slice(1), {
       cwd: process.cwd(),
-      env: process.env
+      env: process.env,
     })
     starting = false
     //var compileReqWatcher = filewatcher({ forcePolling: opts.poll })
     if (compileReqWatcher) {
       compileReqWatcher.close()
-    }    
+    }
     compileReqWatcher = chokidar.watch([], {
       usePolling: opts.poll,
-      interval: parseInt(opts.interval) || undefined
+      interval: parseInt(opts.interval) || undefined,
     })
     var currentCompilePath
     fs.writeFileSync(compiler.getCompileReqFilePath(), '')
     compileReqWatcher.add(compiler.getCompileReqFilePath())
-    compileReqWatcher.on('change', function(file) {
-      fs.readFile(file, 'utf-8', function(err, data) {
+    compileReqWatcher.on('change', function (file) {
+      fs.readFile(file, 'utf-8', function (err, data) {
         if (err) {
           log.error('Error reading compile request file', err)
           return
@@ -128,19 +131,19 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
         if (compiledPath) {
           compiler.compile({
             compile: compile,
-            compiledPath: compiledPath
+            compiledPath: compiledPath,
           })
         }
       })
     })
-    child.on('message', function(message) {
+    child.on('message', function (message) {
       if (!message.compiledPath || currentCompilePath === message.compiledPath)
         return
       currentCompilePath = message.compiledPath
       compiler.compile(message)
     })
 
-    child.on('exit', function(code) {
+    child.on('exit', function (code) {
       log.debug('Child exited with code %s', code)
       if (!child) return
       if (!child.respawn) process.exit(code)
@@ -156,18 +159,19 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     }
 
     // Listen for `required` messages and watch the required file.
-    ipc.on(child, 'required', function(m) {
+    ipc.on(child, 'required', function (m) {
       var isIgnored =
         cfg.ignore.some(isPrefixOf(m.required)) ||
         cfg.ignore.some(isRegExpMatch(m.required))
 
       if (!isIgnored && (cfg.deps === -1 || getLevel(m.required) <= cfg.deps)) {
+        log.debug(m.required, 'added to watcher')
         watcher.add(m.required)
       }
     })
 
     // Upon errors, display a notification and tell the child to exit.
-    ipc.on(child, 'error', function(m) {
+    ipc.on(child, 'error', function (m) {
       log.debug('Child error')
       notify(m.error, m.message, 'error')
       stop(m.willTerminate)
@@ -194,7 +198,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       log.debug('Disconnecting from child')
       child.disconnect()
       //if (!willTerminate) {
-        killChild()
+      killChild()
       //}
     }
   }
@@ -219,7 +223,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     }
     log.debug('Removing all watchers from files')
     //watcher.removeAll()ya
-    
+
     watcher.close()
     watcher = initWatcher()
     starting = true
@@ -235,18 +239,18 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
   compiler.restart = restart
 
   // Relay SIGTERM
-  process.on('SIGTERM', function() {
+  process.on('SIGTERM', function () {
     log.debug('Process got SIGTERM')
     killChild()
     if (opts['restart-terminated']) {
       var timeout = opts['restart-terminated'] || 0
       log.info('Restarting terminated in ' + timeout + ' seconds')
-      setTimeout(() => {        
+      setTimeout(() => {
         start()
       }, timeout)
     } else {
       process.exit(0)
-    }    
+    }
   })
 
   start()
@@ -273,13 +277,13 @@ function getPrefix(mod) {
 }
 
 function isPrefixOf(value) {
-  return function(prefix) {
+  return function (prefix) {
     return value.indexOf(prefix) === 0
   }
 }
 
 function isRegExpMatch(value) {
-  return function(regExp) {
+  return function (regExp) {
     return new RegExp(regExp).test(value)
   }
 }

test/index.ts

@@ -190,15 +190,15 @@ test('It allows to use custom TS Transformers', async (t) => {
   await ps.exit()
 })
 //
-test.only('It should --prefer-ts', async (t) => {
+test('It should --prefer-ts', async (t) => {
   t.test('Should require JS by default', async (t) => {
     const ps = spawnTsNodeDev(
       [
         `--respawn`,
         //`--prefer-ts-exts`,
         `prefer/prefer.js`,
       ].join(' ')
-    ).turnOnOutput()
+    )//.turnOnOutput()
     await ps.waitForLine(/PREFER DEP JS/)
     await ps.waitForLine(/PREFER JS/)
     await ps.exit()
@@ -211,23 +211,31 @@ test.only('It should --prefer-ts', async (t) => {
         //`--prefer-ts`,
         `prefer/prefer`,
       ].join(' ')
-    ).turnOnOutput()
+    )//.turnOnOutput()
     await ps.waitForLine(/PREFER DEP JS/)
     await ps.waitForLine(/PREFER TS/)
     await ps.exit()
     t.pass()
   })
+  
   t.test('Use require all TS with --ts-prefer', async (t) => {
     const ps = spawnTsNodeDev(
       [
         `--respawn`,
         `--prefer-ts-exts`,
-        `prefer/prefer.js`,
+        //'--debug',
+        `prefer/prefer`,
       ].join(' ')
-    ).turnOnOutput()
+    )//.turnOnOutput()
     await ps.waitForLine(/PREFER DEP TS/)
     await ps.waitForLine(/PREFER TS/)
+
+    setTimeout(() => replaceText('prefer/prefer-dep.ts', 'DEP', 'DEP MOD'), 250)
+
+    await ps.waitForLine(/PREFER DEP MOD TS/)    
+
     await ps.exit()
     t.pass()
+    replaceText('prefer/prefer-dep.ts', 'DEP MOD', 'DEP')
   })
 })