From 48a0d41a816ff1203823e65b54c30cc20da9d017 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Fri, 13 Dec 2024 10:15:00 +0100 Subject: [PATCH] WIP --- .../src/diagrams/swimlane/parser/swimlane.jison | 10 ++++++++-- packages/mermaid/src/diagrams/swimlane/swimlaneDb.ts | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/mermaid/src/diagrams/swimlane/parser/swimlane.jison b/packages/mermaid/src/diagrams/swimlane/parser/swimlane.jison index e64d38650..76a0d26a4 100644 --- a/packages/mermaid/src/diagrams/swimlane/parser/swimlane.jison +++ b/packages/mermaid/src/diagrams/swimlane/parser/swimlane.jison @@ -374,10 +374,16 @@ statement {$$=yy.addSubGraph($textNoTags,$document,$text);} | subgraph SPACE textNoTags separator document end {$$=yy.addSubGraph($textNoTags,$document,$textNoTags);} - // | subgraph SPACE textNoTags separator document end - // {$$=yy.addSubGraph($textNoTags,$document,$textNoTags);} | subgraph separator document end {$$=yy.addSubGraph(undefined,$document,undefined);} + + | lane SPACE textNoTags SQS text SQE separator document end + {$$=yy.addSubGraph($textNoTags,$document,$text, 'lane');} + | lane SPACE textNoTags separator document end + {$$=yy.addSubGraph($textNoTags,$document,$textNoTags, 'lane');} + | lane separator document end + {$$=yy.addSubGraph(undefined,$document,undefined, 'lane');} + | direction | acc_title acc_title_value { $$=$acc_title_value.trim();yy.setAccTitle($$); } | acc_descr acc_descr_value { $$=$acc_descr_value.trim();yy.setAccDescription($$); } diff --git a/packages/mermaid/src/diagrams/swimlane/swimlaneDb.ts b/packages/mermaid/src/diagrams/swimlane/swimlaneDb.ts index 659a5c3ea..c7273729e 100644 --- a/packages/mermaid/src/diagrams/swimlane/swimlaneDb.ts +++ b/packages/mermaid/src/diagrams/swimlane/swimlaneDb.ts @@ -537,7 +537,8 @@ export const defaultStyle = function () { export const addSubGraph = function ( _id: { text: string }, list: string[], - _title: { text: string; type: string } + _title: { text: string; type: string }, + type = 'cluster' ) { let id: string | undefined = _id.text.trim(); let title = _title.text; @@ -586,6 +587,7 @@ export const addSubGraph = function ( classes: [], dir, labelType: _title.type, + type, }; log.info('Adding', subGraph.id, subGraph.nodes, subGraph.dir);