From 10d10697992acc6f606bef0cae0d2f0fe038e4f6 Mon Sep 17 00:00:00 2001
From: sheng <Sheng.Zhang@batw.bmwgroup.com>
Date: Mon, 24 Aug 2026 11:15:34 +0800
Subject: [PATCH 1/2] class: complete stereotype propagation and fixtures

---
 .../cases/complex_class/expected.json         |  3 +
 .../dependent_decltype_base/expected.json     |  5 ++
 .../cases/include_3rdparty/expected.json      |  1 +
 .../cases/inherit_external_base/expected.json |  1 +
 .../cases/method_parameter_type/expected.json |  1 +
 .../cases/method_return_type/expected.json    |  2 +
 .../cases/nest_namespace_class/expected.json  |  1 +
 .../nested_type_relationship/expected.json    |  3 +
 .../relationship_aggregation/expected.json    |  2 +
 .../relationship_association/expected.json    |  4 +
 .../relationship_composition/expected.json    |  2 +
 .../relationship_dependency/expected.json     |  5 ++
 .../relationship_implementation/expected.json |  2 +
 .../relationship_inheritance/expected.json    |  2 +
 .../same_name_diff_namespace/expected.json    |  3 +
 .../cases/simple_enums/expected.json          |  4 +
 .../cases/simple_struct/expected.json         |  2 +
 .../expected.json                             |  1 +
 .../cases/std_string_alias/expected.json      |  1 +
 .../expected.json                             |  1 +
 .../cases/template_class/expected.json        |  2 +
 .../expected.json                             |  3 +
 .../expected.json                             |  3 +
 .../cases/type_alias/expected.json            |  1 +
 .../cases/variable_namespace/expected.json    |  2 +
 .../output.json                               |  1 +
 .../class_diagram_positive/output.json        |  8 ++
 .../class_diagram_syntax_coverage/output.json |  1 +
 .../src/class_diagram/src/class_ast.rs        | 15 ++++
 .../src/class_diagram/src/class_parser.rs     |  9 +++
 .../src/class_diagram/src/class_traits.rs     |  1 +
 .../stereotype_definition/output.json         |  3 +
 .../stereotype_relationship/output.json       |  2 +
 .../src/class_diagram/src/class_resolver.rs   | 73 +++++++++++--------
 tools/metamodel/class/class_logic.rs          |  2 +
 .../flatbuffers/class/class_diagram.fbs       |  1 +
 .../flatbuffers/class/class_serializer.rs     |  5 ++
 .../core/src/models/class_diagram_models.rs   |  5 ++
 .../core/src/readers/class_diagram_reader.rs  |  1 +
 .../class_design_implementation_validator.rs  |  1 +
 .../core/src/validators/test/fixtures.rs      |  1 +
 41 files changed, 156 insertions(+), 30 deletions(-)

diff --git a/cpp/libclang/integration_test/cases/complex_class/expected.json b/cpp/libclang/integration_test/cases/complex_class/expected.json
index 259132a5..567b9f31 100644
--- a/cpp/libclang/integration_test/cases/complex_class/expected.json
+++ b/cpp/libclang/integration_test/cases/complex_class/expected.json
@@ -103,6 +103,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
@@ -176,6 +177,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -290,6 +292,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/dependent_decltype_base/expected.json b/cpp/libclang/integration_test/cases/dependent_decltype_base/expected.json
index c5d06501..c4825211 100644
--- a/cpp/libclang/integration_test/cases/dependent_decltype_base/expected.json
+++ b/cpp/libclang/integration_test/cases/dependent_decltype_base/expected.json
@@ -24,6 +24,7 @@
                 }
             ],
             "relationships": [],
+            "stereotype": null,
             "template_parameters": null,
             "type_aliases": [],
             "variables": [],
@@ -33,6 +34,7 @@
             }
         },
         "IsMaplikeContainer": {
+            "stereotype": null,
             "id": "IsMaplikeContainer",
             "name": "IsMaplikeContainer",
             "enclosing_namespace_id": null,
@@ -75,6 +77,7 @@
                     }
                 }
             ],
+            "stereotype": null,
             "template_parameters": null,
             "type_aliases": [],
             "variables": [],
@@ -106,6 +109,7 @@
                 }
             ],
             "relationships": [],
+            "stereotype": null,
             "template_parameters": null,
             "type_aliases": [],
             "variables": [],
@@ -134,6 +138,7 @@
                     }
                 }
             ],
+            "stereotype": null,
             "template_parameters": null,
             "type_aliases": [],
             "variables": [],
