marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-29 21:26:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict with style statements

Browse Source
This commit is contained in:
yari-dewalt
2024-10-23 12:01:08 -07:00
parent 2771b14f65
commit 39a6c308fb
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/mermaid/src/diagrams/er/parser/erDiagram.jison
View File

@@ -5,6 +5,7 @@
%x acc_title %x acc_title
%x acc_descr %x acc_descr
%x acc_descr_multiline %x acc_descr_multiline
%x style
%% %%
accTitle\s*":"\s* { this.begin("acc_title");return 'acc_title'; } accTitle\s*":"\s* { this.begin("acc_title");return 'acc_title'; }
@@ -41,8 +42,13 @@ accDescr\s*"{"\s* { this.begin("acc_descr_multili
"[" return 'SQS'; "[" return 'SQS';
"]" return 'SQE'; "]" return 'SQE';
"style" return 'STYLE'; "style" { this.begin("style"); return 'STYLE'; }
"classDef" return 'CLASSDEF'; <style>[\n]+ { this.popState(); return 'NEWLINE'; }
<style>\s+ /* skip whitespace in block */
<style>":" return 'COLON';
<style>"," return 'COMMA';
<style>"#" return 'BRKT';
"classDef" { this.begin("style"); return 'CLASSDEF'; }
"class" return 'CLASS'; "class" return 'CLASS';
"one or zero" return 'ZERO_OR_ONE'; "one or zero" return 'ZERO_OR_ONE';
"one or more" return 'ONE_OR_MORE'; "one or more" return 'ONE_OR_MORE';
@@ -72,6 +78,8 @@ o\{ return 'ZERO_OR_MORE';
"optionally to" return 'NON_IDENTIFYING'; "optionally to" return 'NON_IDENTIFYING';
\.\- return 'NON_IDENTIFYING'; \.\- return 'NON_IDENTIFYING';
\-\. return 'NON_IDENTIFYING'; \-\. return 'NON_IDENTIFYING';
<style>([^\x00-\x7F]|\w|\-|\*)+ return 'STYLE_TEXT';
<style>';' return 'SEMI';
([^\x00-\x7F]|\w|\-|\*)+ return 'UNICODE_TEXT'; ([^\x00-\x7F]|\w|\-|\*)+ return 'UNICODE_TEXT';
[0-9] return 'NUM'; [0-9] return 'NUM';
. return yytext[0]; . return yytext[0];
@@ -181,12 +189,14 @@ direction
; ;
classDefStatement classDefStatement
: CLASSDEF idList stylesOpt {$$ = $CLASSDEF;yy.addClass($idList,$stylesOpt);} : CLASSDEF idList stylesOpt separator {$$ = $CLASSDEF;yy.addClass($idList,$stylesOpt);}
; ;
idList idList
: UNICODE_TEXT { $$ = [$UNICODE_TEXT]; } : UNICODE_TEXT { $$ = [$UNICODE_TEXT]; }
| STYLE_TEXT { $$ = [$STYLE_TEXT]; }
| idList COMMA UNICODE_TEXT = { $$ = $idList.concat([$UNICODE_TEXT]); } | idList COMMA UNICODE_TEXT = { $$ = $idList.concat([$UNICODE_TEXT]); }
| idList COMMA STYLE_TEXT = { $$ = $idList.concat([$STYLE_TEXT]); }
; ;
classStatement classStatement
@@ -194,7 +204,7 @@ classStatement
; ;
styleStatement styleStatement
: STYLE idList stylesOpt {$$ = $STYLE;yy.addCssStyles($2,$stylesOpt);} : STYLE idList stylesOpt separator {;$$ = $STYLE;yy.addCssStyles($2,$stylesOpt);}
; ;
stylesOpt stylesOpt
@@ -207,7 +217,13 @@ style
| style styleComponent { $$ = $style + $styleComponent; } | style styleComponent { $$ = $style + $styleComponent; }
; ;
styleComponent: UNICODE_TEXT | NUM | COLON | BRKT | STYLE; separator
: SEMI
| NEWLINE
| EOF
;
styleComponent: STYLE_TEXT | NUM | COLON | BRKT;
entityName entityName
: 'ENTITY_NAME' { $$ = $1.replace(/"/g, ''); } : 'ENTITY_NAME' { $$ = $1.replace(/"/g, ''); }