fix allowJs, new tests

Author: wclr

.gitignore

@@ -2,4 +2,4 @@
 node_modules
 *.log
 .ts-node
-.temp
+.tmp

docker-compose.yml

@@ -1,7 +1,9 @@
 version: '3.0'
 volumes:
   node10modules: null
+  node10tmp: null
   node14modules: null
+  node14tmp: null
 services:
   node10:
     image: node:10.21.0-jessie-slim
@@ -10,6 +12,7 @@ services:
     volumes:
       - ./:/package
       - node10modules:/package/node_modules
+      - node10tmp:/package/.tmp
 
   node14:
     image: node:14-stretch-slim
@@ -18,3 +21,4 @@ services:
     volumes:
       - ./:/package
       - node14modules:/package/node_modules
+      - node14tmp:/package/.tmp

lib/child-require-hook.js

@@ -14,6 +14,7 @@ var readyFile
 var execCheck = false
 var exitChild = false
 var sourceMapSupportPath
+var libPath
 
 var checkFileScript = join(__dirname, 'check-file-exists.js')
 
@@ -67,9 +68,12 @@ function isFileInNodeModules(fileName) {
 }
 
 function registerJsExtension() {
-  var old = require.extensions['.js']
+  var old = require.extensions['.js']  
   if (allowJs || preferTs) {
     require.extensions['.js'] = function(m, fileName) {
+      if (fileName.indexOf(libPath) === 0)  {        
+        return old(m, fileName)
+      }
       var tsCode
       var tsFileName
       if (preferTs && !isFileInNodeModules(fileName)) {
@@ -98,7 +102,9 @@ function registerJsExtension() {
   }
 }
 
-var sourceMapRequire = Module.createRequire ? Module.createRequire(sourceMapSupportPath) : require
+var sourceMapRequire = Module.createRequire 
+  ? Module.createRequire(sourceMapSupportPath) 
+  : require
 
 sourceMapRequire(sourceMapSupportPath).install({
   hookRequire: true

lib/compiler.js

@@ -117,6 +117,10 @@ var compiler = {
       'var sourceMapSupportPath',
       'var sourceMapSupportPath = "' + fixPath(sourceMapSupportPath) + '"'
     )
+    fileData = fileData.replace(
+      'var libPath',
+      'var libPath = "' + __dirname.replace(/\\/g, '\\\\') + '"'
+    )
     fileData = fileData.replace(/__dirname/, '"' + fixPath(__dirname) + '"')
     fs.writeFileSync(compiler.getChildHookPath(), fileData)
   },
@@ -146,7 +150,7 @@ var compiler = {
     var allowJsEnabled = require.extensions['.js'] !== originalJsHandler
     if (allowJsEnabled) {
       compiler.allowJs = true
-      require.extensions['.js'] = originalJsHandler
+      //require.extensions['.js'] = originalJsHandler
       extensions.push('.js')
     }
 
@@ -247,7 +251,7 @@ var compiler = {
     }
     const _compile = () => {
       var ext = path.extname(fileName)
-      var extHandler = extHandlers[ext]
+      var extHandler = extHandlers[ext] || require.extensions[ext]
       extHandler(m, fileName)
       m._compile(code, fileName)
       compiler.log.debug(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-node-dev",
-  "version": "1.0.0-pre.47",
+  "version": "1.0.0-pre.48",
   "description": "Compiles your TS app and restarts when files are modified.",
   "keywords": [
     "restart",
@@ -40,6 +40,7 @@
     "ts-node-dev": "node ./bin/ts-node-dev",
     "tsnd": "yarn ts-node-dev",
     "test": "ts-node --transpile-only test/index.ts",
+    "test-docker": "docker-compose up",
     "ci": "yarn test",
     "ci-local": "docker run --name travis-debug -dit quay.io/travisci/ci-nodejs",
     "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"
@@ -63,6 +64,7 @@
     "@types/node": "^8.0.4",
     "@types/tape": "^4.13.0",
     "@types/touch": "^3.1.1",
+    "@types/ts-nameof": "^4.2.1",
     "coffee-script": "^1.8.0",
     "eslint": "^2.0.0",
     "eslint-config-airbnb-base": "^3.0.1",
@@ -72,7 +74,9 @@
     "tap": "^5.2.0",
     "tape": "^5.0.1",
     "touch": "^1.0.0",
+    "ts-nameof": "^5.0.0",
     "tsconfig-paths": "^3.3.1",
+    "ttypescript": "^1.5.10",
     "typescript": "^3.9.5"
   },
   "peerDependencies": {

test/fixture/js-module.js

@@ -0,0 +1,5 @@
+import { fn } from './dep'
+
+console.log(fn(1))
+
+console.log('JS MODULE')

test/fixture/nameof.ts

@@ -0,0 +1 @@
+console.log(nameof(console))

test/fixture/to-transform.ts

@@ -0,0 +1 @@
+console.log("something")

test/index.ts

@@ -1,12 +1,9 @@
 import * as test from 'tape'
-import { spawnTsNodeDev } from './spawn'
+import { spawnTsNodeDev, scriptsDir, tmpDir } from './spawn'
 import * as fs from 'fs-extra'
 import { join } from 'path'
 import touch = require('touch')
 
-const tempDir = join(__dirname, '../.temp')
-export const scriptsDir = join(tempDir, 'fixture')
-
 const replaceText = async (
   script: string,
   pattern: string | RegExp,
@@ -31,8 +28,8 @@ const waitFor = (timeout: number) => {
   return new Promise((resolve) => setTimeout(resolve, timeout))
 }
 
-fs.ensureDirSync(tempDir)
-fs.removeSync(join(tempDir, 'fixture'))
+fs.ensureDirSync(tmpDir)
+fs.removeSync(join(tmpDir, 'fixture'))
 fs.copySync(join(__dirname, 'fixture'), scriptsDir)
 
 /* 
@@ -116,10 +113,9 @@ 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,
+    //stdout: true,
     env: {
       TS_NODE_DEV_ERROR_RECOMPILE_TIMEOUT: 250,
     },
@@ -129,7 +125,50 @@ test('It restarts when not found module added', async (t) => {
   setTimeout(() => writeFile('not-found.ts', notFoundSource), 1000)
 
   await ps.waitForLine(/v1/)
-  t.pass('Restarted successfully after error fixed.')
+  t.pass('Restarted successfully after module was created.')
   await ps.exit()
   await removeFile('not-found.ts')
 })
+
+test('It handles allowJs option and loads JS modules', async (t) => {
+  const cOptions = { allowJs: true }
+  const ps = spawnTsNodeDev(
+    [
+      `--respawn`,
+      `--compiler ttypescript`,
+      `--compilerOptions=${JSON.stringify(cOptions)}`,
+      `js-module.js`,
+    ].join(' ')
+  ).turnOnOutput()
+  await ps.waitForLine(/JS MODULE/)
+  await ps.exit()
+})
+
+test('It allows use TS Transformers', async (t) => {
+  const cOptions = { plugins: [{ transform: 'ts-nameof', type: 'raw' }] }
+  const ps = spawnTsNodeDev(
+    [
+      `--respawn`,
+      `--compiler ttypescript`,
+      `--compilerOptions=${JSON.stringify(cOptions)}`,
+      `nameof.ts`,
+    ].join(' ')
+  ) //.turnOnOutput()
+  await ps.waitForLine(/console/)
+
+  await ps.exit()
+})
+
+test('It allows use custom TS Transformers', async (t) => {
+  const cOptions = { plugins: [{ transform: __dirname + '/transformer.ts' }] }
+  const ps = spawnTsNodeDev(
+    [
+      `--respawn`,
+      `--compiler ttypescript`,
+      `--compilerOptions=${JSON.stringify(cOptions)}`,
+      `to-transform.ts`,
+    ].join(' ')
+  ) //.turnOnOutput()
+  await ps.waitForLine(/transformed/)
+  await ps.exit()
+})

test/spawn.ts

@@ -1,17 +1,23 @@
 import child = require('child_process')
 import path = require('path')
 const bin = path.join(__dirname, '/../bin/ts-node-dev')
-const scriptsDir = path.join(__dirname, '/../.temp/fixture')
+
+export const tmpDir = path.join(__dirname, '../.tmp')
+export const scriptsDir = path.join(tmpDir, 'fixture')
 
 export const spawnTsNodeDev = (
   cmd: string,
-  opts: { stdout?: boolean; stderr?: boolean; env?: any } = {}
+  options: { stdout?: boolean; stderr?: boolean; env?: any } = {}
 ) => {
+  const opts = { ...options }
   const nodeArg = [bin].concat(cmd.split(' '))
-  const ps = child.spawn('node', nodeArg, { cwd: scriptsDir, env: {
-    ...process.env,
-    ...opts.env
-  } })
+  const ps = child.spawn('node', nodeArg, {
+    cwd: scriptsDir,
+    env: {
+      ...process.env,
+      ...opts.env,
+    },
+  })
   var out = ''
   var err = ''
 
@@ -33,9 +39,13 @@ export const spawnTsNodeDev = (
       ? str.indexOf(pattern) >= 0
       : pattern.test(str)
   }
-
-  return {
+  const self = {
     ps,
+    turnOnOutput: () => {
+      opts.stderr = true
+      opts.stdout = true
+      return self
+    },
     getStdout: () => out,
     getStderr: () => err,
     waitForLine: (pattern: string | RegExp) => {
@@ -62,4 +72,5 @@ export const spawnTsNodeDev = (
       })
     },
   }
+  return self
 }