add tree-kill and esm support

Author: wclr

bin/ts-node-dev

@@ -28,7 +28,8 @@ var opts = minimist(devArgs, {
     'pretty',
     'prefer-ts',
     'exec-check',
-    'debug'
+    'debug',
+    'tree-kill'
   ],
   string: [
     'compiler',
@@ -65,6 +66,7 @@ var opts = minimist(devArgs, {
 
 var script = opts._[0]
 var scriptArgs = opts._.slice(1)
+var loadEsm = false
 
 unknown.forEach(function(arg) {
   if (arg === script || nodeArgs.indexOf(arg) >= 0) return
@@ -73,13 +75,22 @@ unknown.forEach(function(arg) {
   var argOpts = opts[argName]
   var argValues = Array.isArray(argOpts) ? argOpts : [argOpts]
   argValues.forEach(function(argValue) {
+    console.log('argValue', argValue, 'arg', arg)
+    if ((arg === '-r' || arg === '--require') && argValue === 'esm') {
+      loadEsm = true
+      return false
+    }
     nodeArgs.push(arg)
     if (typeof argValue === 'string') {
       nodeArgs.push(argValue)
     }
   })
 })
 
+if (loadEsm) {
+  require('esm')
+}
+
 if (!script) {
   console.log('Usage: ts-node-dev [options] script [arguments]\n')
   process.exit(1)

lib/index.js

@@ -6,6 +6,7 @@ var compiler = require('./compiler')
 var fs = require('fs')
 var tsNodeVersion = require('ts-node').VERSION
 var tsVersion = require('typescript').version
+var kill = require('tree-kill')
 
 module.exports = function(script, scriptArgs, nodeArgs, opts) {
   if (typeof script !== 'string' || script.length === 0) {
@@ -49,9 +50,13 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     }
     /* eslint-disable no-octal-escape */
     if (cfg.clear) process.stdout.write('\033[2J\033[H')
-    notify('Restarting', file + ' has been modified')
-    compiler.compileChanged(file)
-    if (starting) return
+    notify('Restarting', file + ' has been modified')    
+    compiler.compileChanged(file)    
+    if (starting) {
+      log.debug('Already starting')
+      return
+    }
+    log.debug('Removing all watchers from files')
     watcher.removeAll()
     starting = true
     if (child) {
@@ -148,12 +153,22 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
 
     // Upon errors, display a notification and tell the child to exit.
     ipc.on(child, 'error', function(m) {
+      log.debug('Child error')
       notify(m.error, m.message, 'error')
       stop(m.willTerminate)
     })
     compiler.writeReadyFile()
   }
-
+  const killChild = () => {
+    if (!child) return
+    log.debug('Sending SIGTERM kill to child pid', child.pid)
+    if (opts['tree-kill']) {
+      log.debug('Using tree-kill')
+      kill(child.pid)
+    } else {
+      child.kill('SIGTERM')
+    }
+  }
   function stop(willTerminate) {
     if (!child || child.stopping) {
       return
@@ -164,15 +179,15 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       log.debug('Disconnecting from child')
       child.disconnect()
       if (!willTerminate) {
-        log.debug('Sending SIGTERM kill to child')
-        child.kill('SIGTERM')
+        killChild()
       }
     }
   }
 
   // Relay SIGTERM
   process.on('SIGTERM', function() {
-    if (child) child.kill('SIGTERM')
+    log.debug('Process got SIGTERM')
+    killChild()
     process.exit(0)
   })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-node-dev",
-  "version": "1.0.0-pre.35",
+  "version": "1.0.0-pre.36",
   "description": "Compiles your TS app and restarts when files are modified.",
   "keywords": [
     "restart",
@@ -39,7 +39,7 @@
   "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\\\"}\" --preserve-symlinks --respawn --ignore-watch 'lib' --ignore-watch bin --prefer-ts --debug --poll --interval 1000 --cache-directory .ts-node --inspect -- test/ts/test-script test-arg --fd",
+    "test": "node ./bin/ts-node-dev --tree-kill -r tsconfig-paths/register -r ./test/ts/add-require.js -r ./test/ts/add-require-2.js -O \"{\\\"module\\\": \\\"commonjs\\\"}\" --preserve-symlinks --respawn --ignore-watch 'lib' --ignore-watch bin --prefer-ts --debug --poll --interval 1000 --cache-directory .ts-node --inspect -- 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": {
@@ -51,6 +51,7 @@
     "node-notifier": "^5.4.0",
     "resolve": "^1.0.0",
     "rimraf": "^2.6.1",
+    "tree-kill": "^1.2.1",
     "ts-node": "*",
     "tsconfig": "^7.0.0"
   },

test/ts/test-script.ts

@@ -7,10 +7,12 @@ const obj: A = {
 }
 console.log('test', str)
 
-//fn()
 
+setInterval(() => {
+  console.log('Working')
+}, 5000)
 
 
 console.log('test', str)
 
-throw new Error('fds')
+//throw new Error('fds')

yarn.lock

@@ -2257,6 +2257,11 @@ tough-cookie@>=0.12.0, tough-cookie@~2.3.0:
   dependencies:
     punycode "^1.4.1"
 
+tree-kill@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
+  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"