lutaml 0.10.5 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1caee886e1e27cbbd7db3101f510bd0a1169050cbab47f48bdb31622e46c16
-  data.tar.gz: 4d42b151859f65339b67dffc2e5070e2851819daaf145295b05285d2cecc5e50
+  metadata.gz: 84ecefe8a15ae033ee203318b3db70ac20ea3f727d4a94cb98ffdd6444f0111f
+  data.tar.gz: afe30e1675098ee1248114e4999117b0b8b159c902ae304e5d4b8212ac801bfa
 SHA512:
-  metadata.gz: 62f845a38a4336cee141fb710ced850a20332db561ab44fe08d16c9e780c75c2844b982176902c0eab600175561e7efd7b63136ba9eabc707ce07d424f1c0c9f
-  data.tar.gz: 0ce0fd5ae74fdd0ba9f795e39e4b7b0ead7492443f06eeee34dbbeaaf31fdab16601174dbf53f72d412c13581a8cac82cefdf4906c060f317d7f7afd2a8f3b1d
+  metadata.gz: 4ac75c14a3991c8b7885f4fc62fbe29640be5fe7b4d2cc9a5abfc01c585e038dd50a495a69cdab4483fb6840671b1a1ab35a66263e570c1da7cc005ce9fda626
+  data.tar.gz: 92f724a84ddfc10d49800a2f118bdc31d6d80054d9238a2feacc0a1f9e74312ea1fc96ac95b58893f5ec24d88f1fbe09f2b2eff64be6b45f879208babfa162b8

data/.gitignore

@@ -8,9 +8,17 @@ Gemfile.lock
 # rspec failure tracking
 .rspec_status
 /spec/reports/
+/spec/tmp/
 /tmp/
 /.yardoc
 /_yardoc/
 
 _site/
 old-docs
+
+# Editor / OS
+.DS_Store
+
+# Transient planning files
+TODO.*/
+.rubocop_todo.yml.tmp

data/.rubocop_todo.yml

@@ -1,51 +1,43 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-28 10:51:28 UTC using RuboCop version 1.86.1.
+# on 2026-05-07 04:34:28 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/lutaml/qea/factory/association_builder.rb'
-    - 'lib/lutaml/uml/inheritance_walker.rb'
-    - 'lib/lutaml/uml_repository/static_site/data_transformer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/diagram_serializer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/package_serializer.rb'
-
-# Offense count: 4
+# Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
   Exclude:
-    - 'lib/lutaml/cli/interactive_shell/command_base.rb'
+    - 'lib/lutaml/uml_repository/static_site/generator.rb'
+    - 'spec/lutaml/uml_repository/static_site/serializers/diagram_serializer_spec.rb'
 
-# Offense count: 1
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLinesAfterModuleInclusion:
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
   Exclude:
-    - 'lib/lutaml/uml_repository/repository.rb'
+    - 'spec/lutaml/uml_repository/static_site/serializers/diagram_serializer_spec.rb'
 
-# Offense count: 183
+# Offense count: 175
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
   Exclude:
-    - 'lib/lutaml/uml/model_helpers.rb'
+    - 'spec/lutaml/uml_repository/static_site/serializers/diagram_serializer_spec.rb'
 
 # Offense count: 1
 Lint/BinaryOperatorWithIdenticalOperands:
@@ -98,13 +90,6 @@ Lint/MissingSuper:
   Exclude:
     - 'lib/lutaml/uml_repository/lazy_repository.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantRequireStatement:
-  Exclude:
-    - 'lib/lutaml/qea/factory/generalization_builder.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
@@ -118,7 +103,7 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'lib/lutaml/cli/interactive_shell.rb'
 
-# Offense count: 52
+# Offense count: 51
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
@@ -134,7 +119,7 @@ Metrics/BlockLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 65
+# Offense count: 67
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 62
@@ -209,7 +194,7 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 649
+# Offense count: 654
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 30
@@ -263,7 +248,7 @@ RSpec/MessageSpies:
     - 'spec/lutaml/uml_repository/presenters/diagram_presenter_spec.rb'
     - 'spec/lutaml/uml_repository/repository_spec.rb'
 
-# Offense count: 35
+# Offense count: 38
 RSpec/MultipleExpectations:
   Max: 6
 
@@ -285,6 +270,12 @@ RSpec/NoExpectationExample:
     - 'spec/lutaml/qea/verification/comprehensive_equivalence_spec.rb'
     - 'spec/lutaml/uml_repository/static_site/generator_spec.rb'
 
