Merge branch 'newline_and_indent_fixes' of https://github.com/myitcv/typescript-formatter into myitcv-newline_and_indent_fixes

Author: vvakame

lib/cli.ts

@@ -124,14 +124,14 @@ function showResultHandler(resultMap: lib.ResultMap): Promise<any> {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .filter(result => result.error)
-            .forEach(result => console.error(result.message));
+            .forEach(result => process.stderr.write(result.message));
         process.exit(1);
     } else {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .forEach(result => {
                 if (result.message) {
-                    console.log(result.message);
+                    process.stdout.write(result.message);
                 }
             });
     }

lib/index.ts

@@ -2,7 +2,7 @@
 
 import * as ts from "typescript";
 import formatter from "./formatter";
-import {createDefaultFormatCodeOptions} from "./utils";
+import {createDefaultFormatCodeOptions, createDefaultAdditionalFormatCodeOptions} from "./utils";
 
 import * as fs from "fs";
 
@@ -34,6 +34,11 @@ export interface Result {
     dest: string;
 }
 
+export interface AdditionalFormatOptions {
+    noConsecutiveBlankLines: boolean;
+    noTrailingWhitespace: boolean;
+}
+
 export function processFiles(files: string[], opts: Options): Promise<ResultMap> {
     "use strict";
 
@@ -43,7 +48,7 @@ export function processFiles(files: string[], opts: Options): Promise<ResultMap>
             let result: Result = {
                 fileName: fileName,
                 options: null,
-                message: `${fileName} is not exists. process abort.`,
+                message: `${fileName} does not exist. process abort.\n`,
                 error: true,
                 src: "",
                 dest: ""
@@ -84,6 +89,7 @@ export function processString(fileName: string, content: string, opts: Options):
     "use strict";
 
     let formatOptions = createDefaultFormatCodeOptions();
+    let additionalOptions = createDefaultAdditionalFormatCodeOptions();
     let optGenPromises: (ts.FormatCodeOptions | Promise<ts.FormatCodeOptions>)[] = [];
     if (opts.tsfmt) {
         optGenPromises.push(base(fileName, opts, formatOptions));
@@ -92,7 +98,7 @@ export function processString(fileName: string, content: string, opts: Options):
         optGenPromises.push(editorconfig(fileName, opts, formatOptions));
     }
     if (opts.tslint) {
-        optGenPromises.push(tslintjson(fileName, opts, formatOptions));
+        optGenPromises.push(tslintjson(fileName, opts, formatOptions, additionalOptions));
     }
 
     return Promise
@@ -104,18 +110,26 @@ export function processString(fileName: string, content: string, opts: Options):
                 formattedCode += "\n";
             }
 
+            if (additionalOptions.noTrailingWhitespace) {
+                formattedCode = formattedCode.replace(/^\s+$/mg, "");
+            }
+
+            if (additionalOptions.noConsecutiveBlankLines) {
+                formattedCode = formattedCode.replace(/\n\n^$/mg, "");
+            }
+
             // TODO replace newline code. NewLineCharacter params affect to only "new" newline. maybe.
             let message: string;
             let error = false;
             if (opts && opts.verify) {
                 if (content !== formattedCode) {
-                    message = `${fileName} is not formatted`;
+                    message = `${fileName} is not formatted\n`;
                     error = true;
                 }
             } else if (opts && opts.replace) {
                 if (content !== formattedCode) {
                     fs.writeFileSync(fileName, formattedCode);
-                    message = `replaced ${fileName}`;
+                    message = `replaced ${fileName}\n`;
                 }
             } else if (opts && !opts.dryRun) {
                 message = formattedCode;

lib/provider/tslintjson.ts

@@ -5,15 +5,17 @@ import * as ts from "typescript";
 import * as path from "path";
 import * as fs from "fs";
 
-import {Options} from "../";
+import {Options, AdditionalFormatOptions} from "../";
 import {getConfigFileName} from "../utils";
 
 interface TslintSettings {
     rules: {
         indent: {
             0: boolean;
-            1: number;
+            1: string;
         };
+        "no-consecutive-blank-lines": boolean,
+        "no-trailing-whitespace": boolean,
         whitespace: {
             0: boolean;
             1: string;
@@ -26,7 +28,7 @@ interface TslintSettings {
     };
 }
 
-export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {
+export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions, additionalOptions: AdditionalFormatOptions): ts.FormatCodeOptions {
     "use strict";
 
     let baseDir = opts.baseDir ? path.resolve(opts.baseDir) : path.dirname(path.resolve(fileName));
@@ -42,8 +44,8 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
     if (!config.rules) {
         return formatOptions;
     }
-    if (config.rules.indent && config.rules.indent[0]) {
-        formatOptions.IndentSize = config.rules.indent[1];
+    if (config.rules.indent && config.rules.indent[0] && config.rules.indent[1] === "spaces") {
+        formatOptions.ConvertTabsToSpaces = true;
     }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (let p in config.rules.whitespace) {
@@ -63,5 +65,13 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
         }
     }
 
+    if (config.rules["no-consecutive-blank-lines"] === true) {
+        additionalOptions.noConsecutiveBlankLines = true;
+    }
+
+    if (config.rules["no-trailing-whitespace"] === true) {
+        additionalOptions.noTrailingWhitespace = true;
+    }
+
     return formatOptions;
 }

lib/utils.ts

@@ -5,6 +5,8 @@ import * as ts from "typescript";
 import * as fs from "fs";
 import * as path from "path";
 
+import {AdditionalFormatOptions} from "./";
+
 export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
     "use strict";
 
@@ -39,3 +41,12 @@ export function getConfigFileName(baseDir: string, configFileName: string): stri
 
     return getConfigFileName(path.resolve(baseDir, "../"), configFileName);
 }
+
+export function createDefaultAdditionalFormatCodeOptions(): AdditionalFormatOptions {
+    "use strict";
+
+    return {
+        noConsecutiveBlankLines: false,
+        noTrailingWhitespace: false
+    };
+}

test/indexSpec.ts

@@ -173,7 +173,7 @@ describe("tsfmt test", () => {
                 })
                 .then(resultMap => {
                     assert(resultMap[fileName].error);
-                    assert(resultMap[fileName].message === "./test/fixture/tsfmt/a/main.ts is not formatted");
+                    assert(resultMap[fileName].message === "./test/fixture/tsfmt/a/main.ts is not formatted\n");
                 });
         });
     });