Merge pull request #18 from darkriszty/feature/EscapeSeparator

Feature/escape separator

Author: darkriszty

CHANGELOG.md

@@ -5,7 +5,9 @@ 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 #12: Full rewrite for refactoring
+- Issue #11: Support escaping of separators with backslash
 
 ## 1.1.1 - 2017-05-27
 ### Fixed

package-lock.json

@@ -1,11 +1,28 @@
 export class SelectionInterpreter {
     public allRows(selection: string): string[][] {
         return selection.split(/\r\n|\r|\n/)
-            .map(l => l.split("|"))
-            .filter(arr => !(arr.length == 1 && /^\s*$/.test(arr[0])));
+            .map(this.splitLine, this)
+            .filter(arr => arr.length > 0 && !(arr.length == 1 && /^\s*$/.test(arr[0])));
     }
 
     public separator(selection: string): string[] {
         return this.allRows(selection).filter((v, i) => i == 1)[0];
     }
+
+    private splitLine(line: string): string[] {
+        if (line == null || line.length == 0) return [];
+
+        let result:string[] = [],
+            index = -1,
+            previousSplitIndex = -1;
+        while ((index = line.indexOf("|", index + 1)) > -1) {
+            if (line[index - 1] != "\\") {
+                result.push(line.substring(previousSplitIndex + 1, index));
+                previousSplitIndex = index;
+            }
+        }
+        result.push(line.substring(previousSplitIndex + 1));
+
+        return result;
+    }
 }

src/modelFactory/selectionInterpreter.ts

@@ -0,0 +1,13 @@
+x       | y       | x&y     | x\|y
+--------|---------|---------|-------------
+`true`  | `true`  | `true`  | `true`
+`true`  | `false` | `false` | `true`
+`true`  | `null`  | `null`  | `null`
+`false` | `true`  | `false` | `true`
+`false` | `false` | `false` | `false`
+`false` | `null`  | `false` | `null`
+`null`  | `true`  | `null`  | `true`
+`null`  | `false` | `false` | `null`
+`null`  | `null`  | `null`  | `null`
+f\|oo   |         |         |
+        |         |         | b **\|** im

test/systemTests/resources/escapeSeparator-expected.md

@@ -0,0 +1,13 @@
+x|y|x&y|x\|y
+-|-|-|-
+`true` | `true`  | `true`  | `true`
+`true` | `false` | `false` | `true`
+`true` | `null`  | `null`  | `null`
+`false`| `true`  | `false` | `true`
+`false`| `false` | `false` | `false`
+`false`| `null`  | `false` | `null`
+`null` | `true`  | `null`  | `true`
+`null` | `false` | `false` | `null`
+`null` | `null`  | `null`  | `null`
+f\|oo | | |
+| | | b **\|** im

test/systemTests/resources/escapeSeparator-input.md

@@ -44,6 +44,37 @@ suite("SelectionInterpreter tests", () => {
         assert.equal(rows[1][1], "v2");
     });
 
+    test("allRows() line starting and ending with pipe is correctly splitted", () => {
+        const text = "|h1|h2|h3|h4|";
+        const sut = createSut();
+
+        const rows = sut.allRows(text);
+
+        assert.equal(rows.length, 1);
+        assert.equal(rows[0].length, 6);
+        assert.equal(rows[0][0], "");
+        assert.equal(rows[0][1], "h1");
+        assert.equal(rows[0][2], "h2");
+        assert.equal(rows[0][3], "h3");
+        assert.equal(rows[0][4], "h4");
+        assert.equal(rows[0][5], "");
+    });
+
+    test("allRows() doesn't consider \\| as separator ", () => {
+        const text = "h1|h2\\|still\\|h2\nv1|v2";
+        const sut = createSut();
+
+        const rows = sut.allRows(text);
+
+        assert.equal(rows.length, 2);
+        assert.equal(rows[0].length, 2);
+        assert.equal(rows[1].length, 2);
+        assert.equal(rows[0][0], "h1");
+        assert.equal(rows[0][1], "h2\\|still\\|h2");
+        assert.equal(rows[1][0], "v1");
+        assert.equal(rows[1][1], "v2");
+    });
+
     test("separator() returns the first row", () => {
         const text = "h1|h2\r\n:-|-\r\nv1|v2";
         const sut = createSut();