Merge pull request #3 from knsv/master

Merge from master

README.md

@@ -38,6 +38,17 @@ graph LR;
     C-->|Two|E[Result two];
 ```
 
+Below is the new declaration of the graph which since 0.2.16  also is valid along with the old declaration of the graph as described in the graph example on the home wiki page.
+
+```
+graph LR
+    A[Hard edge] -->|Link text| B(Round edge)
+    B --> C{Decision}
+    C -->|One| D[Result one]
+    C -->|Two| E[Result two]
+```
+
+
 ![Example 2](http://www.sveido.com/mermaid/img/ex2.png)
 
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "authors": [
     "knsv <knut@sveido.com>"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Markdownish syntax for generating flowcharts",
   "main": "src/main.js",
   "scripts": {

src/diagrams/flowchart/parser/flow.jison

@@ -26,6 +26,8 @@
 "."                   return 'DOT';
 "<"                   return 'TAGSTART';
 ">"                   return 'TAGEND';
+"^"                   return 'UP'
+"v"                   return 'DOWN'
 \-\-[x]               return 'ARROW_CROSS';
 \-\-\>                return 'ARROW_POINT';
 \-\-[o]               return 'ARROW_CIRCLE';
@@ -120,17 +122,32 @@
 
 expressions
     : graphConfig statements EOF
+    | graphConfig statements 
     | graphConfig spaceListNewline statements EOF
         {$$=$1;}
+    | graphConfig spaceListNewline statements
+        {$$=$1;}
     ;
 
 graphConfig
-    : GRAPH SPACE DIR SEMI
+    : GRAPH SPACE DIR FirstStmtSeperator
         { yy.setDirection($3);$$ = $3;}
+    | GRAPH SPACE TAGEND FirstStmtSeperator
+        { yy.setDirection("LR");$$ = $3;}
+    | GRAPH SPACE TAGSTART FirstStmtSeperator
+        { yy.setDirection("RL");$$ = $3;}
+    | GRAPH SPACE UP FirstStmtSeperator
+        { yy.setDirection("BT");$$ = $3;}
+    | GRAPH SPACE DOWN FirstStmtSeperator
+        { yy.setDirection("TB");$$ = $3;}
     ;
 
+FirstStmtSeperator 
+    : SEMI | NEWLINE | spaceList NEWLINE ;
+
 statements
     : statement spaceListNewline statements
+    | statement statements
     | statement
     ;
 
@@ -150,15 +167,16 @@ spaceList
 
 statement
     : commentStatement NEWLINE
-    {$$='Comment';}
-    | verticeStatement SEMI
-    | styleStatement SEMI
-    | linkStyleStatement SEMI
-    | classDefStatement SEMI
-    | classStatement SEMI
-    | clickStatement SEMI
+    | verticeStatement separator
+    | styleStatement separator
+    | linkStyleStatement separator
+    | classDefStatement separator
+    | classStatement separator
+    | clickStatement separator
     ;
 
+separator: NEWLINE | SEMI | EOF ;
+
 verticeStatement:
      vertex link vertex
         { yy.addLink($1,$3,$2);$$ = 'oy'}

src/diagrams/flowchart/parser/flow.spec.js

@@ -10,7 +10,7 @@ describe('when parsing ',function(){
         flow.parser.yy = require('../graphDb');
         flow.parser.yy.clear();
         /*flow.parser.parse.parseError= function parseError(str, hash) {
-            console.log(str);
+            console.logconsole.log(str);
         }*/
     });
 
@@ -30,6 +30,84 @@ describe('when parsing ',function(){
         expect(edges[0].text).toBe('');
     });
 
+    it('should handle angle bracket '>' as direction LR',function(){
+        var res = flow.parser.parse('graph >;A-->B;');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+        var direction = flow.parser.yy.getDirection();
+
+        expect(direction).toBe('LR');
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(1);
+        expect(edges[0].start).toBe('A');
+        expect(edges[0].end).toBe('B');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+
+    it('should handle angle bracket '<' as direction RL',function(){
+        var res = flow.parser.parse('graph <;A-->B;');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+        var direction = flow.parser.yy.getDirection();
+
+        expect(direction).toBe('RL');
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(1);
+        expect(edges[0].start).toBe('A');
+        expect(edges[0].end).toBe('B');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+
+
+    it('should handle caret '^' as direction BT',function(){
+        var res = flow.parser.parse('graph ^;A-->B;');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+        var direction = flow.parser.yy.getDirection();
+
+        expect(direction).toBe('BT');
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(1);
+        expect(edges[0].start).toBe('A');
+        expect(edges[0].end).toBe('B');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+
+
+    it('should handle lower-case \'v\' as direction TB',function(){
+        var res = flow.parser.parse('graph v;A-->B;');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+        var direction = flow.parser.yy.getDirection();
+
+        expect(direction).toBe('TB');
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(1);
+        expect(edges[0].start).toBe('A');
+        expect(edges[0].end).toBe('B');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+
     it('should handle a nodes and edges and a space between link and node',function(){
         var res = flow.parser.parse('graph TD;A --> B;');
 
@@ -46,6 +124,37 @@ describe('when parsing ',function(){
         expect(edges[0].text).toBe('');
     });
 
+    it('should handle a nodes and edges, a space between link and node and each line ending without semicolon',function(){
+        var res = flow.parser.parse('graph TD\nA --> B\n style e red');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(1);
+        expect(edges[0].start).toBe('A');
+        expect(edges[0].end).toBe('B');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+    it('should handle statements ending without semicolon',function(){
+        var res = flow.parser.parse('graph TD\nA-->B\nB-->C');
+
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(vert['A'].id).toBe('A');
+        expect(vert['B'].id).toBe('B');
+        expect(edges.length).toBe(2);
+        expect(edges[1].start).toBe('B');
+        expect(edges[1].end).toBe('C');
+        expect(edges[0].type).toBe('arrow');
+        expect(edges[0].text).toBe('');
+    });
+
     it('should handle a comments',function(){
         var res = flow.parser.parse('graph TD;\n%% CComment\n A-->B;');
 
@@ -199,6 +308,18 @@ describe('when parsing ',function(){
         expect(edges[0].type).toBe('arrow_cross');
         expect(edges[0].text).toBe('text including URL space');
 
+    });
+
+    it('should handle text on edges with space dir',function(){
+        var res = flow.parser.parse('graph TD;A--x|text including R TD space|B;');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+
+        expect(edges[0].type).toBe('arrow_cross');
+        expect(edges[0].text).toBe('text including R TD space');
+
     });
     it('should handle text on edges with graph keyword',function(){
         var res = flow.parser.parse('graph TD;A--x|text including graph space|B;');
@@ -343,6 +464,15 @@ describe('when parsing ',function(){
         expect(vert['C'].type).toBe('round');
         expect(vert['C'].text).toBe('Chimpansen hoppar åäö  <br> -  ÅÄÖ');
     });
+    xit('should handle text in vertices with åäö, minus and space and br',function(){
+        var res = flow.parser.parse('graph TD; A[Object&#40;foo,bar&#41;]-->B(Thing);');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(vert['C'].type).toBe('round');
+        expect(vert['C'].text).toBe(' A[Object&#40;foo,bar&#41;]-->B(Thing);');
+    });
     it('should handle text in vertices with unicode chars',function(){
         var res = flow.parser.parse('graph TD;A-->C(Начало);');
 

src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison

@@ -16,7 +16,10 @@
 [\n]+             return 'NL';
 \s+               /* skip whitespace */
 \#[^\n]*          /* skip comments */
+\%%[^\n]*          /* skip comments */
 "participant"     return 'participant';
+"loop"     		  return 'loop';
+"end"     		  return 'end';
 "left of"         return 'left_of';
 "right of"        return 'right_of';
 "over"            return 'over';
@@ -30,6 +33,7 @@
 ">>"              return 'OPENARROW';
 ">"               return 'ARROW';
 :[^#\n]+          return 'MESSAGE';
+"%%"		      return 'CMT';
 <<EOF>>           return 'EOF';
 .                 return 'INVALID';
 
@@ -58,6 +62,10 @@ statement
 	| signal               { $$='signal'; }
 	| note_statement       { $$='note';  }
 	| 'title' message      { yy.setTitle($2);  }
+	| 'loop' ACTOR
+	 { yy.addSignal(undefined, undefined, $2, yy.LINETYPE.LOOP_START);$$='loop';  }
+	| 'end'
+	 { yy.addSignal(undefined, undefined, undefined, yy.LINETYPE.LOOP_END);$$='loop';  }
 	;
 
 note_statement