tests

cspotcode · cspotcode · commit 6fb4b8fff82e · 2020-07-29T03:04:37.000-04:00
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -471,7 +471,7 @@ describe('ts-node', function () {
       const BIN_EXEC = `"${BIN_PATH}" --project tests/tsconfig-options/tsconfig.json`
 
       it('should override compiler options from env', function (done) {
-        exec(`${BIN_EXEC} tests/tsconfig-options/log-options.js`, {
+        exec(`${BIN_EXEC} tests/tsconfig-options/log-options1.js`, {
           env: {
             ...process.env,
             TS_NODE_COMPILER_OPTIONS: '{"typeRoots": ["env-typeroots"]}'
@@ -485,35 +485,38 @@ describe('ts-node', function () {
       })
 
       it('should use options from `tsconfig.json`', function (done) {
-        exec(`${BIN_EXEC} tests/tsconfig-options/log-options.js`, function (err, stdout) {
+        exec(`${BIN_EXEC} tests/tsconfig-options/log-options1.js`, function (err, stdout) {
           expect(err).to.equal(null)
           const { options, config } = JSON.parse(stdout)
           expect(config.options.typeRoots).to.deep.equal([join(__dirname, '../tests/tsconfig-options/tsconfig-typeroots').replace(/\\/g, '/')])
           expect(config.options.types).to.deep.equal(['tsconfig-tsnode-types'])
           expect(options.pretty).to.equal(undefined)
           expect(options.skipIgnore).to.equal(false)
           expect(options.transpileOnly).to.equal(true)
-          expect(options.require).to.deep.equal([join(__dirname, '../tests/tsconfig-options/required.js')])
+          expect(options.require).to.deep.equal([join(__dirname, '../tests/tsconfig-options/required1.js')])
           return done()
         })
       })
 
-      it('should have flags override `tsconfig.json`', function (done) {
-        exec(`${BIN_EXEC} --skip-ignore --compiler-options "{\\"types\\":[\\"flags-types\\"]}" tests/tsconfig-options/log-options.js`, function (err, stdout) {
+      it('should have flags override / merge with `tsconfig.json`', function (done) {
+        exec(`${BIN_EXEC} --skip-ignore --compiler-options "{\\"types\\":[\\"flags-types\\"]}" --require ./tests/tsconfig-options/required2.js tests/tsconfig-options/log-options2.js`, function (err, stdout) {
           expect(err).to.equal(null)
           const { options, config } = JSON.parse(stdout)
           expect(config.options.typeRoots).to.deep.equal([join(__dirname, '../tests/tsconfig-options/tsconfig-typeroots').replace(/\\/g, '/')])
           expect(config.options.types).to.deep.equal(['flags-types'])
           expect(options.pretty).to.equal(undefined)
           expect(options.skipIgnore).to.equal(true)
           expect(options.transpileOnly).to.equal(true)
-          expect(options.require).to.deep.equal([join(__dirname, '../tests/tsconfig-options/required.js')])
+          expect(options.require).to.deep.equal([
+            join(__dirname, '../tests/tsconfig-options/required1.js'),
+            './tests/tsconfig-options/required2.js'
+          ])
           return done()
         })
       })
 
       it('should have `tsconfig.json` override environment', function (done) {
-        exec(`${BIN_EXEC} tests/tsconfig-options/log-options.js`, {
+        exec(`${BIN_EXEC} tests/tsconfig-options/log-options1.js`, {
           env: {
             ...process.env,
             TS_NODE_PRETTY: 'true',
@@ -527,7 +530,7 @@ describe('ts-node', function () {
           expect(options.pretty).to.equal(true)
           expect(options.skipIgnore).to.equal(false)
           expect(options.transpileOnly).to.equal(true)
-          expect(options.require).to.deep.equal([join(__dirname, '../tests/tsconfig-options/required.js')])
+          expect(options.require).to.deep.equal([join(__dirname, '../tests/tsconfig-options/required1.js')])
           return done()
         })
       })
diff --git a/tests/tsconfig-options/log-options1.js b/tests/tsconfig-options/log-options1.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-assert(process.required)
+assert(process.required1)
 const register = process[Symbol.for('ts-node.register.instance')]
 console.log(JSON.stringify({
   options: register.options,
diff --git a/tests/tsconfig-options/log-options2.js b/tests/tsconfig-options/log-options2.js
@@ -0,0 +1,3 @@
+const assert = require('assert')
+require('./log-options1')
+assert(process.required2)
diff --git a/tests/tsconfig-options/required.js b/tests/tsconfig-options/required.js
diff --git a/tests/tsconfig-options/required1.js b/tests/tsconfig-options/required1.js
@@ -0,0 +1 @@
+process.required1 = true
diff --git a/tests/tsconfig-options/required2.js b/tests/tsconfig-options/required2.js
@@ -0,0 +1,2 @@
+require('assert')(process.required1)
+process.required2 = true
diff --git a/tests/tsconfig-options/tsconfig.json b/tests/tsconfig-options/tsconfig.json
@@ -5,7 +5,7 @@
       "types": ["tsconfig-tsnode-types"]
     },
     "transpileOnly": true,
-    "require": ["./required"],
+    "require": ["./required1"],
     "skipIgnore": false
   },
   "compilerOptions": {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const assert = require('assert')`
	`2`	`+require('./log-options1')`
	`3`	`+assert(process.required2)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require('assert')(process.required1)`
	`2`	`+process.required2 = true`