lutaml-lml 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898a161f5d3fba30a3dd3021dc15aaa847caba9cbfd65e0e999dba964bffecca
-  data.tar.gz: d30e8bdb048aff5b2644e96770412135196e3cf5e2a369b5cdffbd14a7f64c6d
+  metadata.gz: 43171296e53409193af9a65974a2e30adb2f425c8dd952eb5a08be556411cb6b
+  data.tar.gz: 8146fffb1c51f8fcd7d5061192596a8e73749c443a573f6a6e48c00c5885997c
 SHA512:
-  metadata.gz: 893325a9b6f5f3e2607dc0cfb6f7ffdd2efd1f6d34b7d38221bfbffdfb7fd8973af67ded3461a1670d7c0a4a55d10540f3a72d06de16503fc2eed3eaf3206342
-  data.tar.gz: 258179e87ee9815a677a294a09ce08d131a6068931c21bdcf883cf2e2862cf91dd9ef9efba787131bd73b31578d8697ed316e4398a1062cb5eb64edd1647e0c6
+  metadata.gz: e50bf16b938b8708125c81d828c2350224dc7ed7ef9526e6fd7a066f44041b7e990003bfd6f3315aee69cdc68628399691dab28aacc7c4c2a233074d43887f0d
+  data.tar.gz: ba5efefb14c289839ca8fcc03d9102847cc495797816ddf51ce5dd1177d9ba100324e415ff329bb2b74b88e8db32532baa08e040e94f4e8ffff2ae2c9f23f3d5

data/lib/lutaml/lml/data_processor/attribute_processing.rb

@@ -4,7 +4,7 @@ module Lutaml
   module Lml
     class DataProcessor
       module AttributeProcessing
-        EXCLUDED_PASS_THROUGH_KEYS = %i[key value comments add attributes properties].freeze
+        EXCLUDED_PASS_THROUGH_KEYS = %i[key value comments add attributes properties type_literal].freeze
 
         def process_attributes(obj)
           case obj
@@ -31,6 +31,7 @@ module Lutaml
           result = extract_name_and_value(obj)
           convert_instance_type(result)
           result[:extended] = !obj[:add].nil? if obj.key?(:add)
+          result[:literal] = true if obj.key?(:type_literal)
           apply_nested_attributes(result, obj)
           apply_remaining_keys(result, obj)
           result

data/lib/lutaml/lml/formatter/graphviz/node_formatter.rb

@@ -14,8 +14,8 @@ module Lutaml
           symbol = ACCESS_SYMBOLS[node.visibility]
           result = "#{symbol}#{node.name}"
           if node.type
-            keyword = node.keyword ? "«#{node.keyword}»" : ''
-            result += " : #{keyword}#{node.type}"
+            stereotype = node.stereotype.empty? ? '' : node.stereotype.map { |s| "«#{s}»" }.join
+            result += " : #{stereotype}#{node.type}"
           end
           result += format_cardinality_bounds(node.cardinality) if node.cardinality
           result = escape_html_chars(result)
@@ -48,9 +48,23 @@ module Lutaml
           end.join(', ')
         end
 
+        # Kind labels rendered above the name: guillemet stereotypes first,
+        # then the entity-kind label (enums/data types/primitives carry no
+        # user stereotypes of their own in the grammar).
+        KIND_LABELS = {
+          enums: "enumeration",
+          data_types: "dataType",
+          primitives: "primitive"
+        }.freeze
+
         def format_class(node, hide_members = nil)
           name = ["<B>#{escape_html_chars(node.name)}</B>"]
-          name.unshift("«#{escape_html_chars(node.keyword)}»") if node.keyword
+          node.stereotype.each do |stereotype|
+            name.unshift("«#{escape_html_chars(stereotype)}»")
+          end
+          if (kind = KIND_LABELS[node.class.entity_type])
+            name.unshift("«#{kind}»")
+          end
           name_html = build_name_table(name)
 
           member_formatter = node.is_a?(Lml::Enum) ? method(:format_enum_member) : nil