GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Update and fix logic for lollipop interfaces

Browse Source
This commit is contained in:
yari-dewalt 2024-09-24 09:28:17 -07:00
parent f031abcec2
commit 3e697e2ea4
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/mermaid/src/diagrams/class/classDb.ts
View File

@ -101,6 +101,7 @@ export const addClass = function (_id: string) {
const addInterface = function (label: string, classId: string) {
const _interface: Interface = {
id: `interface${interfaces.length}`,
label,
classId,
};
@ -163,12 +164,12 @@ export const addRelation = function (relation: ClassRelation) {
relationType.DEPENDENCY ||
relationType.EXTENSION)
) {
addClass(relation.id1);
addInterface(relation.id2, relation.id1);
relation.id2 = `interface ${relation.id2}`;
addClass(relation.id2);
addInterface(relation.id1, relation.id2);
relation.id1 = `interface${interfaces.length - 1}`;
// Also can't set the type to 'none'
relation.relation.type1 = -1;
relation.relation.type2 = relationType.LOLLIPOP;
// relation.relation.type1 = -1;
// relation.relation.type2 = relationType.LOLLIPOP;
} else if (
relation.relation.type2 === relationType.LOLLIPOP &&
relation.relation.type1 !==
@ -178,11 +179,11 @@ export const addRelation = function (relation: ClassRelation) {
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;
addClass(relation.id1);
addInterface(relation.id2, relation.id1);
relation.id2 = `interface${interfaces.length - 1}`;
// relation.relation.type1 = relationType.LOLLIPOP;
// relation.relation.type2 = -1;
} else {
addClass(relation.id1);
addClass(relation.id2);
@ -651,7 +652,7 @@ export const getData = () => {
for (const _interface of interfaces) {
const interfaceNode: Node = {
id: `interface ${_interface.label}`,
id: _interface.id,
label: _interface.label,
isGroup: false,
shape: 'rect',

1
packages/mermaid/src/diagrams/class/classTypes.ts
View File

@ -168,6 +168,7 @@ export interface ClassRelation {
}
export interface Interface {
id: string;
label: string;
classId: string;
}