Add right alignment pad content calculation

Author: darkriszty

src/padCalculation/basePadCalculator.ts

@@ -2,7 +2,7 @@ import { Table } from "../models/table";
 import { Cell } from "../models/cell";
 
 export abstract class BasePadCalculator {
-    public abstract getLeftPadding(paddingChar: string, table: Table, cell: Cell): string;
+    public abstract getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string;
     public abstract getRightPadding(paddingChar: string, table: Table, row: number, column: number): string;
 
     protected baseGetRightPadding(paddingChar: string, table: Table, row: number, column: number): string {

src/padCalculation/contentPadCalculator.ts

@@ -10,7 +10,7 @@ export class ContentPadCalculator implements PadCalculator {
     { }
 
     public getLeftPadding(table: Table, row: number, column: number): string {
-        return this._padCalculatorSelector.select(table, column).getLeftPadding(this._paddingChar, table, table.rows[row][column]);
+        return this._padCalculatorSelector.select(table, column).getLeftPadding(this._paddingChar, table, row, column);
     }
 
     public getRightPadding(table: Table, row: number, column: number): string {

src/padCalculation/left/firstColumnPadCalculator.ts

@@ -3,7 +3,7 @@ import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
 
 export class FirstColumnPadCalculator extends BasePadCalculator {
-    public getLeftPadding(paddingChar: string, table: Table, cell: Cell): string {
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
         return table.hasLeftBorder ? paddingChar : "";
     }
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {

src/padCalculation/left/index.ts

@@ -0,0 +1,3 @@
+export * from "./firstColumnPadCalculator"
+export * from "./middleColumnPadCalculator"
+export * from "./lastColumnPadCalculator"

src/padCalculation/left/lastColumnPadCalculator.ts

@@ -3,8 +3,8 @@ import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
 
 export class LastColumnPadCalculator extends BasePadCalculator {
-    public getLeftPadding(paddingChar: string, table: Table, cell: Cell): string {
-        return (cell.getValue() == "" && !table.hasRightBorder) ? "" : paddingChar;
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return (table.rows[row][column].getValue() == "" && !table.hasRightBorder) ? "" : paddingChar;
     }
 
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {

src/padCalculation/left/middleColumnPadCalculator.ts

@@ -3,7 +3,7 @@ import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
 
 export class MiddleColumnPadCalculator extends BasePadCalculator {
-    public getLeftPadding(paddingChar: string, table: Table, cell: Cell): string {
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
         return paddingChar;
     }
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {

src/padCalculation/padCalculatorSelector.ts

@@ -1,13 +1,27 @@
 import { Table } from "../models/table";
 import { BasePadCalculator } from "./basePadCalculator";
-import { FirstColumnPadCalculator } from "./left/firstColumnPadCalculator";
-import { LastColumnPadCalculator } from "./left/lastColumnPadCalculator";
-import { MiddleColumnPadCalculator } from "./left/middleColumnPadCalculator";
+import * as LeftAlignment from "./left";
+import * as RightAlignment from "./right";
+import { Alignment } from "../models/alignment";
 
 export class PadCalculatorSelector {
     public select(table: Table,  column: number) : BasePadCalculator {
-        if (column == 0) return new FirstColumnPadCalculator();
-        if (column == table.columnCount - 1) return new LastColumnPadCalculator();
-        return new MiddleColumnPadCalculator();
+        switch (table.alignments[column]) {
+            case Alignment.Center: return this.leftAlignmentPadCalculator(table, column);
+            case Alignment.Right: return this.rightAlignmentPadCalculator(table, column);
+            default: return this.leftAlignmentPadCalculator(table, column);
+        }
+    }
+
+    private leftAlignmentPadCalculator(table: Table,  column: number) : BasePadCalculator {
+        if (column == 0) return new LeftAlignment.FirstColumnPadCalculator();
+        if (column == table.columnCount - 1) return new LeftAlignment.LastColumnPadCalculator();
+        return new LeftAlignment.MiddleColumnPadCalculator();
+    }
+
+    private rightAlignmentPadCalculator(table: Table,  column: number) : BasePadCalculator {
+        if (column == 0) return new RightAlignment.FirstColumnPadCalculator();
+        if (column == table.columnCount - 1) return new RightAlignment.LastColumnPadCalculator();
+        return new RightAlignment.MiddleColumnPadCalculator();
     }
 }

src/padCalculation/right/firstColumnPadCalculator.ts

@@ -0,0 +1,24 @@
+import { BasePadCalculator } from "../basePadCalculator";
+import { Table } from "../../models/table";
+import { Cell } from "../../models/cell";
+
+export class FirstColumnPadCalculator extends BasePadCalculator {
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(
+            this.getLeftPaddingCount(table.getLongestColumnLengths()[column], table.rows[row][column].getLength(), table.hasLeftBorder)
+        );
+    }
+
+    private getLeftPaddingCount(longestColumnLength: number, cellTextLength: number, hasLeftBorder: boolean) {
+        let leftPadCount = longestColumnLength > 0
+            ? longestColumnLength - cellTextLength
+            : 1;
+        if (hasLeftBorder)
+            leftPadCount++;
+        return leftPadCount;
+    }
+
+    public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar;
+    }
+}

src/padCalculation/right/index.ts

@@ -0,0 +1,3 @@
+export * from "./firstColumnPadCalculator"
+export * from "./middleColumnPadCalculator"
+export * from "./lastColumnPadCalculator"

src/padCalculation/right/lastColumnPadCalculator.ts

@@ -0,0 +1,24 @@
+import { BasePadCalculator } from "../basePadCalculator";
+import { Table } from "../../models/table";
+import { Cell } from "../../models/cell";
+
+export class LastColumnPadCalculator extends BasePadCalculator {
+
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(
+            this.getLeftPaddingCount(table.getLongestColumnLengths()[column], table.rows[row][column].getLength(), table.hasLeftBorder)
+        );
+    }
+
+    private getLeftPaddingCount(longestColumnLength: number, cellTextLength: number, hasLeftBorder: boolean) {
+        let leftPadCount = longestColumnLength > 0
+            ? longestColumnLength - cellTextLength
+            : 1;
+        leftPadCount++;
+        return leftPadCount;
+    }
+
+    public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return table.hasLeftBorder ? paddingChar : "";
+    }
+}