From f031abcec23e53a082f62e7d44a9f9f7bc86a9fe Mon Sep 17 00:00:00 2001
From: yari-dewalt <yari.dewalt@gmail.com>
Date: Mon, 23 Sep 2024 12:19:22 -0700
Subject: [PATCH] Support lollipop interface feature

---
 cypress/platform/yari.html                    |  7 +++
 .../mermaid/src/diagrams/class/classDb.ts     | 60 ++++++++++++++++++-
 .../mermaid/src/diagrams/class/classTypes.ts  |  5 ++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/cypress/platform/yari.html b/cypress/platform/yari.html
index 86d7ae2c1..547716ee7 100644
--- a/cypress/platform/yari.html
+++ b/cypress/platform/yari.html
@@ -565,6 +565,7 @@
             Class09 "1" --> "*" C2 : Where am i?
             Class09 "*" --* "*" C3
             Class09 "1" --|> "1" Class07
+            NewClass ()--() Class04
             Class09 <|--|> AveryLongClass
             Class07  : equals()
             Class07  : Object[] elementData
@@ -581,6 +582,12 @@
             Class10 <--> Class07
         </pre>
       </div>
+      <div class="test">
+        <pre class="mermaid">
+          classDiagram
+            test ()--() test2
+        </pre>
+      </div>
     </div>
 
     <script type="module">
diff --git a/packages/mermaid/src/diagrams/class/classDb.ts b/packages/mermaid/src/diagrams/class/classDb.ts
index 55a43ce27..e6cc16679 100644
--- a/packages/mermaid/src/diagrams/class/classDb.ts
+++ b/packages/mermaid/src/diagrams/class/classDb.ts
@@ -21,6 +21,7 @@ import type {
   NamespaceMap,
   NamespaceNode,
   StyleClass,
+  Interface,
 } from './classTypes.js';
 import type { Node, Edge } from '../../rendering-util/types.js';
 
@@ -30,6 +31,7 @@ let relations: ClassRelation[] = [];
 let classes = new Map<string, ClassNode>();
 const styleClasses = new Map<string, StyleClass>();
 let notes: ClassNote[] = [];
+let interfaces: Interface[] = [];
 let classCounter = 0;
 let namespaces = new Map<string, NamespaceNode>();
 let namespaceCounter = 0;
@@ -97,6 +99,15 @@ export const addClass = function (_id: string) {
   classCounter++;
 };
 
+const addInterface = function (label: string, classId: string) {
+  const _interface: Interface = {
+    label,
+    classId,
+  };
+
+  interfaces.push(_interface);
+};
+
 /**
  * Function to lookup domId from id in the graph definition.
  *
@@ -115,6 +126,7 @@ export const clear = function () {
   relations = [];
   classes = new Map();
   notes = [];
+  interfaces = [];
   functions = [];
   functions.push(setupToolTips);
   namespaces = new Map();
@@ -141,8 +153,40 @@ export const getNotes = function () {
 
 export const addRelation = function (relation: ClassRelation) {
   log.debug('Adding relation: ' + JSON.stringify(relation));
-  addClass(relation.id1);
-  addClass(relation.id2);
+  // Due to relationType cannot just check if it is equal to 'none' or it complains, can fix this later
+  if (
+    relation.relation.type1 === relationType.LOLLIPOP &&
+    relation.relation.type2 !==
+      (relationType.LOLLIPOP ||
+        relationType.AGGREGATION ||
+        relationType.COMPOSITION ||
+        relationType.DEPENDENCY ||
+        relationType.EXTENSION)
+  ) {
+    addClass(relation.id1);
+    addInterface(relation.id2, relation.id1);
+    relation.id2 = `interface ${relation.id2}`;
+    // Also can't set the type to 'none'
+    relation.relation.type1 = -1;
+    relation.relation.type2 = relationType.LOLLIPOP;
+  } else if (
+    relation.relation.type2 === relationType.LOLLIPOP &&
+    relation.relation.type1 !==
+      (relationType.LOLLIPOP ||
+        relationType.AGGREGATION ||
+        relationType.COMPOSITION ||
+        relationType.DEPENDENCY ||
+        relationType.EXTENSION)
+  ) {
+    addClass(relation.id2);
+    addInterface(relation.id1, relation.id2);
+    relation.id1 = `interface ${relation.id1}`;
+    relation.relation.type1 = relationType.LOLLIPOP;
+    relation.relation.type2 = -1;
+  } else {
+    addClass(relation.id1);
+    addClass(relation.id2);
+  }
 
   relation.id1 = splitClassNameAndType(relation.id1).className;
   relation.id2 = splitClassNameAndType(relation.id2).className;
@@ -605,6 +649,18 @@ export const getData = () => {
     }
   }
 
+  for (const _interface of interfaces) {
+    const interfaceNode: Node = {
+      id: `interface ${_interface.label}`,
+      label: _interface.label,
+      isGroup: false,
+      shape: 'rect',
+      cssStyles: ['opacity: 0;'],
+      look: config.look,
+    };
+    nodes.push(interfaceNode);
+  }
+
   cnt = 0;
   for (const relation of relations) {
     cnt++;
diff --git a/packages/mermaid/src/diagrams/class/classTypes.ts b/packages/mermaid/src/diagrams/class/classTypes.ts
index 29d668344..a5727644b 100644
--- a/packages/mermaid/src/diagrams/class/classTypes.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.ts
@@ -167,6 +167,11 @@ export interface ClassRelation {
   };
 }
 
+export interface Interface {
+  label: string;
+  classId: string;
+}
+
 export interface NamespaceNode {
   id: string;
   domId: string;