marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 15:30:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: validate individual values of weekdays

Browse Source
This commit is contained in:
Lei Nelissen
2023-07-14 14:09:29 +02:00
parent 11f2e31ff1
commit d0afc3bffe
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
packages/mermaid/src/diagrams/gantt/parser/gantt.jison
View File

@@ -77,25 +77,31 @@ that id.
<click>[\s\n] this.popState(); <click>[\s\n] this.popState();
<click>[^\s\n]* return 'click'; <click>[^\s\n]* return 'click';
"gantt" return 'gantt'; "gantt" return 'gantt';
"dateFormat"\s[^#\n;]+ return 'dateFormat'; "dateFormat"\s[^#\n;]+ return 'dateFormat';
"inclusiveEndDates" return 'inclusiveEndDates'; "inclusiveEndDates" return 'inclusiveEndDates';
"topAxis" return 'topAxis'; "topAxis" return 'topAxis';
"axisFormat"\s[^#\n;]+ return 'axisFormat'; "axisFormat"\s[^#\n;]+ return 'axisFormat';
"tickInterval"\s[^#\n;]+ return 'tickInterval'; "tickInterval"\s[^#\n;]+ return 'tickInterval';
"includes"\s[^#\n;]+ return 'includes'; "includes"\s[^#\n;]+ return 'includes';
"excludes"\s[^#\n;]+ return 'excludes'; "excludes"\s[^#\n;]+ return 'excludes';
"todayMarker"\s[^\n;]+ return 'todayMarker'; "todayMarker"\s[^\n;]+ return 'todayMarker';
"weekday"\s[^#\n;]+ return 'weekday'; .*weekday\s+monday[^\n]* return 'weekday_monday'
\d\d\d\d"-"\d\d"-"\d\d return 'date'; .*weekday\s+tuesday[^\n]* return 'weekday_tuesday'
"title"\s[^#\n;]+ return 'title'; .*weekday\s+wednesday[^\n]* return 'weekday_wednesday'
"accDescription"\s[^#\n;]+ return 'accDescription' .*weekday\s+thursday[^\n]* return 'weekday_thursday'
"section"\s[^#:\n;]+ return 'section'; .*weekday\s+friday[^\n]* return 'weekday_friday'
[^#:\n;]+ return 'taskTxt'; .*weekday\s+saturday[^\n]* return 'weekday_saturday'
":"[^#\n;]+ return 'taskData'; .*weekday\s+sunday[^\n]* return 'weekday_sunday'
":" return ':'; \d\d\d\d"-"\d\d"-"\d\d return 'date';
<<EOF>> return 'EOF'; "title"\s[^#\n;]+ return 'title';
. return 'INVALID'; "accDescription"\s[^#\n;]+ return 'accDescription'
"section"\s[^#:\n;]+ return 'section';
[^#:\n;]+ return 'taskTxt';
":"[^#\n;]+ return 'taskData';
":" return ':';
<<EOF>> return 'EOF';
. return 'INVALID';
/lex /lex
@@ -122,6 +128,16 @@ line
| EOF { $$=[];} | EOF { $$=[];}
; ;
weekday
: weekday_monday { yy.setWeekday("monday");}
| weekday_tuesday { yy.setWeekday("tuesday");}
| weekday_wednesday { yy.setWeekday("wednesday");}
| weekday_thursday { yy.setWeekday("thursday");}
| weekday_friday { yy.setWeekday("friday");}
| weekday_saturday { yy.setWeekday("saturday");}
| weekday_sunday { yy.setWeekday("sunday");}
;
statement statement
: dateFormat {yy.setDateFormat($1.substr(11));$$=$1.substr(11);} : dateFormat {yy.setDateFormat($1.substr(11));$$=$1.substr(11);}
| inclusiveEndDates {yy.enableInclusiveEndDates();$$=$1.substr(18);} | inclusiveEndDates {yy.enableInclusiveEndDates();$$=$1.substr(18);}
@@ -131,7 +147,7 @@ statement
| excludes {yy.setExcludes($1.substr(9));$$=$1.substr(9);} | excludes {yy.setExcludes($1.substr(9));$$=$1.substr(9);}
| includes {yy.setIncludes($1.substr(9));$$=$1.substr(9);} | includes {yy.setIncludes($1.substr(9));$$=$1.substr(9);}
| todayMarker {yy.setTodayMarker($1.substr(12));$$=$1.substr(12);} | todayMarker {yy.setTodayMarker($1.substr(12));$$=$1.substr(12);}
| weekday { yy.setWeekday($1.substr(8));$$=$1.substr(8);} | weekday
| title {yy.setDiagramTitle($1.substr(6));$$=$1.substr(6);} | title {yy.setDiagramTitle($1.substr(6));$$=$1.substr(6);}
| acc_title acc_title_value { $$=$2.trim();yy.setAccTitle($$); } | acc_title acc_title_value { $$=$2.trim();yy.setAccTitle($$); }
| acc_descr acc_descr_value { $$=$2.trim();yy.setAccDescription($$); } | acc_descr acc_descr_value { $$=$2.trim();yy.setAccDescription($$); }