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

refactor(lexer): added contextual handling for new participant types as actors

Browse Source
This commit is contained in:
omkarht
2025-07-08 13:47:41 +05:30
parent 012530e98e
commit ee82694645
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/mermaid/src/diagrams/sequence/parser/sequenceDiagram.jison
View File

@@ -12,6 +12,25 @@
%options case-insensitive %options case-insensitive
%{
function matchAsActorOrParticipant(tokenName, tokenType) {
const ahead = this._input;
// Detect if an arrow or colon is coming right after the token
const arrowLike = /^(?:\s)*(->>|-->>|->|-->|<<->>|<<-->>)/;
const colonLike = /^\s*:/;
// Treat as ACTOR if database appears inline in a message (arrow or colon follows)
if (arrowLike.test(ahead) || colonLike.test(ahead)) {
yytext = tokenName;
return 'ACTOR';
}
// Otherwise treat as a participant type declaration
this.begin('ID');
return tokenType;
}
%}
// Special states for recognizing aliases // Special states for recognizing aliases
// A special state for grabbing text up to the first comment/newline // A special state for grabbing text up to the first comment/newline
%x ID ALIAS LINE %x ID ALIAS LINE
@@ -31,12 +50,12 @@
"box" { this.begin('LINE'); return 'box'; } "box" { this.begin('LINE'); return 'box'; }
"participant" { this.begin('ID'); return 'participant'; } "participant" { this.begin('ID'); return 'participant'; }
"actor" { this.begin('ID'); return 'participant_actor'; } "actor" { this.begin('ID'); return 'participant_actor'; }
"boundary" { this.begin('ID'); return 'participant_boundary'; } "boundary" { return matchAsActorOrParticipant.call(this, 'boundary', 'participant_boundary'); }
"control" { this.begin('ID'); return 'participant_control'; } "control" { return matchAsActorOrParticipant.call(this, 'control', 'participant_control'); }
"entity" { this.begin('ID'); return 'participant_entity'; } "entity" { return matchAsActorOrParticipant.call(this, 'entity', 'participant_entity'); }
"database" { this.begin('ID'); return 'participant_database'; } "database" { return matchAsActorOrParticipant.call(this, 'database', 'participant_database'); }
"collections" { this.begin('ID'); return 'participant_collections'; } "collections" { return matchAsActorOrParticipant.call(this, 'collections', 'participant_collections'); }
"queue" { this.begin('ID'); return 'participant_queue'; } "queue" { return matchAsActorOrParticipant.call(this, 'queue', 'participant_queue'); }
"create" return 'create'; "create" return 'create';
"destroy" { this.begin('ID'); return 'destroy'; } "destroy" { this.begin('ID'); return 'destroy'; }
<ID>[^\<->\->:\n,;]+?([\-]*[^\<->\->:\n,;]+?)*?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$) { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; } <ID>[^\<->\->:\n,;]+?([\-]*[^\<->\->:\n,;]+?)*?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$) { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; }