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

Merge pull request #5016 from aloisklink/fix/4964-fix-invalid-ellipseText-regex

Browse Source 
fix(flow): fix invalid ellipseText regex
This commit is contained in:
Knut Sveidqvist
2023-11-06 11:16:44 +00:00
committed by GitHub
parent f5bd1e0809 172d90e731
commit 7c7f3dd8be
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mermaid/src/diagrams/flowchart/parser/flow-text.spec.js
View File

@@ -535,6 +535,10 @@ describe('[Text] when parsing', () => {
expect(vert['A'].text).toBe('this is an ellipse'); expect(vert['A'].text).toBe('this is an ellipse');
}); });
it('should not freeze when ellipse text has a `(`', function () {
expect(() => flow.parser.parse('graph\nX(- My Text (')).toThrowError();
});
it('should handle text in diamond vertices with space', function () { it('should handle text in diamond vertices with space', function () {
const res = flow.parser.parse('graph TD;A(chimpansen hoppar)-->C;'); const res = flow.parser.parse('graph TD;A(chimpansen hoppar)-->C;');

2
packages/mermaid/src/diagrams/flowchart/parser/flow.jison
View File

@@ -134,7 +134,7 @@ that id.
<*>\s*\~\~[\~]+\s* return 'LINK'; <*>\s*\~\~[\~]+\s* return 'LINK';
<ellipseText>[-/\)][\)] { this.popState(); return '-)'; } <ellipseText>[-/\)][\)] { this.popState(); return '-)'; }
<ellipseText>[^\(\)\[\]\{\}]|-/!\)+ return "TEXT" <ellipseText>[^\(\)\[\]\{\}]|-\!\)+ return "TEXT"
<*>"(-" { this.pushState("ellipseText"); return '(-'; } <*>"(-" { this.pushState("ellipseText"); return '(-'; }
<text>"])" { this.popState(); return 'STADIUMEND'; } <text>"])" { this.popState(); return 'STADIUMEND'; }