Merge pull request #24 from darkriszty/feature/Alignments

Feature/alignments

Author: darkriszty

.vscode/settings.json

@@ -4,6 +4,8 @@
         "out": false // set this to true to hide the "out" folder with the compiled JS files
     },
     "search.exclude": {
-        "out": true // set this to false to include "out" folder in search results
+        "**/.git": true,
+        "**/out": true,
+        "**/node_modules": true
     }
 }

CHANGELOG.md

@@ -5,8 +5,14 @@ All notable changes to the `markdowntableprettify` extension will be documented
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Issue #15: Support alignment options
+
+## 2.1.0 - 2018-09-15
+### Added
+- Issue #15: Support alignment options
 
-## 2.0.0 - 2012-02-09
+## 2.0.0 - 2018-02-09
 ### Added
 - Issue #12: Full rewrite for refactoring.
 - Issue #11: Support escaping of separators with backslash.

package-lock.json

@@ -2,7 +2,7 @@
   "name": "markdown-table-prettify",
   "displayName": "Markdown Table Prettifier",
   "description": "Transforms markdown tables to be more readable.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "publisher": "darkriszty",
   "repository": {
     "type": "git",
@@ -33,12 +33,12 @@
     "test": "gulp copy-systemTest-resources && node ./node_modules/vscode/bin/test"
   },
   "devDependencies": {
-    "@types/mocha": "~2.2.48",
-    "@types/node": "~6.0.117",
+    "@types/mocha": "~5.2.0",
+    "@types/node": "~10.9.4",
     "gulp": "~4.0.0",
     "mocha": "~5.2.0",
     "typemoq": "~1.8.0",
-    "typescript": "~2.9.2",
+    "typescript": "~3.0.3",
     "vscode": "~1.1.21"
   },
   "license": "MIT"

package.json

@@ -13,8 +13,8 @@ import { RowViewModelFactory } from '../viewModelFactories/rowViewModelFactory';
 import { TrimmerTransformer } from '../modelFactory/transformers/trimmerTransformer';
 import { BorderTransformer } from '../modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../modelFactory/selectionInterpreter';
-import { SeparatorPadCalculator } from '../padCalculation/separatorPadCalculator';
 import { PadCalculatorSelector } from '../padCalculation/padCalculatorSelector';
+import { AlignmentMarkerStrategy } from '../viewModelFactories/alignmentMarking';
 
 // This method is called when the extension is activated.
 // The extension is activated the very first time the command is executed.
@@ -31,8 +31,8 @@ export function activate(context: vscode.ExtensionContext): void {
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(
                 new RowViewModelFactory(
-                    new ContentPadCalculator(new PadCalculatorSelector(), " "), 
-                    new SeparatorPadCalculator(new PadCalculatorSelector(), "-")
+                    new ContentPadCalculator(new PadCalculatorSelector(), " "),
+                    new AlignmentMarkerStrategy(":")
                 )
             ),
             new TableStringWriter(),

src/extension/extension.ts

@@ -1,23 +1,19 @@
 import { Alignment } from "../models/alignment";
 
 export class AlignmentFactory {
+
     public createAlignments(cells: string[]): Alignment[] {
-        let result: Alignment[] = [];
+        return cells.map(this.alignmentOf);
+    }
 
-        const len: number = cells.length;
-        for (let i = 0; i < len; i++) {
-            const cell = cells[i];
-            const left = cell[0] == ":";;
-            const right = cell[cell.length - 1] == ":";
+    private alignmentOf(cell: string): Alignment {
+        const left = cell[0] == ":";
+        const right = cell[cell.length - 1] == ":";
 
-            if (left && right)
-                result.push(Alignment.Center);
-            else if (right)
-                result.push(Alignment.Right);
-            else
-                result.push(Alignment.Left);
-        }
+        if (left && right) return Alignment.Center;
+        if (right) return Alignment.Right;
+        if (left) return Alignment.Left;
 
-        return result;
+        return Alignment.NotSet;
     }
 }

src/modelFactory/alignmentFactory.ts

@@ -18,9 +18,10 @@ export class TableFactory {
             throw new Error("Can't create table model from null table text.");
 
         const rowsWithoutSeparator = this._selectionInterpreter.allRows(text).filter((v, i) => i != 1);
+        const separator = this._selectionInterpreter.separator(text);
 
-        const alignments: Alignment[] = rowsWithoutSeparator != null && rowsWithoutSeparator.length > 1 
-            ? this._alignmentFactory.createAlignments(rowsWithoutSeparator[1]) 
+        const alignments: Alignment[] = separator != null && separator.length > 0
+            ? this._alignmentFactory.createAlignments(separator) 
             : [];
 
         const cells = rowsWithoutSeparator.map(row => row.map(c  => new Cell(c)));

src/modelFactory/tableFactory.ts

@@ -1,4 +1,5 @@
 export enum Alignment {
+    NotSet,
     Left,
     Center,
     Right

src/models/alignment.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/basePadCalculator.ts

@@ -0,0 +1,26 @@
+import { Table } from "../../models/table";
+import { Cell } from "../../models/cell";
+import { BasePadCalculator } from "../basePadCalculator";
+
+export abstract class CenterPadCalculator extends BasePadCalculator {
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));
+    }
+
+    public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));
+    }
+
+    protected totalPadCount(table: Table, column: number, row: number): number {
+        const longestColumnLength = table.getLongestColumnLengths()[column];
+        let padCount = longestColumnLength > 0
+            ? longestColumnLength - table.rows[row][column].getLength()
+            : 1;
+        padCount += this.extraPadCount(table);
+        return padCount / 2;
+    }
+
+    protected extraPadCount(table: Table): number {
+        return 2;
+    }
+}