Merge pull request #66 from William9923/fix/no-whitespace-arrow-head-support

Author: AlexanderGrooff

cmd/parse.go

@@ -214,27 +214,27 @@ func (gp *graphProperties) parseString(line string) ([]textNode, error) {
 			},
 		},
 		{
-			regex: regexp.MustCompile(`(?s)^(.+)\s+-->\s+(.+)$`),
+			regex: regexp.MustCompile(`(?s)^(.+)\s*-->\s*\|(.+)\|\s*(.+)$`),
 			handler: func(match []string) ([]textNode, error) {
 				if lhs, err = gp.parseString(match[0]); err != nil {
 					lhs = []textNode{parseNode(match[0])}
 				}
-				if rhs, err = gp.parseString(match[1]); err != nil {
-					rhs = []textNode{parseNode(match[1])}
+				if rhs, err = gp.parseString(match[2]); err != nil {
+					rhs = []textNode{parseNode(match[2])}
 				}
-				return setArrow(lhs, rhs, gp), nil
+				return setArrowWithLabel(lhs, rhs, match[1], gp), nil
 			},
 		},
 		{
-			regex: regexp.MustCompile(`(?s)^(.+)\s+-->\|(.+)\|\s+(.+)$`),
+			regex: regexp.MustCompile(`(?s)^(.+)\s*-->\s*(.+)$`),
 			handler: func(match []string) ([]textNode, error) {
 				if lhs, err = gp.parseString(match[0]); err != nil {
 					lhs = []textNode{parseNode(match[0])}
 				}
-				if rhs, err = gp.parseString(match[2]); err != nil {
-					rhs = []textNode{parseNode(match[2])}
+				if rhs, err = gp.parseString(match[1]); err != nil {
+					rhs = []textNode{parseNode(match[1])}
 				}
-				return setArrowWithLabel(lhs, rhs, match[1], gp), nil
+				return setArrow(lhs, rhs, gp), nil
 			},
 		},
 		{

cmd/testdata/ascii/tight_arrow.txt

@@ -0,0 +1,8 @@
+graph LR
+A-->B
+---
++---+     +---+
+|   |     |   |
+| A |---->| B |
+|   |     |   |
++---+     +---+

cmd/testdata/ascii/tight_arrow_mixed.txt

@@ -0,0 +1,31 @@
+graph TD
+A-->B
+B -->C
+C-->|back1|A
+C  -->|back2|B
+---
++---+       
+|   |       
+| A |<--+   
+|   |   |   
++---+   |   
+  |     |   
+  |     |   
+  |     |   
+  |     |   
+  v     |   
++---+   |   
+|   |   |   
+| B |<back1 
+|   |   |   
++---+   |   
+  |     |   
+  |     |   
+  |   back2 
+  |     |   
+  v     |   
++---+   |   
+|   |   |   
+| C |---+   
+|   |       
++---+       

cmd/testdata/extended-chars/tight_arrow.txt

@@ -0,0 +1,8 @@
+graph LR
+A-->B
+---
+┌───┐     ┌───┐
+│   │     │   │
+│ A ├────►│ B │
+│   │     │   │
+└───┘     └───┘

cmd/testdata/extended-chars/tight_arrow_mixed.txt

@@ -0,0 +1,31 @@
+graph TD
+A-->B
+B-->  C
+C-->|back1|A
+C  -->|back2|B
+---
+┌───┐       
+│   │       
+│ A │◄──┐   
+│   │   │   
+└─┬─┘   │   
+  │     │   
+  │     │   
+  │     │   
+  │     │   
+  ▼     │   
+┌───┐   │   
+│   │   │   
+│ B │◄back1 
+│   │   │   
+└─┬─┘   │   
+  │     │   
+  │     │   
+  │   back2 
+  │     │   
+  ▼     │   
+┌───┐   │   
+│   │   │   
+│ C ├───┘   
+│   │       
+└───┘