add error recompile

Author: wclr

README.md

@@ -41,7 +41,7 @@ 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 everything in `node_modules`, just pass `--ignore-watch node_modules`.
+  So, to ignore everything in `node_modules`, just pass `--ignore-watch node_modules`, or us `--no-deps` for the same effect.
 
 - `--debug` - Some additional debug output.
 - `--interval` - Polling interval (ms)

lib/compiler.js

@@ -28,6 +28,7 @@ var extHandlers = {}
 var compiler = {
   allowJs: false,
   tsConfigPath: '',
+  _errorCompileTimeout: 0,
   getCompilationId: function () {
     return compilationInstanceStamp
   },
@@ -122,6 +123,9 @@ var compiler = {
     )
     fs.writeFileSync(compiler.getChildHookPath(), fileData)
   },
+  clearErrorCompile: () => {
+    clearTimeout(compiler._errorCompileTimeout)
+  },
   init: function (options) {
     compiler.options = options
     var project = options['project']
@@ -201,7 +205,7 @@ var compiler = {
       files: options['files'] || true,
     }
     try {
-      compiler.service = register(tsNodeOptions)      
+      compiler.service = register(tsNodeOptions)
     } catch (e) {
       console.log(e)
       return
@@ -244,7 +248,7 @@ var compiler = {
     var m = {
       _compile: writeCompiled,
     }
-    try {
+    const _compile = () => {
       var ext = path.extname(fileName)
       var extHandler = extHandlers[ext]
       extHandler(m, fileName)
@@ -255,12 +259,33 @@ var compiler = {
         new Date().getTime() - starTime,
         'ms'
       )
+    }
+    try {
+      _compile()
     } catch (e) {
       console.log('Compilation error in', fileName)
       const errorCode =
         'throw ' + 'new Error(' + JSON.stringify(e.message) + ')' + ';'
       writeCompiled(errorCode)
+      // should we really re-register ts-node?
       compiler.registerTsNode()
+
+      const timeoutMs =
+        parseInt(process.env.TS_NODE_DEV_ERROR_RECOMPILE_TIMEOUT) || 2500
+      const errorHandler = () => {
+        clearTimeout(compiler._errorCompileTimeout)
+        compiler._errorCompileTimeout = setTimeout(() => {
+          try {
+            _compile()
+            compiler.restart(fileName)
+          } catch (e) {
+            compiler.registerTsNode()
+            errorHandler()
+          }
+        }, timeoutMs)
+      }
+
+      errorHandler()
     }
   },
 }

lib/index.js

@@ -72,8 +72,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       output: process.stdout,
       terminal: false
     })