+# Offense count: 6
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/lutaml/uml_repository/static_site/serializers/diagram_serializer_spec.rb'
+
 # Offense count: 12
 RSpec/RepeatedExample:
   Exclude:
@@ -309,6 +300,12 @@ RSpec/SpecFilePathFormat:
     - 'spec/lutaml/parsers/serialize_xmi_to_liquid_spec.rb'
     - 'spec/lutaml/uml_repository/web_ui/app_spec.rb'
 
+# Offense count: 10
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/VerifiedDoubleReference:
+  Exclude:
+    - 'spec/lutaml/uml_repository/static_site/serializers/diagram_serializer_spec.rb'
+
 # Offense count: 3
 Security/Eval:
   Exclude:
@@ -336,13 +333,6 @@ Style/EvalWithLocation:
   Exclude:
     - 'spec/lutaml/cli/uml/search_command_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
-Style/MultipleComparison:
-  Exclude:
-    - 'lib/lutaml/cli/interactive_shell.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/PartitionInsteadOfDoubleSelect:
@@ -355,19 +345,3 @@ Style/SafeNavigationChainLength:
   Exclude:
     - 'lib/lutaml/qea/validation/attribute_validator.rb'
     - 'lib/lutaml/qea/validation/operation_validator.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'lib/lutaml/qea/factory/class_transformer.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/lutaml/cli/interactive_shell.rb'

data/exe/lutaml

@@ -5,6 +5,7 @@ require "pathname"
 bin_file = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
+require "lutaml"
 require "lutaml/cli"
 
 Lutaml::CLI.start(ARGV)

data/lib/lutaml/cli/interactive_shell/command_base.rb

@@ -12,15 +12,19 @@ module Lutaml
 
         def repository = shell.repository
         def current_path = shell.current_path
+
         def current_path=(path)
           shell.instance_variable_set(:@current_path, path)
         end
+
         def config = shell.config
         def bookmarks = shell.bookmarks
         def last_results = shell.last_results
+
         def last_results=(results)
           shell.instance_variable_set(:@last_results, results)
         end
+
         def path_history = shell.path_history
       end
     end

data/lib/lutaml/cli/interactive_shell.rb

@@ -101,7 +101,7 @@ module Lutaml
         "history" => :@help,
         "clear" => :@help, "cls" => :@help,
         "config" => :@help,
-        "stats" => :@help,
+        "stats" => :@help
       }.freeze
 
       METHOD_MAP = {
@@ -119,7 +119,7 @@ module Lutaml
         "history" => :cmd_history,
         "clear" => :cmd_clear, "cls" => :cmd_clear,
         "config" => :cmd_config,
-        "stats" => :cmd_stats,
+        "stats" => :cmd_stats
       }.freeze
 
       def execute_command(input)
@@ -127,7 +127,7 @@ module Lutaml
         command = parts[0].downcase
         args = parts[1..]
 
-        if command == "exit" || command == "quit" || command == "q"
+        if ["exit", "quit", "q"].include?(command)
           @running = false
           return
         end

data/lib/lutaml/cli/uml/spa_command.rb

@@ -47,6 +47,9 @@ module Lutaml
                                      desc: "Minify HTML/CSS/JS output"
           thor_class.option :theme, type: :string, default: "light",
                                     desc: "Default theme: 'light' or 'dark'"
+          thor_class.option :render_diagrams, type: :boolean, default: false,
+                                              desc: "Render diagram SVGs " \
+                                                    "(may increase output size)"
         end
 
         def run(input_path) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
@@ -169,6 +172,7 @@ module Lutaml
             title: options[:title] || "UML Model Browser",
             minify: options[:minify] || false,
             theme: options[:theme] || "light",
