@aiderdesk/aiderdesk 0.77.0 → 0.78.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/renderer/assets/{AgentSettings-B73lGg-P.js → AgentSettings-mSGpRs0A.js} +1228 -4469
- package/out/renderer/assets/{InfoIcon-BaDK-htg.js → InfoIcon-Dllba1sv.js} +1 -1
- package/out/renderer/assets/{Onboarding-CttlAepw.js → Onboarding-D_AT4vxY.js} +4 -4
- package/out/renderer/assets/{ProviderHeader-B0-K9908.js → ProviderHeader-DAchpkUt.js} +8 -20
- package/out/renderer/assets/{SettingsPage-BtyX7Wv1.js → SettingsPage-DPaPSR-0.js} +5612 -291
- package/out/renderer/assets/{UsageDashboard-CKuev9SP.js → UsageDashboard-CfP-txzz.js} +3 -3
- package/out/renderer/assets/abnfDiagram-N423BO3Z-tqPb0OUs.js +118 -0
- package/out/renderer/assets/{arc-CDCMm4PF.js → arc-lUzj6CoE.js} +1 -1
- package/out/renderer/assets/{architectureDiagram-3BPJPVTR-DoyTFQYe.js → architectureDiagram-T3A2C74G-CuNUo8J6.js} +242 -133
- package/out/renderer/assets/{blockDiagram-GPEHLZMM-CophuS51.js → blockDiagram-VBNYF7ZC-CIiOkZ_D.js} +76 -77
- package/out/renderer/assets/{c4Diagram-AAUBKEIU-Dc3YxNWW.js → c4Diagram-5PPSVZJV-DcgBNVnI.js} +2 -2
- package/out/renderer/assets/{channel-cZzRDUFG.js → channel-PMBABQAa.js} +1 -1
- package/out/renderer/assets/{chunk-ND2GUHAM-BWiS_Ttp.js → chunk-2GRJ4B5K-CJI-utiZ.js} +4 -4
- package/out/renderer/assets/{chunk-QZHKN3VN-4NHol9Dz.js → chunk-2Q5K7J3B-D8LOcAuY.js} +1 -1
- package/out/renderer/assets/{chunk-AQP2D5EJ-CYCp3XBh.js → chunk-5RXB4S5H-dp0xqMbI.js} +67 -32
- package/out/renderer/assets/{chunk-FMBD7UC4-DIj-DOVN.js → chunk-5VM5RSS4-D731WvT8.js} +1 -1
- package/out/renderer/assets/chunk-6Q2QTUOP-BjzdFhNB.js +860 -0
- package/out/renderer/assets/{chunk-727SXJPM-CPUXDO_8.js → chunk-GF5L2VYU-Ct3zh1DW.js} +18 -8
- package/out/renderer/assets/{chunk-4BX2VUAB-DKNGjk29.js → chunk-JWPE2WC7-OPg0X7jU.js} +1 -1
- package/out/renderer/assets/{chunk-2J33WTMH-YV6ZtOyU.js → chunk-KBJHAD2P-qbM4OnIO.js} +1 -1
- package/out/renderer/assets/{dagre-BM42HDAG-5_V5lQc0.js → chunk-RYQCIY6F-DQI4Jds6.js} +85 -316
- package/out/renderer/assets/{chunk-55IACEB6-MkIW5gHI.js → chunk-XXDRQBXY-D_LC4QkV.js} +1 -1
- package/out/renderer/assets/{classDiagram-4FO5ZUOK-C1yfJEIb.js → classDiagram-JCYQIIEL-D4e_9tkA.js} +6 -6
- package/out/renderer/assets/{classDiagram-v2-Q7XG4LA2-C1yfJEIb.js → classDiagram-v2-OCEON4UE-D4e_9tkA.js} +6 -6
- package/out/renderer/assets/{cose-bilkent-S5V4N54A-B8D60fQa.js → cose-bilkent-JH36ORCC-tRlBuEjd.js} +2 -2
- package/out/renderer/assets/{wardley-L42UT6IY-CsNzYaF9.js → cynefin-VYW2F7L2-BiEI2vQb.js} +1527 -120
- package/out/renderer/assets/cynefinDiagram-MW4NZA55-DBSV1HcE.js +453 -0
- package/out/renderer/assets/{cytoscape.esm-BNSvh83I.js → cytoscape.esm-Bx_1tVW-.js} +160 -67
- package/out/renderer/assets/dagre-VZM6K2ZE-DRrMrSSw.js +522 -0
- package/out/renderer/assets/diagram-7IWD3JNH-CreTV9nH.js +488 -0
- package/out/renderer/assets/{diagram-KO2AKTUF-So0t9fVd.js → diagram-B4RE2ZJO-3tlgxoIb.js} +3 -3
- package/out/renderer/assets/{diagram-LMA3HP47-CbSRJgt4.js → diagram-LBJQPF4R-BFO2qTLJ.js} +3 -3
- package/out/renderer/assets/{diagram-OG6HWLK6-Bls2tZCJ.js → diagram-Q27KOJAE-BDgXUH9Q.js} +30 -24
- package/out/renderer/assets/{diagram-2AECGRRQ-Bb4cbiKY.js → diagram-UB23O5K3-Qw-ipaCG.js} +18 -8
- package/out/renderer/assets/ebnfDiagram-BXEA7PRR-izS1zYs0.js +138 -0
- package/out/renderer/assets/{erDiagram-TEJ5UH35-CESbOlvh.js → erDiagram-JOGREHBK-ld9lNh2F.js} +88 -77
- package/out/renderer/assets/{flowDiagram-I6XJVG4X-B-35DKDx.js → flowDiagram-UKHOOZJN-g11KS_zg.js} +112 -96
- package/out/renderer/assets/{ganttDiagram-6RSMTGT7-BL1OQkTj.js → ganttDiagram-PKOTCBZU-CMsbJWqv.js} +31 -19
- package/out/renderer/assets/{gitGraphDiagram-PVQCEYII-SJkGLAAz.js → gitGraphDiagram-DS77QQ5N-CKiYKjBJ.js} +4 -4
- package/out/renderer/assets/{graph-BSxR7Gef.js → graph--1WSNErU.js} +10 -10
- package/out/renderer/assets/{index-BqZxyppq.js → index-BJGP-Ed0.js} +1 -1
- package/out/renderer/assets/{index-NF_MxNl9.js → index-BSQTFZZV.js} +1 -1
- package/out/renderer/assets/{index-xCqv98zj.js → index-BSRjTKaQ.js} +1 -1
- package/out/renderer/assets/{index-Cmn9J2p1.js → index-BahRAP01.js} +2586 -1866
- package/out/renderer/assets/{index-DGcKtfCM.js → index-BbYkC4ZX.js} +1 -1
- package/out/renderer/assets/{index-VX8ukL4o.js → index-BktqS5iT.js} +1 -1
- package/out/renderer/assets/{index-DFODyrlX.js → index-DJfxm3SJ.js} +3 -3
- package/out/renderer/assets/{index-BVOpoJw8.js → index-DqZ8FyZG.js} +1 -1
- package/out/renderer/assets/{index-HJk8ZKtm.js → index-r15oFU5X.js} +1 -1
- package/out/renderer/assets/{index-DgDxO_E3.js → index-xC4jIIdf.js} +1 -1
- package/out/renderer/assets/{infoDiagram-5YYISTIA-lRTvqfXx.js → infoDiagram-6WML65LV-CZoJK8b2.js} +3 -3
- package/out/renderer/assets/{ishikawaDiagram-YF4QCWOH-CtsU-ctO.js → ishikawaDiagram-WSZJBQD7-BrUuSNZ-.js} +1 -1
- package/out/renderer/assets/{journeyDiagram-JHISSGLW-3MrLeKXj.js → journeyDiagram-NVQOT4AX-w91U6vB5.js} +4 -4
- package/out/renderer/assets/{jsx-dev-runtime-BTcJ8PkQ.js → jsx-dev-runtime-Bu2_G2cv.js} +1 -1
- package/out/renderer/assets/{kanban-definition-UN3LZRKU-CinUVJ12.js → kanban-definition-27J2QSJJ-DVuGbAnS.js} +2 -2
- package/out/renderer/assets/{katex-Co8xHYNH.js → katex-oVG3DVWa.js} +4039 -4063
- package/out/renderer/assets/{layout-C9eRMSnE.js → layout-BA4uCGdL.js} +36 -320
- package/out/renderer/assets/{linear-WwW43_Ig.js → linear-CWQmShZV.js} +1 -1
- package/out/renderer/assets/map-DSwlVIuN.js +299 -0
- package/out/renderer/assets/{mindmap-definition-RKZ34NQL-B-K0dkdA.js → mindmap-definition-FAOFIHXS-CbswsknG.js} +3 -3
- package/out/renderer/assets/pegDiagram-VL7TDLO6-CCqeWB6l.js +126 -0
- package/out/renderer/assets/{pieDiagram-4H26LBE5-eotxzUOT.js → pieDiagram-7S7Q4E2Y-Chd5qh8F.js} +89 -19
- package/out/renderer/assets/{quadrantDiagram-W4KKPZXB-BtKKvYmW.js → quadrantDiagram-CIZ2JOQS-CzmUVvXi.js} +8 -9
- package/out/renderer/assets/railroadDiagram-AXF67PYL-CXY83yzR.js +92 -0
- package/out/renderer/assets/{requirementDiagram-4Y6WPE33-k_JQl4AM.js → requirementDiagram-LRYGKXZP-DToxgkKr.js} +3 -3
- package/out/renderer/assets/{sankeyDiagram-5OEKKPKP-BVDWaFSn.js → sankeyDiagram-W5VNT64P-CRs67mfK.js} +1 -1
- package/out/renderer/assets/{sequenceDiagram-3UESZ5HK-dpVnolZO.js → sequenceDiagram-SI44F4Z6-CzmgqSt2.js} +11 -11
- package/out/renderer/assets/sizeCapture-X5ZJPWSS-mheyKWG9.js +62 -0
- package/out/renderer/assets/{stateDiagram-AJRCARHV-DYd-R9tJ.js → stateDiagram-OKZ733FA-DGyuxXU_.js} +8 -6
- package/out/renderer/assets/{stateDiagram-v2-BHNVJYJU-CyE2HX6z.js → stateDiagram-v2-UEYNNEHI-TldVLbtJ.js} +5 -4
- package/out/renderer/assets/swimlanes-SLNWSIFB-B3lFy2HE.js +8557 -0
- package/out/renderer/assets/swimlanesDiagram-ULZ7WXOC-BxN-HDA3.js +20 -0
- package/out/renderer/assets/{time-Claj2vse.js → time-DcFzC-ob.js} +1 -1
- package/out/renderer/assets/{timeline-definition-PNZ67QCA-0vKYrH6S.js → timeline-definition-Z64GVDOM-DQ7vCcJR.js} +2 -2
- package/out/renderer/assets/{vennDiagram-CIIHVFJN-op3DVQGG.js → vennDiagram-T6HMQDX7-MrgLWWY3.js} +32 -3
- package/out/renderer/assets/{wardleyDiagram-YWT4CUSO-D3jK8kAv.js → wardleyDiagram-T6FBY63Y-BCA6xyJ2.js} +3 -3
- package/out/renderer/assets/{xychartDiagram-2RQKCTM6-C9wPvZAU.js → xychartDiagram-ELKLHX3M-BZmPte5b.js} +125 -57
- package/out/renderer/index.html +1 -1
- package/out/renderer/sw.js +4 -0
- package/out/resources/skills/extension-creator/references/extension-interface.md +3 -0
- package/out/runner.js +4902 -3209
- package/package.json +5 -4
- package/out/renderer/assets/diagram-5GNKFQAL-DQ_vjlxb.js +0 -169
|
@@ -0,0 +1,522 @@
|
|
|
1
|
+
import { c as clear$2, w as write, a as adjustClustersAndEdges, f as findNonClusterChild, b as clusterDb, s as sortNodesByHierarchy } from "./chunk-RYQCIY6F-DQI4Jds6.js";
|
|
2
|
+
import { _ as __name, a$ as markers_default, b0 as clear2, b1 as clear, b2 as clear$1, O as log, L as getConfig2, b3 as updateNodeBounds, b4 as setNodeElem, aV as insertNode, b5 as getSubGraphTitleMargins, aW as positionNode, aU as insertCluster, b6 as insertEdge, b7 as positionEdgeLabel, b8 as insertEdgeLabel } from "./index-BahRAP01.js";
|
|
3
|
+
import { G as Graph } from "./graph--1WSNErU.js";
|
|
4
|
+
import { l as layout } from "./layout-BA4uCGdL.js";
|
|
5
|
+
import "./map-DSwlVIuN.js";
|
|
6
|
+
var clamp = /* @__PURE__ */ __name((value, min, max) => Math.max(min, Math.min(max, value)), "clamp");
|
|
7
|
+
var getDefaultSelfLoopSide = /* @__PURE__ */ __name((rankdir = "TB") => {
|
|
8
|
+
switch (rankdir) {
|
|
9
|
+
case "BT":
|
|
10
|
+
return "bottom";
|
|
11
|
+
case "LR":
|
|
12
|
+
return "right";
|
|
13
|
+
case "RL":
|
|
14
|
+
return "left";
|
|
15
|
+
case "TB":
|
|
16
|
+
default:
|
|
17
|
+
return "top";
|
|
18
|
+
}
|
|
19
|
+
}, "getDefaultSelfLoopSide");
|
|
20
|
+
var shouldMergeSelfLoopSegments = /* @__PURE__ */ __name((diagramType) => diagramType === "flowchart" || diagramType === "flowchart-v2" || diagramType === "stateDiagram", "shouldMergeSelfLoopSegments");
|
|
21
|
+
var getSelfLoopSide = /* @__PURE__ */ __name((graph, node, segments, originalNodeId, rankdir) => {
|
|
22
|
+
const layoutHints = [];
|
|
23
|
+
const dummyNodeIds = /* @__PURE__ */ new Set();
|
|
24
|
+
segments.forEach(({ start, end }) => {
|
|
25
|
+
if (start !== originalNodeId) {
|
|
26
|
+
dummyNodeIds.add(start);
|
|
27
|
+
}
|
|
28
|
+
if (end !== originalNodeId) {
|
|
29
|
+
dummyNodeIds.add(end);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
dummyNodeIds.forEach((id) => {
|
|
33
|
+
const dummyNode = graph.node(id);
|
|
34
|
+
if (typeof dummyNode?.x === "number" && typeof dummyNode?.y === "number") {
|
|
35
|
+
layoutHints.push(dummyNode);
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
if (layoutHints.length === 0) {
|
|
39
|
+
segments.forEach(({ edge }) => {
|
|
40
|
+
(edge.points ?? []).forEach((point) => {
|
|
41
|
+
if (typeof point?.x === "number" && typeof point?.y === "number") {
|
|
42
|
+
layoutHints.push(point);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
if (layoutHints.length === 0) {
|
|
48
|
+
return getDefaultSelfLoopSide(rankdir);
|
|
49
|
+
}
|
|
50
|
+
const center = layoutHints.reduce(
|
|
51
|
+
(acc, point) => ({
|
|
52
|
+
x: acc.x + point.x / layoutHints.length,
|
|
53
|
+
y: acc.y + point.y / layoutHints.length
|
|
54
|
+
}),
|
|
55
|
+
{ x: 0, y: 0 }
|
|
56
|
+
);
|
|
57
|
+
const dx = center.x - node.x;
|
|
58
|
+
const dy = center.y - node.y;
|
|
59
|
+
if (Math.abs(dx) > Math.abs(dy)) {
|
|
60
|
+
return dx > 0 ? "right" : "left";
|
|
61
|
+
}
|
|
62
|
+
if (Math.abs(dy) > 0) {
|
|
63
|
+
return dy > 0 ? "bottom" : "top";
|
|
64
|
+
}
|
|
65
|
+
return getDefaultSelfLoopSide(rankdir);
|
|
66
|
+
}, "getSelfLoopSide");
|
|
67
|
+
var getSelfLoopPoints = /* @__PURE__ */ __name((node, side = "top", yOffset = 0, labelWidth = 0) => {
|
|
68
|
+
const x = node.x;
|
|
69
|
+
const y = node.y - yOffset;
|
|
70
|
+
const halfWidth = node.width / 2;
|
|
71
|
+
const halfHeight = node.height / 2;
|
|
72
|
+
const maxSpan = Math.max(36, Math.min(100, node.width * 0.8));
|
|
73
|
+
const span = clamp(Math.max(labelWidth, node.width * 0.35), 36, maxSpan);
|
|
74
|
+
const depth = clamp(Math.min(node.width, node.height) * 0.45, 24, 48);
|
|
75
|
+
switch (side) {
|
|
76
|
+
case "bottom": {
|
|
77
|
+
const bottom = y + halfHeight;
|
|
78
|
+
return [
|
|
79
|
+
{ x: x - span / 2, y: bottom },
|
|
80
|
+
{ x: x - span / 2, y: bottom + depth },
|
|
81
|
+
{ x: x + span / 2, y: bottom + depth },
|
|
82
|
+
{ x: x + span / 2, y: bottom }
|
|
83
|
+
];
|
|
84
|
+
}
|
|
85
|
+
case "right": {
|
|
86
|
+
const right = x + halfWidth;
|
|
87
|
+
return [
|
|
88
|
+
{ x: right, y: y - span / 2 },
|
|
89
|
+
{ x: right + depth, y: y - span / 2 },
|
|
90
|
+
{ x: right + depth, y: y + span / 2 },
|
|
91
|
+
{ x: right, y: y + span / 2 }
|
|
92
|
+
];
|
|
93
|
+
}
|
|
94
|
+
case "left": {
|
|
95
|
+
const left = x - halfWidth;
|
|
96
|
+
return [
|
|
97
|
+
{ x: left, y: y - span / 2 },
|
|
98
|
+
{ x: left - depth, y: y - span / 2 },
|
|
99
|
+
{ x: left - depth, y: y + span / 2 },
|
|
100
|
+
{ x: left, y: y + span / 2 }
|
|
101
|
+
];
|
|
102
|
+
}
|
|
103
|
+
case "top":
|
|
104
|
+
default: {
|
|
105
|
+
const top = y - halfHeight;
|
|
106
|
+
return [
|
|
107
|
+
{ x: x - span / 2, y: top },
|
|
108
|
+
{ x: x - span / 2, y: top - depth },
|
|
109
|
+
{ x: x + span / 2, y: top - depth },
|
|
110
|
+
{ x: x + span / 2, y: top }
|
|
111
|
+
];
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}, "getSelfLoopPoints");
|
|
115
|
+
var getSelfLoopLabelPosition = /* @__PURE__ */ __name((node, points, side = "top", yOffset = 0, label = {}) => {
|
|
116
|
+
const gap = 4;
|
|
117
|
+
const x = node.x;
|
|
118
|
+
const y = node.y - yOffset;
|
|
119
|
+
const labelWidth = label.width ?? 0;
|
|
120
|
+
const labelHeight = label.height ?? 0;
|
|
121
|
+
switch (side) {
|
|
122
|
+
case "bottom":
|
|
123
|
+
return { x, y: Math.max(...points.map((point) => point.y)) + labelHeight / 2 + gap };
|
|
124
|
+
case "right":
|
|
125
|
+
return { x: Math.max(...points.map((point) => point.x)) + labelWidth / 2 + gap, y };
|
|
126
|
+
case "left":
|
|
127
|
+
return { x: Math.min(...points.map((point) => point.x)) - labelWidth / 2 - gap, y };
|
|
128
|
+
case "top":
|
|
129
|
+
default:
|
|
130
|
+
return { x, y: Math.min(...points.map((point) => point.y)) - labelHeight / 2 - gap };
|
|
131
|
+
}
|
|
132
|
+
}, "getSelfLoopLabelPosition");
|
|
133
|
+
var getEdgesToRender = /* @__PURE__ */ __name((graph, yOffset = 0, { mergeSelfLoops = true } = {}) => {
|
|
134
|
+
const selfLoopEdgeGroups = /* @__PURE__ */ new Map();
|
|
135
|
+
const edgesToRender = [];
|
|
136
|
+
const rankdir = graph.graph()?.rankdir;
|
|
137
|
+
graph.edges().forEach((e) => {
|
|
138
|
+
const edge = graph.edge(e);
|
|
139
|
+
if (mergeSelfLoops && edge.selfLoop) {
|
|
140
|
+
const key = edge.selfLoop.id;
|
|
141
|
+
if (!selfLoopEdgeGroups.has(key)) {
|
|
142
|
+
selfLoopEdgeGroups.set(key, []);
|
|
143
|
+
}
|
|
144
|
+
selfLoopEdgeGroups.get(key).push({ edge, start: e.v, end: e.w });
|
|
145
|
+
} else {
|
|
146
|
+
edgesToRender.push({ edge, start: e.v, end: e.w });
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
selfLoopEdgeGroups.forEach((segments) => {
|
|
150
|
+
if (segments.length !== 3) {
|
|
151
|
+
segments.forEach((segment) => edgesToRender.push(segment));
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
segments.sort((a, b) => a.edge.selfLoop.order - b.edge.selfLoop.order);
|
|
155
|
+
const [firstSegment, middleSegment, lastSegment] = segments;
|
|
156
|
+
const originalEdge = firstSegment.edge.originalEdge ?? middleSegment.edge.originalEdge ?? lastSegment.edge.originalEdge ?? middleSegment.edge;
|
|
157
|
+
const node = graph.node(originalEdge.start);
|
|
158
|
+
if (!node) {
|
|
159
|
+
segments.forEach((segment) => edgesToRender.push(segment));
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
const label = {
|
|
163
|
+
width: middleSegment.edge.width,
|
|
164
|
+
height: middleSegment.edge.height
|
|
165
|
+
};
|
|
166
|
+
const side = getSelfLoopSide(graph, node, segments, originalEdge.start, rankdir);
|
|
167
|
+
const points = getSelfLoopPoints(node, side, yOffset, label.width ?? 0);
|
|
168
|
+
const labelPosition = getSelfLoopLabelPosition(node, points, side, yOffset, label);
|
|
169
|
+
const mergedEdge = {
|
|
170
|
+
...middleSegment.edge,
|
|
171
|
+
...originalEdge,
|
|
172
|
+
id: originalEdge.id,
|
|
173
|
+
points,
|
|
174
|
+
start: originalEdge.start,
|
|
175
|
+
end: originalEdge.end,
|
|
176
|
+
x: labelPosition.x,
|
|
177
|
+
y: labelPosition.y,
|
|
178
|
+
width: label.width,
|
|
179
|
+
height: label.height,
|
|
180
|
+
labelStyle: middleSegment.edge.labelStyle,
|
|
181
|
+
fromCluster: firstSegment.edge.fromCluster ?? middleSegment.edge.fromCluster ?? lastSegment.edge.fromCluster,
|
|
182
|
+
toCluster: firstSegment.edge.toCluster ?? middleSegment.edge.toCluster ?? lastSegment.edge.toCluster
|
|
183
|
+
};
|
|
184
|
+
delete mergedEdge.selfLoop;
|
|
185
|
+
delete mergedEdge.originalEdge;
|
|
186
|
+
edgesToRender.push({ edge: mergedEdge, start: mergedEdge.start, end: mergedEdge.end });
|
|
187
|
+
});
|
|
188
|
+
return edgesToRender;
|
|
189
|
+
}, "getEdgesToRender");
|
|
190
|
+
var recursiveRender = /* @__PURE__ */ __name(async (_elem, graph, diagramType, id, parentCluster, siteConfig) => {
|
|
191
|
+
log.warn("Graph in recursive render:XAX", write(graph), parentCluster);
|
|
192
|
+
const dir = graph.graph().rankdir;
|
|
193
|
+
log.trace("Dir in recursive render - dir:", dir);
|
|
194
|
+
const elem = _elem.insert("g").attr("class", "root");
|
|
195
|
+
if (!graph.nodes()) {
|
|
196
|
+
log.info("No nodes found for", graph);
|
|
197
|
+
} else {
|
|
198
|
+
log.info("Recursive render XXX", graph.nodes());
|
|
199
|
+
}
|
|
200
|
+
if (graph.edges().length > 0) {
|
|
201
|
+
log.info("Recursive edges", graph.edge(graph.edges()[0]));
|
|
202
|
+
}
|
|
203
|
+
const clusters = elem.insert("g").attr("class", "clusters");
|
|
204
|
+
const edgePaths = elem.insert("g").attr("class", "edgePaths");
|
|
205
|
+
const edgeLabels = elem.insert("g").attr("class", "edgeLabels");
|
|
206
|
+
const nodes = elem.insert("g").attr("class", "nodes");
|
|
207
|
+
const mergeSelfLoops = shouldMergeSelfLoopSegments(diagramType);
|
|
208
|
+
await Promise.all(
|
|
209
|
+
graph.nodes().map(async function(v) {
|
|
210
|
+
const node = graph.node(v);
|
|
211
|
+
if (parentCluster !== void 0) {
|
|
212
|
+
const data = JSON.parse(JSON.stringify(parentCluster.clusterData));
|
|
213
|
+
log.trace(
|
|
214
|
+
"Setting data for parent cluster XXX\n Node.id = ",
|
|
215
|
+
v,
|
|
216
|
+
"\n data=",
|
|
217
|
+
data.height,
|
|
218
|
+
"\nParent cluster",
|
|
219
|
+
parentCluster.height
|
|
220
|
+
);
|
|
221
|
+
graph.setNode(parentCluster.id, data);
|
|
222
|
+
if (!graph.parent(v)) {
|
|
223
|
+
log.trace("Setting parent", v, parentCluster.id);
|
|
224
|
+
graph.setParent(v, parentCluster.id, data);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
log.info("(Insert) Node XXX" + v + ": " + JSON.stringify(graph.node(v)));
|
|
228
|
+
if (node?.clusterNode) {
|
|
229
|
+
log.info("Cluster identified XBX", v, node.width, graph.node(v));
|
|
230
|
+
const { ranksep, nodesep } = graph.graph();
|
|
231
|
+
node.graph.setGraph({
|
|
232
|
+
...node.graph.graph(),
|
|
233
|
+
ranksep: ranksep + 25,
|
|
234
|
+
nodesep
|
|
235
|
+
});
|
|
236
|
+
const o = await recursiveRender(
|
|
237
|
+
nodes,
|
|
238
|
+
node.graph,
|
|
239
|
+
diagramType,
|
|
240
|
+
id,
|
|
241
|
+
graph.node(v),
|
|
242
|
+
siteConfig
|
|
243
|
+
);
|
|
244
|
+
const newEl = o.elem;
|
|
245
|
+
updateNodeBounds(node, newEl);
|
|
246
|
+
node.diff = o.diff || 0;
|
|
247
|
+
log.info(
|
|
248
|
+
"New compound node after recursive render XAX",
|
|
249
|
+
v,
|
|
250
|
+
"width",
|
|
251
|
+
// node,
|
|
252
|
+
node.width,
|
|
253
|
+
"height",
|
|
254
|
+
node.height
|
|
255
|
+
// node.x,
|
|
256
|
+
// node.y
|
|
257
|
+
);
|
|
258
|
+
setNodeElem(newEl, node);
|
|
259
|
+
} else {
|
|
260
|
+
if (graph.children(v).length > 0) {
|
|
261
|
+
log.trace(
|
|
262
|
+
"Cluster - the non recursive path XBX",
|
|
263
|
+
v,
|
|
264
|
+
node.id,
|
|
265
|
+
node,
|
|
266
|
+
node.width,
|
|
267
|
+
"Graph:",
|
|
268
|
+
graph
|
|
269
|
+
);
|
|
270
|
+
log.trace(findNonClusterChild(node.id, graph));
|
|
271
|
+
clusterDb.set(node.id, { id: findNonClusterChild(node.id, graph), node });
|
|
272
|
+
} else {
|
|
273
|
+
log.trace("Node - the non recursive path XAX", v, nodes, graph.node(v), dir);
|
|
274
|
+
await insertNode(nodes, graph.node(v), { config: siteConfig, dir });
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
})
|
|
278
|
+
);
|
|
279
|
+
const processEdges = /* @__PURE__ */ __name(async () => {
|
|
280
|
+
const edgePromises = graph.edges().map(async function(e) {
|
|
281
|
+
const edge = graph.edge(e.v, e.w, e.name);
|
|
282
|
+
log.info("Edge " + e.v + " -> " + e.w + ": " + JSON.stringify(e));
|
|
283
|
+
log.info("Edge " + e.v + " -> " + e.w + ": ", e, " ", JSON.stringify(graph.edge(e)));
|
|
284
|
+
log.info(
|
|
285
|
+
"Fix",
|
|
286
|
+
clusterDb,
|
|
287
|
+
"ids:",
|
|
288
|
+
e.v,
|
|
289
|
+
e.w,
|
|
290
|
+
"Translating: ",
|
|
291
|
+
clusterDb.get(e.v),
|
|
292
|
+
clusterDb.get(e.w)
|
|
293
|
+
);
|
|
294
|
+
if (mergeSelfLoops && edge.selfLoop) {
|
|
295
|
+
if (edge.selfLoop.order !== 1) {
|
|
296
|
+
return;
|
|
297
|
+
}
|
|
298
|
+
const segmentId = edge.id;
|
|
299
|
+
edge.id = edge.selfLoop.id;
|
|
300
|
+
await insertEdgeLabel(edgeLabels, edge);
|
|
301
|
+
edge.id = segmentId;
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
304
|
+
await insertEdgeLabel(edgeLabels, edge);
|
|
305
|
+
});
|
|
306
|
+
await Promise.all(edgePromises);
|
|
307
|
+
}, "processEdges");
|
|
308
|
+
await processEdges();
|
|
309
|
+
log.info("Graph before layout:", JSON.stringify(write(graph)));
|
|
310
|
+
log.info("############################################# XXX");
|
|
311
|
+
log.info("### Layout ### XXX");
|
|
312
|
+
log.info("############################################# XXX");
|
|
313
|
+
layout(graph);
|
|
314
|
+
log.info("Graph after layout:", JSON.stringify(write(graph)));
|
|
315
|
+
let diff = 0;
|
|
316
|
+
let { subGraphTitleTotalMargin } = getSubGraphTitleMargins(siteConfig);
|
|
317
|
+
await Promise.all(
|
|
318
|
+
sortNodesByHierarchy(graph).map(async function(v) {
|
|
319
|
+
const node = graph.node(v);
|
|
320
|
+
log.info(
|
|
321
|
+
"Position XBX => " + v + ": (" + node.x,
|
|
322
|
+
"," + node.y,
|
|
323
|
+
") width: ",
|
|
324
|
+
node.width,
|
|
325
|
+
" height: ",
|
|
326
|
+
node.height
|
|
327
|
+
);
|
|
328
|
+
if (node?.clusterNode) {
|
|
329
|
+
node.y += subGraphTitleTotalMargin;
|
|
330
|
+
log.info(
|
|
331
|
+
"A tainted cluster node XBX1",
|
|
332
|
+
v,
|
|
333
|
+
node.id,
|
|
334
|
+
node.width,
|
|
335
|
+
node.height,
|
|
336
|
+
node.x,
|
|
337
|
+
node.y,
|
|
338
|
+
graph.parent(v)
|
|
339
|
+
);
|
|
340
|
+
clusterDb.get(node.id).node = node;
|
|
341
|
+
positionNode(node);
|
|
342
|
+
} else {
|
|
343
|
+
if (graph.children(v).length > 0) {
|
|
344
|
+
log.info(
|
|
345
|
+
"A pure cluster node XBX1",
|
|
346
|
+
v,
|
|
347
|
+
node.id,
|
|
348
|
+
node.x,
|
|
349
|
+
node.y,
|
|
350
|
+
node.width,
|
|
351
|
+
node.height,
|
|
352
|
+
graph.parent(v)
|
|
353
|
+
);
|
|
354
|
+
node.height += subGraphTitleTotalMargin;
|
|
355
|
+
graph.node(node.parentId);
|
|
356
|
+
const halfPadding = node?.padding / 2 || 0;
|
|
357
|
+
const labelHeight = node?.labelBBox?.height || 0;
|
|
358
|
+
const offsetY = labelHeight - halfPadding || 0;
|
|
359
|
+
log.debug("OffsetY", offsetY, "labelHeight", labelHeight, "halfPadding", halfPadding);
|
|
360
|
+
await insertCluster(clusters, node);
|
|
361
|
+
clusterDb.get(node.id).node = node;
|
|
362
|
+
} else {
|
|
363
|
+
const parent = graph.node(node.parentId);
|
|
364
|
+
node.y += subGraphTitleTotalMargin / 2;
|
|
365
|
+
log.info(
|
|
366
|
+
"A regular node XBX1 - using the padding",
|
|
367
|
+
node.id,
|
|
368
|
+
"parent",
|
|
369
|
+
node.parentId,
|
|
370
|
+
node.width,
|
|
371
|
+
node.height,
|
|
372
|
+
node.x,
|
|
373
|
+
node.y,
|
|
374
|
+
"offsetY",
|
|
375
|
+
node.offsetY,
|
|
376
|
+
"parent",
|
|
377
|
+
parent,
|
|
378
|
+
parent?.offsetY,
|
|
379
|
+
node
|
|
380
|
+
);
|
|
381
|
+
positionNode(node);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
})
|
|
385
|
+
);
|
|
386
|
+
const edgeOffsetY = subGraphTitleTotalMargin / 2;
|
|
387
|
+
const edgesToRender = getEdgesToRender(graph, edgeOffsetY, { mergeSelfLoops });
|
|
388
|
+
edgesToRender.forEach(function({ edge, start, end }) {
|
|
389
|
+
log.info("Edge " + start + " -> " + end + ": " + JSON.stringify(edge), edge);
|
|
390
|
+
edge.points.forEach((point) => point.y += edgeOffsetY);
|
|
391
|
+
const startNode = graph.node(start);
|
|
392
|
+
const endNode = graph.node(end);
|
|
393
|
+
const paths = insertEdge(edgePaths, edge, clusterDb, diagramType, startNode, endNode, id);
|
|
394
|
+
positionEdgeLabel(edge, paths);
|
|
395
|
+
});
|
|
396
|
+
graph.nodes().forEach(function(v) {
|
|
397
|
+
const n = graph.node(v);
|
|
398
|
+
log.info(v, n.type, n.diff);
|
|
399
|
+
if (n.isGroup) {
|
|
400
|
+
diff = n.diff;
|
|
401
|
+
}
|
|
402
|
+
});
|
|
403
|
+
log.warn("Returning from recursive render XAX", elem, diff);
|
|
404
|
+
return { elem, diff };
|
|
405
|
+
}, "recursiveRender");
|
|
406
|
+
var render = /* @__PURE__ */ __name(async (data4Layout, svg) => {
|
|
407
|
+
const graph = new Graph({
|
|
408
|
+
multigraph: true,
|
|
409
|
+
compound: true
|
|
410
|
+
}).setGraph({
|
|
411
|
+
rankdir: data4Layout.direction,
|
|
412
|
+
nodesep: data4Layout.config?.nodeSpacing || data4Layout.config?.flowchart?.nodeSpacing || data4Layout.nodeSpacing,
|
|
413
|
+
ranksep: data4Layout.config?.rankSpacing || data4Layout.config?.flowchart?.rankSpacing || data4Layout.rankSpacing,
|
|
414
|
+
marginx: 8,
|
|
415
|
+
marginy: 8
|
|
416
|
+
}).setDefaultEdgeLabel(function() {
|
|
417
|
+
return {};
|
|
418
|
+
});
|
|
419
|
+
const element = svg.select("g");
|
|
420
|
+
markers_default(element, data4Layout.markers, data4Layout.type, data4Layout.diagramId);
|
|
421
|
+
clear2();
|
|
422
|
+
clear();
|
|
423
|
+
clear$1();
|
|
424
|
+
clear$2();
|
|
425
|
+
data4Layout.nodes.forEach((node) => {
|
|
426
|
+
graph.setNode(node.id, { ...node });
|
|
427
|
+
if (node.parentId) {
|
|
428
|
+
graph.setParent(node.id, node.parentId);
|
|
429
|
+
}
|
|
430
|
+
});
|
|
431
|
+
log.debug("Edges:", data4Layout.edges);
|
|
432
|
+
data4Layout.edges.forEach((edge) => {
|
|
433
|
+
if (edge.start === edge.end) {
|
|
434
|
+
const nodeId = edge.start;
|
|
435
|
+
const specialId1 = nodeId + "---" + nodeId + "---1";
|
|
436
|
+
const specialId2 = nodeId + "---" + nodeId + "---2";
|
|
437
|
+
const node = graph.node(nodeId);
|
|
438
|
+
graph.setNode(specialId1, {
|
|
439
|
+
domId: specialId1,
|
|
440
|
+
id: specialId1,
|
|
441
|
+
parentId: node.parentId,
|
|
442
|
+
labelStyle: "",
|
|
443
|
+
label: "",
|
|
444
|
+
padding: 0,
|
|
445
|
+
shape: "labelRect",
|
|
446
|
+
// shape: 'rect',
|
|
447
|
+
style: "",
|
|
448
|
+
width: 10,
|
|
449
|
+
height: 10
|
|
450
|
+
});
|
|
451
|
+
graph.setParent(specialId1, node.parentId);
|
|
452
|
+
graph.setNode(specialId2, {
|
|
453
|
+
domId: specialId2,
|
|
454
|
+
id: specialId2,
|
|
455
|
+
parentId: node.parentId,
|
|
456
|
+
labelStyle: "",
|
|
457
|
+
padding: 0,
|
|
458
|
+
// shape: 'rect',
|
|
459
|
+
shape: "labelRect",
|
|
460
|
+
label: "",
|
|
461
|
+
style: "",
|
|
462
|
+
width: 10,
|
|
463
|
+
height: 10
|
|
464
|
+
});
|
|
465
|
+
graph.setParent(specialId2, node.parentId);
|
|
466
|
+
const originalEdge = structuredClone(edge);
|
|
467
|
+
const edge1 = structuredClone(edge);
|
|
468
|
+
const edgeMid = structuredClone(edge);
|
|
469
|
+
const edge2 = structuredClone(edge);
|
|
470
|
+
edge1.originalEdge = originalEdge;
|
|
471
|
+
edge1.selfLoop = { id: originalEdge.id, order: 0 };
|
|
472
|
+
edgeMid.originalEdge = originalEdge;
|
|
473
|
+
edgeMid.selfLoop = { id: originalEdge.id, order: 1 };
|
|
474
|
+
edge2.originalEdge = originalEdge;
|
|
475
|
+
edge2.selfLoop = { id: originalEdge.id, order: 2 };
|
|
476
|
+
edge1.label = "";
|
|
477
|
+
edge1.arrowTypeEnd = "none";
|
|
478
|
+
edge1.endLabelLeft = "";
|
|
479
|
+
edge1.endLabelRight = "";
|
|
480
|
+
edge1.startLabelLeft = "";
|
|
481
|
+
edge1.id = nodeId + "-cyclic-special-1";
|
|
482
|
+
edgeMid.startLabelRight = "";
|
|
483
|
+
edgeMid.startLabelLeft = "";
|
|
484
|
+
edgeMid.endLabelLeft = "";
|
|
485
|
+
edgeMid.endLabelRight = "";
|
|
486
|
+
edgeMid.arrowTypeStart = "none";
|
|
487
|
+
edgeMid.arrowTypeEnd = "none";
|
|
488
|
+
edgeMid.id = nodeId + "-cyclic-special-mid";
|
|
489
|
+
edge2.label = "";
|
|
490
|
+
edge2.startLabelRight = "";
|
|
491
|
+
edge2.startLabelLeft = "";
|
|
492
|
+
edge2.arrowTypeStart = "none";
|
|
493
|
+
if (node.isGroup) {
|
|
494
|
+
edge1.fromCluster = nodeId;
|
|
495
|
+
edge2.toCluster = nodeId;
|
|
496
|
+
}
|
|
497
|
+
edge2.id = nodeId + "-cyclic-special-2";
|
|
498
|
+
edge2.arrowTypeStart = "none";
|
|
499
|
+
graph.setEdge(nodeId, specialId1, edge1, nodeId + "-cyclic-special-0");
|
|
500
|
+
graph.setEdge(specialId1, specialId2, edgeMid, nodeId + "-cyclic-special-1");
|
|
501
|
+
graph.setEdge(specialId2, nodeId, edge2, nodeId + "-cyclic-special-2");
|
|
502
|
+
} else {
|
|
503
|
+
graph.setEdge(edge.start, edge.end, { ...edge }, edge.id);
|
|
504
|
+
}
|
|
505
|
+
});
|
|
506
|
+
log.warn("Graph at first:", JSON.stringify(write(graph)));
|
|
507
|
+
adjustClustersAndEdges(graph);
|
|
508
|
+
log.warn("Graph after XAX:", JSON.stringify(write(graph)));
|
|
509
|
+
const siteConfig = getConfig2();
|
|
510
|
+
await recursiveRender(
|
|
511
|
+
element,
|
|
512
|
+
graph,
|
|
513
|
+
data4Layout.type,
|
|
514
|
+
data4Layout.diagramId,
|
|
515
|
+
void 0,
|
|
516
|
+
siteConfig
|
|
517
|
+
);
|
|
518
|
+
}, "render");
|
|
519
|
+
export {
|
|
520
|
+
getEdgesToRender,
|
|
521
|
+
render
|
|
522
|
+
};
|