marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-04 21:04:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #872 from knsv/feature/allow-inclusive-enddates

Browse Source 
Feature/allow inclusive enddates
This commit is contained in:
Knut Sveidqvist
2019-07-12 18:05:21 +02:00
committed by GitHub
parent 86f430f61b c6511ed829
commit 3b41ba9dd9
6 changed files with 233 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/index.html vendored
View File

@@ -7,6 +7,26 @@
<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo="> <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
</head> </head>
<body> <body>
<div class="mermaid">
gantt
title Exclusive end dates (Manual date should end on 3d)
dateFormat YYYY-MM-DD
axisFormat %d
section Section1
2 Days: 1, 2019-01-01,2d
Manual Date: 2, 2019-01-01,2019-01-03
</div>
<div class="mermaid">
gantt
title Inclusive end dates (Manual date should end on 4th)
dateFormat YYYY-MM-DD
axisFormat %d
inclusiveEndDates
section Section1
2 Days: 1, 2019-01-01,2d
Manual Date: 2, 2019-01-01,2019-01-03
</div>
<div class="mermaid"> <div class="mermaid">
graph LR graph LR
sid-B3655226-6C29-4D00-B685-3D5C734DC7E1[" sid-B3655226-6C29-4D00-B685-3D5C734DC7E1["

101
src/diagrams/gantt/ganttDb.js
View File

@@ -11,6 +11,7 @@ let tasks = []
let currentSection = '' let currentSection = ''
const tags = ['active', 'done', 'crit', 'milestone'] const tags = ['active', 'done', 'crit', 'milestone']
let funs = [] let funs = []
let inclusiveEndDates = false
export const clear = function () { export const clear = function () {
sections = [] sections = []
@@ -22,6 +23,10 @@ export const clear = function () {
lastTask = undefined lastTask = undefined
lastTaskID = undefined lastTaskID = undefined
rawTasks = [] rawTasks = []
dateFormat = ''
axisFormat = ''
excludes = []
inclusiveEndDates = false
} }
export const setAxisFormat = function (txt) { export const setAxisFormat = function (txt) {
@@ -36,10 +41,26 @@ export const setDateFormat = function (txt) {
dateFormat = txt dateFormat = txt
} }
export const enableInclusiveEndDates = function () {
inclusiveEndDates = true
}
export const endDatesAreInclusive = function () {
return inclusiveEndDates
}
export const getDateFormat = function () {
return dateFormat
}
export const setExcludes = function (txt) { export const setExcludes = function (txt) {
excludes = txt.toLowerCase().split(/[\s,]+/) excludes = txt.toLowerCase().split(/[\s,]+/)
} }
export const getExcludes = function () {
return excludes
}
export const setTitle = function (txt) { export const setTitle = function (txt) {
title = txt title = txt
} }
@@ -53,6 +74,10 @@ export const addSection = function (txt) {
sections.push(txt) sections.push(txt)
} }
export const getSections = function () {
return sections
}
export const getTasks = function () { export const getTasks = function () {
let allItemsPricessed = compileTasks() let allItemsPricessed = compileTasks()
const maxDepth = 10 const maxDepth = 10
@@ -134,41 +159,47 @@ const getStartDate = function (prevTime, dateFormat, str) {
return new Date() return new Date()
} }
const getEndDate = function (prevTime, dateFormat, str) { const durationToDate = function (durationStatement, relativeTime) {
if (durationStatement !== null) {
switch (durationStatement[2]) {
case 's':
relativeTime.add(durationStatement[1], 'seconds')
break
case 'm':
relativeTime.add(durationStatement[1], 'minutes')
break
case 'h':
relativeTime.add(durationStatement[1], 'hours')
break
case 'd':
relativeTime.add(durationStatement[1], 'days')
break
case 'w':
relativeTime.add(durationStatement[1], 'weeks')
break
}
}
// Default date - now
return relativeTime.toDate()
}
const getEndDate = function (prevTime, dateFormat, str, inclusive) {
inclusive = inclusive || false
str = str.trim() str = str.trim()
// Check for actual date // Check for actual date
let mDate = moment(str, dateFormat.trim(), true) let mDate = moment(str, dateFormat.trim(), true)
if (mDate.isValid()) { if (mDate.isValid()) {
if (inclusive) {
mDate.add(1, 'd')
}
return mDate.toDate() return mDate.toDate()
} }
const d = moment(prevTime) return durationToDate(
// Check for length /^([\d]+)([wdhms])/.exec(str.trim()),
const re = /^([\d]+)([wdhms])/ moment(prevTime)
const durationStatement = re.exec(str.trim()) )
if (durationStatement !== null) {
switch (durationStatement[2]) {
case 's':
d.add(durationStatement[1], 'seconds')
break
case 'm':
d.add(durationStatement[1], 'minutes')
break
case 'h':
d.add(durationStatement[1], 'hours')
break
case 'd':
d.add(durationStatement[1], 'days')
break
case 'w':
d.add(durationStatement[1], 'weeks')
break
}
}
// Default date - now
return d.toDate()
} }
let taskCnt = 0 let taskCnt = 0
@@ -231,8 +262,8 @@ const compileData = function (prevTask, dataStr) {
} }
if (endTimeData) { if (endTimeData) {
task.endTime = getEndDate(task.startTime, dateFormat, endTimeData) task.endTime = getEndDate(task.startTime, dateFormat, endTimeData, inclusiveEndDates)
task.manualEndTime = endTimeData === moment(task.endTime).format(dateFormat.trim()) task.manualEndTime = moment(endTimeData, 'YYYY-MM-DD', true).isValid()
checkTaskDates(task, dateFormat, excludes) checkTaskDates(task, dateFormat, excludes)
} }
@@ -370,10 +401,10 @@ const compileTasks = function () {
} }
if (rawTasks[pos].startTime) { if (rawTasks[pos].startTime) {
rawTasks[pos].endTime = getEndDate(rawTasks[pos].startTime, dateFormat, rawTasks[pos].raw.endTime.data) rawTasks[pos].endTime = getEndDate(rawTasks[pos].startTime, dateFormat, rawTasks[pos].raw.endTime.data, inclusiveEndDates)
if (rawTasks[pos].endTime) { if (rawTasks[pos].endTime) {
rawTasks[pos].processed = true rawTasks[pos].processed = true
rawTasks[pos].manualEndTime = rawTasks[pos].raw.endTime.data === moment(rawTasks[pos].endTime).format(dateFormat.trim()) rawTasks[pos].manualEndTime = moment(rawTasks[pos].raw.endTime.data, 'YYYY-MM-DD', true).isValid()
checkTaskDates(rawTasks[pos], dateFormat, excludes) checkTaskDates(rawTasks[pos], dateFormat, excludes)
} }
} }
@@ -495,19 +526,25 @@ export const bindFunctions = function (element) {
export default { export default {
clear, clear,
setDateFormat, setDateFormat,
getDateFormat,
enableInclusiveEndDates,
endDatesAreInclusive,
setAxisFormat, setAxisFormat,
getAxisFormat, getAxisFormat,
setTitle, setTitle,
getTitle, getTitle,
addSection, addSection,
getSections,
getTasks, getTasks,
addTask, addTask,
findTaskById, findTaskById,
addTaskOrg, addTaskOrg,
setExcludes, setExcludes,
getExcludes,
setClickEvent, setClickEvent,
setLink, setLink,
bindFunctions bindFunctions,
durationToDate
} }
function getTaskTags (data, task, tags) { function getTaskTags (data, task, tags) {

58
src/diagrams/gantt/ganttDb.spec.js
View File

@@ -7,6 +7,41 @@ describe('when using the ganttDb', function () {
ganttDb.clear() ganttDb.clear()
}) })
describe('when using relative times', function () {
it.each`
diff | date | expected
${' 1d'} | ${moment('2019-01-01')} | ${moment('2019-01-02').toDate()}
${' 1w'} | ${moment('2019-01-01')} | ${moment('2019-01-08').toDate()}
`('should add $diff to $date resulting in $expected', ({ diff, date, expected }) => {
expect(ganttDb.durationToDate(diff, date)).toEqual(expected)
})
})
describe('when calling the clear function', function () {
beforeEach(function () {
ganttDb.setDateFormat('YYYY-MM-DD')
ganttDb.enableInclusiveEndDates()
ganttDb.setExcludes('weekends 2019-02-06,friday')
ganttDb.addSection('weekends skip test')
ganttDb.addTask('test1', 'id1,2019-02-01,1d')
ganttDb.addTask('test2', 'id2,after id1,2d')
ganttDb.clear()
})
it.each`
fn | expected
${'getTasks'} | ${[]}
${'getTitle'} | ${''}
${'getDateFormat'} | ${''}
${'getAxisFormat'} | ${''}
${'getExcludes'} | ${[]}
${'getSections'} | ${[]}
${'endDatesAreInclusive'} | ${false}
`('should clear $fn', ({ fn, expected }) => {
expect(ganttDb[ fn ]()).toEqual(expected)
})
})
it.each` it.each`
testName | section | taskName | taskData | expStartDate | expEndDate | expId | expTask testName | section | taskName | taskData | expStartDate | expEndDate | expId | expTask
${'should handle fixed dates'} | ${'testa1'} | ${'test1'} | ${'id1,2013-01-01,2013-01-12'} | ${new Date(2013, 0, 1)} | ${new Date(2013, 0, 12)} | ${'id1'} | ${'test1'} ${'should handle fixed dates'} | ${'testa1'} | ${'test1'} | ${'id1,2013-01-01,2013-01-12'} | ${new Date(2013, 0, 1)} | ${new Date(2013, 0, 12)} | ${'id1'} | ${'test1'}
@@ -125,4 +160,27 @@ describe('when using the ganttDb', function () {
expect(tasks[6].id).toEqual('id7') expect(tasks[6].id).toEqual('id7')
expect(tasks[6].task).toEqual('test7') expect(tasks[6].task).toEqual('test7')
}) })
describe('when setting inclusive end dates', function () {
beforeEach(function () {
ganttDb.setDateFormat('YYYY-MM-DD')
ganttDb.enableInclusiveEndDates()
ganttDb.addTask('test1', 'id1,2019-02-01,1d')
ganttDb.addTask('test2', 'id2,2019-02-01,2019-02-03')
})
it('should automatically add one day to all end dates', function () {
const tasks = ganttDb.getTasks()
expect(tasks[0].startTime).toEqual(moment('2019-02-01', 'YYYY-MM-DD').toDate())
expect(tasks[0].endTime).toEqual(moment('2019-02-02', 'YYYY-MM-DD').toDate())
expect(tasks[0].id).toEqual('id1')
expect(tasks[0].task).toEqual('test1')
expect(tasks[1].startTime).toEqual(moment('2019-02-01', 'YYYY-MM-DD').toDate())
expect(tasks[1].endTime).toEqual(moment('2019-02-04', 'YYYY-MM-DD').toDate())
expect(tasks[1].renderEndTime).toBeNull() // Fixed end
expect(tasks[1].manualEndTime).toBeTruthy()
expect(tasks[1].id).toEqual('id2')
expect(tasks[1].task).toEqual('test2')
})
})
}) })