+            render_diagrams: options[:render_diagrams] || false,
           }
 
           Lutaml::UmlRepository::StaticSite.generate(repository,

data/lib/lutaml/qea/factory/association_builder.rb

@@ -179,6 +179,7 @@ module Lutaml
 
         def find_package_name(package_id)
           return nil if package_id.nil?
+
           database.find_package(package_id)&.name
         end
       end

data/lib/lutaml/qea/factory/class_transformer.rb

@@ -60,7 +60,7 @@ module Lutaml
               .load_association_generalizations(ea_object.ea_object_id)
 
             klass.associations = assoc_builder.load_class_associations(
-              ea_object.ea_object_id, ea_object.ea_guid,
+              ea_object.ea_object_id, ea_object.ea_guid
             )
           end
         end
@@ -116,7 +116,9 @@ module Lutaml
           return [] if ea_guid.nil?
           return [] unless database.tagged_values
 
-          ea_tags = database.tagged_values.select { |tag| tag.element_id == ea_guid }
+          ea_tags = database.tagged_values.select do |tag|
+            tag.element_id == ea_guid
+          end
           TaggedValueTransformer.new(database).transform_collection(ea_tags)
         end
 

data/lib/lutaml/qea/factory/generalization_builder.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "base_transformer"
 require_relative "attribute_transformer"
 require_relative "generalization_transformer"
@@ -31,7 +30,8 @@ module Lutaml
           generalization = if ea_connector.nil?
                              gen_transformer.transform(nil, current_obj)
                            else
-                             gen_transformer.transform(ea_connector, current_obj)
+                             gen_transformer.transform(ea_connector,
+                                                       current_obj)
                            end
           return nil unless generalization
 

data/lib/lutaml/uml/inheritance_walker.rb

@@ -38,6 +38,7 @@ module Lutaml
         collect_ancestors(klass, ancestors)
         ancestors.reverse_each.with_index(1) do |ancestor, level|
           break if @visited.include?(ancestor.xmi_id)
+
           @visited.add(ancestor.xmi_id)
           yield(ancestor, level) if block_given?
         end

data/lib/lutaml/uml/model_helpers.rb

@@ -122,7 +122,7 @@ module Lutaml
       # @param max [String, nil]
       # @return [Hash{Symbol => String, nil}] Hash with :min and :max keys
       def parse_cardinality(min, max)
-        {min: min, max: max}
+        { min: min, max: max }
       end
     end
   end

data/lib/lutaml/uml_repository/exporters/markdown/class_page_builder.rb

@@ -49,7 +49,9 @@ module Lutaml
             stereotypes_array = normalize_stereotypes(klass.stereotype)
             return "" if stereotypes_array.empty?
 
-            "**Stereotypes**: #{stereotypes_array.map { |s| "`#{s}`" }.join(', ')}\n\n"
+            "**Stereotypes**: #{stereotypes_array.map do |s|
+              "`#{s}`"
+            end.join(', ')}\n\n"
           end
 
           def build_definition_section(klass)

data/lib/lutaml/uml_repository/exporters/markdown_exporter.rb

@@ -41,7 +41,8 @@ module Lutaml
         end
 
         def generate_index_page
-          content = Markdown::IndexPageBuilder.new(repository, options, link_resolver).build
+          content = Markdown::IndexPageBuilder.new(repository, options,
+                                                   link_resolver).build
           File.write(File.join(output_dir, "index.md"), content)
         end
 

data/lib/lutaml/uml_repository/repository.rb

@@ -51,6 +51,7 @@ module Lutaml
     #   descendants = repo.descendants_of("ModelRoot::Parent", max_depth: 2)
     class Repository
       include Deprecated
+
       # @return [Lutaml::Uml::Document] The underlying UML document
       attr_reader :document
 

data/lib/lutaml/uml_repository/static_site/data_transformer.rb

@@ -32,13 +32,24 @@ module Lutaml
         def transform
           {
             metadata: Serializers::MetadataBuilder.new(repository).build,
-            packageTree: Serializers::PackageTreeBuilder.new(repository, id_generator).build,
-            packages: Serializers::PackageSerializer.new(repository, id_generator, options).build_map,
-            classes: Serializers::ClassSerializer.new(repository, id_generator, options, inheritance_resolver).build_map,
-            attributes: Serializers::AttributeSerializer.new(repository, id_generator, options).build_map,
+            packageTree: Serializers::PackageTreeBuilder.new(repository,
+                                                             id_generator).build,
+            packages: Serializers::PackageSerializer.new(repository,
+                                                         id_generator, options).build_map,
+            classes: Serializers::ClassSerializer.new(repository, id_generator,
+                                                      options, inheritance_resolver).build_map,
+            attributes: Serializers::AttributeSerializer.new(repository,
+                                                             id_generator, options).build_map,
             associations: build_associations_map,
-            operations: Serializers::OperationSerializer.new(repository, id_generator).build_map,
-            diagrams: (options[:include_diagrams] ? Serializers::DiagramSerializer.new(repository, id_generator, options).build_map : {}),
+            operations: Serializers::OperationSerializer.new(repository,
+                                                             id_generator).build_map,
+            diagrams: (if options[:include_diagrams]
+                         Serializers::DiagramSerializer.new(
+                           repository, id_generator, options
+                         ).build_map
+                       else
+                         {}
+                       end),
           }
         end
 
