feat(tsfmt): support include, exclude properties @tsconfig.json when using --replace options #48

Author: vvakame

lib/cli.ts

@@ -13,12 +13,9 @@ try {
 
 import * as fs from "fs";
 import * as commandpost from "commandpost";
-import * as path from "path";
-
-import * as expand from "glob-expand";
 
 import * as lib from "./";
-import { getConfigFileName } from "./utils";
+import { getConfigFileName, readFilesFromTsconfig } from "./utils";
 
 let packageJson = JSON.parse(fs.readFileSync(__dirname + "/../package.json").toString());
 
@@ -170,18 +167,3 @@ function errorHandler(err: any): Promise<any> {
         return null;
     });
 }
-
-function readFilesFromTsconfig(configPath: string) {
-    "use strict";
-
-    let tsconfigDir = path.dirname(configPath);
-    let tsconfig = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-    if (tsconfig.files) {
-        let files: string[] = tsconfig.files;
-        return files.map(filePath => path.resolve(tsconfigDir, filePath));
-    } else if (tsconfig.filesGlob) {
-        return expand({ filter: "isFile", cwd: tsconfigDir }, tsconfig.filesGlob);
-    } else {
-        throw new Error(`No "files" or "filesGlob" section present in tsconfig.json`);
-    }
-}

lib/utils.ts

@@ -2,6 +2,8 @@
 
 import * as ts from "typescript";
 
+import * as expand from "glob-expand";
+
 import * as fs from "fs";
 import * as path from "path";
 
@@ -41,3 +43,59 @@ export function getConfigFileName(baseDir: string, configFileName: string): stri
 
     return getConfigFileName(path.resolve(baseDir, "../"), configFileName);
 }
+
+export function readFilesFromTsconfig(configPath: string): string[] {
+    "use strict";
+
+    interface TsConfigJSON {
+        files?: string[];
+        filesGlob?: string[];
+        include?: string[];
+        exclude?: string[];
+    }
+
+    let tsconfigDir = path.dirname(configPath);
+    let tsconfig: TsConfigJSON = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    if (tsconfig.files) {
+        let files: string[] = tsconfig.files;
+        return files.map(filePath => path.resolve(tsconfigDir, filePath));
+    } else if (tsconfig.filesGlob) {
+        return expand({ filter: "isFile", cwd: tsconfigDir }, tsconfig.filesGlob);
+    } else if (tsconfig.include || tsconfig.exclude) {
+        return tsMatchFiles(tsconfig.exclude || [], tsconfig.include || []);
+    } else {
+        throw new Error(`No "files" or "filesGlob" section present in tsconfig.json`);
+    }
+
+    function tsMatchFiles(excludes: string[], includes: string[]) {
+        interface TsMatchFiles {
+            (path: string, extensions: string[], excludes: string[], includes: string[], useCaseSensitiveFileNames: boolean, currentDirectory: string, getFileSystemEntries: (path: string) => TsFileSystemEntries): string[];
+        }
+        interface TsFileSystemEntries {
+            files: string[];
+            directories: string[];
+        }
+
+        let f: TsMatchFiles = (ts as any).matchFiles;
+        if (!f) {
+            throw new Error("ts.matchFiles is not exists. typescript@^2.0.0 required");
+        }
+        return f(tsconfigDir, [".ts", ".tsx"], excludes, includes, true, tsconfigDir, dirPath => {
+            let stat = fs.statSync(dirPath);
+            if (stat.isDirectory()) {
+                let result: TsFileSystemEntries = { files: [], directories: [] };
+                let dirEntries = fs.readdirSync(dirPath);
+                dirEntries.forEach(entry => {
+                    let stat = fs.statSync(path.join(dirPath, entry));
+                    if (stat.isDirectory()) {
+                        result.directories.push(entry);
+                    } else if (stat.isFile()) {
+                        result.files.push(entry);
+                    }
+                });
+                return result;
+            }
+            return { files: [], directories: [] };
+        });
+    }
+}

package.json

@@ -55,6 +55,6 @@
     "mocha": "^2.5.3",
     "power-assert": "^1.2.0",
     "tslint": "^3.13.0",
-    "typescript": "~2.0.0"
+    "typescript": "^2.0.0"
   }
 }

test/cli/main.ts renamed to test/cli/files/main.ts

@@ -0,0 +1,4 @@
+export class TestCLI {
+method() {
+}
+}

test/cli/tsconfig.json renamed to test/cli/files/tsconfig.json

@@ -0,0 +1,4 @@
+export class TestCLI {
+method() {
+}
+}

test/cli/includeExclude/exclude.ts

@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": true,
+        "removeComments": false,
+        "noLib": false
+    },
+    "include": [
+        "./*.ts"
+    ],
+    "exclude": [
+        "./exclude.ts",
+        "./*.d.ts"
+    ]
+}

test/cli/includeExclude/include.ts

@@ -1,5 +1,8 @@
 {
 	"compilerOptions": {
 		"newLine": "CRLF"
-	}
+	},
+	"files": [
+		"main.ts"
+	]
 }

test/cli/includeExclude/tsconfig.json

@@ -1,5 +1,8 @@
 {
 	"compilerOptions": {
 		"newLine": "LF"
-	}
+	},
+	"files": [
+		"main.ts"
+	]
 }

test/fixture/tsconfig/crlf/tsconfig.json

@@ -202,15 +202,27 @@ describe("tsfmt test", () => {
     });
 
     describe("CLI test", () => {
-        it("should reformat files specified in tsconfig.json", () => {
-            return exec(path.resolve("./bin/tsfmt"), [], { cwd: path.resolve('./test/cli') }).then(result => {
+        it("should reformat files specified at files in tsconfig.json", () => {
+            return exec(path.resolve("./bin/tsfmt"), [], { cwd: path.resolve('./test/cli/files') }).then(result => {
                 assert.equal(result.status, 0);
                 assert.equal(result.stdout.trim(), `
 class TestCLI {
     method() {
 
     }
 }
+`.trim().replace(/\n/g, "\r\n"));
+            });
+        });
+
+        it("should reformat files specified at include, exclude in tsconfig.json", () => {
+            return exec(path.resolve("./bin/tsfmt"), [], { cwd: path.resolve('./test/cli/includeExclude') }).then(result => {
+                assert.equal(result.status, 0);
+                assert.equal(result.stdout.trim(), `
+export class TestCLI {
+    method() {
+    }
+}
 `.trim().replace(/\n/g, "\r\n"));
             });
         });