add priorNodeArgs, fix esm support

Author: wclr

README.md

@@ -38,15 +38,15 @@ tsnd --respawn server.ts
 
 - `--prefer-ts` (default: false) - for each `.js` file (that is not in `node_modules`) will try to check if corresponding `.ts` version exists and require it.
 - `--ignore-watch` (default: []) - files/folders to be [ignored by `node-dev`](https://github.com/fgnass/node-dev#ignore-paths). **But also this behaviour enhanced:** it will also make up `new RegExp` of passed ignore string and check absolute paths of required files for match.
-  So, to ignore everthing in `node_modules`, just pass `--ignore-watch node_modules`.
+  So, to ignore everything in `node_modules`, just pass `--ignore-watch node_modules`.
 
 - `--debug` - some additional debug output.
 - `--interval` Polling interval (ms)
 - `--debounce` Debounce file change events (ms, non-polling mode)
 
 **Caveats and points of notice:**
 
-- Especially for large code bases always consider running with `--transpileOnly` flag which is normal for dev workflow and will speed up things greatly. Note, that `ts-node-dev` will not put watch handlers on TS files that contain only types/interfaces (used only for type checking) - this is current limitation by design.
+- Especially for large code bases always consider running with `--transpile-only` flag which is normal for dev workflow and will speed up things greatly. Note, that `ts-node-dev` will not put watch handlers on TS files that contain only types/interfaces (used only for type checking) - this is current limitation by design.
 
 - `--ignore-watch` will NOT affect files ignored by TS compilation. Use `--ignore` option (or `TS_NODE_IGNORE` env variable) to pass **RegExp strings** for filtering files that should not be compiled, by default `/node_modules/` are ignored.
 
@@ -58,6 +58,8 @@ tsnd --respawn server.ts
 
 - The good thing is that `ts-node-dev` watches used `tsconfig.json` file, and will reinitialize compilation on its change, but you have to restart the process manually when you update used version of `typescript` or make any other changes that may effect compilation results.
 
+- In some rare cases `ts-node-dev` may fail to terminate an application by sending `SIGTERM` signal, this maybe caused by the app having running heavy child process or something. But the app should get the signal anyway and it can be explicitly processed there: `process.on('SIGTERM', () => process.exit())`.
+
 ## License
 
 WTF.

bin/ts-node-dev

@@ -66,7 +66,8 @@ var opts = minimist(devArgs, {
 
 var script = opts._[0]
 var scriptArgs = opts._.slice(1)
-var loadEsm = false
+
+opts.priorNodeArgs = []
 
 unknown.forEach(function(arg) {
   if (arg === script || nodeArgs.indexOf(arg) >= 0) return
@@ -75,9 +76,8 @@ 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
+      opts.priorNodeArgs.push(arg, argValue)
       return false
     }
     nodeArgs.push(arg)
@@ -87,10 +87,6 @@ unknown.forEach(function(arg) {
   })
 })
 
-if (loadEsm) {
-  require('esm')
-}
-
 if (!script) {
   console.log('Usage: ts-node-dev [options] script [arguments]\n')
   process.exit(1)

lib/index.js

@@ -87,7 +87,8 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
     )
     var cmd = nodeArgs.concat(wrapper, script, scriptArgs)
     var childHookPath = compiler.getChildHookPath()
-    cmd = ['-r', childHookPath].concat(cmd)
+
+    cmd = (opts.priorNodeArgs || []).concat(['-r', childHookPath]).concat(cmd)
     log.debug('Starting child process %s', cmd.join(' '))
     child = fork(cmd[0], cmd.slice(1), {
       cwd: process.cwd(),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-node-dev",
-  "version": "1.0.0-pre.36",
+  "version": "1.0.0-pre.38",
   "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 --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": "node ./bin/ts-node-dev --tree-kill -r tsconfig-paths/register -r ./test/ts/add-require.js -r ./test/ts/add-require-2.js -r esm -O \"{\\\"module\\\": \\\"es6\\\"}\" --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": {
@@ -61,6 +61,7 @@
     "eslint": "^2.0.0",
     "eslint-config-airbnb-base": "^3.0.1",
     "eslint-plugin-import": "^1.8.1",
+    "esm": "^3.2.22",
     "tap": "^5.2.0",
     "touch": "^1.0.0",
     "tsconfig-paths": "^3.3.1",

test.js

@@ -0,0 +1,3 @@
+import { readFileSync } from 'fs'
+
+readFileSync('./test.js')

test/ts/test-script.ts

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

yarn.lock

@@ -689,6 +689,11 @@ eslint@^2.0.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
+esm@^3.2.22:
+  version "3.2.22"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
+  integrity sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA==
+
 espree@^3.1.6:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"