@@ -69,12 +80,14 @@ module Lutaml
 
             klass.association_generalization.each do |assoc_gen|
               next unless assoc_gen.respond_to?(:parent_object_id)
+
               parent_object_id = assoc_gen.parent_object_id
               next unless parent_object_id
 
               parent_class = class_lookup.by_object_id(parent_object_id)
               if parent_class&.xmi_id
                 next if parent_class.xmi_id == klass.xmi_id
+
                 unless map[klass.xmi_id].include?(parent_class.xmi_id)
                   map[klass.xmi_id] << parent_class.xmi_id
                 end
@@ -91,6 +104,7 @@ module Lutaml
 
         def find_class_by_xmi_id(xmi_id)
           return nil unless xmi_id
+
           class_lookup.by_xmi_id(xmi_id)
         rescue StandardError
           nil
@@ -98,6 +112,7 @@ module Lutaml
 
         def find_class_by_object_id(object_id)
           return nil unless object_id
+
           class_lookup.by_object_id(object_id)
         rescue StandardError
           nil
@@ -114,6 +129,7 @@ module Lutaml
 
         def format_definition(definition)
           return nil if definition.nil? || definition.empty?
+
           formatted = definition.strip
           if @options[:max_definition_length] &&
               formatted.length > @options[:max_definition_length]

data/lib/lutaml/uml_repository/static_site/generator.rb

@@ -11,6 +11,27 @@ require_relative "id_generator"
 module Lutaml
   module UmlRepository
     module StaticSite
+      # Resolves Liquid {% include %} paths to template files on disk.
+      # Unlike LocalFileSystem (which adds a "_" prefix), this resolves
+      # paths directly: "components/header" → "<root>/components/header.liquid"
+      class TemplateFileSystem
+        attr_reader :root
+
+        def initialize(root)
+          @root = root
+        end
+
+        def read_template_file(template_path)
+          full = File.expand_path("#{template_path}.liquid", @root)
+          unless full.start_with?(@root)
+            raise Liquid::FileSystemError,
+                  "Illegal template path: #{template_path}"
+          end
+
+          File.read(full)
+        end
+      end
+
       # Main static site generator for LutaML UML Browser.
       #
       # Follows Dependency Inversion Principle by injecting dependencies
@@ -143,7 +164,8 @@ module Lutaml
             include_diagrams: config_opts["include_diagrams"] != false,
             format_definitions: config_opts["format_definitions"] != false,
             max_definition_length: config_opts["max_definition_length"],
-          }.merge(@options.slice(:include_diagrams, :format_definitions))
+          }.merge(@options.slice(:include_diagrams, :format_definitions,
+                                 :render_diagrams))
         end
 
         def search_options
@@ -163,12 +185,9 @@ module Lutaml
         end
 
         def setup_liquid
-          # Use environment instead of deprecated class-level setters
-          environment = Liquid::Environment.new
-          environment.file_system = Liquid::LocalFileSystem.new(@options[:template_path])
-          # Changed from :strict to handle missing includes
-          environment.error_mode = :lax
-          @liquid_environment = environment
+          @liquid_environment = Liquid::Environment.new
+          @liquid_environment.file_system = TemplateFileSystem.new(@options[:template_path])
+          @liquid_environment.error_mode = :lax
         end
 
         # Generate single-file SPA
@@ -226,7 +245,7 @@ module Lutaml
 
         def render_components # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           # Set up Liquid file system for recursive includes
-          temp_file_system = Liquid::LocalFileSystem.new(@options[:template_path])
+          temp_file_system = TemplateFileSystem.new(@options[:template_path])
 
           component_names = ["header", "sidebar", "content", "package_details",
                              "class_details"]
@@ -274,7 +293,10 @@ module Lutaml
           # Render and write index.html
           template_content = File.read(File.join(@options[:template_path],
                                                  "multi_file.liquid"))
-          template = Liquid::Template.parse(template_content)
+          file_system = TemplateFileSystem.new(@options[:template_path])
+          template = Liquid::Template.parse(template_content,
+                                            error_mode: :lax)
+          template.registers[:file_system] = file_system
           html = template.render(context)
           html = minify_html(html) if @options[:minify]
           File.write(File.join(output_dir, "index.html"), html)
@@ -337,6 +359,7 @@ module Lutaml
             "03-layout.css",
             "04-components.css",
             "05-utilities.css",
+            "06-diagrams.css",
           ]
 
           css_parts = css_files.map do |file|

data/lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb

@@ -9,7 +9,8 @@ module Lutaml
         class ClassSerializer
           include Lutaml::Uml::ModelHelpers
 
-          def initialize(repository, id_generator, options, inheritance_resolver)
+          def initialize(repository, id_generator, options,
+inheritance_resolver)
             @repository = repository
             @id_generator = id_generator
             @options = options
@@ -81,6 +82,7 @@ module Lutaml
 
           def serialize_class_operations(klass)
             return [] unless klass.respond_to?(:operations) && klass.operations
+
             klass.operations.map { |op| @id_generator.operation_id(op, klass) }
           end
 
@@ -88,7 +90,8 @@ module Lutaml
             return [] unless klass.is_a?(Lutaml::Uml::Enum) && klass.owned_literal
 
             klass.owned_literal.map do |literal|
-              { name: literal.name, definition: format_definition(literal.definition) }
+              { name: literal.name,
+                definition: format_definition(literal.definition) }
             end
           rescue StandardError
             []
@@ -97,11 +100,13 @@ module Lutaml
           def package_id_for_class(klass)
             ns = klass.respond_to?(:namespace) ? klass.namespace : nil
             return nil unless ns.is_a?(Lutaml::Uml::Package)
+
             @id_generator.package_id(ns)
           end
 
           def format_definition(definition)
             return nil if definition.nil? || definition.empty?
+
             formatted = definition.strip
             if @options[:max_definition_length] &&
                 formatted.length > @options[:max_definition_length]

data/lib/lutaml/uml_repository/static_site/serializers/diagram_serializer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../presenters/diagram_presenter"
+
 module Lutaml
   module UmlRepository
     module StaticSite
@@ -25,13 +27,31 @@ module Lutaml
           private
 
           def serialize(diagram, id)
