#4012 Neater grammar for the rows before mindmap

mermaid-js · Jan 20, 2023 · bc56a7d · bc56a7d
1 parent 80903e4
commit bc56a7d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/packages/mermaid-mindmap/src/mindmap.spec.js b/packages/mermaid-mindmap/src/mindmap.spec.js
@@ -366,6 +366,18 @@ root
     expect(mm.nodeId).toEqual('root');
     expect(mm.children.length).toEqual(2);
 
+    const child = mm.children[0];
+    expect(child.nodeId).toEqual('A');
+    const child2 = mm.children[1];
+    expect(child2.nodeId).toEqual('B');
+  });
+  it('MMP-25 Handle rows above the mindmap declarations, no space', function () {
+    let str = '\n\n\nmindmap\nroot\n A\n \n\n B';
+    mindmap.parse(str);
+    const mm = mindmap.yy.getMindmap();
+    expect(mm.nodeId).toEqual('root');
+    expect(mm.children.length).toEqual(2);
+
     const child = mm.children[0];
     expect(child.nodeId).toEqual('A');
     const child2 = mm.children[1];

diff --git a/packages/mermaid-mindmap/src/parser/mindmap.jison b/packages/mermaid-mindmap/src/parser/mindmap.jison
@@ -65,18 +65,21 @@
 
 start
 // %{	: info document 'EOF' { return yy; } }
-	: MINDMAP document  { return yy; }
-	| MINDMAP NL document  { return yy; }
-  |	spaceLines MINDMAP document  { return yy; }
-  |	spaceLines MINDMAP NL document  { return yy; }
-	;
+	: mindMap
+  |	spaceLines mindMap
+  ;
 
 spaceLines
   : SPACELINE
   | spaceLines SPACELINE
   | spaceLines NL
   ;
 
+mindMap
+  : MINDMAP document  { return yy; }
+  | MINDMAP NL document  { return yy; }
+  ;
+
 stop
   : NL {yy.getLogger().trace('Stop NL ');}
   | EOF {yy.getLogger().trace('Stop EOF ');}