8
src/diagrams/gantt/parser/gantt.jison
View File

@@ -55,6 +55,7 @@ that id.
"gantt" return 'gantt'; "gantt" return 'gantt';
"dateFormat"\s[^#\n;]+ return 'dateFormat'; "dateFormat"\s[^#\n;]+ return 'dateFormat';
"inclusiveEndDates" return 'inclusiveEndDates';
"axisFormat"\s[^#\n;]+ return 'axisFormat'; "axisFormat"\s[^#\n;]+ return 'axisFormat';
"excludes"\s[^#\n;]+ return 'excludes'; "excludes"\s[^#\n;]+ return 'excludes';
\d\d\d\d"-"\d\d"-"\d\d return 'date'; \d\d\d\d"-"\d\d"-"\d\d return 'date';
@@ -91,9 +92,10 @@ line
; ;
statement statement
: 'dateFormat' {yy.setDateFormat($1.substr(11));$$=$1.substr(11);} : dateFormat {yy.setDateFormat($1.substr(11));$$=$1.substr(11);}
| 'axisFormat' {yy.setAxisFormat($1.substr(11));$$=$1.substr(11);} | inclusiveEndDates {yy.enableInclusiveEndDates();$$=$1.substr(18);}
| 'excludes' {yy.setExcludes($1.substr(9));$$=$1.substr(9);} | axisFormat {yy.setAxisFormat($1.substr(11));$$=$1.substr(11);}
| excludes {yy.setExcludes($1.substr(9));$$=$1.substr(9);}
| title {yy.setTitle($1.substr(6));$$=$1.substr(6);} | title {yy.setTitle($1.substr(6));$$=$1.substr(6);}
| section {yy.addSection($1.substr(8));$$=$1.substr(8);} | section {yy.addSection($1.substr(8));$$=$1.substr(8);}
| clickStatement | clickStatement

124
src/diagrams/gantt/parser/gantt.js
View File

@@ -71,13 +71,13 @@
recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
} }
*/ */
var parser = (function(){ var gantt = (function(){
var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,8,10,11,12,13,14,15,17,19],$V1=[1,9],$V2=[1,10],$V3=[1,11],$V4=[1,12],$V5=[1,13],$V6=[1,15],$V7=[1,16]; var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,8,10,11,12,13,14,15,16,18,20],$V1=[1,9],$V2=[1,10],$V3=[1,11],$V4=[1,12],$V5=[1,13],$V6=[1,14],$V7=[1,16],$V8=[1,17];
var parser = {trace: function trace () { }, var parser = {trace: function trace () { },
yy: {}, yy: {},
symbols_: {"error":2,"start":3,"gantt":4,"document":5,"EOF":6,"line":7,"SPACE":8,"statement":9,"NL":10,"dateFormat":11,"axisFormat":12,"excludes":13,"title":14,"section":15,"clickStatement":16,"taskTxt":17,"taskData":18,"click":19,"callbackname":20,"callbackargs":21,"href":22,"clickStatementDebug":23,"$accept":0,"$end":1}, symbols_: {"error":2,"start":3,"gantt":4,"document":5,"EOF":6,"line":7,"SPACE":8,"statement":9,"NL":10,"dateFormat":11,"inclusiveEndDates":12,"axisFormat":13,"excludes":14,"title":15,"section":16,"clickStatement":17,"taskTxt":18,"taskData":19,"click":20,"callbackname":21,"callbackargs":22,"href":23,"clickStatementDebug":24,"$accept":0,"$end":1},
terminals_: {2:"error",4:"gantt",6:"EOF",8:"SPACE",10:"NL",11:"dateFormat",12:"axisFormat",13:"excludes",14:"title",15:"section",17:"taskTxt",18:"taskData",19:"click",20:"callbackname",21:"callbackargs",22:"href"}, terminals_: {2:"error",4:"gantt",6:"EOF",8:"SPACE",10:"NL",11:"dateFormat",12:"inclusiveEndDates",13:"axisFormat",14:"excludes",15:"title",16:"section",18:"taskTxt",19:"taskData",20:"click",21:"callbackname",22:"callbackargs",23:"href"},
productions_: [0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,2],[16,2],[16,3],[16,3],[16,4],[16,3],[16,4],[16,2],[23,2],[23,3],[23,3],[23,4],[23,3],[23,4],[23,2]], productions_: [0,[3,3],[5,0],[5,2],[7,2],[7,1],[7,1],[7,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,1],[9,2],[17,2],[17,3],[17,3],[17,4],[17,3],[17,4],[17,2],[24,2],[24,3],[24,3],[24,4],[24,3],[24,4],[24,2]],
performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
/* this == yyval */ /* this == yyval */
@@ -102,53 +102,56 @@ case 8:
yy.setDateFormat($$[$0].substr(11));this.$=$$[$0].substr(11); yy.setDateFormat($$[$0].substr(11));this.$=$$[$0].substr(11);
break; break;
case 9: case 9:
yy.setAxisFormat($$[$0].substr(11));this.$=$$[$0].substr(11); yy.enableInclusiveEndDates();this.$=$$[$0].substr(18);
break; break;
case 10: case 10:
yy.setExcludes($$[$0].substr(9));this.$=$$[$0].substr(9); yy.setAxisFormat($$[$0].substr(11));this.$=$$[$0].substr(11);
break; break;
case 11: case 11:
yy.setTitle($$[$0].substr(6));this.$=$$[$0].substr(6); yy.setExcludes($$[$0].substr(9));this.$=$$[$0].substr(9);
break; break;
case 12: case 12:
yy.setTitle($$[$0].substr(6));this.$=$$[$0].substr(6);
break;
case 13:
yy.addSection($$[$0].substr(8));this.$=$$[$0].substr(8); yy.addSection($$[$0].substr(8));this.$=$$[$0].substr(8);
break; break;
case 14: case 15:
yy.addTask($$[$0-1],$$[$0]);this.$='task'; yy.addTask($$[$0-1],$$[$0]);this.$='task';
break; break;
case 15: case 16:
this.$ = $$[$0-1];yy.setClickEvent($$[$0-1], $$[$0], null); this.$ = $$[$0-1];yy.setClickEvent($$[$0-1], $$[$0], null);
break; break;
case 16: case 17:
this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0-1], $$[$0]); this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0-1], $$[$0]);
break; break;
case 17: case 18:
this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0-1], null);yy.setLink($$[$0-2],$$[$0]); this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0-1], null);yy.setLink($$[$0-2],$$[$0]);
break; break;
case 18: case 19:
this.$ = $$[$0-3];yy.setClickEvent($$[$0-3], $$[$0-2], $$[$0-1]);yy.setLink($$[$0-3],$$[$0]); this.$ = $$[$0-3];yy.setClickEvent($$[$0-3], $$[$0-2], $$[$0-1]);yy.setLink($$[$0-3],$$[$0]);
break; break;
case 19: case 20:
this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0], null);yy.setLink($$[$0-2],$$[$0-1]); this.$ = $$[$0-2];yy.setClickEvent($$[$0-2], $$[$0], null);yy.setLink($$[$0-2],$$[$0-1]);
break; break;
case 20: case 21:
this.$ = $$[$0-3];yy.setClickEvent($$[$0-3], $$[$0-1], $$[$0]);yy.setLink($$[$0-3],$$[$0-2]); this.$ = $$[$0-3];yy.setClickEvent($$[$0-3], $$[$0-1], $$[$0]);yy.setLink($$[$0-3],$$[$0-2]);
break; break;
case 21: case 22:
this.$ = $$[$0-1];yy.setLink($$[$0-1], $$[$0]); this.$ = $$[$0-1];yy.setLink($$[$0-1], $$[$0]);
break; break;
case 22: case 28: case 23: case 29:
this.$=$$[$0-1] + ' ' + $$[$0]; this.$=$$[$0-1] + ' ' + $$[$0];
break; break;
case 23: case 24: case 26: case 24: case 25: case 27:
this.$=$$[$0-2] + ' ' + $$[$0-1] + ' ' + $$[$0]; this.$=$$[$0-2] + ' ' + $$[$0-1] + ' ' + $$[$0];
break; break;
case 25: case 27: case 26: case 28:
this.$=$$[$0-3] + ' ' + $$[$0-2] + ' ' + $$[$0-1] + ' ' + $$[$0]; this.$=$$[$0-3] + ' ' + $$[$0-2] + ' ' + $$[$0-1] + ' ' + $$[$0];
break; break;
} }
}, },
table: [{3:1,4:[1,2]},{1:[3]},o($V0,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:$V1,12:$V2,13:$V3,14:$V4,15:$V5,16:14,17:$V6,19:$V7},o($V0,[2,7],{1:[2,1]}),o($V0,[2,3]),{9:17,11:$V1,12:$V2,13:$V3,14:$V4,15:$V5,16:14,17:$V6,19:$V7},o($V0,[2,5]),o($V0,[2,6]),o($V0,[2,8]),o($V0,[2,9]),o($V0,[2,10]),o($V0,[2,11]),o($V0,[2,12]),o($V0,[2,13]),{18:[1,18]},{20:[1,19],22:[1,20]},o($V0,[2,4]),o($V0,[2,14]),o($V0,[2,15],{21:[1,21],22:[1,22]}),o($V0,[2,21],{20:[1,23]}),o($V0,[2,16],{22:[1,24]}),o($V0,[2,17]),o($V0,[2,19],{21:[1,25]}),o($V0,[2,18]),o($V0,[2,20])], table: [{3:1,4:[1,2]},{1:[3]},o($V0,[2,2],{5:3}),{6:[1,4],7:5,8:[1,6],9:7,10:[1,8],11:$V1,12:$V2,13:$V3,14:$V4,15:$V5,16:$V6,17:15,18:$V7,20:$V8},o($V0,[2,7],{1:[2,1]}),o($V0,[2,3]),{9:18,11:$V1,12:$V2,13:$V3,14:$V4,15:$V5,16:$V6,17:15,18:$V7,20:$V8},o($V0,[2,5]),o($V0,[2,6]),o($V0,[2,8]),o($V0,[2,9]),o($V0,[2,10]),o($V0,[2,11]),o($V0,[2,12]),o($V0,[2,13]),o($V0,[2,14]),{19:[1,19]},{21:[1,20],23:[1,21]},o($V0,[2,4]),o($V0,[2,15]),o($V0,[2,16],{22:[1,22],23:[1,23]}),o($V0,[2,22],{21:[1,24]}),o($V0,[2,17],{23:[1,25]}),o($V0,[2,18]),o($V0,[2,20],{22:[1,26]}),o($V0,[2,19]),o($V0,[2,21])],
defaultActions: {}, defaultActions: {},
parseError: function parseError (str, hash) { parseError: function parseError (str, hash) {
if (hash.recoverable) { if (hash.recoverable) {
@@ -188,18 +191,15 @@ parse: function parse(input) {
vstack.length = vstack.length - n; vstack.length = vstack.length - n;
lstack.length = lstack.length - n; lstack.length = lstack.length - n;
} }
function lex() { _token_stack:
var lex = function () {
var token; var token;
token = tstack.pop() || lexer.lex() || EOF; token = lexer.lex() || EOF;
if (typeof token !== 'number') { if (typeof token !== 'number') {
if (token instanceof Array) {
tstack = token;
token = tstack.pop();
}
token = self.symbols_[token] || token; token = self.symbols_[token] || token;
} }
return token; return token;
} };
var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected; var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
while (true) { while (true) {
state = stack[stack.length - 1]; state = stack[stack.length - 1];
@@ -211,27 +211,27 @@ parse: function parse(input) {
} }
action = table[state] && table[state][symbol]; action = table[state] && table[state][symbol];
} }
if (typeof action === 'undefined' || !action.length || !action[0]) { if (typeof action === 'undefined' || !action.length || !action[0]) {
var errStr = ''; var errStr = '';
expected = []; expected = [];
for (p in table[state]) { for (p in table[state]) {
if (this.terminals_[p] && p > TERROR) { if (this.terminals_[p] && p > TERROR) {
expected.push('\'' + this.terminals_[p] + '\''); expected.push('\'' + this.terminals_[p] + '\'');
}
} }
if (lexer.showPosition) {
errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
} else {
errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
}
this.parseError(errStr, {
text: lexer.match,
token: this.terminals_[symbol] || symbol,
line: lexer.yylineno,
loc: yyloc,
expected: expected
});
} }
if (lexer.showPosition) {
errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
} else {
errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
}
this.parseError(errStr, {
text: lexer.match,
token: this.terminals_[symbol] || symbol,
line: lexer.yylineno,
loc: yyloc,
expected: expected
});
}
if (action[0] instanceof Array && action.length > 1) { if (action[0] instanceof Array && action.length > 1) {
throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol); throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
} }
@@ -640,7 +640,7 @@ case 4:this.begin("href");
break; break;
case 5:this.popState(); case 5:this.popState();
break; break;
case 6:return 22; case 6:return 23;
break; break;
case 7:this.begin("callbackname"); case 7:this.begin("callbackname");
break; break;
@@ -648,17 +648,17 @@ case 8:this.popState();
break; break;
case 9:this.popState(); this.begin("callbackargs"); case 9:this.popState(); this.begin("callbackargs");
break; break;
case 10:return 20; case 10:return 21;
break; break;
case 11:this.popState(); case 11:this.popState();
break; break;
case 12:return 21; case 12:return 22;
break; break;
case 13:this.begin("click"); case 13:this.begin("click");
break; break;
case 14:this.popState(); case 14:this.popState();
break; break;
case 15:return 19; case 15:return 20;
break; break;
case 16:return 4; case 16:return 4;
break; break;
@@ -668,26 +668,28 @@ case 18:return 12;
break; break;
case 19:return 13; case 19:return 13;
break; break;
case 20:return 'date'; case 20:return 14;
break; break;
case 21:return 14; case 21:return 'date';
break; break;
case 22:return 15; case 22:return 15;
break; break;
case 23:return 17; case 23:return 16;
break; break;
case 24:return 18; case 24:return 18;
break; break;
case 25:return ':'; case 25:return 19;
break; break;
case 26:return 6; case 26:return ':';
break; break;
case 27:return 'INVALID'; case 27:return 6;
break;
case 28:return 'INVALID';
break; break;
} }
}, },
rules: [/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:href[\s]+["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:call[\s]+)/i,/^(?:\([\s]*\))/i,/^(?:\()/i,/^(?:[^(]*)/i,/^(?:\))/i,/^(?:[^)]*)/i,/^(?:click[\s]+)/i,/^(?:[\s\n])/i,/^(?:[^\s\n]*)/i,/^(?:gantt\b)/i,/^(?:dateFormat\s[^#\n;]+)/i,/^(?:axisFormat\s[^#\n;]+)/i,/^(?:excludes\s[^#\n;]+)/i,/^(?:\d\d\d\d-\d\d-\d\d\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:section\s[^#:\n;]+)/i,/^(?:[^#:\n;]+)/i,/^(?::[^#\n;]+)/i,/^(?::)/i,/^(?:$)/i,/^(?:.)/i], rules: [/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:href[\s]+["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:call[\s]+)/i,/^(?:\([\s]*\))/i,/^(?:\()/i,/^(?:[^(]*)/i,/^(?:\))/i,/^(?:[^)]*)/i,/^(?:click[\s]+)/i,/^(?:[\s\n])/i,/^(?:[^\s\n]*)/i,/^(?:gantt\b)/i,/^(?:dateFormat\s[^#\n;]+)/i,/^(?:inclusiveEndDates\b)/i,/^(?:axisFormat\s[^#\n;]+)/i,/^(?:excludes\s[^#\n;]+)/i,/^(?:\d\d\d\d-\d\d-\d\d\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:section\s[^#:\n;]+)/i,/^(?:[^#:\n;]+)/i,/^(?::[^#\n;]+)/i,/^(?::)/i,/^(?:$)/i,/^(?:.)/i],
conditions: {"callbackargs":{"rules":[11,12],"inclusive":false},"callbackname":{"rules":[8,9,10],"inclusive":false},"href":{"rules":[5,6],"inclusive":false},"click":{"rules":[14,15],"inclusive":false},"INITIAL":{"rules":[0,1,2,3,4,7,13,16,17,18,19,20,21,22,23,24,25,26,27],"inclusive":true}} conditions: {"callbackargs":{"rules":[11,12],"inclusive":false},"callbackname":{"rules":[8,9,10],"inclusive":false},"href":{"rules":[5,6],"inclusive":false},"click":{"rules":[14,15],"inclusive":false},"INITIAL":{"rules":[0,1,2,3,4,7,13,16,17,18,19,20,21,22,23,24,25,26,27,28],"inclusive":true}}
}); });
return lexer; return lexer;
})(); })();
@@ -701,9 +703,9 @@ return new Parser;
if (typeof require !== 'undefined' && typeof exports !== 'undefined') { if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
exports.parser = parser; exports.parser = gantt;
exports.Parser = parser.Parser; exports.Parser = gantt.Parser;
exports.parse = function () { return parser.parse.apply(parser, arguments); }; exports.parse = function () { return gantt.parse.apply(gantt, arguments); };
exports.main = function commonjsMain (args) { exports.main = function commonjsMain (args) {
if (!args[1]) { if (!args[1]) {
console.log('Usage: '+args[0]+' FILE'); console.log('Usage: '+args[0]+' FILE');

24
src/diagrams/gantt/parser/gantt.spec.js
View File

@@ -3,6 +3,12 @@
import { parser } from './gantt' import { parser } from './gantt'
import ganttDb from '../ganttDb' import ganttDb from '../ganttDb'
const parserFnConstructor = (str) => {
return () => {
parser.parse(str)
}
}
describe('when parsing a gantt diagram it', function () { describe('when parsing a gantt diagram it', function () {
beforeEach(function () { beforeEach(function () {
parser.yy = ganttDb parser.yy = ganttDb
@@ -12,17 +18,23 @@ describe('when parsing a gantt diagram it', function () {
it('should handle a dateFormat definition', function () { it('should handle a dateFormat definition', function () {
const str = 'gantt\ndateFormat yyyy-mm-dd' const str = 'gantt\ndateFormat yyyy-mm-dd'
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
})
it('should handle a inclusive end date definition', function () {
const str = 'gantt\ndateFormat yyyy-mm-dd\ninclusiveEndDates'
expect(parserFnConstructor(str)).not.toThrow()
}) })
it('should handle a title definition', function () { it('should handle a title definition', function () {
const str = 'gantt\ndateFormat yyyy-mm-dd\ntitle Adding gantt diagram functionality to mermaid' const str = 'gantt\ndateFormat yyyy-mm-dd\ntitle Adding gantt diagram functionality to mermaid'
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
}) })
it('should handle an excludes definition', function () { it('should handle an excludes definition', function () {
const str = 'gantt\ndateFormat yyyy-mm-dd\ntitle Adding gantt diagram functionality to mermaid\nexcludes weekdays 2019-02-01' const str = 'gantt\ndateFormat yyyy-mm-dd\ntitle Adding gantt diagram functionality to mermaid\nexcludes weekdays 2019-02-01'
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
}) })
it('should handle a section definition', function () { it('should handle a section definition', function () {
const str = 'gantt\n' + const str = 'gantt\n' +
@@ -31,7 +43,7 @@ describe('when parsing a gantt diagram it', function () {
'excludes weekdays 2019-02-01\n' + 'excludes weekdays 2019-02-01\n' +
'section Documentation' 'section Documentation'
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
}) })
/** /**
* Beslutsflöde inligt nedan. Obs bla bla bla * Beslutsflöde inligt nedan. Obs bla bla bla
@@ -51,7 +63,7 @@ describe('when parsing a gantt diagram it', function () {
'section Documentation\n' + 'section Documentation\n' +
'Design jison grammar:des1, 2014-01-01, 2014-01-04' 'Design jison grammar:des1, 2014-01-01, 2014-01-04'
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
const tasks = parser.yy.getTasks() const tasks = parser.yy.getTasks()
@@ -76,7 +88,7 @@ describe('when parsing a gantt diagram it', function () {
const allowedTags = ['active', 'done', 'crit', 'milestone'] const allowedTags = ['active', 'done', 'crit', 'milestone']
parser.parse(str) expect(parserFnConstructor(str)).not.toThrow()
const tasks = parser.yy.getTasks() const tasks = parser.yy.getTasks()