Add declarationDir to excludeSpec

a-tarasyuk · a-tarasyuk · commit bb615ac3f9ef · 2018-05-11T13:47:44.000+03:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -1607,10 +1607,13 @@ namespace ts {
                     createCompilerDiagnosticOnlyIfJson(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array");
                 }
             }
-            else {
-                const outDir = raw.compilerOptions && raw.compilerOptions.outDir;
-                if (outDir) {
-                    excludeSpecs = [outDir];
+            else if (raw.compilerOptions) {
+                const outDir = raw.compilerOptions.outDir;
+                const declarationDir = raw.compilerOptions.declarationDir;
+                const excludeDirs = [outDir, declarationDir].filter(dir => dir);
+
+                if (excludeDirs.length) {
+                    excludeSpecs = excludeDirs;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1607,10 +1607,13 @@ namespace ts {`
`1607`	`1607`	`createCompilerDiagnosticOnlyIfJson(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array");`
`1608`	`1608`	`}`
`1609`	`1609`	`}`
`1610`		`- else {`
`1611`		`- const outDir = raw.compilerOptions && raw.compilerOptions.outDir;`
`1612`		`- if (outDir) {`
`1613`		`- excludeSpecs = [outDir];`
	`1610`	`+ else if (raw.compilerOptions) {`
	`1611`	`+ const outDir = raw.compilerOptions.outDir;`
	`1612`	`+ const declarationDir = raw.compilerOptions.declarationDir;`
	`1613`	`+ const excludeDirs = [outDir, declarationDir].filter(dir => dir);`
	`1614`	`+`
	`1615`	`+ if (excludeDirs.length) {`
	`1616`	`+ excludeSpecs = excludeDirs;`
`1614`	`1617`	`}`
`1615`	`1618`	`}`
`1616`	`1619`