--deps flag and tests

Author: wclr

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-node_modules
+/node_modules
 *.log
 .ts-node
 .tmp

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Yalc changelog
 
+## 1.0.0-pre.57
+
+- fix `--deps` flag
+- add `--deps-level` flag
+
 ## 1.0.0-pre.56 (2020-07-24)
 
 - add `node-notifier` from `peerDependencies` make optional

bin/ts-node-dev

@@ -7,11 +7,11 @@ var nodeArgs = []
 
 var devArgs = process.argv.slice(2, 100)
 var unknown = []
-var opts = minimist(devArgs, {
-  stopEarly: true,
+var opts = minimist(devArgs, {  
+  stopEarly: true,  
   boolean: [
+    'deps',    
     'all-deps',
-    'deps',
     'dedupe',
     'poll',
     'respawn',
@@ -37,9 +37,10 @@ var opts = minimist(devArgs, {
     'compiler-host',
     'script-mode',
     'rs'
-  ],
-  string: [
+  ],  
+  string: [    
     'dir',
+    'deps-level',
     'compile-timeout',
     'ignore-watch',
     'interval',

lib/cfg.js

@@ -16,20 +16,19 @@ module.exports = function (main, opts) {
   var c = read(dir)
     || read(process.cwd())
     || read(process.env.HOME || process.env.USERPROFILE) || {};
-
-  // Truthy == --all-deps, false: one level of deps
-  if (typeof c.deps !== 'number') c.deps = c.deps ? -1 : 1;
-
+      
+  c.deps = parseInt(opts['deps-level']) || 0
+  if (typeof c.depsLevel === 'number') c.deps = c.depsLevel
+  
   if (opts) {
     // Overwrite with CLI opts ...
-    if (opts.allDeps) c.deps = -1;
-    if (!opts.deps) c.deps = 0;
+    if (opts['deps'] || opts['all-deps']) c.deps = -1;    
     if (opts.dedupe) c.dedupe = true;
     if (opts.respawn) c.respawn = true;
     if (opts.notify === false) c.notify = false;
     if (opts.clear || opts.cls) c.clear = true;
   }
-  
+  console.log('c.deps', c.deps)
   var ignoreWatch = ([]).concat(opts && opts['ignore-watch'] || []).concat(c.ignore || []);  
   opts.debug && console.log('Ignore watch:', ignoreWatch)
   var ignore = ignoreWatch.concat(ignoreWatch.map(resolvePath));  

lib/index.js

@@ -157,7 +157,7 @@ module.exports = function (script, scriptArgs, nodeArgs, opts) {
     }
 
     // Listen for `required` messages and watch the required file.
-    ipc.on(child, 'required', function (m) {
+    ipc.on(child, 'required', function (m) {      
       var isIgnored =
         cfg.ignore.some(isPrefixOf(m.required)) ||
         cfg.ignore.some(isRegExpMatch(m.required))

package.json

@@ -36,7 +36,7 @@
     "ts-node-dev": "node ./bin/ts-node-dev",
     "tsnd": "yarn ts-node-dev",
     "test": "ts-node -T test/index.ts",
-    "test-dev": "ts-node-dev -T --respawn test/index.ts",
+    "test-dev": "ts-node-dev -T --respawn test/index.ts --output",
     "test-docker": "docker-compose up",
     "ci": "yarn test",
     "ci-local": "docker run --name travis-debug -dit quay.io/travisci/ci-nodejs",
@@ -57,6 +57,7 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
+    "@types/minimist": "^1.2.0",
     "@types/node": "^8.0.4",
     "@types/tape": "^4.13.0",
     "@types/touch": "^3.1.1",
@@ -76,8 +77,8 @@
     "typescript": "^3.9.5"
   },
   "peerDependencies": {
-    "typescript": "*",
-    "node-notifier": "*"
+    "node-notifier": "*",
+    "typescript": "*"
   },
   "peerDependenciesMeta": {
     "node-notifier": {

test/fixture/node_modules/package/index.js

@@ -1,9 +1,13 @@
 import * as test from 'tape'
-import { spawnTsNodeDev, scriptsDir, tmpDir } from './spawn'
+import { spawnTsNodeDev, scriptsDir, tmpDir, turnOnOutput } from './spawn'
 import * as fs from 'fs-extra'
 import { join } from 'path'
 import touch = require('touch')
 
+if (process.argv.slice(2)[0] === '--output') {
+  turnOnOutput()
+}
+
 export const replaceText = async (
   script: string,
   pattern: string | RegExp,
@@ -44,7 +48,7 @@ test('It should restart on file change', async (t) => {
 })
 
 test('It allow watch arbitrary folder/file', async (t) => {
-  const ps = spawnTsNodeDev('--respawn --watch folder,folder2 simple.ts') //.turnOnOutput()
+  const ps = spawnTsNodeDev('--respawn --watch folder,folder2 simple.ts')
   await ps.waitForLine(/Using/)
   setTimeout(() => touch(join(scriptsDir, 'folder/some-file')), 250)
   await ps.waitForLine(/Restarting.*some-file/)
@@ -53,7 +57,7 @@ test('It allow watch arbitrary folder/file', async (t) => {
 })
 
 test('It should report an error on start', async (t) => {
-  const ps = spawnTsNodeDev('--respawn with-error.ts') //.turnOnOutput()
+  const ps = spawnTsNodeDev('--respawn with-error.ts')
   await ps.waitForLine(/[ERROR]/)
   const out = ps.getStdout()
   t.ok(/Compilation error in/.test(out), 'Reports error file')
@@ -72,7 +76,7 @@ test('It should report an error on start', async (t) => {
 })
 
 test('It should report an error with --log-error and continue to work', async (t) => {
-  const ps = spawnTsNodeDev('--respawn --log-error with-error.ts') //.turnOnOutput()
+  const ps = spawnTsNodeDev('--respawn --log-error with-error.ts')
   await ps.waitForErrorLine(/error/)
 
   const out = ps.getStderr()
@@ -134,7 +138,7 @@ test('It handles allowJs option and loads JS modules', async (t) => {
       `--compiler-options=${JSON.stringify(cOptions)}`,
       `js-module.js`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/JS MODULE/)
   t.pass('ok')
   await ps.exit()
@@ -149,7 +153,7 @@ test('It handles resolveJsonModule option and loads JSON modules', async (t) =>
       `--compiler-options=${JSON.stringify(cOptions)}`,
       `import-json`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/JSON DATA: { file: 'json' }/)
   t.pass('ok')
   await ps.exit()
@@ -158,21 +162,21 @@ test('It handles resolveJsonModule option and loads JSON modules', async (t) =>
 test('It should not allow --script-mode and --dir together', async (t) => {
   const ps = spawnTsNodeDev(
     [`--script-mode`, `--dir folder`, `simple.ts`].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/TypeError: Script mode cannot be combined with `--dir`/)
   t.pass('ok')
   await ps.exit()
 })
 
 test('It should use the tsconfig at --dir when defined', async (t) => {
-  const ps = spawnTsNodeDev([`--dir dir-test`, `dir-test/index.ts`].join(' ')) //.turnOnOutput()
+  const ps = spawnTsNodeDev([`--dir dir-test`, `dir-test/index.ts`].join(' '))
   await ps.waitForLine(/\{ hello: 'world' \}/)
   t.pass('ok')
   await ps.exit()
 })
 
 test('It should use the tsconfig at --script-mode when defined', async (t) => {
-  const ps = spawnTsNodeDev([`-s`, `dir-test/index.ts`].join(' ')) //.turnOnOutput()
+  const ps = spawnTsNodeDev([`-s`, `dir-test/index.ts`].join(' '))
   await ps.waitForLine(/\{ hello: 'world' \}/)
   t.pass('ok')
   await ps.exit()
@@ -185,7 +189,7 @@ test('It should fail if not using --dir or --script-mode on dir-test/index.ts',
       `--compiler-options=${JSON.stringify(cOptions)}`,
       `dir-test/index.ts`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/has no default export./)
   t.pass('ok')
   await ps.exit()
@@ -200,7 +204,7 @@ test('It allows to use TS Transformers', async (t) => {
       `--compiler-options=${JSON.stringify(cOptions)}`,
       `nameof.ts`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/console/)
 
   await ps.exit()
@@ -215,7 +219,7 @@ test('It allows to use custom TS Transformers', async (t) => {
       `--compiler-options=${JSON.stringify(cOptions)}`,
       `to-transform.ts`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/transformed/)
   t.pass('ok')
   await ps.exit()
@@ -229,13 +233,13 @@ test('It should --prefer-ts', async (t) => {
         //`--prefer-ts-exts`,
         `prefer/prefer.js`,
       ].join(' ')
-    ) //.turnOnOutput()
+    )
     await ps.waitForLine(/PREFER DEP JS/)
     await ps.waitForLine(/PREFER JS/)
     await ps.exit()
     t.pass()
   })
-  t.test('SHould require JS deps by default', async (t) => {
+  t.test('Should require JS deps by default', async (t) => {
     const ps = spawnTsNodeDev(
       [
         `--respawn`,
@@ -273,7 +277,7 @@ test.skip('It should add require with -r flag', async (t) => {
       //`--debug`,
       `simple`,
     ].join(' ')
-  ) //.turnOnOutput()
+  )
   await ps.waitForLine(/added --require/)
   await ps.waitForLine(/v1/)
 
@@ -286,7 +290,7 @@ test.skip('It should add require with -r flag', async (t) => {
 })
 
 test('It should handle --deps flag', async (t) => {
-  const ps = spawnTsNodeDev([`--deps`, `--respawn`, `req-package`].join(' ')) //.turnOnOutput()
+  const ps = spawnTsNodeDev([`--deps`, `--respawn`, `req-package`].join(' '))
 
   await ps.waitForLine(/PACKAGE/)
 
@@ -305,3 +309,25 @@ test('It should handle --deps flag', async (t) => {
   t.pass()
   t.end()
 })
+
+
+test('It should handle deep deps with --deps flag', async (t) => {
+  const ps = spawnTsNodeDev([`--all-deps`, `--respawn`, `req-package`].join(' '))
+
+  await ps.waitForLine(/PACKAGE/)
+
+  setTimeout(
+    () =>
+      replaceText(
+        'node_modules/package/node_modules/level2-package/index.js',
+        'PACKAGE',
+        'CHANGED PACKAGE'
+      ),
+    100
+  )
+
+  await ps.waitForLine(/CHANGED PACKAGE/)
+  await ps.exit()
+  t.pass()
+  t.end()
+})

test/fixture/node_modules/package/node_modules/level2-package/index.js

@@ -5,6 +5,12 @@ const bin = path.join(__dirname, '/../bin/ts-node-dev')
 export const tmpDir = path.join(__dirname, '../.tmp')
 export const scriptsDir = path.join(tmpDir, 'fixture')
 
+let outputTurnedOn = false
+
+export const turnOnOutput = () => {
+  outputTurnedOn = true
+}
+
 export const spawnTsNodeDev = (
   cmd: string,
   options: { stdout?: boolean; stderr?: boolean; env?: any } = {}
@@ -20,15 +26,15 @@ export const spawnTsNodeDev = (
   })
   var out = ''
   var err = ''
-  
+
   ps.stderr.on('data', function (data) {
-    if (opts.stderr) {
+    if (opts.stderr || outputTurnedOn) {
       console.log('STDERR:', data.toString())
     }
     err += data.toString()
   })
   ps.stdout.on('data', function (data) {
-    if (opts.stdout) {
+    if (opts.stdout || outputTurnedOn) {
       console.log('STDOUT:', data.toString())
     }
     out += data.toString()