Merge pull request microsoft#24056 from a-tarasyuk/bug/23891-declarationDir-needs-to-be-handled-in-excludeSpecs

mhegazy · web-flow · commit b0c67fd023b1 · 2018-05-11T12:56:15.000-07:00
Add declarationDir to excludeSpec
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -1607,10 +1607,12 @@ 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;
+
+                if (outDir || declarationDir) {
+                    excludeSpecs = [outDir, declarationDir].filter(d => !!d);
                 }
             }
 
diff --git a/src/harness/unittests/tsconfigParsing.ts b/src/harness/unittests/tsconfigParsing.ts
@@ -217,6 +217,29 @@ namespace ts {
             assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, allFiles);
         });
 
+        it("exclude declarationDir unless overridden", () => {
+            const tsconfigWithoutExclude =
+            `{
+                "compilerOptions": {
+                    "declarationDir": "declarations"
+                }
+            }`;
+            const tsconfigWithExclude =
+            `{
+                "compilerOptions": {
+                    "declarationDir": "declarations"
+                },
+                "exclude": [ "types" ]
+            }`;
+
+            const rootDir = "/";
+            const allFiles = ["/declarations/a.d.ts", "/a.ts"];
+            const expectedFiles = ["/a.ts"];
+
+            assertParseFileList(tsconfigWithoutExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
+            assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, allFiles);
+        });
+
         it("implicitly exclude common package folders", () => {
             assertParseFileList(
                 `{}`,

Original file line number	Diff line number	Diff line change
`@@ -1607,10 +1607,12 @@ 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`	`+`
	`1614`	`+ if (outDir \|\| declarationDir) {`
	`1615`	`+ excludeSpecs = [outDir, declarationDir].filter(d => !!d);`
`1614`	`1616`	`}`
`1615`	`1617`	`}`
`1616`	`1618`