lutaml 0.10.2 → 0.10.4

data/lib/lutaml/uml_repository/queries/class_query.rb

@@ -69,38 +69,72 @@ module Lutaml
         def in_package(package_path_string, recursive: false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           return [] if package_path_string.nil? || package_path_string.empty?
 
-          package_path = Lutaml::Uml::PackagePath.new(package_path_string)
+          pkg_to_classes = indexes[:package_to_classes]
+          if pkg_to_classes
+            in_package_indexed(package_path_string, pkg_to_classes,
+                               recursive: recursive)
+          else
+            in_package_scan(package_path_string, recursive: recursive)
+          end
+        end
+
+        private
+
+        # O(1) indexed lookup for in_package
+        def in_package_indexed(package_path_string, pkg_to_classes, recursive:) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+          is_absolute = package_path_string.start_with?("::")
+          search_segs = package_path_string.split("::").reject(&:empty?)
+
           results = []
+          pkg_to_classes.each do |path, classes|
+            path_segs = path.split("::")
+            matched = if is_absolute
+                        if recursive
+                          path == package_path_string ||
+                            path.start_with?("#{package_path_string}::")
+                        else
+                          path == package_path_string
+                        end
+                      elsif recursive
+                        # Relative: match when path ends with search segments
+                        (0..(path_segs.size - search_segs.size)).any? do |i|
+                          path_segs[i, search_segs.size] == search_segs
+                        end
+                      else
+                        path_segs.size >= search_segs.size &&
+                          path_segs[-search_segs.size..] == search_segs
+                      end
 
-          # Check if the path is absolute (starts with ModelRoot)
+            results.concat(classes) if matched
+          end
+          results
+        end
+
+        # Fallback: original O(n) scan
+        def in_package_scan(package_path_string, recursive:)
+          package_path = Lutaml::Uml::PackagePath.new(package_path_string)
+          results = []
           is_absolute = package_path.absolute?
 
-          indexes[:qualified_names].each do |qname_string, klass| # rubocop:disable Metrics/BlockLength
+          indexes[:qualified_names].each do |qname_string, klass|
             qname = Lutaml::Uml::QualifiedName.new(qname_string)
 
             matched = if is_absolute
-                        # Absolute path - exact match
                         if recursive
                           qname.package_path.starts_with?(package_path)
                         else
                           qname.package_path == package_path
                         end
                       else
-                        # Relative path - match if the class's package path ends with
-                        # the given path
                         class_pkg_segs = qname.package_path.segments
                         search_segs = package_path.segments
 
                         if recursive
-                          # For recursive, check if any suffix of the class path
-                          # starts with search_segs
                           (0..(class_pkg_segs.size - search_segs.size))
                             .any? do |i|
                             class_pkg_segs[i, search_segs.size] == search_segs
                           end
                         else
-                          # For non-recursive, check if class path ends with
-                          # search_segs
                           class_pkg_segs.size >= search_segs.size &&
                             class_pkg_segs[-search_segs.size..] == search_segs
                         end

data/lib/lutaml/uml_repository/queries/inheritance_query.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "base_query"
 require_relative "../../uml/qualified_name"
 

data/lib/lutaml/uml_repository/repository.rb

@@ -625,8 +625,8 @@ module Lutaml
       #   results = repo.query! do |q|
       #     q.classes.where(stereotype: 'featureType')
       #   end
-      def query!(&block)
-        query(&block).execute
+      def query!(&)
+        query(&).execute
       end
 
       # Convenience methods for SPA data transformer
@@ -646,25 +646,29 @@ module Lutaml
       # Get all associations as an array
       # Collects from both document-level (XMI) and class-level (QEA/EA)
       # @return [Array<Lutaml::Uml::Association>] All associations
-      def associations_index # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      def associations_index # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics:MethodLength,Metrics:PerceivedComplexity
         # Use cached index if available (built by IndexBuilder)
         return @indexes[:associations].values if @indexes[:associations]
 
         # Fallback for edge cases: collect from document and classes
+        seen = Set.new
         associations = []
 
-        # Document-level associations (XMI format)
-        associations.concat(@document.associations) if @document.associations
+        (@document.associations || []).each do |assoc|
+          if assoc.xmi_id && !seen.include?(assoc.xmi_id)
+            seen << assoc.xmi_id
+            associations << assoc
+          end
+        end
 
-        # Class-level associations (QEA/EA format)
         classes_index.each do |klass|
           next unless klass.respond_to?(:associations) && klass.associations
 
           klass.associations.each do |assoc|
-            # Avoid duplicates - check xmi_id
-            next if associations.any? { |a| a.xmi_id == assoc.xmi_id }
-
-            associations << assoc
+            if assoc.xmi_id && !seen.include?(assoc.xmi_id)
+              seen << assoc.xmi_id
+              associations << assoc
+            end
           end
         end
 

data/lib/lutaml/uml_repository/statistics_calculator.rb

@@ -262,12 +262,14 @@ module Lutaml
       def max_inheritance_depth
         return 0 if @indexes[:inheritance_graph].empty?
 
-        max = 0
+        @inheritance_depth_cache ||= {}
+        max_depth = 0
+
         @indexes[:qualified_names].each_key do |qname|
-          depth = calculate_inheritance_depth(qname)
-          max = depth if depth > max
+          depth = memoized_inheritance_depth(qname)
+          max_depth = depth if depth > max_depth
         end
-        max
+        max_depth
       end
 
       # Calculate inheritance depth for a class
@@ -275,23 +277,33 @@ module Lutaml
       # @param qname [String] Qualified name of the class
       # @param visited [Set] Set of visited classes (to detect cycles)
       # @return [Integer] Depth of inheritance chain
-      def calculate_inheritance_depth(qname, visited = Set.new) # rubocop:disable Metrics/MethodLength
-        return 0 if visited.include?(qname)
-
-        visited.add(qname)
+      def calculate_inheritance_depth(qname, visited = Set.new)
+        memoized_inheritance_depth(qname, visited)
+      end
 
-        # Find parent
-        parent_qname = nil
-        @indexes[:inheritance_graph].each do |parent, children|
-          if children.include?(qname)
-            parent_qname = parent
-            break
+      # Build reverse index: child_qname => parent_qname
+      def child_to_parent_index
+        @child_to_parent_index ||= begin
+          idx = {}
+          @indexes[:inheritance_graph].each do |parent, children|
+            children.each { |child| idx[child] = parent }
           end
+          idx
         end
+      end
+
+      # Memoized inheritance depth calculation using reverse index
+      def memoized_inheritance_depth(qname, visited = Set.new)
+        return 0 if visited.include?(qname)
+        return @inheritance_depth_cache[qname] if @inheritance_depth_cache.key?(qname)
 
-        return 0 unless parent_qname
+        parent = child_to_parent_index[qname]
+        return 0 unless parent
 
-        1 + calculate_inheritance_depth(parent_qname, visited)
+        visited.add(qname)
+        depth = 1 + memoized_inheritance_depth(parent, visited)
+        @inheritance_depth_cache[qname] = depth
+        depth
       end
 
       # Get count of abstract classes

data/lib/lutaml/version.rb

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

data/lib/lutaml/xmi/parsers/xmi_base.rb

@@ -485,9 +485,7 @@ module Lutaml
         # @return [Array<Hash>]
         # @note xpath %(//diagrams/diagram/model[@package="#{node['xmi:id']}"])
         def serialize_model_diagrams(node_id, with_package: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          diagrams = @xmi_root_model.extension.diagrams.diagram.select do |d|
-            d.model.package == node_id
-          end
+          diagrams = diagram_lookup[node_id]
 
           diagrams.map do |diagram|
             h = {
@@ -506,6 +504,17 @@ module Lutaml
           end
         end
 
+        # Lazy-built hash index for O(1) diagram lookups by package
+        # @return [Hash] Mapping of package_id => [diagrams]
+        def diagram_lookup
+          @diagram_lookup ||= begin
+            idx = Hash.new { |h, k| h[k] = [] }
+            diagrams = @xmi_root_model.extension&.diagrams&.diagram || []
+            diagrams.each { |d| idx[d.model.package] << d if d.model&.package }
+            idx
+          end
+        end
+
         # @param xmi_id [String]
         # @return [Array<Hash>]
         # @note xpath %(//element[@xmi:idref="#{xmi_id}"]/links/*)
@@ -932,8 +941,22 @@ module Lutaml
         # @param source_or_target [String]
         # @return [String]
         def connector_node_by_id(xmi_id, source_or_target)
-          @xmi_root_model.extension.connectors.connector.find do |con|
-            con.send(source_or_target.to_sym).idref == xmi_id
+          connector_lookup[[source_or_target.to_sym, xmi_id]]
+        end
+
+        # Lazy-built hash index for O(1) connector lookups
+        # @return [Hash] Mapping of [direction, idref] => connector
+        def connector_lookup
+          @connector_lookup ||= begin
+            lookup = {}
+            connectors = @xmi_root_model.extension&.connectors&.connector || []
+            connectors.each do |con|
+              %i[source target].each do |dir|
+                idref = con.send(dir)&.idref
+                lookup[[dir, idref]] = con if idref
+              end
+            end
+            lookup
           end
         end
 

data/lib/lutaml.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require_relative "lutaml/version"
-require_relative "lutaml/parser"
 
 module Lutaml
+  class Error < StandardError; end
 end
 
+require_relative "lutaml/parser"
+
 require_relative "lutaml/express"
 require_relative "lutaml/formatter"
 require_relative "lutaml/layout"

data/lutaml.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   spec.name          = "lutaml"
   spec.version       = Lutaml::VERSION
   spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com'"]
+  spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "LutaML: data models in textual form"
   spec.description   = "LutaML: data models in textual form"
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.7.0" # rubocop:disable Gemspec/RequiredRubyVersion
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.add_dependency "expressir", "~> 2.3"
   # TODO: remove once reline declares fiddle as a dependency

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-23 00:00:00.000000000 Z
+date: 2026-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -312,7 +312,7 @@ dependencies:
         version: 0.5.2
 description: 'LutaML: data models in textual form'
 email:
-- open.source@ribose.com'
+- open.source@ribose.com
 executables:
 - lutaml
 - lutaml-sysml
@@ -330,6 +330,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - Makefile
 - README.adoc
@@ -960,7 +961,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="