diff --git a/cpp/libclang/integration_test/cases/include_3rdparty/expected.json b/cpp/libclang/integration_test/cases/include_3rdparty/expected.json
index b54e34ce..ec282e82 100644
--- a/cpp/libclang/integration_test/cases/include_3rdparty/expected.json
+++ b/cpp/libclang/integration_test/cases/include_3rdparty/expected.json
@@ -33,6 +33,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/inherit_external_base/expected.json b/cpp/libclang/integration_test/cases/inherit_external_base/expected.json
index f9246329..e929324e 100644
--- a/cpp/libclang/integration_test/cases/inherit_external_base/expected.json
+++ b/cpp/libclang/integration_test/cases/inherit_external_base/expected.json
@@ -8,6 +8,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/method_parameter_type/expected.json b/cpp/libclang/integration_test/cases/method_parameter_type/expected.json
index 4f5b3168..2bc08c4b 100644
--- a/cpp/libclang/integration_test/cases/method_parameter_type/expected.json
+++ b/cpp/libclang/integration_test/cases/method_parameter_type/expected.json
@@ -261,6 +261,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/method_return_type/expected.json b/cpp/libclang/integration_test/cases/method_return_type/expected.json
index e9cbd21a..c084d9a2 100644
--- a/cpp/libclang/integration_test/cases/method_return_type/expected.json
+++ b/cpp/libclang/integration_test/cases/method_return_type/expected.json
@@ -145,6 +145,7 @@
         "file": "cpp/libclang/integration_test/cases/method_return_type/transport.cpp",
         "line": 25
       },
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": []
@@ -157,6 +158,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/nest_namespace_class/expected.json b/cpp/libclang/integration_test/cases/nest_namespace_class/expected.json
index ff2bfe13..69b421ce 100644
--- a/cpp/libclang/integration_test/cases/nest_namespace_class/expected.json
+++ b/cpp/libclang/integration_test/cases/nest_namespace_class/expected.json
@@ -54,6 +54,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/nested_type_relationship/expected.json b/cpp/libclang/integration_test/cases/nested_type_relationship/expected.json
index ab7108fd..07e8c411 100644
--- a/cpp/libclang/integration_test/cases/nested_type_relationship/expected.json
+++ b/cpp/libclang/integration_test/cases/nested_type_relationship/expected.json
@@ -20,6 +20,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
@@ -47,6 +48,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -63,6 +65,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_aggregation/expected.json b/cpp/libclang/integration_test/cases/relationship_aggregation/expected.json
index 7dd0c941..98a902b5 100644
--- a/cpp/libclang/integration_test/cases/relationship_aggregation/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_aggregation/expected.json
@@ -31,6 +31,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
@@ -108,6 +109,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_association/expected.json b/cpp/libclang/integration_test/cases/relationship_association/expected.json
index fae6c6cf..815de751 100644
--- a/cpp/libclang/integration_test/cases/relationship_association/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_association/expected.json
@@ -39,6 +39,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -80,6 +81,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -121,6 +123,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -137,6 +140,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_composition/expected.json b/cpp/libclang/integration_test/cases/relationship_composition/expected.json
index a2e5af2f..47421f3d 100644
--- a/cpp/libclang/integration_test/cases/relationship_composition/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_composition/expected.json
@@ -20,6 +20,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
@@ -47,6 +48,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_dependency/expected.json b/cpp/libclang/integration_test/cases/relationship_dependency/expected.json
index 91a1f0f9..1c879d04 100644
--- a/cpp/libclang/integration_test/cases/relationship_dependency/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_dependency/expected.json
@@ -39,6 +39,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -86,6 +87,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -127,6 +129,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -168,6 +171,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -184,6 +188,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_implementation/expected.json b/cpp/libclang/integration_test/cases/relationship_implementation/expected.json
index 5011fd67..e5aa09c0 100644
--- a/cpp/libclang/integration_test/cases/relationship_implementation/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_implementation/expected.json
@@ -36,6 +36,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -83,6 +84,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/relationship_inheritance/expected.json b/cpp/libclang/integration_test/cases/relationship_inheritance/expected.json
index b7944dca..1826f046 100644
--- a/cpp/libclang/integration_test/cases/relationship_inheritance/expected.json
+++ b/cpp/libclang/integration_test/cases/relationship_inheritance/expected.json
@@ -24,6 +24,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -52,6 +53,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/same_name_diff_namespace/expected.json b/cpp/libclang/integration_test/cases/same_name_diff_namespace/expected.json
index b0c63e5b..527018fc 100644
--- a/cpp/libclang/integration_test/cases/same_name_diff_namespace/expected.json
+++ b/cpp/libclang/integration_test/cases/same_name_diff_namespace/expected.json
@@ -8,6 +8,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -24,6 +25,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -63,6 +65,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/simple_enums/expected.json b/cpp/libclang/integration_test/cases/simple_enums/expected.json
index d2382541..cdae8d27 100644
--- a/cpp/libclang/integration_test/cases/simple_enums/expected.json
+++ b/cpp/libclang/integration_test/cases/simple_enums/expected.json
@@ -41,6 +41,7 @@
       ],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -90,6 +91,7 @@
       ],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -131,6 +133,7 @@
       ],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
@@ -196,6 +199,7 @@
       ],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/cpp/libclang/integration_test/cases/simple_struct/expected.json b/cpp/libclang/integration_test/cases/simple_struct/expected.json
index defe8e2c..72268c1e 100644
--- a/cpp/libclang/integration_test/cases/simple_struct/expected.json
+++ b/cpp/libclang/integration_test/cases/simple_struct/expected.json
@@ -20,6 +20,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
@@ -117,6 +118,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/std_internal_namespace_rendering/expected.json b/cpp/libclang/integration_test/cases/std_internal_namespace_rendering/expected.json
index 0c85a670..92655060 100644
--- a/cpp/libclang/integration_test/cases/std_internal_namespace_rendering/expected.json
+++ b/cpp/libclang/integration_test/cases/std_internal_namespace_rendering/expected.json
@@ -32,6 +32,7 @@
         "file": "cpp/libclang/integration_test/cases/std_internal_namespace_rendering/transport.cpp",
         "line": 17
       },
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/std_string_alias/expected.json b/cpp/libclang/integration_test/cases/std_string_alias/expected.json
index 5183cefa..1ba7b54a 100644
--- a/cpp/libclang/integration_test/cases/std_string_alias/expected.json
+++ b/cpp/libclang/integration_test/cases/std_string_alias/expected.json
@@ -50,6 +50,7 @@
                 }
             ],
             "relationships": [],
+            "stereotype": null,
             "template_parameters": null,
             "type_aliases": [],
             "variables": [
diff --git a/cpp/libclang/integration_test/cases/std_template_specialization_filter/expected.json b/cpp/libclang/integration_test/cases/std_template_specialization_filter/expected.json
index 069bf2d8..6f80ac67 100644
--- a/cpp/libclang/integration_test/cases/std_template_specialization_filter/expected.json
+++ b/cpp/libclang/integration_test/cases/std_template_specialization_filter/expected.json
@@ -13,6 +13,7 @@
         "file": "./cpp/libclang/integration_test/cases/std_template_specialization_filter/specialization.h",
         "line": 23
       },
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/template_class/expected.json b/cpp/libclang/integration_test/cases/template_class/expected.json
index dec95fb1..87a58b03 100644
--- a/cpp/libclang/integration_test/cases/template_class/expected.json
+++ b/cpp/libclang/integration_test/cases/template_class/expected.json
@@ -21,6 +21,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": [
         {
           "Template": {
@@ -146,6 +147,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
diff --git a/cpp/libclang/integration_test/cases/template_partial_specialization_ids/expected.json b/cpp/libclang/integration_test/cases/template_partial_specialization_ids/expected.json
index cd4a0cea..6dfc865c 100644
--- a/cpp/libclang/integration_test/cases/template_partial_specialization_ids/expected.json
+++ b/cpp/libclang/integration_test/cases/template_partial_specialization_ids/expected.json
@@ -33,6 +33,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_ids/specialization_with_return.h",
         "line": 25
       },
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
@@ -93,6 +94,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_ids/specialization_without_return.h",
         "line": 25
       },
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
@@ -127,6 +129,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_ids/specialization.h",
         "line": 23
       },
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
diff --git a/cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/expected.json b/cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/expected.json
index 08ac6dd0..9f7e8af1 100644
--- a/cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/expected.json
+++ b/cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/expected.json
@@ -33,6 +33,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/endpoint_without_return.h",
         "line": 23
       },
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
@@ -67,6 +68,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/endpoint.h",
         "line": 23
       },
+      "stereotype": null,
       "template_parameters": [
         {
           "Type": {
@@ -102,6 +104,7 @@
         "file": "./cpp/libclang/integration_test/cases/template_partial_specialization_relationship_target/holder.h",
         "line": 24
       },
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [
diff --git a/cpp/libclang/integration_test/cases/type_alias/expected.json b/cpp/libclang/integration_test/cases/type_alias/expected.json
index 80561614..80c15217 100644
--- a/cpp/libclang/integration_test/cases/type_alias/expected.json
+++ b/cpp/libclang/integration_test/cases/type_alias/expected.json
@@ -34,6 +34,7 @@
         }
       ],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [
         {
diff --git a/cpp/libclang/integration_test/cases/variable_namespace/expected.json b/cpp/libclang/integration_test/cases/variable_namespace/expected.json
index 7d458251..b885003d 100644
--- a/cpp/libclang/integration_test/cases/variable_namespace/expected.json
+++ b/cpp/libclang/integration_test/cases/variable_namespace/expected.json
@@ -31,6 +31,7 @@
           }
         }
       ],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [
         {
@@ -117,6 +118,7 @@
       "enum_literals": [],
       "methods": [],
       "relationships": [],
+      "stereotype": null,
       "template_parameters": null,
       "type_aliases": [],
       "variables": [],
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json
index 5c395948..1e523a11 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json
@@ -73,6 +73,7 @@
         "id": "sample.file_level.<<template>>\\nTest<T>",
         "name": "TestTemplate",
         "enclosing_namespace_id": "sample.file_level",
+        "stereotype": "service",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
index 78fb0c11..c2b6efef 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
@@ -6,6 +6,7 @@
         "id": "core.Point",
         "name": "Point",
         "enclosing_namespace_id": "core",
+        "stereotype": "value_object",
         "entity_type": "Struct",
         "type_aliases": [],
         "methods": [],
@@ -43,6 +44,7 @@
         "id": "core.Size",
         "name": "Size",
         "enclosing_namespace_id": "core",
+        "stereotype": "value_object",
         "entity_type": "Struct",
         "type_aliases": [],
         "methods": [],
@@ -133,6 +135,7 @@
         "id": "core.Shape",
         "name": "Shape",
         "enclosing_namespace_id": "core",
+        "stereotype": "abstract_entity",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
@@ -197,6 +200,7 @@
         "id": "core.Drawable",
         "name": "Drawable",
         "enclosing_namespace_id": "core",
+        "stereotype": "spi",
         "entity_type": "Interface",
         "type_aliases": [],
         "methods": [
@@ -226,6 +230,7 @@
         "id": "core.Canvas",
         "name": "Canvas",
         "enclosing_namespace_id": "core",
+        "stereotype": "aggregate_root",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
@@ -296,6 +301,7 @@
         "id": "core.geometry.Circle",
         "name": "Circle",
         "enclosing_namespace_id": "core.geometry",
+        "stereotype": "entity",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
@@ -369,6 +375,7 @@
         "id": "core.geometry.Rectangle",
         "name": "Rectangle",
         "enclosing_namespace_id": "core.geometry",
+        "stereotype": "entity",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
@@ -570,6 +577,7 @@
         "id": "api.RestApi",
         "name": "RestApi",
         "enclosing_namespace_id": "api",
+        "stereotype": "adapter",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
index d0e33df4..c0e30cb2 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
@@ -809,6 +809,7 @@
         "id": "sample.newline.<<template>>\\nTest<T>",
         "name": "TestTemplate",
         "enclosing_namespace_id": "sample.newline",
+        "stereotype": "service",
         "entity_type": "Class",
         "type_aliases": [],
         "methods": [
diff --git a/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs b/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
index 22ef6e7f..e94af29a 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
+++ b/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
@@ -151,6 +151,7 @@ pub struct ClassDef {
     pub name: Name,
     pub namespace: String,
     pub package: String,
+    pub stereotype: Option<String>,
     pub is_abstract: bool,
     pub template_parameters: Option<Vec<String>>,
     pub extends: Vec<String>,
@@ -165,6 +166,10 @@ impl TypeDef for ClassDef {
         &mut self.name
     }
 
+    fn stereotype_mut(&mut self) -> &mut Option<String> {
+        &mut self.stereotype
+    }
+
     fn attributes_mut(&mut self) -> &mut Vec<Attribute> {
         &mut self.attributes
     }
@@ -183,6 +188,7 @@ pub struct StructDef {
     pub name: Name,
     pub namespace: String,
     pub package: String,
+    pub stereotype: Option<String>,
     pub template_parameters: Option<Vec<String>>,
     pub attributes: Vec<Attribute>,
     pub type_aliases: Vec<TypeAlias>,
@@ -194,6 +200,10 @@ impl TypeDef for StructDef {
         &mut self.name
     }
 
+    fn stereotype_mut(&mut self) -> &mut Option<String> {
+        &mut self.stereotype
+    }
+
     fn attributes_mut(&mut self) -> &mut Vec<Attribute> {
         &mut self.attributes
     }
@@ -212,6 +222,7 @@ pub struct InterfaceDef {
     pub name: Name,
     pub namespace: String,
     pub package: String,
+    pub stereotype: Option<String>,
     pub template_parameters: Option<Vec<String>>,
     pub extends: Vec<String>,
     pub attributes: Vec<Attribute>,
@@ -224,6 +235,10 @@ impl TypeDef for InterfaceDef {
         &mut self.name
     }
 
+    fn stereotype_mut(&mut self) -> &mut Option<String> {
+        &mut self.stereotype
+    }
+
     fn attributes_mut(&mut self) -> &mut Vec<Attribute> {
         &mut self.attributes
     }
diff --git a/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs b/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
index 999caae2..cdf5265a 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
+++ b/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
@@ -119,6 +119,12 @@ struct ClassParseSession<'a> {
 }
 
 impl ClassParseSession<'_> {
+    fn extract_stereotype(pair: pest::iterators::Pair<Rule>) -> Option<String> {
+        pair.into_inner()
+            .find(|inner| inner.as_rule() == Rule::STEREOTYPE_NAME)
+            .map(|inner| inner.as_str().to_string())
+    }
+
     fn parse_visibility(pair: Option<pest::iterators::Pair<Rule>>) -> Visibility {
         let mut vis = Visibility::Public;
         if let Some(v) = pair {
@@ -480,6 +486,9 @@ impl ClassParseSession<'_> {
             Rule::named => {
                 Self::parse_named(pair, def.name_mut());
             }
+            Rule::stereotype => {
+                *def.stereotype_mut() = Self::extract_stereotype(pair);
+            }
             Rule::class_body => {
                 for inner in pair.into_inner() {
                     if let Rule::class_member = inner.as_rule() {
diff --git a/plantuml/parser/puml_parser/src/class_diagram/src/class_traits.rs b/plantuml/parser/puml_parser/src/class_diagram/src/class_traits.rs
index 7dfd9893..b407c092 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/src/class_traits.rs
+++ b/plantuml/parser/puml_parser/src/class_diagram/src/class_traits.rs
@@ -14,6 +14,7 @@ use crate::class_ast::{Attribute, Method, Name, TypeAlias};
 
 pub trait TypeDef {
     fn name_mut(&mut self) -> &mut Name;
+    fn stereotype_mut(&mut self) -> &mut Option<String>;
     fn attributes_mut(&mut self) -> &mut Vec<Attribute>;
     fn type_aliases_mut(&mut self) -> &mut Vec<TypeAlias>;
     fn methods_mut(&mut self) -> &mut Vec<Method>;
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
index 32d86d3e..34b6c733 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
@@ -11,6 +11,7 @@
             },
             "namespace": "",
             "package": "",
+            "stereotype": "Model",
             "source_location": {
               "file": "",
               "line": 15
@@ -58,6 +59,7 @@
             },
             "namespace": "",
             "package": "",
+            "stereotype": "Singleton, Immutable",
             "source_location": {
               "file": "",
               "line": 20
@@ -89,6 +91,7 @@
             },
             "namespace": "",
             "package": "",
+            "stereotype": "abstract",
             "source_location": {
               "file": "",
               "line": 24
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_relationship/output.json b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_relationship/output.json
index 50eb9b13..f51a22b0 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_relationship/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_relationship/output.json
@@ -11,6 +11,7 @@
             },
             "namespace": "",
             "package": "",
+            "stereotype": "Model",
             "source_location": {
               "file": "",
               "line": 15
@@ -34,6 +35,7 @@
             },
             "namespace": "",
             "package": "",
+            "stereotype": "Service",
             "source_location": {
               "file": "",
               "line": 16
diff --git a/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs b/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
index 42e132fc..883b536b 100644
--- a/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
+++ b/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
@@ -408,36 +408,46 @@ impl ClassResolver {
     }
 
     fn process_class(&mut self, def: &Element, parent: Option<String>, entity_type: EntityType) {
-        let (name, attributes, type_aliases, methods, template_parameters, source_location) =
-            match def {
-                Element::ClassDef(c) => (
-                    &c.name,
-                    &c.attributes,
-                    &c.type_aliases,
-                    &c.methods,
-                    &c.template_parameters,
-                    &c.source_location,
-                ),
-                Element::StructDef(s) => (
-                    &s.name,
-                    &s.attributes,
-                    &s.type_aliases,
-                    &s.methods,
-                    &s.template_parameters,
-                    &s.source_location,
-                ),
-                Element::InterfaceDef(i) => (
-                    &i.name,
-                    &i.attributes,
-                    &i.type_aliases,
-                    &i.methods,
-                    &i.template_parameters,
-                    &i.source_location,
-                ),
-                Element::EnumDef(_) => {
-                    unreachable!("EnumDef should not be passed to process_class")
-                }
-            };
+        let (
+            name,
+            stereotype,
+            attributes,
+            type_aliases,
+            methods,
+            template_parameters,
+            source_location,
+        ) = match def {
+            Element::ClassDef(c) => (
+                &c.name,
+                c.stereotype.as_ref(),
+                &c.attributes,
+                &c.type_aliases,
+                &c.methods,
+                &c.template_parameters,
+                &c.source_location,
+            ),
+            Element::StructDef(s) => (
+                &s.name,
+                s.stereotype.as_ref(),
+                &s.attributes,
+                &s.type_aliases,
+                &s.methods,
+                &s.template_parameters,
+                &s.source_location,
+            ),
+            Element::InterfaceDef(i) => (
+                &i.name,
+                i.stereotype.as_ref(),
+                &i.attributes,
+                &i.type_aliases,
+                &i.methods,
+                &i.template_parameters,
+                &i.source_location,
+            ),
+            Element::EnumDef(_) => {
+                unreachable!("EnumDef should not be passed to process_class")
+            }
+        };
 
         let id = self.build_fqn(&name.internal, &parent);
 
@@ -448,6 +458,7 @@ impl ClassResolver {
             id: id.clone(),
             name: Self::entity_name(name),
             enclosing_namespace_id: parent.clone(),
+            stereotype: stereotype.cloned(),
             entity_type,
             type_aliases: type_aliases.iter().map(Self::convert_type_alias).collect(),
             variables: attributes.iter().map(Self::convert_variable).collect(),
@@ -657,6 +668,7 @@ impl ClassResolver {
             id: id.clone(),
             name: Self::entity_name(&def.name),
             enclosing_namespace_id: parent.clone(),
+            stereotype: None,
             entity_type: EntityType::Enum,
             type_aliases: vec![],
             variables: vec![],
@@ -856,6 +868,7 @@ mod tests {
             name: make_name(name),
             namespace: "".to_string(),
             package: "".to_string(),
+            stereotype: None,
             source_location: SourceLocation::new("test.puml", 1),
             is_abstract: false,
             template_parameters: None,
diff --git a/tools/metamodel/class/class_logic.rs b/tools/metamodel/class/class_logic.rs
index d4737c4b..f632458b 100644
--- a/tools/metamodel/class/class_logic.rs
+++ b/tools/metamodel/class/class_logic.rs
@@ -41,6 +41,8 @@ pub struct SimpleEntity {
     /// FQN of parent namespace/package
     /// enclosing namespace name
     pub enclosing_namespace_id: Option<String>,
+    /// Optional PlantUML stereotype declared on the entity.
+    pub stereotype: Option<String>,
     /// Type of entity (class, struct, interface, enum, etc.)
     pub entity_type: EntityType,
 
diff --git a/tools/serialization/flatbuffers/class/class_diagram.fbs b/tools/serialization/flatbuffers/class/class_diagram.fbs
index b20813de..f397592f 100644
--- a/tools/serialization/flatbuffers/class/class_diagram.fbs
+++ b/tools/serialization/flatbuffers/class/class_diagram.fbs
@@ -115,6 +115,7 @@ table SimpleEntity {
     id: string (required);
     name: string (required);
     enclosing_namespace_id: string;
+    stereotype: string;
     entity_type: EntityType = Class;
     type_aliases: [TypeAlias];
     variables: [MemberVariable];
diff --git a/tools/serialization/flatbuffers/class/class_serializer.rs b/tools/serialization/flatbuffers/class/class_serializer.rs
index adee2fab..d9c67329 100644
--- a/tools/serialization/flatbuffers/class/class_serializer.rs
+++ b/tools/serialization/flatbuffers/class/class_serializer.rs
@@ -56,6 +56,10 @@ impl ClassSerializer {
             .enclosing_namespace_id
             .as_ref()
             .map(|namespace| builder.create_string(namespace));
+        let stereotype_offset = entity
+            .stereotype
+            .as_ref()
+            .map(|stereotype| builder.create_string(stereotype));
 
         let type_alias_offsets: Vec<_> = entity
             .type_aliases
@@ -109,6 +113,7 @@ impl ClassSerializer {
                 id: Some(id_offset),
                 name: Some(name_offset),
                 enclosing_namespace_id: enclosing_namespace_id_offset,
+                stereotype: stereotype_offset,
                 entity_type: Self::map_entity_type(entity.entity_type),
                 type_aliases: Some(type_aliases_offset),
                 variables: Some(variables_offset),
diff --git a/validation/core/src/models/class_diagram_models.rs b/validation/core/src/models/class_diagram_models.rs
index 0fd78288..c6723a4a 100644
--- a/validation/core/src/models/class_diagram_models.rs
+++ b/validation/core/src/models/class_diagram_models.rs
@@ -186,6 +186,7 @@ mod tests {
             id: id.to_string(),
             name: id.rsplit('.').next().unwrap_or(id).to_string(),
             enclosing_namespace_id: None,
+            stereotype: None,
             entity_type: EntityType::Class,
             type_aliases: Vec::new(),
             variables: Vec::new(),
@@ -225,6 +226,7 @@ mod tests {
                     id: "InternalAPI.InternalInterface".to_string(),
                     name: "InternalInterface".to_string(),
                     enclosing_namespace_id: Some("InternalAPI".to_string()),
+                    stereotype: None,
                     entity_type: EntityType::Interface,
                     type_aliases: Vec::new(),
                     variables: Vec::new(),
@@ -238,6 +240,7 @@ mod tests {
                     id: "InternalAPI.Helper".to_string(),
                     name: "Helper".to_string(),
                     enclosing_namespace_id: Some("InternalAPI".to_string()),
+                    stereotype: None,
                     entity_type: EntityType::Class,
                     type_aliases: Vec::new(),
                     variables: Vec::new(),
@@ -272,6 +275,7 @@ mod tests {
                     id: "InternalAPI.InternalInterfaceA".to_string(),
                     name: "InternalInterface".to_string(),
                     enclosing_namespace_id: Some("InternalAPI".to_string()),
+                    stereotype: None,
                     entity_type: EntityType::Interface,
                     type_aliases: Vec::new(),
                     variables: Vec::new(),
@@ -285,6 +289,7 @@ mod tests {
                     id: "InternalAPI.InternalInterfaceB".to_string(),
                     name: "InternalInterface".to_string(),
                     enclosing_namespace_id: Some("InternalAPI".to_string()),
+                    stereotype: None,
                     entity_type: EntityType::Interface,
                     type_aliases: Vec::new(),
                     variables: Vec::new(),
diff --git a/validation/core/src/readers/class_diagram_reader.rs b/validation/core/src/readers/class_diagram_reader.rs
index af6f9c42..d5177406 100644
--- a/validation/core/src/readers/class_diagram_reader.rs
+++ b/validation/core/src/readers/class_diagram_reader.rs
@@ -241,6 +241,7 @@ fn read_entity(entity: fb_class::SimpleEntity<'_>, path: &str) -> Result<SimpleE
         id: entity.id().to_string(),
         name: entity.name().to_string(),
         enclosing_namespace_id: entity.enclosing_namespace_id().map(|s| s.to_string()),
+        stereotype: entity.stereotype().map(|s| s.to_string()),
         entity_type: map_entity_type(
             entity.entity_type(),
             &format!("{path}:entity:{}", entity.id()),
diff --git a/validation/core/src/validators/class_design_implementation_validator.rs b/validation/core/src/validators/class_design_implementation_validator.rs
index b8c74643..157760c7 100644
--- a/validation/core/src/validators/class_design_implementation_validator.rs
+++ b/validation/core/src/validators/class_design_implementation_validator.rs
@@ -1080,6 +1080,7 @@ mod tests {
             id: id.to_string(),
             name: id.rsplit('.').next().unwrap_or(id).to_string(),
             enclosing_namespace_id: enclosing_namespace_id.map(str::to_string),
+            stereotype: None,
             entity_type: EntityType::Class,
             type_aliases: Vec::new(),
             variables: Vec::new(),
diff --git a/validation/core/src/validators/test/fixtures.rs b/validation/core/src/validators/test/fixtures.rs
index 0d95b149..b19357b4 100644
--- a/validation/core/src/validators/test/fixtures.rs
+++ b/validation/core/src/validators/test/fixtures.rs
@@ -201,6 +201,7 @@ fn simple_entity(name: &str, entity_type: EntityType, namespace: Option<&str>) -
         id: entity_id(name, namespace),
         name: name.to_string(),
         enclosing_namespace_id: namespace.map(str::to_string),
+        stereotype: None,
         entity_type,
         type_aliases: Vec::new(),
         variables: Vec::new(),

From 5988c9ff020c122c8e0cba15c9b5ea5055572f30 Mon Sep 17 00:00:00 2001
From: sheng <Sheng.Zhang@batw.bmwgroup.com>
Date: Tue, 25 Aug 2026 11:40:01 +0800
Subject: [PATCH 2/2] Unify enum stereotype handling

---
 .../class_diagram/class_diagram_positive/output.json      | 1 +
 .../src/class_diagram/detail_design/class_ast.puml        | 2 +-
 .../parser/puml_parser/src/class_diagram/src/class_ast.rs | 2 +-
 .../puml_parser/src/class_diagram/src/class_parser.rs     | 3 +++
 .../tests/class_diagram/alias_class/output.json           | 2 +-
 .../tests/class_diagram/alias_package/output.json         | 2 +-
 .../puml_parser/tests/class_diagram/enum/output.json      | 8 ++++----
 .../tests/class_diagram/full_features/output.json         | 2 +-
 .../tests/class_diagram/namespace_1/output.json           | 2 +-
 .../tests/class_diagram/stereotype_definition/output.json | 2 +-
 .../puml_resolver/src/class_diagram/src/class_resolver.rs | 6 +++---
 11 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
index c2b6efef..18e17d4b 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_positive/output.json
@@ -82,6 +82,7 @@
         "id": "core.Color",
         "name": "Color",
         "enclosing_namespace_id": "core",
+        "stereotype": "primitive_enum",
         "entity_type": "Enum",
         "type_aliases": [],
         "methods": [],
diff --git a/plantuml/parser/puml_parser/src/class_diagram/detail_design/class_ast.puml b/plantuml/parser/puml_parser/src/class_diagram/detail_design/class_ast.puml
index 46b307ce..d82ab19b 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/detail_design/class_ast.puml
+++ b/plantuml/parser/puml_parser/src/class_diagram/detail_design/class_ast.puml
@@ -50,7 +50,7 @@ class EnumDef {
   name: Name
   namespace: String
   package: String
-  stereotypes: Vec<String>
+  stereotype: Option<String>
   items: Vec<EnumItem>
   source_location: SourceLocation
 }
diff --git a/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs b/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
index e94af29a..6847656b 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
+++ b/plantuml/parser/puml_parser/src/class_diagram/src/class_ast.rs
@@ -257,7 +257,7 @@ pub struct EnumDef {
     pub name: Name,
     pub namespace: String,
     pub package: String,
-    pub stereotypes: Vec<String>,
+    pub stereotype: Option<String>,
     pub items: Vec<EnumItem>,
     pub source_location: SourceLocation,
 }
diff --git a/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs b/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
index cdf5265a..81b791c4 100644
--- a/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
+++ b/plantuml/parser/puml_parser/src/class_diagram/src/class_parser.rs
@@ -787,6 +787,9 @@ impl ClassParseSession<'_> {
                     // enum_def.name = inner.as_str().trim().to_string();
                     Self::parse_named(inner, &mut enum_def.name);
                 }
+                Rule::stereotype => {
+                    enum_def.stereotype = Self::extract_stereotype(inner);
+                }
                 Rule::enum_body => {
                     enum_def.items = self.parse_enum_body(inner);
                 }
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/alias_class/output.json b/plantuml/parser/puml_parser/tests/class_diagram/alias_class/output.json
index 3d3d2367..c0e037e1 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/alias_class/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/alias_class/output.json
@@ -57,7 +57,7 @@
             "file": "",
             "line": 17
           },
-          "stereotypes": [],
+          "stereotype": null,
           "items": []
         }
       }
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/alias_package/output.json b/plantuml/parser/puml_parser/tests/class_diagram/alias_package/output.json
index 2465e439..f23400fa 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/alias_package/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/alias_package/output.json
@@ -113,7 +113,7 @@
                   "file": "",
                   "line": 24
                 },
-                "stereotypes": [],
+                "stereotype": null,
                 "items": []
               }
             }
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/enum/output.json b/plantuml/parser/puml_parser/tests/class_diagram/enum/output.json
index a71233b3..1ced3e44 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/enum/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/enum/output.json
@@ -14,7 +14,7 @@
             "file": "",
             "line": 15
           },
-          "stereotypes": [],
+          "stereotype": null,
           "items": []
         }
       },
@@ -30,7 +30,7 @@
             "file": "",
             "line": 17
           },
-          "stereotypes": [],
+          "stereotype": null,
           "items": [
             {
               "name": "OK",
@@ -71,7 +71,7 @@
             "file": "",
             "line": 23
           },
-          "stereotypes": [],
+          "stereotype": null,
           "items": [
             {
               "name": "INIT",
@@ -118,7 +118,7 @@
             "file": "",
             "line": 29
           },
-          "stereotypes": [],
+          "stereotype": null,
           "items": [
             {
               "name": "HIGH",
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/full_features/output.json b/plantuml/parser/puml_parser/tests/class_diagram/full_features/output.json
index a3f6853f..2c2c6e38 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/full_features/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/full_features/output.json
@@ -171,7 +171,7 @@
                   "file": "",
                   "line": 33
                 },
-                "stereotypes": [],
+                "stereotype": null,
                 "items": [
                   {
                     "name": "A",
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/namespace_1/output.json b/plantuml/parser/puml_parser/tests/class_diagram/namespace_1/output.json
index 43fde935..fc23ccf9 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/namespace_1/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/namespace_1/output.json
@@ -63,7 +63,7 @@
                   "file": "",
                   "line": 19
                 },
-                "stereotypes": [],
+                "stereotype": null,
                 "items": [
                   {
                     "name": "a",
diff --git a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
index 34b6c733..b63ca3e9 100644
--- a/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
+++ b/plantuml/parser/puml_parser/tests/class_diagram/stereotype_definition/output.json
@@ -129,7 +129,7 @@
             "file": "",
             "line": 28
           },
-          "stereotypes": [],
+          "stereotype": "enum",
           "items": [
             {
               "name": "MALE",
diff --git a/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs b/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
index 883b536b..cd8aa502 100644
--- a/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
+++ b/plantuml/parser/puml_resolver/src/class_diagram/src/class_resolver.rs
@@ -668,7 +668,7 @@ impl ClassResolver {
             id: id.clone(),
             name: Self::entity_name(&def.name),
             enclosing_namespace_id: parent.clone(),
-            stereotype: None,
+            stereotype: def.stereotype.clone(),
             entity_type: EntityType::Enum,
             type_aliases: vec![],
             variables: vec![],
@@ -886,7 +886,7 @@ mod tests {
             namespace: "".to_string(),
             package: "".to_string(),
             source_location: SourceLocation::new("test.puml", 1),
-            stereotypes: vec![],
+            stereotype: None,
             items: items
                 .into_iter()
                 .map(|n| EnumItem {
@@ -1198,7 +1198,7 @@ mod tests {
                 namespace: "".to_string(),
                 package: "".to_string(),
                 source_location: SourceLocation::new("test.puml", 1),
-                stereotypes: vec![],
+                stereotype: None,
                 items: vec![],
             }),
             ClassUmlTopLevel::Namespace(Namespace {