Initial setup for writing alignments in output

Author: darkriszty

src/viewModelFactories/alignmentMarker.ts

@@ -0,0 +1,41 @@
+import { Alignment } from "../models/alignment";
+
+export class AlignmentMarkerStrategy {
+
+    public marker(alignment: Alignment): IMarker {
+        switch (alignment) {
+            case Alignment.Left: return new LeftMarker();
+            case Alignment.Right: return new RightMarker();
+            case Alignment.Center: return new CenterMarker();
+            default: return new NoOpMarker();
+        }
+    }
+}
+
+export interface IMarker {
+    mark(padding: string): string;
+}
+
+export class NoOpMarker implements IMarker {
+    public mark(padding: string): string {
+        return padding;
+    }
+}
+
+export class LeftMarker implements IMarker {
+    public mark(padding: string): string {
+        return ":" + padding.substr(1);
+    }
+}
+
+export class RightMarker implements IMarker {
+    public mark(padding: string): string {
+        return padding.substring(0, padding.length - 1) + ":";
+    }
+}
+
+export class CenterMarker implements IMarker {
+    public mark(padding: string): string {
+        return ":" + padding.substring(1, padding.length - 1) + ":";
+    }
+}

src/viewModelFactories/rowViewModelFactory.ts

@@ -1,8 +1,11 @@
 import { RowViewModel } from "../viewModels/rowViewModel";
 import { PadCalculator } from "../padCalculation/padCalculator";
 import { Table } from "../models/table";
+import { Alignment } from "../models/alignment";
+import { AlignmentMarkerStrategy } from "./alignmentMarker";
 
 export class RowViewModelFactory {
+
     constructor(
         private _contentPadCalculator: PadCalculator,
         private _separatorPadCalculator: PadCalculator)
@@ -24,11 +27,26 @@ export class RowViewModelFactory {
 
     public buildSeparator(table: Table): RowViewModel {
         let resultRow = new Array(table.columnCount);
-        for(let col = 0; col < table.columnCount; col++) {
-            resultRow[col] =
+
+        //TODO: extract this as constructor param
+        let alignmentMarkerSelector = new AlignmentMarkerStrategy();
+        for(let col = 0; col < table.columnCount; col++)
+            resultRow[col] = alignmentMarkerSelector.marker(table.alignments[col]).mark(
                 this._separatorPadCalculator.getLeftPadding(table, 1, col) +
-                this._separatorPadCalculator.getRightPadding(table, 0, col);
-        }
+                this._separatorPadCalculator.getRightPadding(table, 0, col)
+            );
+
         return new RowViewModel(resultRow);
     }
+/*
+    private withAlignmentMarkers(padding: string, alignment: Alignment): string {
+        if (alignment == Alignment.NotSet || padding == null)
+            return padding;
+        if (alignment == Alignment.Left)
+            return ":" + padding.substr(1);
+        if (alignment == Alignment.Right)
+            return padding.substring(0, padding.length - 1) + ":";
+
+        return ":" + padding.substring(1, padding.length - 1) + ":";
+    }*/
 }

test/unitTests/viewModelFactories/rowViewModelFactory.test.ts

@@ -82,6 +82,9 @@ suite("RowViewModelFactory.buildSeparator() tests", () => {
         const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
         const table = threeColumnTable();
 
+        _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "");
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "");
+
         const separatorRowViewModel = sut.buildSeparator(table);
 
         _separatorPadCalculator.verify(_ => _.getLeftPadding(It.isAny(), It.isAny(), 0), Times.once());
@@ -96,6 +99,8 @@ suite("RowViewModelFactory.buildSeparator() tests", () => {
     test("Value returned from padCalculator.getLeftPadding is used to start the row value", () => {
         const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
         const table = threeColumnTable();
+
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "");
         _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), 0)).returns(() => "test");
 
         const separatorRowViewModel = sut.buildSeparator(table);
@@ -125,24 +130,76 @@ suite("RowViewModelFactory.buildSeparator() tests", () => {
         assertExt.isNotNull(separatorRowViewModel);
         assert.equal(separatorRowViewModel.getValueAt(1), "LeftRight");
     });
+
+    test("Not set alignment column separator does not contain :", () => {
+        const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
+        const table = threeColumnTable(Alignment.NotSet);
+
+        _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+
+        const separatorRowViewModel = sut.buildSeparator(table);
+
+        for (let col = 0; col < separatorRowViewModel.columnCount; col++)
+            assert.equal(separatorRowViewModel.getValueAt(col), "----");
+    });
+
+    test("Left aligned column separator starts with :", () => {
+        const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
+        const table = threeColumnTable(Alignment.Left);
+
+        _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+
+        const separatorRowViewModel = sut.buildSeparator(table);
+
+        for (let col = 0; col < separatorRowViewModel.columnCount; col++)
+            assert.equal(separatorRowViewModel.getValueAt(col), ":---");
+    });
+
+    test("Right aligned column separator ends with :", () => {
+        const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
+        const table = threeColumnTable(Alignment.Right);
+
+        _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+
+        const separatorRowViewModel = sut.buildSeparator(table);
+
+        for (let col = 0; col < separatorRowViewModel.columnCount; col++)
+            assert.equal(separatorRowViewModel.getValueAt(col), "---:");
+    });
+
+    test("Centrally aligned column separator starts and ends with :", () => {
+        const sut = createFactory(_contentPadCalculator.object, _separatorPadCalculator.object);
+        const table = threeColumnTable(Alignment.Center);
+
+        _separatorPadCalculator.setup(_ => _.getLeftPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+        _separatorPadCalculator.setup(_ => _.getRightPadding(It.isAny(), It.isAny(), It.isAny())).returns(() => "--");
+
+        const separatorRowViewModel = sut.buildSeparator(table);
+
+        for (let col = 0; col < separatorRowViewModel.columnCount; col++)
+            assert.equal(separatorRowViewModel.getValueAt(col), ":--:");
+    });
 });
 
-function threeColumnTable(): Table {
+function threeColumnTable(alignment: Alignment = Alignment.NotSet): Table {
     return tableFor([
         [ "aaaaa", "bbbbb", "ccccc" ],
         [ "aaaaa", "bbbbb", "ccccc" ]
-    ]);
+    ], alignment);
 }
 
-function threeColumnTableWithEmptyMiddleColumn(): Table {
+function threeColumnTableWithEmptyMiddleColumn(alignment: Alignment = Alignment.NotSet): Table {
     return tableFor([
         [ "aaaaa", "", "ccccc" ],
         [ "aaaaa", "", "ccccc" ]
-    ]);
+    ], alignment);
 }
 
-function tableFor(rows: string[][]) {
-    const alignments: Alignment[] = rows[0].map(r => Alignment.Left);
+function tableFor(rows: string[][], alignment: Alignment) {
+    const alignments: Alignment[] = rows[0].map(r => alignment);
     let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
     return table;
 }