xmi 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac4f03d86ac8abffeaecaf956bcd77ab9a3bb2ed6348a12f3ccb2bd587f2eec
-  data.tar.gz: 7f0051b7bbb867c4c7d82ad95fb435a4f5e5d9bb2b76e1297ded8953682489c1
+  metadata.gz: ea334f95069f7cc7ba3116b4bac7e57bfe56476c6803dd59c84b458b0f9549fc
+  data.tar.gz: a2c61004fa041d2956bbad2f141750ce7c654b552a20ada2040e68e495559f07
 SHA512:
-  metadata.gz: 99a98d34c015c29e2170695e0e3918a98ec9a4308097a32886bd0af401808172b367c2e2da020713dc0ff2db5581c9336b4a4a64e3d3b39b225f4df5cde0296d
-  data.tar.gz: 060447e7ae2275a40e4881616dc104032c491ae4cc3bb0707bcfbcafb7bf93a068ff6cda7da3cbeb62c37c3ef5d8e34f66a1dfd1a11206b509e99d3af27a7d8e
+  metadata.gz: 6c26a6117f49257ec68b0934783cbae29265f79dce927232df36737af3c1076b9802d96d02bf864d76841c820a8ce03869a92af64f31405b6d00b508795b4eff
+  data.tar.gz: 88b6d2d73963616ce39ce6517cb7f2d0a6c3bd86d46e4d0c52a4463e6a2d1c2d6923863c174afac74205619d2a9d30f5edec2adc58c654915a3f361f85c635d5

data/.github/workflows/rake.yml

@@ -9,6 +9,10 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/ci/.github/workflows/graphviz-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
+    with:
+      setup-tools: graphviz
+      submodules: true
+      choco-cache: true
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-14 03:59:00 UTC using RuboCop version 1.86.1.
+# on 2026-04-18 04:57:18 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
@@ -11,13 +11,28 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'xmi.gemspec'
 
-# Offense count: 72
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'lib/xmi/index.rb'
+
+# Offense count: 73
 # 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: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/xmi/index.rb'
+
 # Offense count: 5
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
@@ -25,7 +40,16 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'spec/performance/xmi_parsing_spec.rb'
 
-# Offense count: 12
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods, InferNonNilReceiver, AdditionalNilMethods.
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+# AdditionalNilMethods: present?, blank?, try, try!
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - 'lib/xmi/index.rb'
+
+# Offense count: 14
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -33,6 +57,7 @@ Metrics/AbcSize:
     - 'lib/tasks/performance_comparator.rb'
     - 'lib/tasks/performance_helpers.rb'
     - 'lib/xmi/ea_root.rb'
+    - 'lib/xmi/index.rb'
     - 'lib/xmi/version_registry.rb'
     - 'spec/performance/xmi_parsing_spec.rb'
 
@@ -42,24 +67,33 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 143
 
-# Offense count: 1
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/tasks/performance_helpers.rb'
+    - 'lib/xmi/index.rb'
 
-# Offense count: 26
+# Offense count: 28
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 33
 
-# Offense count: 2
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/tasks/performance_helpers.rb'
+    - 'lib/xmi/index.rb'
     - 'lib/xmi/version_registry.rb'
 
+# Offense count: 3
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/xmi/index.rb'
+
 # Offense count: 19
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
@@ -122,6 +156,12 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Max: 4
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/xmi/index.rb'
+
 # Offense count: 4
 # Configuration parameters: AllowedClasses.
 Style/OneClassPerFile:

data/lib/xmi/index.rb

