6b3f49bed28a061f11ae0b2607691b76c1388083-PR-1259

Build # 6b3f49bed28a061f11ae0b2607691b76c1388083-PR-1259

Build Type

github

Committed by GitHub

Commit Message

Merge f8137ea7c into 3dd0c537e

Pull Request Pull Request #1259: #1257 Adding the autonumber keyword + tests and docs

Run Details

1536 of 2944 branches covered (52.17%)

Branch coverage included in aggregate %.

5 of 5 new or added lines in 2 files covered. (100.0%)

91 existing lines in 1 file now uncovered.

3347 of 6049 relevant lines covered (55.33%)

18207.11 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

67.74

/src/diagrams/sequence/parser/sequenceDiagram.jison

/** mermaid
 *  https://mermaidjs.github.io/
 *  (c) 2014-2015 Knut Sveidqvist
 *  MIT license.
 *
 *  Based on js sequence diagrams jison grammr
 *  http://bramp.github.io/js-sequence-diagrams/
 *  (c) 2012-2013 Andrew Brampton (bramp.net)
 *  Simplified BSD license.
 */
%lex

%options case-insensitive

// Special states for recognizing aliases
%x ID
%x ALIAS

// A special state for grabbing text up to the first comment/newline
%x LINE

%%

[\n]+                            return 'NL';
\s+                              /* skip all whitespace */
<ID,ALIAS,LINE>((?!\n)\s)+       /* skip same-line whitespace */
<INITIAL,ID,ALIAS,LINE>\#[^\n]*  /* skip comments */
\%%[^\n]*                        /* skip comments */
"participant"     { this.begin('ID'); return 'participant'; }
<ID>[^\->:\n,;]+?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$)  { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; }
<ALIAS>"as"       { this.popState(); this.popState(); this.begin('LINE'); return 'AS'; }
<ALIAS>(?:)       { this.popState(); this.popState(); return 'NL'; }
"loop"            { this.begin('LINE'); return 'loop'; }
"rect"            { this.begin('LINE'); return 'rect'; }
"opt"             { this.begin('LINE'); return 'opt'; }
"alt"             { this.begin('LINE'); return 'alt'; }
"else"            { this.begin('LINE'); return 'else'; }
"par"             { this.begin('LINE'); return 'par'; }
"and"             { this.begin('LINE'); return 'and'; }
<LINE>[^#\n;]*    { this.popState(); return 'restOfLine'; }
"end"             return 'end';
"left of"         return 'left_of';
"right of"        return 'right_of';
"over"            return 'over';
"note"            return 'note';
"activate"        { this.begin('ID'); return 'activate'; }
"deactivate"      { this.begin('ID'); return 'deactivate'; }
"title"           return 'title';
"sequenceDiagram" return 'SD';
"autonumber"                         return 'autonumber';
","               return ',';
";"               return 'NL';
[^\+\->:\n,;]+      { yytext = yytext.trim(); return 'ACTOR'; }
"->>"             return 'SOLID_ARROW';
"-->>"            return 'DOTTED_ARROW';
"->"              return 'SOLID_OPEN_ARROW';
"-->"             return 'DOTTED_OPEN_ARROW';
\-[x]             return 'SOLID_CROSS';
\-\-[x]           return 'DOTTED_CROSS';
":"[^#\n;]+       return 'TXT';
"+"               return '+';
"-"               return '-';
<<EOF>>           return 'NL';
.                 return 'INVALID';

/lex

%left '^'

%start start

%% /* language grammar */

start
        : SPACE start
        | NL start
        | SD document { yy.apply($2);return $2; }
        ;

document
        : /* empty */ { $$ = [] }
        | document line {$1.push($2);$$ = $1}
        ;

line
        : SPACE statement { $$ = $2 }
        | statement { $$ = $1 }
        | NL { $$=[];}
        ;

statement
        : 'participant' actor 'AS' restOfLine 'NL' {$2.description=$4; $$=$2;}
        | 'participant' actor 'NL' {$$=$2;}
        | signal 'NL'
        | autonumber {yy.enableSequenceNumbers()}
        | 'activate' actor 'NL' {$$={type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $2};}
        | 'deactivate' actor 'NL' {$$={type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $2};}
        | note_statement 'NL'
        | title text2 'NL' {$$=[{type:'setTitle', text:$2}]}
        | 'loop' restOfLine document end
        {
                $3.unshift({type: 'loopStart', loopText:$2, signalType: yy.LINETYPE.LOOP_START});
                $3.push({type: 'loopEnd', loopText:$2, signalType: yy.LINETYPE.LOOP_END});
                $$=$3;}
        | 'rect' restOfLine document end
        {
                $3.unshift({type: 'rectStart', color:$2, signalType: yy.LINETYPE.RECT_START });
                $3.push({type: 'rectEnd', color:$2, signalType: yy.LINETYPE.RECT_END });
                $$=$3;}
        | opt restOfLine document end
        {
                $3.unshift({type: 'optStart', optText:$2, signalType: yy.LINETYPE.OPT_START});
                $3.push({type: 'optEnd', optText:$2, signalType: yy.LINETYPE.OPT_END});
                $$=$3;}
        | alt restOfLine else_sections end
        {
                // Alt start
                $3.unshift({type: 'altStart', altText:$2, signalType: yy.LINETYPE.ALT_START});
                // Content in alt is already in $3
                // End
                $3.push({type: 'altEnd', signalType: yy.LINETYPE.ALT_END});
                $$=$3;}
        | par restOfLine par_sections end
        {
                // Parallel start
                $3.unshift({type: 'parStart', parText:$2, signalType: yy.LINETYPE.PAR_START});
                // Content in par is already in $3
                // End
                $3.push({type: 'parEnd', signalType: yy.LINETYPE.PAR_END});
                $$=$3;}
        ;

par_sections
        : document
        | document and restOfLine par_sections
        { $$ = $1.concat([{type: 'and', parText:$3, signalType: yy.LINETYPE.PAR_AND}, $4]); }
        ;

else_sections
        : document
        | document else restOfLine else_sections
        { $$ = $1.concat([{type: 'else', altText:$3, signalType: yy.LINETYPE.ALT_ELSE}, $4]); }
        ;

note_statement
        : 'note' placement actor text2
        {
                $$ = [$3, {type:'addNote', placement:$2, actor:$3.actor, text:$4}];}
        | 'note' 'over' actor_pair text2
        {
                // Coerce actor_pair into a [to, from, ...] array
                $2 = [].concat($3, $3).slice(0, 2);
                $2[0] = $2[0].actor;
                $2[1] = $2[1].actor;
                $$ = [$3, {type:'addNote', placement:yy.PLACEMENT.OVER, actor:$2.slice(0, 2), text:$4}];}
        ;

spaceList
    : SPACE spaceList
    | SPACE
    ;
actor_pair
        : actor ',' actor   { $$ = [$1, $3]; }
        | actor             { $$ = $1; }
        ;

placement
        : 'left_of'   { $$ = yy.PLACEMENT.LEFTOF; }
        | 'right_of'  { $$ = yy.PLACEMENT.RIGHTOF; }
        ;

signal
        : actor signaltype '+' actor text2
        { $$ = [$1,$4,{type: 'addMessage', from:$1.actor, to:$4.actor, signalType:$2, msg:$5},
                      {type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $4}
                     ]}
        | actor signaltype '-' actor text2
        { $$ = [$1,$4,{type: 'addMessage', from:$1.actor, to:$4.actor, signalType:$2, msg:$5},
                     {type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $1}
                     ]}
        | actor signaltype actor text2
        { $$ = [$1,$3,{type: 'addMessage', from:$1.actor, to:$3.actor, signalType:$2, msg:$4}]}
        ;

actor
        : ACTOR {$$={type: 'addActor', actor:$1}}
        ;

signaltype
        : SOLID_OPEN_ARROW  { $$ = yy.LINETYPE.SOLID_OPEN; }
        | DOTTED_OPEN_ARROW { $$ = yy.LINETYPE.DOTTED_OPEN; }
        | SOLID_ARROW       { $$ = yy.LINETYPE.SOLID; }
        | DOTTED_ARROW      { $$ = yy.LINETYPE.DOTTED; }
        | SOLID_CROSS       { $$ = yy.LINETYPE.SOLID_CROSS; }
        | DOTTED_CROSS      { $$ = yy.LINETYPE.DOTTED_CROSS; }
        ;

text2: TXT {$$ = $1.substring(1).trim().replace(/\\n/gm, "\n");} ;

%%

1	/** mermaid
2	* https://mermaidjs.github.io/
3	* (c) 2014-2015 Knut Sveidqvist
4	* MIT license.
5	*
6	* Based on js sequence diagrams jison grammr
7	* http://bramp.github.io/js-sequence-diagrams/
8	* (c) 2012-2013 Andrew Brampton (bramp.net)
9	* Simplified BSD license.
10	*/
11	%lex
12
13	%options case-insensitive
14
15	// Special states for recognizing aliases
16	%x ID
17	%x ALIAS
18
19	// A special state for grabbing text up to the first comment/newline
20	%x LINE
21
22	%%
23
24	[\n]+ return 'NL';
25	\s+ /* skip all whitespace */
26	<ID,ALIAS,LINE>((?!\n)\s)+ /* skip same-line whitespace */
27	<INITIAL,ID,ALIAS,LINE>\#[^\n]* /* skip comments */
28	\%%[^\n]* /* skip comments */
29	"participant" { this.begin('ID'); return 'participant'; }
30	<ID>[^\->:\n,;]+?(?=((?!\n)\s)+"as"(?!\n)\s\|[#\n;]\|$) { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; }
31	<ALIAS>"as" { this.popState(); this.popState(); this.begin('LINE'); return 'AS'; }
32	<ALIAS>(?:) { this.popState(); this.popState(); return 'NL'; }
33	"loop" { this.begin('LINE'); return 'loop'; }
34	"rect" { this.begin('LINE'); return 'rect'; }
35	"opt" { this.begin('LINE'); return 'opt'; }
36	"alt" { this.begin('LINE'); return 'alt'; }
37	"else" { this.begin('LINE'); return 'else'; }
38	"par" { this.begin('LINE'); return 'par'; }
39	"and" { this.begin('LINE'); return 'and'; }
40	<LINE>[^#\n;]* { this.popState(); return 'restOfLine'; }
41	"end" return 'end';
42	"left of" return 'left_of';
43	"right of" return 'right_of';
44	"over" return 'over';
45	"note" return 'note';
46	"activate" { this.begin('ID'); return 'activate'; }
47	"deactivate" { this.begin('ID'); return 'deactivate'; }
48	"title" return 'title';
49	"sequenceDiagram" return 'SD';
50	"autonumber" return 'autonumber';
51	"," return ',';
52	";" return 'NL';
53	[^\+\->:\n,;]+ { yytext = yytext.trim(); return 'ACTOR'; }
54	"->>" return 'SOLID_ARROW';
55	"-->>" return 'DOTTED_ARROW';
56	"->" return 'SOLID_OPEN_ARROW';
57	"-->" return 'DOTTED_OPEN_ARROW';
58	\-[x] return 'SOLID_CROSS';
59	\-\-[x] return 'DOTTED_CROSS';
60	":"[^#\n;]+ return 'TXT';
61	"+" return '+';
62	"-" return '-';
63	<<EOF>> return 'NL';
64	. return 'INVALID';
65
66	/lex
67
68	%left '^'
69
70	%start start
71
72	%% /* language grammar */
73
74	start	9✔
75	: SPACE start	288✔
76	\| NL start	9✔
77	\| SD document { yy.apply($2);return $2; }
78	;
79
80	document
81	: /* empty */ { $$ = [] }
82	\| document line {$1.push($2);$$ = $1}
83	;
84		6,258✔
85	line	6,258!
86	: SPACE statement { $$ = $2 }
87	\| statement { $$ = $1 }	234✔
UNCOV 88	\| NL { $$=[];}	×
89	;
90		333✔
91	statement	333✔
92	: 'participant' actor 'AS' restOfLine 'NL' {$2.description=$4; $$=$2;}
93	\| 'participant' actor 'NL' {$$=$2;}	1,272✔
94	\| signal 'NL'	1,272✔
95	\| autonumber {yy.enableSequenceNumbers()}
96	\| 'activate' actor 'NL' {$$={type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $2};}	669✔
97	\| 'deactivate' actor 'NL' {$$={type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $2};}	669✔
98	\| note_statement 'NL'
99	\| title text2 'NL' {$$=[{type:'setTitle', text:$2}]}	603✔
100	\| 'loop' restOfLine document end	603✔
101	{
102	$3.unshift({type: 'loopStart', loopText:$2, signalType: yy.LINETYPE.LOOP_START});	30✔
103	$3.push({type: 'loopEnd', loopText:$2, signalType: yy.LINETYPE.LOOP_END});	30✔
104	$$=$3;}
105	\| 'rect' restOfLine document end	81✔
106	{	81✔
107	$3.unshift({type: 'rectStart', color:$2, signalType: yy.LINETYPE.RECT_START });
108	$3.push({type: 'rectEnd', color:$2, signalType: yy.LINETYPE.RECT_END });	3✔
109	$$=$3;}	3✔
110	\| opt restOfLine document end
111	{	3✔
112	$3.unshift({type: 'optStart', optText:$2, signalType: yy.LINETYPE.OPT_START});	3✔
113	$3.push({type: 'optEnd', optText:$2, signalType: yy.LINETYPE.OPT_END});
114	$$=$3;}	3✔
115	\| alt restOfLine else_sections end	3✔
116	{
117	// Alt start	3✔
118	$3.unshift({type: 'altStart', altText:$2, signalType: yy.LINETYPE.ALT_START});	3✔
119	// Content in alt is already in $3
120	// End
121	$3.push({type: 'altEnd', signalType: yy.LINETYPE.ALT_END});	18✔
122	$$=$3;}	18✔
123	\| par restOfLine par_sections end	18✔
124	{	18✔
125	// Parallel start
126	$3.unshift({type: 'parStart', parText:$2, signalType: yy.LINETYPE.PAR_START});
127	// Content in par is already in $3	15✔
128	// End	15✔
129	$3.push({type: 'parEnd', signalType: yy.LINETYPE.PAR_END});	15✔
130	$$=$3;}	15✔
131	;
132
133	par_sections	9✔
134	: document	9✔
135	\| document and restOfLine par_sections	9✔
136	{ $$ = $1.concat([{type: 'and', parText:$3, signalType: yy.LINETYPE.PAR_AND}, $4]); }	9✔
137	;
138
139	else_sections
140	: document	15✔
141	\| document else restOfLine else_sections
142	{ $$ = $1.concat([{type: 'else', altText:$3, signalType: yy.LINETYPE.ALT_ELSE}, $4]); }
143	;	15✔
144		15✔
145	note_statement	15✔
146	: 'note' placement actor text2
147	{
148	$$ = [$3, {type:'addNote', placement:$2, actor:$3.actor, text:$4}];}
149	\| 'note' 'over' actor_pair text2	9✔
150	{
151	// Coerce actor_pair into a [to, from, ...] array
152	$2 = [].concat($3, $3).slice(0, 2);	9✔
153	$2[0] = $2[0].actor;	9✔
154	$2[1] = $2[1].actor;	9✔
155	$$ = [$3, {type:'addNote', placement:yy.PLACEMENT.OVER, actor:$2.slice(0, 2), text:$4}];}
156	;	12✔
157		12✔
158	spaceList
159	: SPACE spaceList	18✔
160	\| SPACE	18✔
161	;
162	actor_pair
163	: actor ',' actor { $$ = [$1, $3]; }	90✔
164	\| actor { $$ = $1; }	90✔
165	;
166
167	placement
168	: 'left_of' { $$ = yy.PLACEMENT.LEFTOF; }	27✔
169	\| 'right_of' { $$ = yy.PLACEMENT.RIGHTOF; }	27✔
170	;	27✔
171		27✔
172	signal	27✔
173	: actor signaltype '+' actor text2
174	{ $$ = [$1,$4,{type: 'addMessage', from:$1.actor, to:$4.actor, signalType:$2, msg:$5},	18✔
175	{type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $4}	18✔
176	]}
177	\| actor signaltype '-' actor text2	9✔
178	{ $$ = [$1,$4,{type: 'addMessage', from:$1.actor, to:$4.actor, signalType:$2, msg:$5},	9✔
179	{type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $1}
180	]}	12✔
181	\| actor signaltype actor text2	12✔
182	{ $$ = [$1,$3,{type: 'addMessage', from:$1.actor, to:$3.actor, signalType:$2, msg:$4}]}
183	;	78✔
184		78✔
185	actor
186	: ACTOR {$$={type: 'addActor', actor:$1}}	15✔
187	;
188
189	signaltype	15✔
190	: SOLID_OPEN_ARROW { $$ = yy.LINETYPE.SOLID_OPEN; }
191	\| DOTTED_OPEN_ARROW { $$ = yy.LINETYPE.DOTTED_OPEN; }	18✔
192	\| SOLID_ARROW { $$ = yy.LINETYPE.SOLID; }
193	\| DOTTED_ARROW { $$ = yy.LINETYPE.DOTTED; }
194	\| SOLID_CROSS { $$ = yy.LINETYPE.SOLID_CROSS; }	18✔
195	\| DOTTED_CROSS { $$ = yy.LINETYPE.DOTTED_CROSS; }
196	;	330✔
197		330✔
198	text2: TXT {$$ = $1.substring(1).trim().replace(/\\n/gm, "\n");} ;
199		981✔
200	%%	981✔

mermaid-js / mermaid / 6b3f49bed28a061f11ae0b2607691b76c1388083-PR-1259

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous