Improve code reusability for right aligned column pad calculation

Author: darkriszty

src/padCalculation/center/centerPadCalculator.ts

@@ -20,5 +20,7 @@ export abstract class CenterPadCalculator extends BasePadCalculator {
         return padCount / 2;
     }
 
-    protected abstract extraPadCount(table: Table): number;
+    protected extraPadCount(table: Table): number {
+        return 2;
+    }
 }

src/padCalculation/center/firstColumnPadCalculator.ts

@@ -2,7 +2,6 @@ import { Table } from "../../models/table";
 import { CenterPadCalculator } from "./centerPadCalculator";
 
 export class FirstColumnPadCalculator extends CenterPadCalculator {
-
     protected extraPadCount(table: Table): number {
         return table.hasLeftBorder ? 2 : 1;
     }

src/padCalculation/center/lastColumnPadCalculator.ts

@@ -2,13 +2,8 @@ import { Table } from "../../models/table";
 import { CenterPadCalculator } from "./centerPadCalculator";
 
 export class LastColumnPadCalculator extends CenterPadCalculator {
-
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
         if (!table.hasRightBorder) return "";
         return super.getRightPadding(paddingChar, table, row, column);
     }
-
-    protected extraPadCount(table: Table): number {
-        return 2;
-    }
 }

src/padCalculation/center/middleColumnPadCalculator.ts

@@ -2,7 +2,5 @@ import { Table } from "../../models/table";
 import { CenterPadCalculator } from "./centerPadCalculator";
 
 export class MiddleColumnPadCalculator extends CenterPadCalculator {
-    protected extraPadCount(table: Table): number {
-        return 2;
-    }
+
 }

src/padCalculation/right/firstColumnPadCalculator.ts

@@ -1,24 +1,9 @@
-import { BasePadCalculator } from "../basePadCalculator";
 import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
+import { RightPadCalculator } from "./rightPadCalculator";
 
-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;
+export class FirstColumnPadCalculator extends RightPadCalculator {
+    protected extraPadCount(table: Table): number {
+        return table.hasLeftBorder ? 1 : 0;
     }
 }

src/padCalculation/right/lastColumnPadCalculator.ts

@@ -1,24 +1,9 @@
-import { BasePadCalculator } from "../basePadCalculator";
 import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
+import { RightPadCalculator } from "./rightPadCalculator";
 
-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;
-    }
-
+export class LastColumnPadCalculator extends RightPadCalculator {
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
-        return table.hasLeftBorder ? paddingChar : "";
+        return table.hasLeftBorder ? super.getRightPadding(paddingChar, table, row, column) : "";
     }
 }

src/padCalculation/right/middleColumnPadCalculator.ts

@@ -1,23 +1,7 @@
-import { BasePadCalculator } from "../basePadCalculator";
 import { Table } from "../../models/table";
 import { Cell } from "../../models/cell";
+import { RightPadCalculator } from "./rightPadCalculator";
 
-export class MiddleColumnPadCalculator 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)
-        );
-    }
+export class MiddleColumnPadCalculator extends RightPadCalculator {
 
-    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 paddingChar;
-    }
 }

src/padCalculation/right/rightPadCalculator.ts

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