-    rl.on('line', function(line) {
-      console.log('rl.on line', line)
+    rl.on('line', function(line) {      
       if (line.trim() === 'rs') {
         restart('', true)
       }
@@ -205,6 +204,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       notify('Reinitializing TS compilation')
       compiler.init(opts)
     }
+    compiler.clearErrorCompile()
     /* eslint-disable no-octal-escape */
     if (cfg.clear) process.stdout.write('\033[2J\033[H')
     if (isManualRestart === true) {
@@ -232,6 +232,7 @@ module.exports = function(script, scriptArgs, nodeArgs, opts) {
       start()
     }
   }
+  compiler.restart = restart
 
   // Relay SIGTERM
   process.on('SIGTERM', function() {

package.json

@@ -37,8 +37,8 @@
     "node": ">=0.8.0"
   },
   "scripts": {
-    "tsnd": "node ./bin/ts-node-dev",
     "ts-node-dev": "node ./bin/ts-node-dev",
+    "tsnd": "yarn ts-node-dev",
     "test": "ts-node --transpile-only test/index.ts",
     "ci": "yarn test",
     "manual": "node ./bin/ts-node-dev --rt 5 --exit-child --tree-kill --clear -r tsconfig-paths/register -r ./test/manual/add-require -r ./test/manual/add-require-2 -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/manual/test-script test-arg --fd"
@@ -47,8 +47,8 @@
     "chokidar": "^3.4.0",
     "dateformat": "~1.0.4-1.2.3",
     "dynamic-dedupe": "^0.3.0",
-    "minimist": "^1.1.3",
-    "mkdirp": "^0.5.1",
+    "minimist": "^1.2.5",
+    "mkdirp": "^1.0.4",
     "node-notifier": "^5.4.0",
     "resolve": "^1.0.0",
     "rimraf": "^2.6.1",

test/fixture/with-not-found.ts

@@ -0,0 +1,3 @@
+import { fn } from './not-found'
+
+console.log(fn(1))

test/index.ts

@@ -17,6 +17,16 @@ const replaceText = async (
   return fs.writeFile(textFile, text.replace(pattern, replace))
 }
 
+const writeFile = async (script: string, text: string) => {
+  const textFile = join(scriptsDir, script)
+  return fs.writeFile(textFile, text)
+}
+
+const removeFile = async (script: string) => {
+  const textFile = join(scriptsDir, script)
+  return fs.remove(textFile)
+}
+
 const waitFor = (timeout: number) => {
   return new Promise((resolve) => setTimeout(resolve, timeout))
 }
@@ -47,12 +57,14 @@ fs.copySync(join(__dirname, 'fixture'), scriptsDir)
  */
 
 test('It should restart on file change', async (t) => {
-  const ps = spawnTsNodeDev('--respawn --poll simple.ts', {stdout: true})
+  const ps = spawnTsNodeDev('--respawn --poll simple.ts')
   await ps.waitForLine(/v1/)
   setTimeout(() => replaceText('dep.ts', 'v1', 'v2'), 250)
   await ps.waitForLine(/v2/)
   t.pass('Changed code version applied.')
   await ps.exit()
+  // revert
+  replaceText('dep.ts', 'v2', 'v1')
 })
 
 test('It allow watch arbitrary folder/file', async (t) => {
@@ -80,4 +92,44 @@ test('It should report an error on start', async (t) => {
   await ps.waitForLine(/v1/)
   t.pass('Restarted successfully after error fixed.')
   await ps.exit()
+  replaceText('with-error.ts', '1', `'1'`)
+})
+
+test('It restart on non imported file', async (t) => {
+  const ps = spawnTsNodeDev('--respawn with-error.ts', {
+    //stdout: true,
+    env: {
+      TS_NODE_DEV_ERROR_RECOMPILE_TIMEOUT: 500,
+    },
+  })
+  await ps.waitForLine(/[ERROR]/)
+
+  setTimeout(() => replaceText('dep-ts-error.ts', 'number', 'string'), 250)
+
+  await ps.waitForLine(/v1/)
+  t.pass('Restarted successfully after error fixed.')
+  await ps.exit()
+  replaceText('dep-ts-error.ts', 'string', 'number')
+})
+
+const notFoundSource = `export const fn = (x: number) => {  
+  return 'v1'
+}
+`
+
+test('It restarts when not found module added', async (t) => {
+  const ps = spawnTsNodeDev('--respawn with-not-found.ts', {
+    //stdout: true,
+    env: {
+      TS_NODE_DEV_ERROR_RECOMPILE_TIMEOUT: 250,
+    },
+  })
+  await ps.waitForLine(/[ERROR]/)
+
+  setTimeout(() => writeFile('not-found.ts', notFoundSource), 1000)
+
+  await ps.waitForLine(/v1/)
+  t.pass('Restarted successfully after error fixed.')
+  await ps.exit()
+  await removeFile('not-found.ts')
 })

test/spawn.ts

@@ -7,10 +7,10 @@ const scriptsDir = path.join(__dirname, '/../.temp/fixture')
 
 export const spawnTsNodeDev = (
   cmd: string,
-  opts: { stdout?: boolean; stderr?: boolean } = {}
+  opts: { stdout?: boolean; stderr?: boolean; env?: any } = {}
 ) => {
   const nodeArg = [bin].concat(cmd.split(' '))
-  const ps = child.spawn('node', nodeArg, { cwd: scriptsDir })
+  const ps = child.spawn('node', nodeArg, { cwd: scriptsDir, env: opts.env })
   var out = ''
   var err = ''
 
@@ -41,7 +41,6 @@ export const spawnTsNodeDev = (
       return new Promise((resolve) => {
         const listener = (data: string) => {
           const line = data.toString()
-          console.log('line', line)
           if (testPattern(pattern, line)) {
             ps.stdout.removeListener('data', listener)
             resolve(line)

yarn.lock

@@ -1849,6 +1849,11 @@ [email protected], mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"