Fix for conflicts where directory and file have same name

Author: esugoi

Gruntfile.js

@@ -2,19 +2,11 @@ module.exports = function (grunt) {
 	'use strict';
 
 	grunt.loadNpmTasks('grunt-ts');
-	grunt.loadNpmTasks('grunt-dtsm');
 	grunt.loadNpmTasks('grunt-mocha-test');
 	grunt.loadNpmTasks('grunt-contrib-clean');
 
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
-		dtsm: {
-			client: {
-				options: {
-					confog: './dtsm.json'
-				}
-			}
-		},
 		clean: {
 			cruft: {
 				option: {
@@ -45,7 +37,6 @@ module.exports = function (grunt) {
 			main: {
 				src: [
 					'./lib/index.ts',
-					'./typings/bundle.d.ts'
 				],
 				options: {
 					"target": "es5",
@@ -72,6 +63,10 @@ module.exports = function (grunt) {
 			testCommonJs: {
 				src: ['test/src/commonjs/index.ts'],
 				outDir: 'test/build/commonjs'
+			},
+			testConflicts: {
+				src: ['test/src/conflicts/dirname/index.ts'],
+				outDir: 'test/build/conflicts/dirname'
 			}
 		},
 		mochaTest: {
@@ -88,15 +83,15 @@ module.exports = function (grunt) {
 	grunt.registerTask('prep', [
 		'clean:tmp',
 		'clean:test',
-		'clean:cruft',
-		'dtsm'
+		'clean:cruft'
 	]);
 
 	grunt.registerTask('test', [
 		'prep',
 		'ts:test',
 		'ts:testEs6',
 		'ts:testCommonJs',
+		'ts:testConflicts',
 		'run'
 	]);
 

dtsm.json

@@ -539,7 +539,7 @@ export function bundle(options: Options): BundleResult {
         return name.replace(/\.\./g, '--').replace(/[\\\/]/g, separator);
     }
 
-    function mergeModulesLines(lines) {
+    function mergeModulesLines(lines: any) {
         var i = (outputAsModuleFolder ? '' : indent);
         return (lines.length === 0 ? '' : i + lines.join(newline + i)) + newline;
     }
@@ -625,7 +625,7 @@ export function bundle(options: Options): BundleResult {
             }
         };
 
-        code.split(/\r?\n/g).forEach(line => {
+        code.split(/\r?\n/g).forEach((line: any) => {
             let match: string[];
 
             // block comment end
@@ -714,7 +714,7 @@ export function bundle(options: Options): BundleResult {
 
                     let full = path.resolve(path.dirname(file), impPath);
                     // If full is not an existing file, then let's assume the extension .d.ts
-                    if(!fs.existsSync(full)) {
+                    if(!fs.existsSync(full) || fs.existsSync(full + '.d.ts')) {
                         full += '.d.ts';
                     }
                     trace(' - import relative %s (%s)', moduleName, full);

lib/index.ts

@@ -38,6 +38,10 @@
   },
   "main": "./index.js",
   "dependencies": {
+    "@types/detect-indent": "0.1.30",
+    "@types/glob": "5.0.30",
+    "@types/mkdirp": "0.3.29",
+    "@types/node": "8.0.0",
     "commander": "^2.9.0",
     "detect-indent": "^0.2.0",
     "glob": "^6.0.4",
@@ -49,12 +53,12 @@
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.5.0",
     "grunt-contrib-jshint": "^0.10.0",
-    "grunt-dtsm": "^0.2.9",
+    "grunt-dtsm": "1.0.0",
     "grunt-mocha-test": "^0.11.0",
-    "grunt-ts": "^1.11.2",
+    "grunt-ts": "^6.0.0-beta.16",
     "jshint-path-reporter": "^0.1.3",
     "mocha-unfunk-reporter": "^0.4.0",
     "ncp": "^0.5.1",
-    "typescript": "^1.5.3"
+    "typescript": "^2.3.4"
   }
 }

package.json

@@ -0,0 +1,20 @@
+
+declare module 'foo-mx' {
+    export * from 'foo-mx/file1';
+    export * from 'foo-mx/file1/file2';
+}
+
+declare module 'foo-mx/file1' {
+    export class Foo1 {
+        property1: number;
+        constructor();
+    }
+}
+
+declare module 'foo-mx/file1/file2' {
+    export class Foo2 {
+        property2: string;
+        constructor();
+    }
+}
+

test/expected/conflicts_dirname/foo-mx.d.ts

@@ -0,0 +1,4 @@
+export class Foo1 {
+    public property1: number;
+    constructor() { }
+}

test/src/conflicts/dirname/file1.ts

@@ -0,0 +1,4 @@
+export class Foo2 {
+    public property2: string;
+    constructor() { }
+}

test/src/conflicts/dirname/file1/file2.ts

@@ -0,0 +1,2 @@
+export * from './file1';
+export * from './file1/file2';

test/src/conflicts/dirname/index.ts

@@ -334,6 +334,55 @@ describe('dts bundle', function () {
 
   	//testit('includeExclude_cli', function (actDir, expDir) {  }); // No exclude options available from CLI.
 
+	(function testit(name, assertion, run) {
+		var buildDir = path.resolve(__dirname, 'build', 'conflicts', 'dirname');
+		var call = function (done) {
+			var testDir = path.join(tmpDir, name);
+			var expDir = path.join(expectDir, name);
+
+			mkdirp.sync(testDir);
+
+			ncp.ncp(buildDir, testDir, function (err) {
+				if (err) {
+					done(err);
+					return;
+				}
+				assertion(testDir, expDir);
+				done();
+			});
+		};
+
+		var label = 'bundle ' + name;
+
+		if (run === 'skip') {
+			it.skip(label, call);
+		}
+		else if (run === 'only') {
+			it.only(label, call);
+		}
+		else {
+			it(label, call);
+		}
+	})('conflicts_dirname', function (actDir, expDir) {
+		var result = dts.bundle({
+			name: 'foo-mx',
+			main: path.join(actDir, 'index.d.ts'),
+			newline: '\n',
+            verbose: true,
+            headerPath: "none"
+		});
+		var name = 'foo-mx.d.ts';
+		var actualFile = path.join(actDir, name);
+        assert.isTrue(result.emitted, "not emit " + actualFile);
+		var expectedFile = path.join(expDir, name);
+		assertFiles(actDir, [
+			name,
+			'index.d.ts',
+			'file1.d.ts',
+			'file1/file2.d.ts',
+		]);
+		assert.strictEqual(getFile(actualFile), getFile(expectedFile));
+	});
 
 	(function testit(name, assertion, run) {
 		var buildDir = path.resolve(__dirname, 'build', 'es6');