@@ -0,0 +1,243 @@
+# frozen_string_literal: true
+
+module Xmi
+  # Builds all commonly needed indexes from a parsed SparxRoot in a single
+  # targeted walk, avoiding the generic map_id_name approach that visits every
+  # attribute of every node.
+  #
+  # Indexes built:
+  # - id_name_map: { xmi_id => name } for all nodes with both id and name
+  # - packaged_elements: flat array of all PackagedElement instances
+  # - packaged_by_id: { xmi_id => PackagedElement }
+  # - packaged_by_type: { "uml:Class" => [...], "uml:Package" => [...], ... }
+  # - upper_level_map: { xmi_id => parent PackagedElement }
+  # - elements_by_idref: { idref => Extension::Element::Element }
+  # - connectors_by_idref: { idref => Connector::Connector }
+  # - attributes_by_idref: { idref => Extension::Element::Attribute }
+  # - owned_attrs_by_type_idref: { type_idref => [OwnedAttribute, ...] }
+  class Index
+    attr_reader :id_name_map, :packaged_elements, :packaged_by_id,
+                :packaged_by_type, :upper_level_map, :elements_by_idref,
+                :connectors_by_idref, :attributes_by_idref,
+                :owned_attrs_by_type_idref
+
+    PackagedElement = ::Xmi::Uml::PackagedElement
+
+    # @param root [Xmi::Sparx::SparxRoot] parsed XMI model
+    def initialize(root)
+      @id_name_map = {}
+      @packaged_elements = []
+      @packaged_by_id = {}
+      @packaged_by_type = {}
+      @upper_level_map = {}
+      @elements_by_idref = {}
+      @connectors_by_idref = {}
+      @attributes_by_idref = {}
+      @owned_attrs_by_type_idref = {}
+
+      build(root)
+      freeze
+    end
+
+    # Lookup name by XMI ID
+    # @param xmi_id [String] XMI identifier
+    # @return [String, nil]
+    def lookup_name(xmi_id)
+      @id_name_map[xmi_id]
+    end
+
+    # Find packaged element by XMI ID
+    # @param id [String]
+    # @return [Xmi::Uml::PackagedElement, nil]
+    def find_packaged_element(id)
+      @packaged_by_id[id]
+    end
+
+    # Find parent of a packaged element
+    # @param id [String] child XMI ID
+    # @return [Xmi::Uml::PackagedElement, nil]
+    def find_parent(id)
+      @upper_level_map[id]
+    end
+
+    # Find extension element by idref
+    # @param idref [String]
+    # @return [Xmi::Sparx::Element::Element, nil]
+    def find_element(idref)
+      @elements_by_idref[idref]
+    end
+
+    # Find connector by idref
+    # @param idref [String]
+    # @return [Xmi::Sparx::Connector::Connector, nil]
+    def find_connector(idref)
+      @connectors_by_idref[idref]
+    end
+
+    # Find extension attribute by idref
+    # @param idref [String]
+    # @return [Xmi::Sparx::Element::Attribute, nil]
+    def find_attribute(idref)
+      @attributes_by_idref[idref]
+    end
+
+    # Find owned attributes whose uml_type.idref matches
+    # @param type_idref [String]
+    # @return [Array<Xmi::Uml::OwnedAttribute>]
+    def find_owned_attrs_by_type(type_idref)
+      @owned_attrs_by_type_idref[type_idref] || []
+    end
+
+    # Find packaged elements by UML type
+    # @param type [String] e.g. "uml:Class", "uml:Package"
+    # @return [Array<Xmi::Uml::PackagedElement>]
+    def packaged_elements_of_type(type)
+      @packaged_by_type[type] || []
+    end
+
+    # Find first packaged element by name and allowed types
+    # @param name [String]
+    # @param types [Array<String>] e.g. ["uml:Class", "uml:AssociationClass"]
+    # @return [Xmi::Uml::PackagedElement, nil]
+    def find_packaged_by_name_and_types(name, types)
+      types.each do |type|
+        elements = @packaged_by_type[type]
+        next unless elements
+
+        found = elements.find { |e| e.name == name }
+        return found if found
+      end
+      nil
+    end
+
+    private
+
+    def build(root)
+      model = root.model
+      if model
+        id = model.id if model.respond_to?(:id)
+        @id_name_map[id] = model.name if id && model.name
+        walk_packaged_elements(model.packaged_element, nil)
+      end
+
+      ext = root.extension
+      return unless ext
+
+      index_extension_elements(ext.elements)
+      index_extension_connectors(ext.connectors)
+
+      primitives = ext.primitive_types
+      walk_packaged_elements(primitives.packaged_element, nil) if primitives
+
+      index_extension_profiles(ext.profiles)
+    end
+
+    def walk_packaged_elements(elements, parent) # rubocop:disable Metrics/MethodLength
+      return unless elements
+
+      id_name_map = @id_name_map
+      packaged_by_id = @packaged_by_id
+      packaged_by_type = @packaged_by_type
+      upper_level_map = @upper_level_map
+      packaged_elements = @packaged_elements
+      owned_attrs_by_type = @owned_attrs_by_type_idref
+
+      elements.each do |pe|
+        next unless pe.is_a?(PackagedElement)
+
+        pe_id = pe.id
+        pe_type = pe.type
+        pe_name = pe.name
+
+        packaged_elements << pe
+        packaged_by_id[pe_id] = pe if pe_id
+        (packaged_by_type[pe_type] ||= []) << pe if pe_type
+        upper_level_map[pe_id] = parent if parent && pe_id
+        id_name_map[pe_id] = pe_name if pe_id && pe_name
+
+        # Inline owned attribute indexing
+        attrs = pe.owned_attribute
+        if attrs && !attrs.empty?
+          attrs.each do |oa|
+            oa_id = oa.id
+            id_name_map[oa_id] = oa.name if oa_id && oa.name
+            oa_type = oa.uml_type
+            if oa.association && oa_type && oa_type.idref
+              (owned_attrs_by_type[oa_type.idref] ||= []) << oa
+            end
+          end
+        end
+
+        # Inline owned operation indexing
+        ops = pe.owned_operation
+        if ops && !ops.empty?
+          ops.each do |oo|
+            oo_id = oo.id
+            id_name_map[oo_id] = oo.name if oo_id && oo.name
+          end
+        end
+
+        # Inline owned literal indexing
+        lits = pe.owned_literal
+        if lits && !lits.empty?
+          lits.each do |ol|
+            ol_id = ol.id
+            id_name_map[ol_id] = ol.name if ol_id && ol.name
+          end
+        end
+
+        # Recurse into children
+        walk_packaged_elements(pe.packaged_element, pe)
+      end
+    end
+
+    def index_extension_elements(elements)
+      return unless elements
+
+      element_list = elements.element
+      return unless element_list
+
+      element_list.each do |e|
+        idref = e.idref
+        next unless idref
+
+        @elements_by_idref[idref] = e
+
+        props = e.properties
+        @id_name_map[idref] = props.name if props&.name
+
+        attrs_obj = e.attributes
+        next unless attrs_obj
+
+        attr_list = attrs_obj.attribute
+        next unless attr_list
+
+        attr_list.each do |a|
+          @attributes_by_idref[a.idref] = a if a.idref
+        end
+      end
+    end
+
+    def index_extension_connectors(connectors)
+      return unless connectors
+
+      conn_list = connectors.connector
+      return unless conn_list
+
+      conn_list.each do |c|
+        @connectors_by_idref[c.idref] = c if c.idref
+      end
+    end
+
+    def index_extension_profiles(profiles)
+      return unless profiles
+
+      profile_list = profiles.profile
+      return unless profile_list
+
+      profile_list.each do |profile|
+        walk_packaged_elements(profile.packaged_element, nil) if profile.respond_to?(:packaged_element)
+      end
+    end
+  end
+end

