Merge pull request #3188 from Microsoft/tsConfigExclude

ahejlsberg · ahejlsberg · commit ca4bf6bf036c · 2015-06-03T15:35:04.000-07:00
Support "exclude" property in tsconfig.json
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -349,7 +349,7 @@ module ts {
 
         return {
             options: getCompilerOptions(),
-            fileNames: getFiles(),
+            fileNames: getFileNames(),
             errors
         };
 
@@ -395,23 +395,24 @@ module ts {
             return options;
         }
 
-        function getFiles(): string[] {
-            var files: string[] = [];
+        function getFileNames(): string[] {
+            var fileNames: string[] = [];
             if (hasProperty(json, "files")) {
                 if (json["files"] instanceof Array) {
-                    var files = map(<string[]>json["files"], s => combinePaths(basePath, s));
+                    fileNames = map(<string[]>json["files"], s => combinePaths(basePath, s));
                 }
             }
             else {
-                var sysFiles = host.readDirectory(basePath, ".ts");
+                var exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
+                var sysFiles = host.readDirectory(basePath, ".ts", exclude);
                 for (var i = 0; i < sysFiles.length; i++) {
                     var name = sysFiles[i];
                     if (!fileExtensionIs(name, ".d.ts") || !contains(sysFiles, name.substr(0, name.length - 5) + ".ts")) {
-                        files.push(name);
+                        fileNames.push(name);
                     }
                 }
             }
-            return files;
+            return fileNames;
         }
     }
 }
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -15,7 +15,7 @@ module ts {
         createDirectory(path: string): void;
         getExecutingFilePath(): string;
         getCurrentDirectory(): string;
-        readDirectory(path: string, extension?: string): string[];
+        readDirectory(path: string, extension?: string, exclude?: string[]): string[];
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
     }
@@ -109,29 +109,38 @@ module ts {
                 }
             }
 
-            function getNames(collection: any): string[] {
+            function getCanonicalPath(path: string): string {
+                return path.toLowerCase();
+            }
+
+            function getNames(collection: any): string[]{
                 var result: string[] = [];
                 for (var e = new Enumerator(collection); !e.atEnd(); e.moveNext()) {
                     result.push(e.item().Name);
                 }
                 return result.sort();
             }
 
-            function readDirectory(path: string, extension?: string): string[] {
+            function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
                 var result: string[] = [];
+                exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
                 visitDirectory(path);
                 return result;
                 function visitDirectory(path: string) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (let name of files) {
-                        if (!extension || fileExtensionIs(name, extension)) {
-                            result.push(combinePaths(path, name));
+                    for (let current of files) {
+                        let name = combinePaths(path, current);
+                        if ((!extension || fileExtensionIs(name, extension)) && !contains(exclude, getCanonicalPath(name))) {
+                            result.push(name);
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
                     for (let current of subfolders) {
-                        visitDirectory(combinePaths(path, current));
+                        let name = combinePaths(path, current);
+                        if (!contains(exclude, getCanonicalPath(name))) {
+                            visitDirectory(name);
+                        }
                     }
                 }
             }
@@ -222,23 +231,30 @@ module ts {
                 _fs.writeFileSync(fileName, data, "utf8");
             }
 
-            function readDirectory(path: string, extension?: string): string[] {
+            function getCanonicalPath(path: string): string {
+                return useCaseSensitiveFileNames ? path.toLowerCase() : path;
+            }
+
+            function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
                 var result: string[] = [];
+                exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
                 visitDirectory(path);
                 return result;
                 function visitDirectory(path: string) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories: string[] = [];
                     for (let current of files) {
                         var name = combinePaths(path, current);
-                        var stat = _fs.statSync(name);
-                        if (stat.isFile()) {
-                            if (!extension || fileExtensionIs(name, extension)) {
-                                result.push(name);
+                        if (!contains(exclude, getCanonicalPath(name))) {
+                            var stat = _fs.statSync(name);
+                            if (stat.isFile()) {
+                                if (!extension || fileExtensionIs(name, extension)) {
+                                    result.push(name);
+                                }
+                            }
+                            else if (stat.isDirectory()) {
+                                directories.push(name);
                             }
-                        }
-                        else if (stat.isDirectory()) {
-                            directories.push(name);
                         }
                     }
                     for (let current of directories) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1168,7 +1168,7 @@ module ts {
     }
 
     export interface ParseConfigHost {
-        readDirectory(rootDir: string, extension: string): string[];
+        readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
     }
 
     export interface WriteFileCallback {

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ module ts {`
`349`	`349`
`350`	`350`	`return {`
`351`	`351`	`options: getCompilerOptions(),`
`352`		`- fileNames: getFiles(),`
	`352`	`+ fileNames: getFileNames(),`
`353`	`353`	`errors`
`354`	`354`	`};`
`355`	`355`
`@@ -395,23 +395,24 @@ module ts {`
`395`	`395`	`return options;`
`396`	`396`	`}`
`397`	`397`
`398`		`- function getFiles(): string[] {`
`399`		`- var files: string[] = [];`
	`398`	`+ function getFileNames(): string[] {`
	`399`	`+ var fileNames: string[] = [];`
`400`	`400`	`if (hasProperty(json, "files")) {`
`401`	`401`	`if (json["files"] instanceof Array) {`
`402`		`- var files = map(<string[]>json["files"], s => combinePaths(basePath, s));`
	`402`	`+ fileNames = map(<string[]>json["files"], s => combinePaths(basePath, s));`
`403`	`403`	`}`
`404`	`404`	`}`
`405`	`405`	`else {`
`406`		`- var sysFiles = host.readDirectory(basePath, ".ts");`
	`406`	`+ var exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;`
	`407`	`+ var sysFiles = host.readDirectory(basePath, ".ts", exclude);`
`407`	`408`	`for (var i = 0; i < sysFiles.length; i++) {`
`408`	`409`	`var name = sysFiles[i];`
`409`	`410`	`if (!fileExtensionIs(name, ".d.ts") \|\| !contains(sysFiles, name.substr(0, name.length - 5) + ".ts")) {`
`410`		`- files.push(name);`
	`411`	`+ fileNames.push(name);`
`411`	`412`	`}`
`412`	`413`	`}`
`413`	`414`	`}`
`414`		`- return files;`
	`415`	`+ return fileNames;`
`415`	`416`	`}`
`416`	`417`	`}`
`417`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1168,7 +1168,7 @@ module ts {`
`1168`	`1168`	`}`
`1169`	`1169`
`1170`	`1170`	`export interface ParseConfigHost {`
`1171`		`- readDirectory(rootDir: string, extension: string): string[];`
	`1171`	`+ readDirectory(rootDir: string, extension: string, exclude: string[]): string[];`
`1172`	`1172`	`}`
`1173`	`1173`
`1174`	`1174`	`export interface WriteFileCallback {`