-            {
+            data = {
               id: id,
               xmiId: diagram.xmi_id,
               name: diagram.name,
               type: diagram.diagram_type,
               package: find_diagram_package(diagram),
+              objectCount: (diagram.diagram_objects || []).size,
+              linkCount: (diagram.diagram_links || []).size,
             }
+
+            if @options[:render_diagrams]
+              svg = render_svg(diagram)
+              data[:svg] = svg if svg
+            end
+
+            data
+          end
+
+          def render_svg(diagram)
+            return nil unless diagram.diagram_objects&.any?
+
+            presenter = Presenters::DiagramPresenter.new(diagram, @repository)
+            presenter.svg_output
+          rescue StandardError
+            nil
           end
 
           def find_diagram_package(diagram)
@@ -48,6 +68,7 @@ module Lutaml
 
           def package_diagrams(package)
             return [] unless @options[:include_diagrams]
+
             package.diagrams || []
           rescue StandardError
             []

data/lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "../../../uml/model_helpers"
 require_relative "../../class_lookup_index"
 
@@ -24,6 +23,7 @@ module Lutaml
             if parent_xmi_ids && !parent_xmi_ids.empty?
               parents = parent_xmi_ids.filter_map do |parent_xmi_id|
                 next if parent_xmi_id == klass.xmi_id
+
                 parent = class_lookup.by_xmi_id(parent_xmi_id)
                 parent ? @id_generator.class_id(parent) : nil
               end
@@ -32,6 +32,7 @@ module Lutaml
 
             parent = @repository.supertype_of(klass)
             return [] if parent && parent.xmi_id == klass.xmi_id
+
             parent ? [@id_generator.class_id(parent)] : []
           rescue StandardError => e
             warn "Error finding generalizations for #{klass.name}: #{e.message}"
@@ -65,7 +66,9 @@ module Lutaml
               visited.add(parent_class.xmi_id)
 
               if parent_class.attributes
-                sorted_attrs = parent_class.attributes.sort_by { |a| a.name || "" }
+                sorted_attrs = parent_class.attributes.sort_by do |a|
+                  a.name || ""
+                end
                 sorted_attrs.each do |attr|
                   attr_id = @id_generator.attribute_id(attr, parent_class)
                   inherited << {
@@ -164,7 +167,8 @@ module Lutaml
               ownedProps: serialize_general_attrs(gen, :owned_props),
               assocProps: serialize_general_attrs(gen, :assoc_props),
               inheritedProps: serialize_general_attrs(gen, :inherited_props),
-              inheritedAssocProps: serialize_general_attrs(gen, :inherited_assoc_props),
+              inheritedAssocProps: serialize_general_attrs(gen,
+                                                           :inherited_assoc_props),
             }
           rescue StandardError => e
             warn "Error serializing generalization: #{e.message}"
@@ -219,7 +223,10 @@ module Lutaml
 
           def serialize_general_attrs(gen, method)
             return [] unless gen.respond_to?(method)
-            (gen.send(method) || []).map { |attr| serialize_general_attribute(attr) }
+
+            (gen.send(method) || []).map do |attr|
+              serialize_general_attribute(attr)
+            end
           end
 
           def serialize_cardinality(cardinality)
@@ -233,6 +240,7 @@ module Lutaml
 
           def format_definition(definition)
             return nil if definition.nil? || definition.empty?
+
             formatted = definition.strip
             if @options[:max_definition_length] &&
                 formatted.length > @options[:max_definition_length]

data/lib/lutaml/uml_repository/static_site/serializers/package_serializer.rb

@@ -38,9 +38,15 @@ module Lutaml
               stereotypes: normalize_stereotypes(
                 package.respond_to?(:stereotype) ? package.stereotype : nil,
               ),
-              classes: (package.classes || []).map { |c| @id_generator.class_id(c) },
-              subPackages: (package.packages || []).map { |p| @id_generator.package_id(p) },
-              diagrams: package_diagrams(package).map { |d| @id_generator.diagram_id(d) },
+              classes: (package.classes || []).map do |c|
+                @id_generator.class_id(c)
+              end,
+              subPackages: (package.packages || []).map do |p|
+                @id_generator.package_id(p)
+              end,
+              diagrams: package_diagrams(package).map do |d|
+                @id_generator.diagram_id(d)
+              end,
               parent: if package.respond_to?(:namespace) &&
                   package.namespace.is_a?(Lutaml::Uml::Package)
                         @id_generator.package_id(package.namespace)
@@ -59,6 +65,7 @@ module Lutaml
 
           def package_diagrams(package)
             return [] unless @options[:include_diagrams]
+
             package.diagrams || []
           rescue StandardError => e
             warn "Error getting diagrams for #{package.name}: #{e.message}"

data/lib/lutaml/uml_repository/static_site/serializers/package_tree_builder.rb

@@ -44,14 +44,18 @@ module Lutaml
           def build_tree_node(package) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
             pkg_id = @id_generator.package_id(package)
 
-            sorted_children = (package.packages || []).sort_by { |p| p.name || "" }
+            sorted_children = (package.packages || []).sort_by do |p|
+              p.name || ""
+            end
             sorted_classes = (package.classes || [])
               .reject { |c| c.name.nil? || c.name.empty? }
               .sort_by(&:name)
 
             child_nodes = sorted_children.map { |child| build_tree_node(child) }
 
-            total_class_count = sorted_classes.size + child_nodes.sum { |c| c[:classCount] || 0 }
+            total_class_count = sorted_classes.size + child_nodes.sum do |c|
+              c[:classCount] || 0
+            end
 
             {
               id: pkg_id,

data/lib/lutaml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lutaml
-  VERSION = "0.10.5"
+  VERSION = "0.10.7"
 end

data/templates/static_site/assets/scripts/core/state.js

@@ -10,9 +10,10 @@ document.addEventListener('alpine:init', () => {
     config: window.APP_CONFIG || {},
 
     // Current State
-    currentView: 'welcome',  // 'welcome' | 'package' | 'class' | 'search'
+    currentView: 'welcome',  // 'welcome' | 'package' | 'class' | 'search' | 'diagram'
     currentPackage: null,
     currentClass: null,
+    currentDiagram: null,
     searchQuery: '',
     searchResults: [],
 
@@ -86,6 +87,7 @@ document.addEventListener('alpine:init', () => {
       this.currentView = 'welcome';
       this.currentPackage = null;
       this.currentClass = null;
+      this.currentDiagram = null;
       this.breadcrumbs = [];
       this.pushState();
     },
@@ -118,6 +120,21 @@ document.addEventListener('alpine:init', () => {
       this.pushState();
     },
 
+    selectDiagram(diagramId) {
+      if (!this.data || !this.data.diagrams[diagramId]) {
+        console.warn('Diagram not found:', diagramId);
+        return;
+      }
+
+      const diag = this.data.diagrams[diagramId];
+
+      this.currentDiagram = diagramId;
+      this.currentPackage = diag.package;
+      this.currentView = 'diagram';
+      this.updateBreadcrumbs();
+      this.pushState();
+    },
+
     performSearch(query) {
       if (!query || query.length < 2) {
         this.searchResults = [];
@@ -196,6 +213,8 @@ document.addEventListener('alpine:init', () => {
         this.breadcrumbs = this.buildPackageBreadcrumbs(this.currentPackage);
       } else if (this.currentView === 'class' && this.currentClass) {
         this.breadcrumbs = this.buildClassBreadcrumbs(this.currentClass);
+      } else if (this.currentView === 'diagram' && this.currentDiagram) {
+        this.breadcrumbs = [{ name: `Diagram: ${this.data.diagrams[this.currentDiagram]?.name || ''}`, type: 'diagram' }];
       } else if (this.currentView === 'search') {
         this.breadcrumbs = [{ name: `Search: ${this.searchQuery}`, type: 'search' }];
       }
@@ -275,6 +294,8 @@ document.addEventListener('alpine:init', () => {
         this.selectPackage(decodeURIComponent(parts[1]));
       } else if (parts[0] === 'class' && parts[1]) {
         this.selectClass(decodeURIComponent(parts[1]));
+      } else if (parts[0] === 'diagram' && parts[1]) {
+        this.selectDiagram(decodeURIComponent(parts[1]));
       } else if (parts[0] === 'search') {
         const params = new URLSearchParams(queryString);
         const query = params.get('q');
@@ -294,6 +315,8 @@ document.addEventListener('alpine:init', () => {
         hash = `#/package/${encodeURIComponent(this.currentPackage)}`;
       } else if (this.currentView === 'class' && this.currentClass) {
         hash = `#/class/${encodeURIComponent(this.currentClass)}`;
+      } else if (this.currentView === 'diagram' && this.currentDiagram) {
+        hash = `#/diagram/${encodeURIComponent(this.currentDiagram)}`;
       } else if (this.currentView === 'search' && this.searchQuery) {
         hash = `#/search?q=${encodeURIComponent(this.searchQuery)}`;
       }
@@ -370,6 +393,7 @@ function app() {
     get currentView() { return Alpine.store('app').currentView; },
     get currentPackage() { return Alpine.store('app').currentPackage; },
     get currentClass() { return Alpine.store('app').currentClass; },
+    get currentDiagram() { return Alpine.store('app').currentDiagram; },
     get sidebarVisible() {
       return Alpine.store('app').sidebarVisible;
     },
@@ -392,6 +416,9 @@ function app() {
     selectClass(id) {
       Alpine.store('app').selectClass(id);
     },
+    selectDiagram(id) {
+      Alpine.store('app').selectDiagram(id);
+    },
     toggleTheme() {
       Alpine.store('app').toggleTheme();
     },

data/templates/static_site/assets/styles/06-diagrams.css

@@ -274,4 +274,52 @@
   .diagram-wrapper svg {
     filter: brightness(0.9);
   }
+}
+
+/* Inline Diagram Viewer (content pane) */
+.diagram-toolbar {
+  display: flex;
+  gap: 0.5rem;
+  padding: 0.75rem 0;
+  margin-bottom: 1rem;
+}
+
+.diagram-toolbar .btn-sm {
+  padding: 0.375rem 0.75rem;
+  font-size: 0.8rem;
+  background: var(--bg-secondary, #f8f9fa);
+  border: 1px solid var(--color-border, #dcdfe6);
+  border-radius: 4px;
+  cursor: pointer;
+  transition: all 0.15s ease;
+}
+
+.diagram-toolbar .btn-sm:hover {
+  background: var(--color-primary, #3498db);
+  color: white;
+  border-color: var(--color-primary, #3498db);
+}
+
+.diagram-svg-container {
+  background: white;
+  border: 1px solid var(--color-border, #dcdfe6);
+  border-radius: 8px;
+  padding: 1rem;
+  overflow: hidden;
+  transition: transform 0.1s ease-out;
+  min-height: 400px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.diagram-svg-container svg {
+  max-width: 100%;
+  display: block;
+}
+
+.diagram-item .diagram-objects {
+  font-size: 0.8rem;
+  color: var(--color-text-secondary, #7f8c8d);
+  margin-left: auto;
 }

data/templates/static_site/components/content.liquid

@@ -73,7 +73,7 @@
             <h3>Diagrams (<span x-text="pkg.diagrams.length"></span>)</h3>
             <ul class="diagram-list">
               <template x-for="diagramId in pkg.diagrams" :key="diagramId">
-                <li class="diagram-item">
+                <li class="diagram-item clickable-row" @click="$store.app.selectDiagram(diagramId)">
                   <svg class="item-icon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                     <rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect>
                     <line x1="3" y1="9" x2="21" y2="9"></line>
@@ -81,6 +81,7 @@
                   </svg>
                   <span class="diagram-name" x-text="$store.app.data.diagrams[diagramId] && $store.app.data.diagrams[diagramId].name"></span>
                   <span class="diagram-type" x-text="$store.app.data.diagrams[diagramId] && `(${$store.app.data.diagrams[diagramId].type})`"></span>
+                  <span class="diagram-objects" x-show="$store.app.data.diagrams[diagramId] && $store.app.data.diagrams[diagramId].objectCount" x-text="`${$store.app.data.diagrams[diagramId].objectCount} objects`"></span>
                 </li>
               </template>
             </ul>
@@ -503,6 +504,75 @@
           </template>
         </div>
       </div>
+
+    <!-- Diagram View -->
+    <div x-show="currentView === 'diagram'" x-transition class="view-diagram">
+      <template x-if="currentDiagram && data.diagrams[currentDiagram]">
+        <div class="diagram-details" x-data="{
+          get diag() { return data.diagrams[currentDiagram]; },
+          get pkg() { return diag.package ? data.packages[diag.package] : null; },
+          diagramScale: 1.0,
+          diagramPanX: 0,
+          diagramPanY: 0,
+          isPanning: false,
+          panStartX: 0,
+          panStartY: 0,
+          zoom(factor) { this.diagramScale = Math.max(0.1, Math.min(5.0, this.diagramScale * factor)); },
+          resetView() { this.diagramScale = 1.0; this.diagramPanX = 0; this.diagramPanY = 0; },
+          startPan(e) { this.isPanning = true; this.panStartX = e.clientX - this.diagramPanX; this.panStartY = e.clientY - this.diagramPanY; },
+          doPan(e) { if (!this.isPanning) return; this.diagramPanX = e.clientX - this.panStartX; this.diagramPanY = e.clientY - this.panStartY; },
+          endPan() { this.isPanning = false; },
+          downloadSvg() {
+            const svgEl = document.querySelector('.diagram-svg-container svg');
+            if (!svgEl) return;
+            const data = new XMLSerializer().serializeToString(svgEl);
+            const blob = new Blob([data], { type: 'image/svg+xml' });
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement('a');
+            a.href = url; a.download = (this.diag.name || 'diagram').replace(/[^a-zA-Z0-9_-]/g, '_') + '.svg';
+            a.click(); URL.revokeObjectURL(url);
+          }
+        }">
+          <div class="entity-header">
+            <div class="entity-title">
+              <h1 class="entity-name" x-text="diag.name"></h1>
+              <p class="entity-subtitle">
+                <span x-text="diag.type"></span>
+                <span x-show="diag.objectCount"> - <span x-text="diag.objectCount"></span> elements, <span x-text="diag.linkCount"></span> connectors</span>
+              </p>
+            </div>
+            <div style="display: flex; gap: 0.5rem; align-items: center;">
+              <button class="link-button" x-show="diag.package" @click="selectPackage(diag.package)">
+                &larr; Back to package
+              </button>
+              <span class="entity-type-badge">Diagram</span>
+            </div>
+          </div>
+
+          <div class="diagram-toolbar" x-show="diag.svg">
+            <button class="btn btn-sm" @click="zoom(1.2)">Zoom In</button>
+            <button class="btn btn-sm" @click="zoom(0.8)">Zoom Out</button>
+            <button class="btn btn-sm" @click="resetView()">Reset</button>
+            <button class="btn btn-sm" @click="downloadSvg()">Download SVG</button>
+          </div>
+
+          <div class="diagram-svg-container"
+               x-show="diag.svg"
+               x-ref="diagramContainer"
+               @wheel.prevent="zoom($event.deltaY > 0 ? 0.9 : 1.1)"
+               @mousedown="startPan($event)"
+               @mousemove="doPan($event)"
+               @mouseup="endPan()"
+               @mouseleave="endPan()"
+               :style="`transform: translate(${diagramPanX}px, ${diagramPanY}px) scale(${diagramScale}); transform-origin: center; cursor: ${isPanning ? 'grabbing' : 'grab'};`">
+            <div x-html="diag.svg"></div>
+          </div>
+
+          <div x-show="!diag.svg" class="empty-state">
+            <p class="empty-state-message">SVG rendering not available for this diagram. Re-generate with <code>--render-diagrams</code> to include SVG.</p>
+          </div>
+        </div>
+      </template>
     </div>
-  </div>
-</main>
+
+  </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-28 00:00:00.000000000 Z
+date: 2026-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir