Newline fix and various tslint rule changes

lib/cli.ts

@@ -99,14 +99,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

@@ -33,6 +33,11 @@ export interface Result {
     dest: string;
 }
 
+export interface AdditionalFormatOptions {
+	noConsecutiveBlankLines: boolean;
+	noTrailingWhitespace: boolean;
+}
+
 export function processFiles(files: string[], opts: Options): Promise<ResultMap> {
     "use strict";
 
@@ -42,7 +47,7 @@ export function processFiles(files: string[], opts: Options): Promise<ResultMap>
             var 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: ""
@@ -83,6 +88,7 @@ export function processString(fileName: string, content: string, opts: Options):
     "use strict";
 
     var options = utils.createDefaultFormatCodeOptions();
+	 var additionalOptions = utils.createDefaultAdditionalFormatCodeOptions();
     var optGenPromises: (ts.FormatCodeOptions | Promise<ts.FormatCodeOptions>)[] = [];
     if (opts.tsfmt) {
         optGenPromises.push(base.makeFormatCodeOptions(fileName, options));
@@ -91,7 +97,7 @@ export function processString(fileName: string, content: string, opts: Options):
         optGenPromises.push(editorconfig.makeFormatCodeOptions(fileName, options));
     }
     if (opts.tslint) {
-        optGenPromises.push(tslintjson.makeFormatCodeOptions(fileName, options));
+        optGenPromises.push(tslintjson.makeFormatCodeOptions(fileName, options, additionalOptions));
     }
 
     return Promise
@@ -103,18 +109,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.
             var message: string;
             var 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

@@ -4,6 +4,7 @@ import ts = require("typescript");
 
 import path = require("path");
 import fs = require("fs");
+import lib = require("../index");
 
 function getConfigFileName(baseFileName: string, configFileName: string): string {
     "use strict";
@@ -23,10 +24,8 @@ function getConfigFileName(baseFileName: string, configFileName: string): string
 
 interface TslintSettings {
     rules: {
-        indent: {
-            0: boolean;
-            1: number;
-        };
+		  "no-consecutive-blank-lines": boolean,
+		  "no-trailing-whitespace": boolean,
         whitespace: {
             0: boolean;
             1: string;
@@ -39,23 +38,18 @@ interface TslintSettings {
     };
 }
 
-export function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions): ts.FormatCodeOptions {
+export function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOptions, additionalOptions: lib.AdditionalFormatOptions): ts.FormatCodeOptions {
     "use strict";
 
     var configFileName = getConfigFileName(path.resolve(fileName), "tslint.json");
     if (!configFileName) {
         return options;
     }
-    // console.log("tslint makeFormatCodeOptions");
-    // console.log("read " + configFileName);
 
     var config: TslintSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));
     if (!config.rules) {
         return options;
     }
-    if (config.rules.indent && config.rules.indent[0]) {
-        options.IndentSize = config.rules.indent[1];
-    }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (var p in config.rules.whitespace) {
             var value = config.rules.whitespace[p];
@@ -74,5 +68,13 @@ export function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOp
         }
     }
 
+	 if (config.rules["no-consecutive-blank-lines"] === true) {
+		 additionalOptions.noConsecutiveBlankLines = true;
+	 }
+
+	 if (config.rules["no-trailing-whitespace"] === true) {
+		 additionalOptions.noTrailingWhitespace = true;
+	 }
+
     return options;
 }

lib/utils.ts

@@ -1,6 +1,7 @@
 "use strict";
 
 import ts = require("typescript");
+import lib = require("./index");
 
 export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
     "use strict";
@@ -21,3 +22,12 @@ export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
         PlaceOpenBraceOnNewLineForControlBlocks: false
     };
 }
+
+export function createDefaultAdditionalFormatCodeOptions(): lib.AdditionalFormatOptions {
+    "use strict";
+
+    return {
+		 noConsecutiveBlankLines: false,
+		 noTrailingWhitespace: false
+    };
+}

tsconfig.json

@@ -40,4 +40,4 @@
         "./typings/power-assert/power-assert.d.ts",
         "./node_modules/typescript/lib/lib.es6.d.ts"
     ]
-}
+}