data/lib/xmi/sparx/root.rb

@@ -27,13 +27,15 @@ module Xmi
         # their corresponding UML versions.
         #
         # @param xml_content [String] The raw XMI XML content
-        # @return [SparxRoot] The parsed Ruby object
+        # @return [SparxRoot] The parsed Ruby object with index built
         #
         # @see Xmi.parse
         def parse_xml(xml_content)
           xml_content = fix_encoding(xml_content)
           Xmi.init_versioning!
-          Xmi::VersionRegistry.parse_with_detected_version(xml_content, self)
+          root = Xmi::VersionRegistry.parse_with_detected_version(xml_content, self)
+          root.build_index
+          root
         end
 
         # Fix invalid UTF-8 encoding in the XML content.
@@ -55,6 +57,18 @@ module Xmi
 
       # Use the reusable BaseMapping class instead of eval hack
       xml SparxMappings::BaseMapping
+
+      # Build index for fast lookups
+      # @return [Xmi::Index]
+      def build_index
+        @index = Xmi::Index.new(self)
+      end
+
+      # Access the index (builds on first access if needed)
+      # @return [Xmi::Index]
+      def index
+        @index || build_index
+      end
     end
   end
 end

data/lib/xmi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xmi
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/xmi/version_registry.rb

@@ -158,7 +158,8 @@ module Xmi
           # Extend fallback chain only if it won't create a cycle.
           # A cycle would occur if reg's fallback chain includes primary_register.
           # We check this by seeing if primary_register.id appears in reg's fallback.
-          primary_register.fallback << reg.id unless reg.fallback.include?(primary_register.id)
+          # Use add_fallback to keep Register and TypeContext in sync and invalidate caches.
+          primary_register.add_fallback(reg.id) unless reg.fallback.include?(primary_register.id)
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/xmi.rb

@@ -55,6 +55,7 @@ require_relative "xmi/uml"
 require_relative "xmi/custom_profile"
 require_relative "xmi/root"
 require_relative "xmi/sparx"
+require_relative "xmi/index"
 
 # Unified parsing API
 require_relative "xmi/parsing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-14 00:00:00.000000000 Z
+date: 2026-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -72,6 +72,7 @@ files:
 - lib/xmi/documentation.rb
 - lib/xmi/ea_root.rb
 - lib/xmi/extension.rb
+- lib/xmi/index.rb
 - lib/xmi/namespace.rb
 - lib/xmi/namespace/dynamic.rb
 - lib/xmi/namespace/omg.rb