Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tired-rockets-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'mermaid': patch
---

Fix invalid syntax between state and '{'
34 changes: 34 additions & 0 deletions packages/mermaid/src/diagrams/state/parser/state-parser.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,40 @@ describe('state parser can parse...', () => {
stateDiagram.parser.yy.clear();
});

describe('invalid name between state and curly bracket', () => {
describe('valid syntax', () => {
it('should only accept 1 word', () => {
const diagramText = `stateDiagram-v2
state valid { X }`;

stateDiagram.parser.parse(diagramText);

const states = stateDiagram.parser.yy.getStates();
expect(states.get('valid')).not.toBeUndefined();
});
});

describe('invalid syntax', () => {
it('should throw error with 2 words', () => {
const diagramText = `stateDiagram-v2
state invalid syntax { Y }`;

expect(() => {
stateDiagram.parser.parse(diagramText);
}).toThrow('Error: State name must be a single word.');
});

it('should also throw with more than 2 words', () => {
const diagramText = `stateDiagram-v2
state invalid syntax with more than 2 words { Z }`;

expect(() => {
stateDiagram.parser.parse(diagramText);
}).toThrow('Error: State name must be a single word.');
});
});
});

describe('states with id displayed as a (name)', () => {
describe('syntax 1: stateID as "name in quotes"', () => {
it('stateID as "some name"', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ accDescr\s*"{"\s* { this.begin("acc_descr_multili
<STATE_ID>[^\n\{]* { if (!processId()) return; this.popState(); /* console.log('STATE_ID', yytext); */ return "ID"; }
<STATE_STRING>["] { this.popState(); }
<STATE_STRING>[^"]* { /* console.log('Long description:', yytext); */ return "STATE_DESCR"; }
<STATE>\w+\s+\w+.*?\{ { throw new Error('Error: State name must be a single word. Found: "' + yytext.trim() + '"'); }
<STATE>[^\n\s\{]+ { /* console.log('COMPOSIT_STATE', yytext); */ return 'COMPOSIT_STATE'; }
<STATE>\n { this.popState(); }
<INITIAL,STATE>\{ { this.popState(); this.pushState('struct'); /* console.log('begin struct', yytext); */ return 'STRUCT_START'; }
Expand Down Expand Up @@ -349,4 +350,4 @@ notePosition
| right_of
;

%%
%%
Loading