Add test for TypeScript with mixed import syntax

.gitignore

@@ -5,3 +5,4 @@
 *.sublime-project
 *.sublime-workspace
 .idea
+package-lock.json

README.md

@@ -330,10 +330,11 @@ $ npm test
 
 It could happen that the files you're not seeing have been skipped due to errors or that they can't be resolved. Run madge with the `--warning` option to see skipped files. If you need even more info run with the `--debug` option.
 
-## Using both CommonJS and ES6 imports in same file?
+## Using mixed import syntax in the same file?
 
 Only one syntax is used by default. You can use both though if you're willing to take the degraded performance. Put this in your madge config to enable mixed imports.
 
+For ES6 + CommonJS:
 ```json
 {
 	"detectiveOptions": {
@@ -344,6 +345,17 @@ Only one syntax is used by default. You can use both though if you're willing to
 }
 ```
 
+For TypeScript + CommonJS:
+```json
+{
+	"detectiveOptions": {
+		"ts": {
+			"mixedImports": true
+		}
+	}
+}
+```
+
 ## How to ignore `import type` statements in ES6 + Flow?
 
 Put this in your madge config.

test/api.js

@@ -5,9 +5,6 @@ const os = require('os');
 const path = require('path');
 const fs = require('mz/fs');
 const madge = require('../lib/api');
-const expect = require('expect');
-const toMatchSnapshot = require('expect-mocha-snapshot');
-expect.extend({toMatchSnapshot});
 
 require('should');
 
@@ -209,22 +206,14 @@ describe('API', () => {
 	});
 
 	describe('dot()', () => {
-		it('returns a promise resolved with graphviz DOT output', async function () {
-			const res = await madge(__dirname + '/cjs/b.js', {
-				fontSize: '0',
-				// Custom config to make test pass on different OS
-				graphVizOptions: {
-					G: {
-						layout: 'neato',
-						overlap: true
-					},
-					N: {
-						pos: '0,0!',
-						height: 1
-					}
-				}
-			});
-			expect(await res.dot()).toMatchSnapshot(this);
+		it('returns a promise resolved with graphviz DOT output', async () => {
+			const res = await madge(__dirname + '/cjs/b.js');
+			const output = await res.dot();
+			output.should.match(/digraph G/);
+			output.should.match(/bgcolor="#111111"/);
+			output.should.match(/fontcolor="#c6c5fe"/);
+			output.should.match(/color="#757575"/);
+			output.should.match(/fontcolor="#cfffac"/);
 		});
 	});
 

test/typescript.js

@@ -41,4 +41,15 @@ describe('TypeScript', () => {
 			done();
 		}).catch(done);
 	});
+
+	it('supports CJS modules when using mixedImports option', (done) => {
+		madge(dir + '/mixed.ts', {detectiveOptions: {ts: {mixedImports: true}}}).then((res) => {
+			res.obj().should.eql({
+				'export-x.tsx': [],
+				'export.ts': [],
+				'mixed.ts': ['export-x.tsx', 'export.ts']
+			});
+			done();
+		}).catch(done);
+	});
 });

test/typescript/mixed.ts

@@ -0,0 +1,2 @@
+require('./export');
+import './export-x';