fixes #15, #16

Author: wclr

lib/compiler.js

@@ -32,7 +32,7 @@ var compiler = {
   getCompilerReadyFilePath: function () {
     return path.join(os.tmpdir(), 'ts-node-dev-ready-' + comilationInstanceStampt)
       .replace(/\\/g, '/')
-  },  
+  },
   getChildHookPath: function () {
     return path.join(os.tmpdir(), 'ts-node-dev-hook-' + comilationInstanceStampt + '.js')
       .replace(/\\/g, '/')
@@ -86,7 +86,7 @@ var compiler = {
         console.log(e)
       }
     }
-    
+
     var tsNodeOptions = {
       fast: options['fast'],
       cache: options['cache'] || !options['no-cache'],
@@ -102,7 +102,7 @@ var compiler = {
       ignoreDiagnostics: options['ignoreDiagnostics'],
       disableWarnings: options['disableWarnings'],
       compilerOptions: compilerOptions
-    }    
+    }
     try {
       register(tsNodeOptions)
     } catch (e) {
@@ -140,7 +140,7 @@ var compiler = {
   compile: function (params) {
     var fileName = params.compile
     var code = fs.readFileSync(fileName, 'utf-8')
-    var compiledPath = params.compiledPath    
+    var compiledPath = params.compiledPath
     function writeCompiled(code, filename) {
       fs.writeFileSync(compiledPath, code)
       fs.writeFileSync(compiledPath + '.done', '')
@@ -151,13 +151,19 @@ var compiler = {
     var m = {
       _compile: writeCompiled
     }
-    tsHandler(m, fileName)
+    tsHandler(m, fileName)    
     try {
       m._compile(code, fileName)
     } catch (e) {
-      console.error('Compilation error:', e)
-      code = 'throw new Error("Unable to compile TypeScript");'
-      writeCompiled(code)
+      var splits = e.message.split('\n')
+      var title = splits.shift()
+      var message = splits.join('\n')
+      compiler.notify(title, message, 'error')
+      setTimeout(function () {
+        compiler.stop()
+      })
+      //code = 'throw ' + 'new Error(' + JSON.stringify(e.message) + ')' + ';'
+      //writeCompiled(code)      
     }
   }
 }

lib/index.js

@@ -26,8 +26,9 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
   var main = resolveMain(script);
   var cfg = require('./cfg')(main, opts);
   var log = require('./log')(cfg);
-  var notify = require('./notify')(cfg, log);
-
+  var notify = require('./notify')(cfg, log);  
+  compiler.notify = notify
+  compiler.stop = stop  
   // Run ./dedupe.js as preload script
   if (cfg.dedupe) process.env.NODE_DEV_PRELOAD = __dirname + '/dedupe';
 
@@ -42,9 +43,9 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
     if (cfg.clear) process.stdout.write('\033[2J\033[H');
     notify('Restarting', file + ' has been modified');
     compiler.compileChanged(file)
-    watcher.removeAll();
+    //watcher.removeAll();
     if (child) {
-      // Child is still running, restart upon exit
+      // Child is still running, restart upon exit      
       child.on('exit', start);
       stop();
     } else {
@@ -63,7 +64,7 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
   /**
    * Run the wrapped script.
    */
-  function start() {        
+  function start() { 
     var cmd = nodeArgs.concat(wrapper, script, scriptArgs);    
     var childHookPath = compiler.getChildHookPath();
     cmd = ['-r', childHookPath].concat(cmd);
@@ -99,7 +100,6 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
     child.on('message', function (message) {
       if (currentCompilePath == message.compiledPath) return
       currentCompilePath = message.compiledPath
-      // console.log('message comile', message.compile);
       compiler.compile(message)
     });
 

lib/wrap.js

@@ -37,11 +37,17 @@ if (cfg.fork) {
 }
 
 // Error handler that displays a notification and logs the stack to stderr:
+var caught = false;
 process.on('uncaughtException', function (err) {
-  console.error(err.stack || err);
+  // Handle exepection only once
+  if (caught) return;
+  caught = true;
   // If there's a custom uncaughtException handler expect it to terminate
   // the process.
   var hasCustomHandler = process.listeners('uncaughtException').length > 1;
+  if (!hasCustomHandler) {
+    console.error(err.stack || err);
+  }    
   ipc.send({
     error: err.name || 'Error',
     message: err.message,

package.json

@@ -32,8 +32,9 @@
     "node": ">=0.8.0"
   },
   "scripts": {
+    "ts-node-dev": "node ./bin/ts-node-dev",
     "test-node-dev": "tap test/*.js",
-    "test": "node ./bin/ts-node-dev -r tsconfig-paths/register -r ./test/ts/add-require.js -r ./test/ts/add-require-2.js -O \"{\\\"module\\\": \\\"commonjs\\\"}\" --respawn --ignore-watch 'lib' --ignore-watch bin --prefer-ts --cache-directory .ts-node test/ts/test-script test-arg --fd",    
+    "test": "node ./bin/ts-node-dev -r tsconfig-paths/register -r ./test/ts/add-require.js -r ./test/ts/add-require-2.js -O \"{\\\"module\\\": \\\"commonjs\\\"}\" --respawn --ignore-watch 'lib' --ignore-watch bin --prefer-ts --cache-directory .ts-node test/ts/test-script test-arg --fd",
     "test-docker": "docker run --rm -v ${PWD}:/app mhart/alpine-node:8.7.0 sh -c 'cd app && node ./bin/ts-node-dev --cache-directory .ts-node test/ts/big'"
   },
   "dependencies": {

test.ts

@@ -1,4 +1,5 @@
 
-export const fn = () => {  
+export const fn = (x: number) => {  
   console.log('function from dep module here')
-}
+}
+

test/ts/dep.ts

@@ -2,4 +2,5 @@ import {fn} from './dep'
 
 const str: string = process.argv[2]
 console.log('test', str)
-fn()
+
+fn()

test/ts/test-script.ts

@@ -511,6 +511,10 @@ deeper@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/deeper/-/deeper-2.1.0.tgz#bc564e5f73174fdf201e08b00030e8a14da74368"
 
+deepmerge@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102"
+
 default-require-extensions@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
@@ -2290,7 +2294,7 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@^2.0.0:
+strip-json-comments@^2.0.0, strip-json-comments@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -2433,9 +2437,9 @@ tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
-ts-node@*:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.0.tgz#9aa573889ad7949411f972981c209e064705e36f"
+ts-node@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-6.0.3.tgz#28bf74bcad134fad17f7469dad04638ece03f0f4"
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -2446,6 +2450,15 @@ ts-node@*:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
+tsconfig-paths@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.3.1.tgz#e2f4f46ea23a245fc07ba2f84be5f3fab17ee2d5"
+  dependencies:
+    deepmerge "^2.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+    strip-json-comments "^2.0.1"
+
 tsconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"