feat(tsfmt): pass Options object to providers

vvakame · vvakame · commit c425bac60768 · 2015-09-23T03:16:31.000+09:00
diff --git a/lib/cli.ts b/lib/cli.ts
@@ -40,13 +40,17 @@ let root = commandpost
         let tslint = !!opts.tslint;
         let editorconfig = !!opts.editorconfig;
         let tsfmt = !!opts.tsfmt;
+        let verbose = !!opts.verbose;
 
         let files = args.files;
         let useTsconfig = false;
         if (files.length === 0) {
             let configFileName = getConfigFileName(process.cwd(), "tsconfig.json");
             if (configFileName) {
                 files = readFilesFromTsconfig(configFileName);
+                if (verbose) {
+                    console.log(`read: ${configFileName}`);
+                }
                 useTsconfig = true;
             }
         }
@@ -56,7 +60,7 @@ let root = commandpost
             return;
         }
 
-        if (opts.verbose) {
+        if (verbose) {
             console.log("replace:	  " + (replace ? "ON" : "OFF"));
             console.log("verify:	   " + (verify ? "ON" : "OFF"));
             console.log("stdin:		" + (stdin ? "ON" : "OFF"));
@@ -66,8 +70,8 @@ let root = commandpost
             console.log("tsfmt:		" + (tsfmt ? "ON" : "OFF"));
         }
 
-        if (opts.stdin) {
-            if (opts.replace) {
+        if (stdin) {
+            if (replace) {
                 errorHandler("--stdin option can not use with --replace option");
                 return;
             }
@@ -77,7 +81,8 @@ let root = commandpost
                     verify: verify,
                     tslint: tslint,
                     editorconfig: editorconfig,
-                    tsfmt: tsfmt
+                    tsfmt: tsfmt,
+                    verbose: verbose
                 })
                 .then(result => {
                     let resultMap: lib.ResultMap = {};
@@ -93,7 +98,8 @@ let root = commandpost
                     verify: verify,
                     tslint: tslint,
                     editorconfig: editorconfig,
-                    tsfmt: tsfmt
+                    tsfmt: tsfmt,
+                    verbose: verbose
                 })
                 .then(showResultHandler)
                 .catch(errorHandler);
diff --git a/lib/index.ts b/lib/index.ts
@@ -82,22 +82,22 @@ export function processStream(fileName: string, input: NodeJS.ReadableStream, op
 export function processString(fileName: string, content: string, opts: Options): Promise<Result> {
     "use strict";
 
-    let options = createDefaultFormatCodeOptions();
+    let formatOptions = createDefaultFormatCodeOptions();
     let optGenPromises: (ts.FormatCodeOptions | Promise<ts.FormatCodeOptions>)[] = [];
     if (opts.tsfmt) {
-        optGenPromises.push(base(fileName, options));
+        optGenPromises.push(base(fileName, opts, formatOptions));
     }
     if (opts.editorconfig) {
-        optGenPromises.push(editorconfig(fileName, options));
+        optGenPromises.push(editorconfig(fileName, opts, formatOptions));
     }
     if (opts.tslint) {
-        optGenPromises.push(tslintjson(fileName, options));
+        optGenPromises.push(tslintjson(fileName, opts, formatOptions));
     }
 
     return Promise
         .all(optGenPromises)
         .then(() => {
-            let formattedCode = formatter(fileName, content, options);
+            let formattedCode = formatter(fileName, content, formatOptions);
             if ((<any>formattedCode).trimRight) {
                 formattedCode = (<any>formattedCode).trimRight();
                 formattedCode += "\n";
@@ -122,7 +122,7 @@ export function processString(fileName: string, content: string, opts: Options):
 
             let result: Result = {
                 fileName: fileName,
-                options: options,
+                options: formatOptions,
                 message: message,
                 error: error,
                 src: content,
diff --git a/lib/provider/base.ts b/lib/provider/base.ts
@@ -5,6 +5,7 @@ import * as ts from "typescript";
 import * as path from "path";
 import * as fs from "fs";
 
+import {Options} from "../";
 import {getConfigFileName} from "../utils";
 
 interface TsfmtSettings {
@@ -33,56 +34,58 @@ interface TsfmtSettings {
     convertTabsToSpaces?: boolean;
 }
 
-export default function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions): ts.FormatCodeOptions {
+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");
     if (!configFileName) {
-        return options;
+        return formatOptions;
+    }
+
+    if (opts.verbose) {
+        console.log(`read ${configFileName}`);
     }
-    // console.log("base makeFormatCodeOptions");
-    // console.log("read " + configFileName);
 
     var config: TsfmtSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));
     if (typeof config.insertSpaceAfterCommaDelimiter === "boolean") {
-        options.InsertSpaceAfterCommaDelimiter = config.insertSpaceAfterCommaDelimiter;
+        formatOptions.InsertSpaceAfterCommaDelimiter = config.insertSpaceAfterCommaDelimiter;
     }
     if (typeof config.insertSpaceAfterSemicolonInForStatements === "boolean") {
-        options.InsertSpaceAfterSemicolonInForStatements = config.insertSpaceAfterSemicolonInForStatements;
+        formatOptions.InsertSpaceAfterSemicolonInForStatements = config.insertSpaceAfterSemicolonInForStatements;
     }
     if (typeof config.insertSpaceBeforeAndAfterBinaryOperators === "boolean") {
-        options.InsertSpaceBeforeAndAfterBinaryOperators = config.insertSpaceBeforeAndAfterBinaryOperators;
+        formatOptions.InsertSpaceBeforeAndAfterBinaryOperators = config.insertSpaceBeforeAndAfterBinaryOperators;
     }
     if (typeof config.insertSpaceAfterKeywordsInControlFlowStatements === "boolean") {
-        options.InsertSpaceAfterKeywordsInControlFlowStatements = config.insertSpaceAfterKeywordsInControlFlowStatements;
+        formatOptions.InsertSpaceAfterKeywordsInControlFlowStatements = config.insertSpaceAfterKeywordsInControlFlowStatements;
     }
     if (typeof config.insertSpaceAfterFunctionKeywordForAnonymousFunctions === "boolean") {
-        options.InsertSpaceAfterFunctionKeywordForAnonymousFunctions = config.insertSpaceAfterFunctionKeywordForAnonymousFunctions;
+        formatOptions.InsertSpaceAfterFunctionKeywordForAnonymousFunctions = config.insertSpaceAfterFunctionKeywordForAnonymousFunctions;
     }
     if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis === "boolean") {
-        options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;
+        formatOptions.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;
     }
     if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets === "boolean") {
-        options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
+        formatOptions.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
     }
     if (typeof config.placeOpenBraceOnNewLineForFunctions === "boolean") {
-        options.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;
+        formatOptions.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;
     }
     if (typeof config.placeOpenBraceOnNewLineForControlBlocks === "boolean") {
-        options.PlaceOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;
+        formatOptions.PlaceOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;
     }
     if (typeof config.indentSize === "number") {
-        options.IndentSize = config.indentSize;
+        formatOptions.IndentSize = config.indentSize;
     }
     if (typeof config.tabSize === "number") {
-        options.TabSize = config.tabSize;
+        formatOptions.TabSize = config.tabSize;
     }
     if (typeof config.newLineCharacter === "string") {
-        options.NewLineCharacter = config.newLineCharacter;
+        formatOptions.NewLineCharacter = config.newLineCharacter;
     }
     if (typeof config.convertTabsToSpaces === "boolean") {
-        options.ConvertTabsToSpaces = config.convertTabsToSpaces;
+        formatOptions.ConvertTabsToSpaces = config.convertTabsToSpaces;
     }
 
-    return options;
+    return formatOptions;
 }
diff --git a/lib/provider/editorconfig.ts b/lib/provider/editorconfig.ts
@@ -4,35 +4,38 @@ import * as ts from "typescript";
 
 import * as editorconfig from "editorconfig";
 
-export default function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions): Promise<ts.FormatCodeOptions> {
+import {Options} from "../";
+
+export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): Promise<ts.FormatCodeOptions> {
     "use strict";
 
     return editorconfig
         .parse(fileName)
         .then(config => {
             if (Object.keys(config).length === 0) {
-                return options;
+                return formatOptions;
+            }
+            if (opts.verbose) {
+                console.log("editorconfig: \n" + "file: " + fileName + "\n" + JSON.stringify(config, null, 2));
             }
-            // console.log("editorconfig makeFormatCodeOptions");
-            // console.log(config);
 
             if (config.indent_style === "tab") {
-                options.ConvertTabsToSpaces = false;
+                formatOptions.ConvertTabsToSpaces = false;
                 // if (typeof config.tab_width === "number") {
                 // 	options.TabSize = config.tab_width;
                 // }
             } else if (typeof config.indent_size === "number") {
-                options.ConvertTabsToSpaces = true;
-                options.IndentSize = config.indent_size;
+                formatOptions.ConvertTabsToSpaces = true;
+                formatOptions.IndentSize = config.indent_size;
             }
             if (config.end_of_line === "lf") {
-                options.NewLineCharacter = "\n";
+                formatOptions.NewLineCharacter = "\n";
             } else if (config.end_of_line === "cr") {
-                options.NewLineCharacter = "\r";
+                formatOptions.NewLineCharacter = "\r";
             } else if (config.end_of_line === "crlf") {
-                options.NewLineCharacter = "\r\n";
+                formatOptions.NewLineCharacter = "\r\n";
             }
 
-            return options;
+            return formatOptions;
         });
 }
diff --git a/lib/provider/tslintjson.ts b/lib/provider/tslintjson.ts
@@ -5,6 +5,7 @@ import * as ts from "typescript";
 import * as path from "path";
 import * as fs from "fs";
 
+import {Options} from "../";
 import {getConfigFileName} from "../utils";
 
 interface TslintSettings {
@@ -25,40 +26,41 @@ interface TslintSettings {
     };
 }
 
-export default function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions): ts.FormatCodeOptions {
+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");
     if (!configFileName) {
-        return options;
+        return formatOptions;
+    }
+    if (opts.verbose) {
+      console.log(`read ${configFileName} for ${fileName}`);
     }
-    // console.log("tslint makeFormatCodeOptions");
-    // console.log("read " + configFileName);
 
     let config: TslintSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));
     if (!config.rules) {
-        return options;
+        return formatOptions;
     }
     if (config.rules.indent && config.rules.indent[0]) {
-        options.IndentSize = config.rules.indent[1];
+        formatOptions.IndentSize = config.rules.indent[1];
     }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (let p in config.rules.whitespace) {
             let value = config.rules.whitespace[p];
             if (value === "check-branch") {
-                options.InsertSpaceAfterKeywordsInControlFlowStatements = true;
+                formatOptions.InsertSpaceAfterKeywordsInControlFlowStatements = true;
             } else if (value === "check-decl") {
                 // none?
             } else if (value === "check-operator") {
-                options.InsertSpaceBeforeAndAfterBinaryOperators = true;
+                formatOptions.InsertSpaceBeforeAndAfterBinaryOperators = true;
             } else if (value === "check-separator") {
-                options.InsertSpaceAfterCommaDelimiter = true;
-                options.InsertSpaceAfterSemicolonInForStatements = true;
+                formatOptions.InsertSpaceAfterCommaDelimiter = true;
+                formatOptions.InsertSpaceAfterSemicolonInForStatements = true;
             } else if (value === "check-type") {
                 // none?
             }
         }
     }
 
