add error code, not found tests for future

Author: wclr

lib/child-require-hook.js

@@ -22,7 +22,7 @@ var checkFileScript = join(__dirname, 'check-file-exists.js')
 var waitForFile = function(fileName) {
   var start = new Date().getTime()
   while (true) {
-    const exists = execCheck
+    var exists = execCheck
       ? execSync(['node', checkFileScript, '"' + fileName + '"'].join(' '), {
           stdio: 'inherit'
         }) || true
@@ -139,7 +139,7 @@ if (readyFile) {
 }
 
 if (exitChild) {
-  process.on('SIGTERM', function() {
+  process.on('SIGTERM', function() {    
     console.log('Child got SIGTERM, exiting.')
     process.exit()
   })

lib/index.js

@@ -9,7 +9,6 @@ var tsVersion = require('typescript').version
 var kill = require('tree-kill')
 var readline = require('readline')
 
-
 module.exports = function (script, scriptArgs, nodeArgs, opts) {
   if (typeof script !== 'string' || script.length === 0) {
     throw new TypeError('`script` must be a string')
@@ -171,9 +170,9 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
     })
 
     // Upon errors, display a notification and tell the child to exit.
-    ipc.on(child, 'error', function (m) {
+    ipc.on(child, 'error', function (m) {      
       log.debug('Child error')
-      notify(m.error, m.message, 'error')
+      notify(m.error, m.message, 'error')      
       stop(m.willTerminate)
     })
     compiler.writeReadyFile()
@@ -184,19 +183,19 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
     if (opts['tree-kill']) {
       log.debug('Using tree-kill')
       kill(child.pid)
-    } else {
+    } else {      
       child.kill('SIGTERM')
     }
   }
   function stop(willTerminate) {
     if (!child || child.stopping) {
       return
-    }
+    }    
     child.stopping = true
     child.respawn = true
     if (child.connected === undefined || child.connected === true) {
       log.debug('Disconnecting from child')
-      child.disconnect()
+      child.disconnect()      
       //if (!willTerminate) {
       killChild()
       //}

lib/wrap.js

@@ -5,8 +5,9 @@ var resolve = require('resolve').sync
 var hook = require('./hook')
 var ipc = require('./ipc')
 var resolveMain = require('./resolveMain')
-
+// var Module = require('module')
 // Remove wrap.js from the argv array
+
 process.argv.splice(1, 1)
 
 // Resolve the location of the main script relative to cwd
@@ -36,6 +37,13 @@ if (cfg.fork) {
   }
 }
 
+// var lastRequired = null
+// var origRequire = Module.prototype.require
+// Module.prototype.require = function (requirePath) {
+//   lastRequired = { path: requirePath, filename: this.filename }
+//   return origRequire.apply(this, arguments)
+// }
+
 // Error handler that displays a notification and logs the stack to stderr:
 var caught = false
 process.on('uncaughtException', function (err) {
@@ -48,11 +56,13 @@ process.on('uncaughtException', function (err) {
   var hasCustomHandler = process.listeners('uncaughtException').length > 1
   var isTsError = err && err.message && /TypeScript/.test(err.message)
   if (!hasCustomHandler && !isTsError) {
-    console.error((err && err.stack) || err)
+    //console.error((err && err.stack) || err)
   }
   ipc.send({
-    error: isTsError ? '' : err && err.name || 'Error',
+    error: isTsError ? '' : (err && err.name) || 'Error',
+    // lastRequired: lastRequired,
     message: err ? err.message : '',
+    code: err && err.code,
     willTerminate: hasCustomHandler,
   })
 })

test/fixture/not-found/js-with-not-found.js

@@ -0,0 +1 @@
+require('./not-found-js')

test/fixture/not-found/with-not-found-js.ts

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

test/index.ts

@@ -198,7 +198,7 @@ test('It should --prefer-ts', async (t) => {
         //`--prefer-ts-exts`,
         `prefer/prefer.js`,
       ].join(' ')
-    )//.turnOnOutput()
+    ) //.turnOnOutput()
     await ps.waitForLine(/PREFER DEP JS/)
     await ps.waitForLine(/PREFER JS/)
     await ps.exit()
@@ -211,13 +211,13 @@ test('It should --prefer-ts', async (t) => {
         //`--prefer-ts`,
         `prefer/prefer`,
       ].join(' ')
-    )//.turnOnOutput()
+    ) //.turnOnOutput()
     await ps.waitForLine(/PREFER DEP JS/)
     await ps.waitForLine(/PREFER TS/)
     await ps.exit()
     t.pass()
   })
-  
+
   t.test('Use require all TS with --ts-prefer', async (t) => {
     const ps = spawnTsNodeDev(
       [
@@ -226,16 +226,55 @@ test('It should --prefer-ts', async (t) => {
         //'--debug',
         `prefer/prefer`,
       ].join(' ')
-    )//.turnOnOutput()
+    ) //.turnOnOutput()
     await ps.waitForLine(/PREFER DEP TS/)
     await ps.waitForLine(/PREFER TS/)
 
     setTimeout(() => replaceText('prefer/prefer-dep.ts', 'DEP', 'DEP MOD'), 250)
 
-    await ps.waitForLine(/PREFER DEP MOD TS/)    
+    await ps.waitForLine(/PREFER DEP MOD TS/)
 
     await ps.exit()
     t.pass()
     replaceText('prefer/prefer-dep.ts', 'DEP MOD', 'DEP')
   })
 })
+
+// maybe later
+test.skip('Can not find module', async (t) => {
+  const foundText = 'FOUND NOW!'
+
+  const createNotFound = () =>
+    setTimeout(
+      () => writeFile('not-found/not-found.js', `console.log('${foundText}')`),
+      100
+    )
+  const removeNotFound = () => removeFile('not-found/not-found.js')
+
+  // t.test('Not found in TS', async () => {
+  //   const ps = spawnTsNodeDev(
+  //     [`--respawn`, 'not-found/with-not-found-js'].join(' ')
+  //   ).turnOnOutput()
+
+  //   await ps.waitForLine('Cannot find module')
+
+  //   createNotFound()
+
+  //     require.resolve('')
+
+  //   await ps.waitForLine('Restarting')
+
+  //   //await removeNotFound()
+  // })
+
+  t.test('Not found in JS', async () => {
+    const ps = spawnTsNodeDev(
+      ['not-found/js-with-not-found.js'].join(' ')
+    ).turnOnOutput()
+
+    await ps.waitForLine('Cannot find module')
+    
+
+    //await removeNotFound()
+  })
+})

test/spawn.ts

@@ -20,7 +20,7 @@ export const spawnTsNodeDev = (
   })
   var out = ''
   var err = ''
-
+  
   ps.stderr.on('data', function (data) {
     if (opts.stderr) {
       console.log('STDERR:', data.toString())
@@ -33,7 +33,9 @@ export const spawnTsNodeDev = (
     }
     out += data.toString()
   })
-
+  ps.on('disconnect', () => {
+    console.log('im out')
+  })
   const testPattern = (pattern: string | RegExp, str: string) => {
     return typeof pattern === 'string'
       ? str.indexOf(pattern) >= 0