Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize sequence definitions #4795

Draft
wants to merge 13 commits into
base: develop
Choose a base branch
from
+568 −19
Draft

Standardize sequence definitions #4795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f2162ba
Begin creating types for sequenceDB
ibrahimWassouf Aug 31, 2023
9917400
Add types to SequenceDB functions related to Boxes
ibrahimWassouf Sep 1, 2023
f7256b0
Add types to sequenceDB functions related to actors
ibrahimWassouf Sep 1, 2023
2a871d9
Create new Message type and rename old interface to Text
ibrahimWassouf Sep 2, 2023
e298726
Add types to sequenceDB functions related to messages
ibrahimWassouf Sep 2, 2023
bbee2b3
Change parseMessage to parseText
ibrahimWassouf Sep 3, 2023
46b57cc
Add parseText to db interface
ibrahimWassouf Sep 3, 2023
808a756
Add types to db functions related to links
ibrahimWassouf Sep 5, 2023
589c299
Merge branch 'develop' into standardize-sequence-definitions
ibrahimWassouf Sep 5, 2023
1e0d9cc
Migrate enums as union types and add typing to addSignal function
ibrahimWassouf Sep 6, 2023
c4da7bf
Add typed functions relating to wrap config
ibrahimWassouf Sep 12, 2023
f42b783
Add types to addNote, addProperties, and addDetails
ibrahimWassouf Sep 14, 2023
d588c23
Merge branch 'develop' into standardize-sequence-definitions
ibrahimWassouf Oct 14, 2023
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
2 changes: 1 addition & 1 deletion packages/mermaid/src/config.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ export interface SequenceDiagramConfig extends BaseDiagramConfig {
*/
diagramMarginX?: number;
/**
* Margin to the over and under the sequence diagram
* Margin to the top and bottom of the sequence diagram
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a generated file, please modify the original one: packages/mermaid/src/schemas/config.schema.yaml

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oop rookie mistake

*/
diagramMarginY?: number;
/**
Expand Down
34 changes: 17 additions & 17 deletions packages/mermaid/src/diagrams/sequence/parser/sequenceDiagram.jison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,80 +152,80 @@ statement
| acc_descr_multiline_value { $$=$1.trim();yy.setAccDescription($$); }
| 'loop' restOfLine document end
{
$3.unshift({type: 'loopStart', loopText:yy.parseMessage($2), signalType: yy.LINETYPE.LOOP_START});
$3.unshift({type: 'loopStart', loopText:yy.parseText($2), signalType: yy.LINETYPE.LOOP_START});
$3.push({type: 'loopEnd', loopText:$2, signalType: yy.LINETYPE.LOOP_END});
$$=$3;}
| 'rect' restOfLine document end
{
$3.unshift({type: 'rectStart', color:yy.parseMessage($2), signalType: yy.LINETYPE.RECT_START });
$3.push({type: 'rectEnd', color:yy.parseMessage($2), signalType: yy.LINETYPE.RECT_END });
$3.unshift({type: 'rectStart', color:yy.parseText($2), signalType: yy.LINETYPE.RECT_START });
$3.push({type: 'rectEnd', color:yy.parseText($2), signalType: yy.LINETYPE.RECT_END });
$$=$3;}
| opt restOfLine document end
{
$3.unshift({type: 'optStart', optText:yy.parseMessage($2), signalType: yy.LINETYPE.OPT_START});
$3.push({type: 'optEnd', optText:yy.parseMessage($2), signalType: yy.LINETYPE.OPT_END});
$3.unshift({type: 'optStart', optText:yy.parseText($2), signalType: yy.LINETYPE.OPT_START});
$3.push({type: 'optEnd', optText:yy.parseText($2), signalType: yy.LINETYPE.OPT_END});
$$=$3;}
| alt restOfLine else_sections end
{
// Alt start
$3.unshift({type: 'altStart', altText:yy.parseMessage($2), signalType: yy.LINETYPE.ALT_START});
$3.unshift({type: 'altStart', altText:yy.parseText($2), signalType: yy.LINETYPE.ALT_START});
// Content in alt is already in $3
// End
$3.push({type: 'altEnd', signalType: yy.LINETYPE.ALT_END});
$$=$3;}
| par restOfLine par_sections end
{
// Parallel start
$3.unshift({type: 'parStart', parText:yy.parseMessage($2), signalType: yy.LINETYPE.PAR_START});
$3.unshift({type: 'parStart', parText:yy.parseText($2), signalType: yy.LINETYPE.PAR_START});
// Content in par is already in $3
// End
$3.push({type: 'parEnd', signalType: yy.LINETYPE.PAR_END});
$$=$3;}
| par_over restOfLine par_sections end
{
// Parallel (overlapped) start
$3.unshift({type: 'parStart', parText:yy.parseMessage($2), signalType: yy.LINETYPE.PAR_OVER_START});
$3.unshift({type: 'parStart', parText:yy.parseText($2), signalType: yy.LINETYPE.PAR_OVER_START});
// Content in par is already in $3
// End
$3.push({type: 'parEnd', signalType: yy.LINETYPE.PAR_END});
$$=$3;}
| critical restOfLine option_sections end
{
// critical start
$3.unshift({type: 'criticalStart', criticalText:yy.parseMessage($2), signalType: yy.LINETYPE.CRITICAL_START});
$3.unshift({type: 'criticalStart', criticalText:yy.parseText($2), signalType: yy.LINETYPE.CRITICAL_START});
// Content in critical is already in $3
// critical end
$3.push({type: 'criticalEnd', signalType: yy.LINETYPE.CRITICAL_END});
$$=$3;}
| break restOfLine document end
{
$3.unshift({type: 'breakStart', breakText:yy.parseMessage($2), signalType: yy.LINETYPE.BREAK_START});
$3.push({type: 'breakEnd', optText:yy.parseMessage($2), signalType: yy.LINETYPE.BREAK_END});
$3.unshift({type: 'breakStart', breakText:yy.parseText($2), signalType: yy.LINETYPE.BREAK_START});
$3.push({type: 'breakEnd', optText:yy.parseText($2), signalType: yy.LINETYPE.BREAK_END});
$$=$3;}
;

option_sections
: document
| document option restOfLine option_sections
{ $$ = $1.concat([{type: 'option', optionText:yy.parseMessage($3), signalType: yy.LINETYPE.CRITICAL_OPTION}, $4]); }
{ $$ = $1.concat([{type: 'option', optionText:yy.parseText($3), signalType: yy.LINETYPE.CRITICAL_OPTION}, $4]); }
;

par_sections
: document
| document and restOfLine par_sections
{ $$ = $1.concat([{type: 'and', parText:yy.parseMessage($3), signalType: yy.LINETYPE.PAR_AND}, $4]); }
{ $$ = $1.concat([{type: 'and', parText:yy.parseText($3), signalType: yy.LINETYPE.PAR_AND}, $4]); }
;

else_sections
: document
| document else restOfLine else_sections
{ $$ = $1.concat([{type: 'else', altText:yy.parseMessage($3), signalType: yy.LINETYPE.ALT_ELSE}, $4]); }
{ $$ = $1.concat([{type: 'else', altText:yy.parseText($3), signalType: yy.LINETYPE.ALT_ELSE}, $4]); }
;

participant_statement
: 'participant' actor 'AS' restOfLine 'NEWLINE' {$2.draw='participant'; $2.type='addParticipant';$2.description=yy.parseMessage($4); $$=$2;}
: 'participant' actor 'AS' restOfLine 'NEWLINE' {$2.draw='participant'; $2.type='addParticipant';$2.description=yy.parseText($4); $$=$2;}
| 'participant' actor 'NEWLINE' {$2.draw='participant'; $2.type='addParticipant';$$=$2;}
| 'participant_actor' actor 'AS' restOfLine 'NEWLINE' {$2.draw='actor'; $2.type='addParticipant';$2.description=yy.parseMessage($4); $$=$2;}
| 'participant_actor' actor 'AS' restOfLine 'NEWLINE' {$2.draw='actor'; $2.type='addParticipant';$2.description=yy.parseText($4); $$=$2;}
| 'participant_actor' actor 'NEWLINE' {$2.draw='actor'; $2.type='addParticipant'; $$=$2;}
| 'destroy' actor 'NEWLINE' {$2.type='destroyParticipant'; $$=$2;}
;
Expand Down Expand Up @@ -318,7 +318,7 @@ signaltype
;

text2
: TXT {$$ = yy.parseMessage($1.trim().substring(1)) }
: TXT {$$ = yy.parseText($1.trim().substring(1)) }
;

%%
Loading