From 567686e140a4a2d4f35d5b5edf3df52486be29e4 Mon Sep 17 00:00:00 2001
From: Nikolay Rozhkov <nironame@gmail.com>
Date: Sun, 18 Jun 2023 01:32:45 +0300
Subject: [PATCH] Implementing new syntax

---
 .../diagrams/sankey/parser/desired_syntax.md  |  6 +-
 .../src/diagrams/sankey/parser/sankey.jison   | 59 ++++++++++--
 .../src/diagrams/sankey/parser/sankey.spec.js | 90 ++++++++++++++++---
 run                                           | 10 ++-
 4 files changed, 139 insertions(+), 26 deletions(-)

diff --git a/packages/mermaid/src/diagrams/sankey/parser/desired_syntax.md b/packages/mermaid/src/diagrams/sankey/parser/desired_syntax.md
index d0cbd4e8a..1b5cb81d2 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/desired_syntax.md
+++ b/packages/mermaid/src/diagrams/sankey/parser/desired_syntax.md
@@ -100,9 +100,9 @@ a -> {
     30
     40
 } -> b -> {
-    20 -> d
-    50 -> e
-}
+    20 -> d -> 11
+    50 -> e -> 11
+} -> f -> 30 
 ```
 
 **Probably ambiguous!**
diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.jison b/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
index d77b0b241..e0b4252ca 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
+++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
@@ -2,13 +2,21 @@
 %lex
 
 %options case-insensitive
+%s group
+// %x attributes
 
 %%
+"{"       { this.pushState('group'); return 'OPEN_GROUP'; }
+<group>"}" { this.popState('group'); return 'CLOSE_GROUP'; }
 "sankey" return 'SANKEY'
-"->" return 'ARROW'
-\w+ return 'NODE'
-[\n]+ return 'NEWLINE';
-\s+ /* skip all whitespace */
+\d+    return 'VALUE'
+"->"     return 'ARROW'
+\w+      return 'NODE'
+"["             {/*this.pushState('attributes');*/ return 'OPEN_ATTRIBUTES'; }
+"]" { /* this.popState(); */ return 'CLOSE_ATTRIBUTES'; }
+(<<EOF>>|[\n;])+ return 'EOS' // end of statement
+\s+ // skip all whitespace
+// [\n]+ return 'NEWLINE';
 
 // TODO: check if jison will return 2 separate tokens (for nodes) while ignoring whitespace
 
@@ -16,15 +24,50 @@
 
 %start start
 
-%% /* language grammar */
+%% // language grammar
 
 start
-	: SPACE start
+	: EOS SANKEY document
 	| SANKEY document
 	;
 
 document
-	: node document
+	: line document
+	| // empty
+	;
+
+line
+	// : node_with_attributes // one node with attributes
+	: flow EOS
+	| node_with_attributes EOS
+	| EOS
+	;
+	
+
+node_with_attributes
+	: NODE
+	| NODE attributes_group
+	;
+
+attributes_group
+	: OPEN_ATTRIBUTES attributes CLOSE_ATTRIBUTES
+	;
+
+attributes:
+	| // TODO
+	;
+
+flow
+	: NODE ARROW value_or_values_group ARROW flow
+	| NODE
+	;
+
+value_or_values_group
+	: OPEN_GROUP values CLOSE_GROUP
+	| VALUE
+	;
+
+values
+	: values VALUE
 	| /* empty */
 	;
-	
\ No newline at end of file
diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
index 5ef6f80fe..d96663f31 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
+++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
@@ -1,6 +1,7 @@
 import diagram from './sankey.jison';
 import { parser } from './sankey.jison';
 import db from '../sankeyDB.js';
+// import { fail } from 'assert';
 
 describe('Sankey diagram', function () {
   // TODO - these examples should be put into ./parser/stateDiagram.spec.js
@@ -11,39 +12,104 @@ describe('Sankey diagram', function () {
       diagram.parser.yy.clear();
     });
 
-    it('recognized its type', function() {
+    it('recognizes its type', () => {
       const str=`sankey`;
       
       parser.parse(str);
     });
 
-    // it('one simple flow', function () {
+    it('recognizes one flow', () => {
+      const str = `
+      sankey
+      a -> 30 -> b -> 20 -> c
+      `;
+      
+      parser.parse(str);
+    });
+    
+    it('recognizes multiple flows', () => {
+      const str = `
+      sankey
+      a -> 30 -> b -> 12 -> e
+      c -> 30 -> d -> 12 -> e
+      c -> 40 -> e -> 12 -> e
+      `;
+      
+      parser.parse(str);
+    });
+    
+    it('recognizes grouped values', () => {
+      const str = `
+      sankey
+      a -> {30} -> b
+      `;
+      
+      parser.parse(str);
+    });
+
+    it('recognizes a separate node with its attributes', () => {
+      const str = `
+      sankey
+      c[]
+      `;
+      
+      parser.parse(str);
+    });
+
+    // it('recognizes intake group', () => {
     //   const str = `
     //   sankey
-    //   a -> 30 -> b
+    //   a -> {
+    //     30 -> b
+    //     40 -> c
+    //   }
     //   `;
-
+      
     //   parser.parse(str);
     // });
 
-    // it('multiple flows', function () {
+    // it('recognizes exhaust group', () => {
     //   const str = `
     //   sankey
-    //   a -> 30 -> b
-    //   c -> 30 -> d
-    //   c -> 40 -> e
+    //   {
+    //     b -> 30
+    //     c -> 40
+    //   } -> a
     //   `;
-
+      
     //   parser.parse(str);
     // });
 
-    // it('multiple flows', function () {
+    // it('what to do?', () => {
     //   const str = `
     //   sankey
-    //   a -> 30 -> b
-    //   c -> 30 -> d
+    //   {
+    //     b -> 30
+    //     c -> 40
+    //   } -> {
+    //     e
+    //     d
+    //   }
     //   `;
+      
+    //   parser.parse(str);
+    // });
 
+    // it('complex', () => {
+    //   const str = `
+    //   sankey
+    //   {
+    //     a -> 30
+    //     b -> 40
+    //   } -> c -> {
+    //     20 -> e -> 49
+    //     20 -> d -> 23
+    //   } -> k -> 20 -> i -> {
+    //     10 -> f
+    //     11 -> j
+    //   }
+    //   `;
+      
     //   parser.parse(str);
     // });
   });
diff --git a/run b/run
index 7dbdf918a..9b02b0741 100755
--- a/run
+++ b/run
@@ -14,15 +14,19 @@ $RUN mermaid sh $args
 ;;
 
 i | install)
-$RUN mermaid sh -c "npx pnpm install"
+$RUN mermaid sh -c "npx pnpm install $args"
 ;;
 
 test)
-$RUN mermaid sh -c "npx pnpm test"
+$RUN mermaid sh -c "npx pnpm test $args"
+;;
+
+vitest)
+$RUN mermaid sh -c "npx pnpm vitest $args"
 ;;
 
 e2e)
-$RUN mermaid sh -c "npx pnpm e2e"
+$RUN mermaid sh -c "npx pnpm e2e $args"
 ;;
 
 lint)