-    return options;
+    return formatOptions;
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import * as ts from "typescript";`
`5`	`5`	`import * as path from "path";`
`6`	`6`	`import * as fs from "fs";`
`7`	`7`
	`8`	`+import {Options} from "../";`
`8`	`9`	`import {getConfigFileName} from "../utils";`
`9`	`10`
`10`	`11`	`interface TsfmtSettings {`
`@@ -33,56 +34,58 @@ interface TsfmtSettings {`
`33`	`34`	`convertTabsToSpaces?: boolean;`
`34`	`35`	`}`
`35`	`36`
`36`		`-export default function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions): ts.FormatCodeOptions {`
	`37`	`+export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {`
`37`	`38`	`"use strict";`
`38`	`39`
`39`	`40`	`var configFileName = getConfigFileName(path.dirname(path.resolve(fileName)), "tsfmt.json");`
`40`	`41`	`if (!configFileName) {`
`41`		`- return options;`
	`42`	`+ return formatOptions;`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ if (opts.verbose) {`
	`46`	+ console.log(`read ${configFileName}`);
`42`	`47`	`}`
`43`		`- // console.log("base makeFormatCodeOptions");`
`44`		`- // console.log("read " + configFileName);`
`45`	`48`
`46`	`49`	`var config: TsfmtSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));`
`47`	`50`	`if (typeof config.insertSpaceAfterCommaDelimiter === "boolean") {`
`48`		`- options.InsertSpaceAfterCommaDelimiter = config.insertSpaceAfterCommaDelimiter;`
	`51`	`+ formatOptions.InsertSpaceAfterCommaDelimiter = config.insertSpaceAfterCommaDelimiter;`
`49`	`52`	`}`
`50`	`53`	`if (typeof config.insertSpaceAfterSemicolonInForStatements === "boolean") {`
`51`		`- options.InsertSpaceAfterSemicolonInForStatements = config.insertSpaceAfterSemicolonInForStatements;`
	`54`	`+ formatOptions.InsertSpaceAfterSemicolonInForStatements = config.insertSpaceAfterSemicolonInForStatements;`
`52`	`55`	`}`
`53`	`56`	`if (typeof config.insertSpaceBeforeAndAfterBinaryOperators === "boolean") {`
`54`		`- options.InsertSpaceBeforeAndAfterBinaryOperators = config.insertSpaceBeforeAndAfterBinaryOperators;`
	`57`	`+ formatOptions.InsertSpaceBeforeAndAfterBinaryOperators = config.insertSpaceBeforeAndAfterBinaryOperators;`
`55`	`58`	`}`
`56`	`59`	`if (typeof config.insertSpaceAfterKeywordsInControlFlowStatements === "boolean") {`
`57`		`- options.InsertSpaceAfterKeywordsInControlFlowStatements = config.insertSpaceAfterKeywordsInControlFlowStatements;`
	`60`	`+ formatOptions.InsertSpaceAfterKeywordsInControlFlowStatements = config.insertSpaceAfterKeywordsInControlFlowStatements;`
`58`	`61`	`}`
`59`	`62`	`if (typeof config.insertSpaceAfterFunctionKeywordForAnonymousFunctions === "boolean") {`
`60`		`- options.InsertSpaceAfterFunctionKeywordForAnonymousFunctions = config.insertSpaceAfterFunctionKeywordForAnonymousFunctions;`
	`63`	`+ formatOptions.InsertSpaceAfterFunctionKeywordForAnonymousFunctions = config.insertSpaceAfterFunctionKeywordForAnonymousFunctions;`
`61`	`64`	`}`
`62`	`65`	`if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis === "boolean") {`
`63`		`- options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;`
	`66`	`+ formatOptions.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;`
`64`	`67`	`}`
`65`	`68`	`if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets === "boolean") {`
`66`		`- options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;`
	`69`	`+ formatOptions.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;`
`67`	`70`	`}`
`68`	`71`	`if (typeof config.placeOpenBraceOnNewLineForFunctions === "boolean") {`
`69`		`- options.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;`
	`72`	`+ formatOptions.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;`
`70`	`73`	`}`
`71`	`74`	`if (typeof config.placeOpenBraceOnNewLineForControlBlocks === "boolean") {`
`72`		`- options.PlaceOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;`
	`75`	`+ formatOptions.PlaceOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;`
`73`	`76`	`}`
`74`	`77`	`if (typeof config.indentSize === "number") {`
`75`		`- options.IndentSize = config.indentSize;`
	`78`	`+ formatOptions.IndentSize = config.indentSize;`
`76`	`79`	`}`
`77`	`80`	`if (typeof config.tabSize === "number") {`
`78`		`- options.TabSize = config.tabSize;`
	`81`	`+ formatOptions.TabSize = config.tabSize;`
`79`	`82`	`}`
`80`	`83`	`if (typeof config.newLineCharacter === "string") {`
`81`		`- options.NewLineCharacter = config.newLineCharacter;`
	`84`	`+ formatOptions.NewLineCharacter = config.newLineCharacter;`
`82`	`85`	`}`
`83`	`86`	`if (typeof config.convertTabsToSpaces === "boolean") {`
`84`		`- options.ConvertTabsToSpaces = config.convertTabsToSpaces;`
	`87`	`+ formatOptions.ConvertTabsToSpaces = config.convertTabsToSpaces;`
`85`	`88`	`}`
`86`	`89`
`87`		`- return options;`
	`90`	`+ return formatOptions;`
`88`	`91`	`}`