feat(api): add baseDir options closes #23

vvakame · Sep 22, 2015 · b69c4b6 · b69c4b6
1 parent c425bac
commit b69c4b6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/lib/cli.ts b/lib/cli.ts
@@ -12,6 +12,7 @@ let packageJson = JSON.parse(fs.readFileSync(__dirname + "/../package.json").toS
 interface RootOptions {
     replace: boolean;
     verify: boolean;
+    baseDir: string[];
     stdin: boolean;
     tslint: boolean;
     editorconfig: boolean;
@@ -28,6 +29,7 @@ let root = commandpost
     .version(packageJson.version, "-v, --version")
     .option("-r, --replace", "replace .ts file")
     .option("--verify", "checking file format")
+    .option("--baseDir <path>", "config file lookup from <path>")
     .option("--stdin", "get formatting content from stdin")
     .option("--no-tslint", "don't read a tslint.json")
     .option("--no-editorconfig", "don't read a .editorconfig")
@@ -36,6 +38,7 @@ let root = commandpost
     .action((opts, args) => {
         let replace = !!opts.replace;
         let verify = !!opts.verify;
+        let baseDir = opts.baseDir ? opts.baseDir[0] : null;
         let stdin = !!opts.stdin;
         let tslint = !!opts.tslint;
         let editorconfig = !!opts.editorconfig;
@@ -45,7 +48,7 @@ let root = commandpost
         let files = args.files;
         let useTsconfig = false;
         if (files.length === 0) {
-            let configFileName = getConfigFileName(process.cwd(), "tsconfig.json");
+            let configFileName = getConfigFileName(baseDir || process.cwd(), "tsconfig.json");
             if (configFileName) {
                 files = readFilesFromTsconfig(configFileName);
                 if (verbose) {
@@ -63,6 +66,7 @@ let root = commandpost
         if (verbose) {
             console.log("replace:	  " + (replace ? "ON" : "OFF"));
             console.log("verify:	   " + (verify ? "ON" : "OFF"));
+            console.log("baseDir:	   " + (baseDir ? baseDir : process.cwd()));
             console.log("stdin:		" + (stdin ? "ON" : "OFF"));
             console.log("tsconfig:	 " + (useTsconfig ? "ON" : "OFF"));
             console.log("tslint:	   " + (tslint ? "ON" : "OFF"));
@@ -79,6 +83,7 @@ let root = commandpost
                 .processStream(files[0] || "temp.ts", process.stdin, {
                     replace: replace,
                     verify: verify,
+                    baseDir: baseDir,
                     tslint: tslint,
                     editorconfig: editorconfig,
                     tsfmt: tsfmt,
@@ -96,6 +101,7 @@ let root = commandpost
                 .processFiles(files, {
                     replace: replace,
                     verify: verify,
+                    baseDir: baseDir,
                     tslint: tslint,
                     editorconfig: editorconfig,
                     tsfmt: tsfmt,

diff --git a/lib/index.ts b/lib/index.ts
@@ -13,6 +13,7 @@ import tslintjson from "./provider/tslintjson";
 export interface Options {
     dryRun?: boolean;
     verbose?: boolean;
+    baseDir?: string;
     replace: boolean;
     verify: boolean;
     tslint: boolean;

diff --git a/lib/provider/base.ts b/lib/provider/base.ts
@@ -37,13 +37,14 @@ interface TsfmtSettings {
 export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {
     "use strict";
 
-    var configFileName = getConfigFileName(path.dirname(path.resolve(fileName)), "tsfmt.json");
+    let baseDir = opts.baseDir ? path.resolve(opts.baseDir) : path.dirname(path.resolve(fileName));
+    let configFileName = getConfigFileName(baseDir, "tsfmt.json");
     if (!configFileName) {
         return formatOptions;
     }
 
     if (opts.verbose) {
-        console.log(`read ${configFileName}`);
+        console.log(`read ${configFileName} for ${fileName}`);
     }
 
     var config: TsfmtSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));

diff --git a/lib/provider/editorconfig.ts b/lib/provider/editorconfig.ts
@@ -6,9 +6,16 @@ import * as editorconfig from "editorconfig";
 
 import {Options} from "../";
 
+let emitBaseDirWarning = false;
+
 export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): Promise<ts.FormatCodeOptions> {
     "use strict";
 
+    if (opts.verbose && opts.baseDir && !emitBaseDirWarning) {
+        console.log("editorconfig is not supported baseDir options");
+        emitBaseDirWarning = true;
+    }
+
     return editorconfig
         .parse(fileName)
         .then(config => {

diff --git a/lib/provider/tslintjson.ts b/lib/provider/tslintjson.ts
@@ -29,12 +29,13 @@ interface TslintSettings {
 export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {
     "use strict";
 
-    let configFileName = getConfigFileName(path.dirname(path.resolve(fileName)), "tslint.json");
+    let baseDir = opts.baseDir ? path.resolve(opts.baseDir) : path.dirname(path.resolve(fileName));
+    let configFileName = getConfigFileName(baseDir, "tslint.json");
     if (!configFileName) {
         return formatOptions;
     }
     if (opts.verbose) {
-      console.log(`read ${configFileName} for ${fileName}`);
+        console.log(`read ${configFileName} for ${fileName}`);
     }
 
     let config: TslintSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));