fix child fork override

Author: wclr

CHANGELOG.md

@@ -1,6 +1,10 @@
 ### Yalc changelog
 
-## 1.0.0-pre.60 (2020-08-26)
+## 1.0.0-pre.62 (2020-09-22)
+
+- fix child fork override
+
+## 1.0.0-pre.61 (2020-08-26)
 
 - fix terminal clear
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-node-dev",
-  "version": "1.0.0-pre.61",
+  "version": "1.0.0-pre.62",
   "description": "Compiles your TS app and restarts when files are modified.",
   "keywords": [
     "restart",

src/bin.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const dev = require('.')
+import { runDev } from '.'
 import minimist from 'minimist'
 
 const nodeArgs: string[] = []
@@ -71,6 +71,7 @@ const devFlags = {
     'deps',
     'all-deps',
     'dedupe',
+    'fork',
     'exec-check',
     'debug',
     'poll',
@@ -96,24 +97,25 @@ const devFlags = {
 
 type DevOptions = {
   poll: boolean
-  debug: boolean,
+  debug: boolean
+  fork: boolean
   watch: string
   interval: string
   rs: boolean
-  deps: boolean,
-  dedupe: boolean,
-  respawn: boolean,
-  notify: boolean,
-  clear: boolean,
-  cls: boolean,
-  'ignore-watch': string,
-  'all-deps': boolean,
+  deps: boolean
+  dedupe: boolean
+  respawn: boolean
+  notify: boolean
+  clear: boolean
+  cls: boolean
+  'ignore-watch': string
+  'all-deps': boolean
   ['deps-level']: string
   'compile-timeout': string
   'exec-check': boolean
   'exit-child': boolean
   'cache-directory': string
-  'error-recompile': boolean,
+  'error-recompile': boolean
   'tree-kill': boolean
 }
 
@@ -130,8 +132,10 @@ const opts = minimist(devArgs, {
   alias: {
     ...tsNodeAlias,
     'prefer-ts-exts': 'prefer-ts',
+  },    
+  default: {
+    fork: true
   },
-  default: {},
   unknown: function (arg) {
     unknown.push(arg)
     return true
@@ -163,8 +167,11 @@ unknown.forEach(function (arg) {
 })
 
 if (!script) {
+  // eslint-disable-next-line no-console
+  console.log('ts-node-dev: no script to run provided')
+  // eslint-disable-next-line no-console
   console.log('Usage: ts-node-dev [options] script [arguments]\n')
   process.exit(1)
 }
 
-dev(script, scriptArgs, nodeArgs, opts)
+runDev(script, scriptArgs, nodeArgs, opts)

src/cfg.ts

@@ -41,6 +41,7 @@ export const makeCfg = (main: string, opts: Partial<Options>): Config => {
     if (opts.respawn) c.respawn = true
     if (opts.notify === false) c.notify = false
     if (opts.clear || opts.cls) c.clear = true
+    c.fork = opts.fork
   }
 
   const ignoreWatchItems: string[] = opts['ignore-watch']

src/index.ts

@@ -17,12 +17,12 @@ const version = require('../package.json').version
 const tsNodeVersion = require('ts-node').VERSION
 const tsVersion = require('typescript').version
 
-module.exports = function (
+export const runDev = (
   script: string,
   scriptArgs: string[],
   nodeArgs: string[],
   opts: Options
-) {
+) => {
   if (typeof script !== 'string' || script.length === 0) {
     throw new TypeError('`script` must be a string')
   }
@@ -216,9 +216,9 @@ module.exports = function (
       compiler.init()
     }
     compiler.clearErrorCompile()
-    
+
     //if (cfg.clear) process.stdout.write("\u001b[2J\u001b[0;0H")
-    if (cfg.clear) process.stdout.write("\u001bc")
+    if (cfg.clear) process.stdout.write('\u001bc')
     if (isManualRestart === true) {
       notify('Restarting', 'manual restart from user')
     } else {

src/wrap.ts

@@ -30,14 +30,15 @@ process.on('SIGTERM', function () {
 })
 
 if (cfg.fork) {
+  const oldFork = fork
   // Overwrite child_process.fork() so that we can hook into forked processes
   // too. We also need to relay messages about required files to the parent.
   const newFork = function (
     modulePath: string,
     args: string[],
     options: ForkOptions
-  ) {
-    const child = fork(__filename, [modulePath].concat(args), options)
+  ) {    
+    const child = oldFork(__filename, [modulePath].concat(args), options)
     ipc.relay(child)
     return child
   }

test/tsnd.test.ts

@@ -39,7 +39,8 @@ const waitFor = (timeout: number) => {
 fs.ensureDirSync(tmpDir)
 fs.removeSync(join(tmpDir, 'fixture'))
 fs.copySync(join(__dirname, 'fixture'), scriptsDir)
-describe('ts-node-dev', () => {
+describe('ts-node-dev', function () {
+  this.timeout(5000)
   it('It should restart on file change', async () => {
     const ps = spawnTsNodeDev('--respawn --poll simple.ts')
     await ps.waitForLine(/v1/)
@@ -113,9 +114,9 @@ describe('ts-node-dev', () => {
   })
 
   const notFoundSource = `export const fn = (x: number) => {  
-  return 'v1'
-}
-`
+    return 'v1'
+  }
+  `
   it('It recompiles file on error and restarts', async () => {
     const ps = spawnTsNodeDev('--respawn --error-recompile with-not-found.ts', {
       //stdout: true,
@@ -336,4 +337,14 @@ describe('ts-node-dev', () => {
     await ps.exit()
     t.ok(true)
   })
+
+  it.skip('It error on wrong cli flag', async () => {
+    const ps = spawnTsNodeDev([`--transpileOnly`, `req-package`].join(' '))
+
+    await ps.waitForLine(/bad option/)
+
+    await ps.waitForLine(/CHANGED PACKAGE/)
+    await ps.exit()
+    t.ok(true)
+  })
 })