From d2226604e447a2a339abdbb400c403173775c2fb Mon Sep 17 00:00:00 2001
From: Nikolay Rozhkov <nironame@gmail.com>
Date: Sun, 18 Jun 2023 01:32:45 +0300
Subject: [PATCH] Recognizing attrubutes

---
 .../src/diagrams/sankey/parser/sankey.jison   | 62 +++++++++----------
 .../src/diagrams/sankey/parser/sankey.spec.js | 30 +++++----
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.jison b/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
index e0b4252ca..cc262f672 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
+++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.jison
@@ -3,20 +3,29 @@
 
 %options case-insensitive
 %s group
-// %x attributes
+%x attributes
+%x attribute
+%x value
 
 %%
-"{"       { this.pushState('group'); return 'OPEN_GROUP'; }
-<group>"}" { this.popState('group'); return 'CLOSE_GROUP'; }
 "sankey" return 'SANKEY'
-\d+    return 'VALUE'
+\d+      return 'AMOUNT'
 "->"     return 'ARROW'
 \w+      return 'NODE'
-"["             {/*this.pushState('attributes');*/ return 'OPEN_ATTRIBUTES'; }
-"]" { /* this.popState(); */ return 'CLOSE_ATTRIBUTES'; }
-(<<EOF>>|[\n;])+ return 'EOS' // end of statement
+(?:<<EOF>>|[\n;])+ { return 'EOS'; } // end of statement is ; \n or end of file
 \s+ // skip all whitespace
-// [\n]+ return 'NEWLINE';
+"{"             { this.pushState('group'); return 'OPEN_GROUP'; }
+<group>"}"      { this.popState('group'); return 'CLOSE_GROUP'; }
+"["             { this.pushState('attributes'); return 'OPEN_ATTRIBUTES'; }
+<attributes>"]" { this.popState(); return 'CLOSE_ATTRIBUTES'; }
+<attributes>\w+ { return 'ATTRIBUTE'; } // string followed by = sign is "attrName"
+<attributes>(?=\=s*)[\s\w] {return 'VALUE';}
+<attributes>\= { this.pushState('attribute'); return 'EQUAL'; }
+<attributes>\s+ // skip all whitespace
+<attribute>[\w]+ {this.popState(); return 'VALUE';}
+<attribute>\s+ //skip
+<attribute>\" { this.pushState('value'); return 'OPEN_VALUE'; }
+<value>\"  { this.popState(); return 'CLOSE_VALUE'; }
 
 // TODO: check if jison will return 2 separate tokens (for nodes) while ignoring whitespace
 
@@ -33,41 +42,26 @@ start
 
 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
-	;
+node_with_attributes: NODE OPEN_ATTRIBUTES attributes CLOSE_ATTRIBUTES;
 
-attributes_group
-	: OPEN_ATTRIBUTES attributes CLOSE_ATTRIBUTES
-	;
+attributes: attribute attributes | ;
+attribute: ATTRIBUTE EQUAL VALUE | ATTRIBUTE;
 
-attributes:
-	| // TODO
-	;
+// flow
+// 	: NODE ARROW value_or_values_group ARROW flow
+// 	| NODE
+// 	;
 
-flow
-	: NODE ARROW value_or_values_group ARROW flow
-	| NODE
-	;
+flow: n_chain_a;
 
-value_or_values_group
-	: OPEN_GROUP values CLOSE_GROUP
-	| VALUE
-	;
-
-values
-	: values VALUE
-	| /* empty */
-	;
+n_chain_a: NODE ARROW a_chain_n | NODE;
+a_chain_n: AMOUNT ARROW n_chain_a | AMOUNT;
diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
index d96663f31..8617c4bbc 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
+++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
@@ -30,31 +30,37 @@ describe('Sankey diagram', function () {
     it('recognizes multiple flows', () => {
       const str = `
       sankey
-      a -> 30 -> b -> 12 -> e
-      c -> 30 -> d -> 12 -> e
-      c -> 40 -> e -> 12 -> e
+      a -> 30 -> b -> 12 -> e;
+      c -> 30 -> d -> 12 -> e;
+      c -> 40 -> e -> 12 -> q;
       `;
       
       parser.parse(str);
     });
     
-    it('recognizes grouped values', () => {
+    it('recognizes a separate node with its attributes', () => {
       const str = `
       sankey
-      a -> {30} -> b
+      a[]
+      b[attr=1]
+      c[attr=2]
+      d[attrWithoutValue]
+      d[attr = 3]
       `;
       
       parser.parse(str);
     });
 
-    it('recognizes a separate node with its attributes', () => {
-      const str = `
-      sankey
-      c[]
-      `;
+    // it('recognizes grouped values', () => {
+    //   const str = `
+    //   sankey
+    //   a -> {30} -> b
+    //   `;
       
-      parser.parse(str);
-    });
+    //   parser.parse(str);
+    // });
+
+
 
     // it('recognizes intake group', () => {
     //   const str = `