Parse tslint config options properly

Author: myitcv

lib/cli.ts

@@ -106,7 +106,7 @@ function showResultHandler(resultMap: lib.ResultMap): Promise<any> {
             .map(fileName => resultMap[fileName])
             .forEach(result => {
                 if (result.message) {
-                    process.stdout.write(result.message.replace(/^\s+$/mg, "").replace(/\n\n^$/mg, ""));
+                    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";
 
@@ -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,6 +109,14 @@ 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;

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,6 +24,8 @@ function getConfigFileName(baseFileName: string, configFileName: string): string
 
 interface TslintSettings {
     rules: {
+		  "no-consecutive-blank-lines": boolean,
+		  "no-trailing-whitespace": boolean,
         whitespace: {
             0: boolean;
             1: string;
@@ -35,15 +38,13 @@ 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) {
@@ -67,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
+    };
+}