From 5b3b73ba4954f5ce1baf4e40d4229bb4eb1fd077 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Fri, 8 Dec 2023 17:38:49 +0100 Subject: [PATCH] Support for ids on edges --- cypress/platform/knsv2.html | 9 +++------ packages/mermaid/package.json | 11 ++++------- packages/mermaid/src/dagre-wrapper/edges.js | 2 +- .../mermaid/src/diagrams/flowchart/parser/flow.jison | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html index 020ea8b48..fa205cfaa 100644 --- a/cypress/platform/knsv2.html +++ b/cypress/platform/knsv2.html @@ -58,12 +58,9 @@ 
-flowchart TB
-    C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z & A1 & A2 & A3 & A4 & A5 & A6 & A7 & A8
-      ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
-    C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z & A1 & A2 & A3 & A4 & A5 & A6 & A7 & A8
-
-
+flowchart LR + A[Start] --Some text--> B("A[Start]") 
     flowchart TB
       A & A & A & A & A & A & A & A --->  C & D & E & F & G & H & I & J & K & L & M & N & O & P & Q & R & S & T & U & V & W & X & Y & Z
diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
index d298ab37e..55c5d9d32 100644
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@MermaidChart/mermaid",
-  "version": "10.6.1",
+  "name": "@mermaid-chart/mermaid",
+  "version": "10.6.2-b1",
   "description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "type": "module",
   "module": "./dist/mermaid.core.mjs",
@@ -44,7 +44,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mermaid-js/mermaid"
+    "url": "https://github.com/Mermaid-Chart/mermaid"
   },
   "author": "Knut Sveidqvist",
   "license": "MIT",
@@ -129,8 +129,5 @@
     "dist/",
     "README.md"
   ],
-  "sideEffects": false,
-  "publishConfig": {
-    "access": "public"
-  }
+  "sideEffects": false
 }
diff --git a/packages/mermaid/src/dagre-wrapper/edges.js b/packages/mermaid/src/dagre-wrapper/edges.js
index b2486d7d4..ac1ca0be7 100644
--- a/packages/mermaid/src/dagre-wrapper/edges.js
+++ b/packages/mermaid/src/dagre-wrapper/edges.js
@@ -32,7 +32,7 @@ export const insertEdgeLabel = (elem, edge) => {
   const edgeLabel = elem.insert('g').attr('class', 'edgeLabel');
 
   // Create inner g, label, this will be positioned now for centering the text
-  const label = edgeLabel.insert('g').attr('class', 'label');
+  const label = edgeLabel.insert('g').attr('class', 'label').attr('data-id', edge.id);
   label.node().appendChild(labelElement);
 
   // Center the label
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
index de23d93cb..66e233b12 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
@@ -362,7 +362,7 @@ verticeStatement: verticeStatement link node
     |  verticeStatement link node spaceList
         { /* console.warn('vs',$verticeStatement.stmt,$node); */ yy.addLink($verticeStatement.stmt,$node,$link); $$ = { stmt: $node, nodes: $node.concat($verticeStatement.nodes) } }
     |node spaceList {/*console.warn('noda', $node);*/ $$ = {stmt: $node, nodes:$node }}
-    |node { /*console.warn('noda', $node);*/ $$ = {stmt: $node, nodes:$node }}
+    |node { $$ = {stmt: $node, nodes:$node }}
     ;
 
 node: styledVertex