v1 extended analysis render

2026-06-14 20:10:55 +02:00
parent ab474c0766
commit 744439c99d
13 changed files with 2404 additions and 90 deletions
--- a/state_machine_exporter/flow_renderer_plan/pocs/poc2_modern_light.html
+++ b/state_machine_exporter/flow_renderer_plan/pocs/poc2_modern_light.html
@@ -0,0 +1,417 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Final PoC: Real Machine Explorer</title>
+    <script src="https://unpkg.com/@popperjs/core@2"></script>
+    <script src="https://unpkg.com/tippy.js@6"></script>
+    <script src="https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&family=JetBrains+Mono:wght@400;700&display=swap" rel="stylesheet">
+    <style>
+        :root {
+            --bg: #f8fafc;
+            --sidebar-bg: #ffffff;
+            --accent: #3b82f6; /* Modern Blue */
+            --accent-hover: #2563eb;
+            --text: #0f172a;
+            --text-muted: #64748b;
+            --border: #e2e8f0;
+            --highlight: #ef4444; /* Coral Red for Highlights */
+            --node-bg: #ffffff;
+            --node-border: #94a3b8;
+        }
+
+        body {
+            margin: 0;
+            display: flex;
+            height: 100vh;
+            font-family: 'Inter', -apple-system, sans-serif;
+            background: var(--bg);
+            color: var(--text);
+            overflow: hidden;
+        }
+
+        #sidebar {
+            width: 400px;
+            background: var(--sidebar-bg);
+            border-right: 1px solid var(--border);
+            display: flex;
+            flex-direction: column;
+            padding: 25px;
+            overflow-y: auto;
+            box-shadow: 2px 0 15px rgba(0,0,0,0.03);
+            z-index: 10;
+        }
+
+        .ep-card {
+            padding: 16px;
+            background: #fff;
+            border: 1px solid var(--border);
+            border-radius: 8px;
+            margin-bottom: 12px;
+            cursor: pointer;
+            transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+            position: relative;
+            overflow: hidden;
+        }
+
+        .ep-card::before {
+            content: '';
+            position: absolute;
+            left: 0; top: 0; bottom: 0; width: 4px;
+            background: transparent;
+            transition: background 0.2s;
+        }
+
+        .ep-card:hover {
+            border-color: var(--accent);
+            transform: translateY(-2px);
+            box-shadow: 0 10px 15px -3px rgba(0,0,0,0.05);
+        }
+
+        .ep-card:hover::before {
+            background: var(--accent);
+        }
+
+        .ep-type {
+            font-size: 0.65rem;
+            font-weight: 800;
+            padding: 4px 8px;
+            border-radius: 4px;
+            display: inline-block;
+            margin-bottom: 8px;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+        .type-rest { background: #eff6ff; color: #1d4ed8; }
+        .type-custom { background: #fef2f2; color: #b91c1c; }
+
+        .method { font-weight: 700; font-size: 0.95rem; margin-bottom: 6px; }
+        .path { font-family: 'JetBrains Mono', monospace; font-size: 0.75rem; color: var(--text-muted); }
+
+        #main { flex-grow: 1; position: relative; background: var(--bg); }
+        #svg-container { width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; }
+        svg { width: 100%; height: 100%; max-width: none; }
+
+        /* --- SVG Styling --- */
+        .node circle { fill: var(--node-bg); stroke: var(--node-border); stroke-width: 2.5px; transition: all 0.3s; }
+        .node text { fill: var(--text); font-family: 'Inter', sans-serif; font-weight: 600; font-size: 14px; user-select: none; }
+        
+        .transition-link path { stroke: #cbd5e1; stroke-width: 2.5px; fill: none; transition: all 0.3s; }
+        .transition-link text { fill: #64748b; font-family: 'JetBrains Mono', monospace; font-size: 11px; font-weight: 600; transition: all 0.3s; cursor: pointer; user-select: none; }
+        
+        .transition-link:hover path { stroke: var(--accent); stroke-width: 4px; }
+        .transition-link:hover text { fill: var(--accent); font-size: 12px; }
+
+        /* Animation & Highlighting */
+        .dimmed { opacity: 0.1; filter: grayscale(1); transition: all 0.4s ease; }
+        
+        .active-path path { 
+            stroke: var(--highlight) !important; 
+            stroke-width: 4.5px !important; 
+            filter: drop-shadow(0 0 6px rgba(239, 68, 68, 0.4));
+            transition: all 0.3s ease;
+            stroke-dasharray: 8;
+            animation: flow 1s linear infinite;
+        }
+
+        @keyframes flow {
+            from { stroke-dashoffset: 16; }
+            to { stroke-dashoffset: 0; }
+        }
+
+        .active-path text {
+            fill: #000 !important;
+            font-weight: 800 !important;
+            font-size: 12px !important;
+            paint-order: stroke;
+            stroke: #fff;
+            stroke-width: 4px;
+            transition: all 0.3s ease;
+        }
+
+        .active-node circle {
+            stroke: var(--highlight) !important;
+            stroke-width: 3.5px !important;
+        }
+        .active-node text {
+            font-weight: 800 !important;
+        }
+
+        /* Tippy Styling */
+        .tippy-box[data-theme~='modern'] {
+            background-color: #fff;
+            color: var(--text);
+            box-shadow: 0 25px 50px -12px rgba(0,0,0,0.25);
+            border: 1px solid var(--border);
+            padding: 0;
+            border-radius: 12px;
+            text-align: left;
+        }
+
+        .chain-step {
+            display: flex;
+            align-items: center;
+            font-size: 0.8rem;
+            color: var(--text-muted);
+            margin-top: 6px;
+        }
+        .chain-step b { color: var(--accent); margin-right: 8px; width: 15px; }
+
+        .payload-box {
+            background: #0f172a;
+            color: #e2e8f0;
+            border-radius: 8px;
+            padding: 15px;
+            font-family: 'JetBrains Mono', monospace;
+            font-size: 0.75rem;
+            line-height: 1.6;
+            margin-top: 10px;
+        }
+    </style>
+</head>
+<body>
+
+<div id="sidebar">
+    <div style="font-weight: 900; font-size: 1.4rem; margin-bottom: 5px; color: var(--text);">Machine Explorer</div>
+    <div style="font-family: 'JetBrains Mono', monospace; font-size: 0.75rem; color: var(--text-muted); margin-bottom: 30px; padding-bottom: 20px; border-bottom: 1px solid var(--border);">ExtendedStateMachineConfig</div>
+    
+    <div id="ep-list"></div>
+</div>
+
+<div id="main">
+    <div id="svg-container">
+        <svg id="viz" viewBox="0 0 900 500" xmlns="http://www.w3.org/2000/svg">
+            <defs>
+                <marker id="arrow-default" markerWidth="8" markerHeight="8" refX="5" refY="4" orientation="auto-start-reverse">
+                    <path d="M0,0 L8,4 L0,8 Z" fill="#94a3b8" />
+                </marker>
+                <marker id="arrow-active" markerWidth="8" markerHeight="8" refX="5" refY="4" orientation="auto-start-reverse">
+                    <path d="M0,0 L8,4 L0,8 Z" fill="#ef4444" />
+                </marker>
+            </defs>
+
+            <!-- Nodes -->
+            <g class="node" id="node-START">
+                <circle cx="150" cy="250" r="45" />
+                <text x="150" y="255" text-anchor="middle">START</text>
+            </g>
+
+            <g class="node" id="node-PROCESSING">
+                <circle cx="450" cy="250" r="45" />
+                <text x="450" y="255" text-anchor="middle">PROCESSING</text>
+            </g>
+
+            <g class="node" id="node-COMPLETED">
+                <circle cx="750" cy="150" r="45" />
+                <text x="750" y="155" text-anchor="middle">COMPLETED</text>
+            </g>
+
+            <g class="node" id="node-CANCELLED">
+                <circle cx="750" cy="350" r="45" />
+                <text x="750" y="355" text-anchor="middle">CANCELLED</text>
+            </g>
+
+            <!-- Transitions - Paths end exactly at radius (45px) from target center -->
+            <g class="transition-link" id="link_AUDIT_EVENT" data-source="node-START" data-target="node-START">
+                <path d="M 125 215 C 80 160, 40 200, 105 240" marker-end="url(#arrow-default)" />
+                <text x="75" y="165" text-anchor="middle">AUDIT_EVENT</text>
+            </g>
+
+            <g class="transition-link" id="link_SUBMIT_EVENT" data-source="node-START" data-target="node-PROCESSING">
+                <path d="M 195 250 L 405 250" marker-end="url(#arrow-default)" />
+                <text x="300" y="248" text-anchor="middle">SUBMIT_EVENT</text>
+            </g>
+
+            <g class="transition-link" id="link_REACTIVE_EVENT" data-source="node-START" data-target="node-PROCESSING">
+                <path d="M 185 220 Q 300 140 415 220" marker-end="url(#arrow-default)" />
+                <text x="300" y="174" text-anchor="middle">REACTIVE_EVENT</text>
+            </g>
+
+            <g class="transition-link" id="link_EXTERNAL_TRIGGER" data-source="node-START" data-target="node-PROCESSING">
+                <path d="M 185 280 Q 300 360 415 280" marker-end="url(#arrow-default)" />
+                <text x="300" y="329" text-anchor="middle">EXTERNAL_TRIGGER</text>
+            </g>
+
+            <g class="transition-link" id="link_FINISH" data-source="node-PROCESSING" data-target="node-COMPLETED">
+                <path d="M 485 230 L 715 170" marker-end="url(#arrow-default)" />
+                <text x="600" y="198" text-anchor="middle">FINISH</text>
+            </g>
+
+            <g class="transition-link" id="link_CANCEL_EVENT" data-source="node-PROCESSING" data-target="node-CANCELLED">
+                <path d="M 485 270 L 715 330" marker-end="url(#arrow-default)" />
+                <text x="600" y="303" text-anchor="middle">CANCEL_EVENT</text>
+            </g>
+        </svg>
+    </div>
+</div>
+
+<script>
+    // Exact Metadata from ExtendedStateMachineConfig (Hardcoded for PoC)
+    const metadata = {
+        "metadata": {
+            "entryPoints": [
+                { "type": "REST", "name": "POST /api/orders/submit", "className": "OrderController", "methodName": "submitOrder" },
+                { "type": "REST", "name": "POST /api/orders/cancel", "className": "OrderController", "methodName": "cancelOrder" },
+                { "type": "REST", "name": "POST /api/orders/finish", "className": "OrderController", "methodName": "finishOrder" },
+                { "type": "REST", "name": "POST /api/orders/resume", "className": "OrderController", "methodName": "resumeOrder" },
+                { "type": "REST", "name": "POST /api/orders/reactive", "className": "OrderController", "methodName": "reactiveOrder" },
+                { "type": "CUSTOM", "name": "AuditInterceptor", "className": "AuditInterceptor", "methodName": "preHandle" }
+            ],
+            "callChains": [
+                { "entryPoint": { "name": "POST /api/orders/submit" }, "methodChain": ["OrderController.submitOrder", "OrderService.processSubmit"], "triggerPoint": { "event": "SUBMIT_EVENT" } },
+                { "entryPoint": { "name": "POST /api/orders/submit" }, "methodChain": ["OrderController.submitOrder", "OrderService.processSubmit"], "triggerPoint": { "event": "EXTERNAL_TRIGGER" } },
+                { "entryPoint": { "name": "POST /api/orders/cancel" }, "methodChain": ["OrderController.cancelOrder", "OrderService.processCancel"], "triggerPoint": { "event": "CANCEL_EVENT" } },
+                { "entryPoint": { "name": "POST /api/orders/finish" }, "methodChain": ["OrderController.finishOrder"], "triggerPoint": { "event": "FINISH" } },
+                { "entryPoint": { "name": "POST /api/orders/reactive" }, "methodChain": ["OrderController.reactiveOrder", "ReactiveOrderService.processReactive"], "triggerPoint": { "event": "REACTIVE_EVENT" } },
+                { "entryPoint": { "name": "AuditInterceptor" }, "methodChain": ["AuditInterceptor.preHandle"], "triggerPoint": { "event": "AUDIT_EVENT" } }
+            ]
+        },
+        "transitions": [
+            { "event": "SUBMIT_EVENT", "guard": "isNewOrder()", "actions": ["initOrder"] },
+            { "event": "FINISH", "actions": ["markDone"] },
+            { "event": "AUDIT_EVENT", "actions": ["logAudit"] }
+        ]
+    };
+
+    document.addEventListener('DOMContentLoaded', () => {
+        // Setup Pan & Zoom
+        svgPanZoom('#viz', { zoomEnabled: true, controlIconsEnabled: true, fit: true, center: true, minZoom: 0.5, maxZoom: 5 });
+
+        populateSidebar();
+        attachInteractivity();
+    });
+
+    function populateSidebar() {
+        const list = document.getElementById('ep-list');
+        metadata.metadata.entryPoints.forEach(ep => {
+            const card = document.createElement('div');
+            card.className = 'ep-card';
+            card.innerHTML = `
+                <div class="ep-type type-${ep.type.toLowerCase()}">${ep.type}</div>
+                <div class="method">${ep.name}</div>
+                <div class="path">${ep.className}.${ep.methodName}</div>
+            `;
+            card.onmouseenter = () => highlightPaths(ep.name);
+            card.onmouseleave = clearHighlights;
+            list.appendChild(card);
+        });
+    }
+
+    function highlightPaths(epName) {
+        clearHighlights();
+        const relevantEvents = metadata.metadata.callChains
+            .filter(c => c.entryPoint.name === epName)
+            .map(c => c.triggerPoint.event);
+
+        if (relevantEvents.length === 0) return;
+
+        // Dim everything
+        document.querySelectorAll('.node, .transition-link').forEach(el => el.classList.add('dimmed'));
+
+        // Highlight matching paths and their connected nodes
+        relevantEvents.forEach(evt => {
+            const link = document.getElementById('link_' + evt);
+            if (link) {
+                link.classList.remove('dimmed');
+                link.classList.add('active-path');
+                
+                // Swap marker to active (red)
+                const path = link.querySelector('path');
+                if(path) path.setAttribute('marker-end', 'url(#arrow-active)');
+
+                // Highlight source and target nodes
+                const sourceId = link.getAttribute('data-source');
+                const targetId = link.getAttribute('data-target');
+                if (sourceId) {
+                    const node = document.getElementById(sourceId);
+                    node.classList.remove('dimmed');
+                    node.classList.add('active-node');
+                }
+                if (targetId) {
+                    const node = document.getElementById(targetId);
+                    node.classList.remove('dimmed');
+                    node.classList.add('active-node');
+                }
+            }
+        });
+    }
+
+    function clearHighlights() {
+        document.querySelectorAll('.dimmed, .active-path, .active-node').forEach(el => {
+            el.classList.remove('dimmed', 'active-path', 'active-node');
+        });
+        // Reset markers
+        document.querySelectorAll('.transition-link path').forEach(path => {
+            path.setAttribute('marker-end', 'url(#arrow-default)');
+        });
+    }
+
+    function attachInteractivity() {
+        document.querySelectorAll('.transition-link').forEach(link => {
+            const eventName = link.id.replace('link_', '');
+            const metaTrans = metadata.transitions.find(t => t.event === eventName);
+            const chains = metadata.metadata.callChains.filter(c => c.triggerPoint.event === eventName);
+
+            tippy(link, {
+                content: createTooltip(eventName, metaTrans, chains),
+                allowHTML: true,
+                theme: 'modern',
+                interactive: true,
+                appendTo: document.body,
+                placement: 'auto',
+                delay: [100, 50],
+                maxWidth: 450
+            });
+        });
+    }
+
+    function createTooltip(name, trans, chains) {
+        let html = `<div style="padding:20px; min-width:350px;">
+            <div style="font-weight:900; color:var(--text); font-size:1.2rem; margin-bottom:15px;">
+                Event: <span style="color:var(--highlight)">${name}</span>
+            </div>`;
+
+        if (trans) {
+            if (trans.guard) {
+                html += `<div style="font-size:0.7rem; font-weight:800; color:#94a3b8; text-transform:uppercase; margin-bottom:6px; letter-spacing:0.5px">Guard</div>
+                         <div style="background:#f1f5f9; padding:8px 10px; border-radius:6px; font-family:'JetBrains Mono',monospace; font-size:0.85rem; margin-bottom:15px; color:#334155; border:1px solid #e2e8f0;">${trans.guard}</div>`;
+            }
+            if (trans.actions && trans.actions.length > 0) {
+                html += `<div style="font-size:0.7rem; font-weight:800; color:#94a3b8; text-transform:uppercase; margin-bottom:6px; letter-spacing:0.5px">Actions</div>
+                         <div style="display:flex; gap:8px; flex-wrap:wrap; margin-bottom:15px">
+                            ${trans.actions.map(a => `<span style="background:#dbeafe; color:#1d4ed8; padding:4px 10px; border-radius:6px; font-size:0.8rem; font-weight:700; font-family:'JetBrains Mono',monospace; border:1px solid #bfdbfe;">${a}()</span>`).join('')}
+                         </div>`;
+            }
+        }
+
+        if (chains && chains.length > 0) {
+            html += `<div style="font-size:0.7rem; font-weight:800; color:#94a3b8; text-transform:uppercase; margin-bottom:10px; border-top:1px solid #f1f5f9; padding-top:15px; letter-spacing:0.5px">Triggered by Endpoint</div>`;
+            chains.forEach(c => {
+                html += `<div style="margin-bottom:15px">
+                    <div style="font-weight:800; font-size:0.9rem; color:#0f172a;">${c.entryPoint.name}</div>
+                    <div style="margin-left:12px; border-left:2px solid #e2e8f0; padding-left:15px; margin-top:10px">
+                        ${c.methodChain.map((m, i) => `<div class="chain-step"><b>${i+1}</b> <span style="font-family:'JetBrains Mono',monospace;">${m}()</span></div>`).join('')}
+                    </div>
+                </div>`;
+            });
+        }
+
+        // The Placeholder for POJO Data (as requested)
+        html += `<div style="font-size:0.7rem; font-weight:800; color:#94a3b8; text-transform:uppercase; margin-bottom:8px; border-top:1px solid #f1f5f9; padding-top:15px; letter-spacing:0.5px">Data Payload (Planned)</div>
+                 <div class="payload-box">
+                    <span style="color:#f43f5e">@RequestBody</span> <span style="color:#38bdf8">OrderRequest</span> {<br>
+                    &nbsp;&nbsp;<span style="color:#64748b; font-style:italic;">// Real AST parsing logic to map</span><br>
+                    &nbsp;&nbsp;<span style="color:#64748b; font-style:italic;">// endpoint payload to this event</span><br>
+                    &nbsp;&nbsp;<span style="color:#38bdf8">String</span> id: <span style="color:#a3e635">"ORD-123"</span>,<br>
+                    &nbsp;&nbsp;<span style="color:#38bdf8">int</span> quantity: <span style="color:#fbbf24">5</span><br>
+                 }
+                 </div>`;
+
+        html += `</div>`;
+        return html;
+    }
+</script>
+</body>
+</html>
--- a/state_machine_exporter/out_html_verify/Verification.html
+++ b/state_machine_exporter/out_html_verify/Verification.html
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/CodebaseContext.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/CodebaseContext.java
@@ -472,4 +472,27 @@ public class CodebaseContext {
    public Collection<CompilationUnit> getCompilationUnits() {
        return Collections.unmodifiableCollection(allCus);
    }
+
+    public Collection<TypeDeclaration> getTypeDeclarations() {
+        List<TypeDeclaration> types = new ArrayList<>();
+        for (CompilationUnit cu : allCus) {
+            for (Object typeObj : cu.types()) {
+                if (typeObj instanceof TypeDeclaration td) {
+                    types.add(td);
+                    // Handle nested types
+                    types.addAll(getNestedTypes(td));
+                }
+            }
+        }
+        return types;
+    }
+
+    private List<TypeDeclaration> getNestedTypes(TypeDeclaration td) {
+        List<TypeDeclaration> nested = new ArrayList<>();
+        for (TypeDeclaration inner : td.getTypes()) {
+            nested.add(inner);
+            nested.addAll(getNestedTypes(inner));
+        }
+        return nested;
+    }
 }
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/ExportOptions.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/ExportOptions.java
@@ -10,4 +10,6 @@ public class ExportOptions {
    boolean useLambdaGuards = true;
    @Builder.Default
    boolean renderChoicesAsDiamonds = true;
+    @Builder.Default
+    boolean embedIdentifiers = false;
 }
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
@@ -3,37 +3,17 @@ package click.kamil.springstatemachineexporter.exporter;
 import click.kamil.springstatemachineexporter.model.State;
 import click.kamil.springstatemachineexporter.model.Transition;
 import click.kamil.springstatemachineexporter.model.TransitionType;
-import click.kamil.springstatemachineexporter.ast.common.StringUtils;

 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;

 public class PlantUml implements StateMachineExporter {
-    private final List<String> choiceColors = List.of("FF6347", "4682B4", "32CD32", "FFD700", "6A5ACD", "FF69B4");

    private final String LAMBDA = "λ";

-    private String loadBaseStyle() {
-        try (InputStream is = getClass().getResourceAsStream("/plantuml/default-style.puml")) {
-            if (is == null) return "";
-            return new BufferedReader(new InputStreamReader(is))
-                    .lines()
-                    .collect(Collectors.joining("\n"));
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
    @Override
    public String export(click.kamil.springstatemachineexporter.analysis.model.AnalysisResult result, ExportOptions options) {
        return export(result.getName(), result.getTransitions(), result.getStartStates(), result.getEndStates(), options);
@@ -51,7 +31,26 @@ public class PlantUml implements StateMachineExporter {
        sb.append("!pragma layout smetana\n");
        sb.append("hide empty description\n");
        sb.append("hide stereotype\n");
-
+        
+        // --- Premium Modern Styles ---
+        sb.append("skinparam state {\n");
+        sb.append("  BackgroundColor white\n");
+        sb.append("  BorderColor #94a3b8\n");
+        sb.append("  BorderThickness 1\n");
+        sb.append("  FontName Inter\n");
+        sb.append("  FontSize 9\n"); // Sleek but readable
+        sb.append("  FontStyle bold\n");
+        sb.append("  RoundCorner 20\n");
+        sb.append("  Padding 1\n"); 
+        sb.append("}\n");
+        sb.append("skinparam shadowing false\n");
+        sb.append("skinparam ArrowFontName JetBrains Mono\n");
+        sb.append("skinparam ArrowFontSize 8\n");
+        sb.append("skinparam ArrowColor #cbd5e1\n");
+        sb.append("skinparam ArrowThickness 1\n");
+        sb.append("skinparam dpi 110\n");
+        sb.append("skinparam svgLinkTarget _self\n");
+        
        // Pre-declare all unique states for layout stability
        Set<String> allUniqueStates = new LinkedHashSet<>();
        transitions.forEach(t -> {
@@ -61,21 +60,6 @@ public class PlantUml implements StateMachineExporter {
        allUniqueStates.forEach(s -> sb.append("state ").append(s).append("\n"));
        sb.append("\n");

-        String style = loadBaseStyle();
-
-        StringBuilder choiceColorStyles = new StringBuilder();
-        StringBuilder hideChoiceColors = new StringBuilder();
-        for (int i = 0; i < choiceColors.size(); i++) {
-            choiceColorStyles.append("    .choice_color_").append(i)
-                    .append(" { LineColor #").append(choiceColors.get(i)).append(" }\n");
-            hideChoiceColors.append("hide <<choice_color_").append(i).append(">> stereotype\n");
-        }
-
-        style = style.replace("/* CHOICE_COLORS_PLACEHOLDER */", choiceColorStyles.toString());
-        style = style.replace("/* HIDE_CHOICE_COLORS_PLACEHOLDER */", hideChoiceColors.toString());
-
-        sb.append(style).append("\n");
-
        for (String start : startStates) {
            sb.append("[*] --> ").append(simplify(start)).append("\n");
        }
@@ -90,16 +74,10 @@ public class PlantUml implements StateMachineExporter {
            }
        }

-        Map<String, String> choiceStateClassMap = new HashMap<>();
-        int colorIndex = 0;
-
        for (String state : statesWithChoice) {
-            String className = "choice_color_" + (colorIndex % choiceColors.size());
            if (options.isRenderChoicesAsDiamonds()) {
                sb.append("state ").append(state).append(" <<choice>>\n");
            }
-            choiceStateClassMap.put(state, className);
-            colorIndex++;
        }

        Set<String> junctionStates = transitions.stream()
@@ -115,7 +93,6 @@ public class PlantUml implements StateMachineExporter {

        sb.append("\n");

-        Set<String> usedEventStereotypes = new java.util.LinkedHashSet<>();
        for (Transition t : transitions) {
            if (t.getSourceStates() == null || t.getSourceStates().isEmpty())
                continue;
@@ -139,29 +116,31 @@ public class PlantUml implements StateMachineExporter {
                for (String rawTarget : targets) {
                    String target = simplify(rawTarget);

-                    String styleClass = getStyleClass(t, source, choiceStateClassMap);
-                    String color = getLegacyColor(t, source, choiceStateClassMap);
-                    sb.append(source).append(" -[#").append(color).append(",bold]-> ").append(target).append(" <<").append(styleClass).append(">>");
+                    String styleClass = getStyleClass(t, source, Collections.emptyMap());
+                    String color = getLegacyColor(t, source, Collections.emptyMap());
+                    sb.append(source).append(" -[#").append(color).append(",bold]-> ").append(target);
+                    
+                    sb.append(" <<").append(styleClass).append(">>");

                    if (t.getEvent() != null && !t.getEvent().isBlank()) {
-                        String eventClass = "e_" + normalize(t.getEvent());
-                        sb.append(" <<").append(eventClass).append(">>");
-                        usedEventStereotypes.add(eventClass);
+                        sb.append(" <<e_").append(normalize(t.getEvent())).append(">>");
                    }

                    String label = buildLabel(t, options.isUseLambdaGuards());
                    if (!label.isEmpty()) {
-                        sb.append(" : ").append(label);
+                        sb.append(" : ");
+                        if (options.isEmbedIdentifiers() && t.getEvent() != null && !t.getEvent().isBlank()) {
+                            // Link the label text - this forces PlantUML to create an <a> tag
+                            sb.append("[[#link_").append(normalize(t.getEvent())).append(" ").append(label).append("]]");
+                        } else {
+                            sb.append(label);
+                        }
                    }
                    sb.append("\n");
                }
            }
        }

-        for (String eventClass : usedEventStereotypes) {
-            sb.append("hide <<").append(eventClass).append(">> stereotype\n");
-        }
-
        sb.append("\n");
        for (String end : endStates) {
            sb.append(simplify(end)).append(" --> [*]\n");
@@ -178,16 +157,9 @@ public class PlantUml implements StateMachineExporter {

    private String getLegacyColor(Transition t, String source, Map<String, String> choiceStateClassMap) {
        if (t.getType() == null)
-            return "000000";
+            return "94a3b8";
        return switch (t.getType()) {
-            case CHOICE -> {
-                String className = choiceStateClassMap.get(source);
-                if (className != null && className.startsWith("choice_color_")) {
-                    int index = Integer.parseInt(className.substring("choice_color_".length()));
-                    yield choiceColors.get(index % choiceColors.size());
-                }
-                yield "000000";
-            }
+            case CHOICE -> "FF6347";
            case EXTERNAL -> "1E90FF";
            case INTERNAL -> "32CD32";
            case LOCAL -> "FFA500";
@@ -201,7 +173,7 @@ public class PlantUml implements StateMachineExporter {
        if (t.getType() == null)
            return "default";
        return switch (t.getType()) {
-            case CHOICE -> choiceStateClassMap.getOrDefault(source, "choice_type");
+            case CHOICE -> "choice_type";
            case EXTERNAL -> "external";
            case INTERNAL -> "internal";
            case LOCAL -> "local";
@@ -216,35 +188,30 @@ public class PlantUml implements StateMachineExporter {
        return ".puml";
    }

-    private String getGuardText(Transition t, boolean useLambdaGuards) {
-        if (t.getGuard() == null || StringUtils.isBlank(t.getGuard().expression()))
-            return "";
-        if (useLambdaGuards && t.getGuard().isLambda())
-            return LAMBDA;
-        return t.getGuard().expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim();
-    }
-
-    private String getActionsText(Transition t, boolean useLambdaGuards) {
-        if (t.getActions() == null || t.getActions().isEmpty())
-            return "";
-        return t.getActions().stream()
-                .map(action -> (useLambdaGuards && action.isLambda()) ? LAMBDA : action.expression())
-                .collect(Collectors.joining(", "));
+    @Override
+    public String simplify(String state) {
+        if (state == null) return "";
+        if (state.contains("\"")) return state;
+        return state.replaceAll("[^a-zA-Z0-9_]", "");
    }

    private String buildLabel(Transition t, boolean useLambdaGuards) {
        List<String> parts = new ArrayList<>();
-        if (t.getEvent() != null && !t.getEvent().isBlank())
-            parts.add(simplify(t.getEvent()));
-        String guard = getGuardText(t, useLambdaGuards);
-        if (!guard.isEmpty())
-            parts.add("[" + guard + "]");
-        String actions = getActionsText(t, useLambdaGuards);
-        if (!actions.isEmpty()) {
-            if (!parts.isEmpty())
-                parts.add("/ " + actions);
-            else
-                parts.add(actions);
+        if (t.getEvent() != null && !t.getEvent().isBlank()) {
+            parts.add(t.getEvent());
+        }
+        if (t.getGuard() != null) {
+            String g = t.getGuard().expression();
+            if (useLambdaGuards && g.contains("->")) {
+                parts.add("[" + LAMBDA + "]");
+            } else {
+                parts.add("[" + g + "]");
+            }
+        }
+        if (t.getActions() != null && !t.getActions().isEmpty()) {
+            parts.add("/ " + t.getActions().stream()
+                    .map(a -> a.expression().contains("->") ? LAMBDA : a.expression())
+                    .collect(Collectors.joining(", ")));
        }
        Optional.ofNullable(t.getOrder())
                .filter(order -> t.getType() == TransitionType.CHOICE || t.getType() == TransitionType.JUNCTION)