lutaml 0.9.43 → 0.10.0

data/lib/lutaml/cli/uml_commands.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "output_formatter"
+require_relative "uml/build_command"
+require_relative "uml/info_command"
+require_relative "uml/validate_command"
+require_relative "uml/ls_command"
+require_relative "uml/inspect_command"
+require_relative "uml/tree_command"
+require_relative "uml/stats_command"
+require_relative "uml/search_command"
+require_relative "uml/find_command"
+require_relative "uml/export_command"
+require_relative "uml/serve_command"
+require_relative "uml/spa_command"
+require_relative "uml/repl_command"
+require_relative "uml/verify_command"
+require_relative "uml/diagram_command"
+require_relative "element_identifier"
+require_relative "resource_registry"
+
+module Lutaml
+  module Cli
+    # UmlCommands provides CLI commands for UML repository operations
+    #
+    # This is the main CLI interface for working with UML models from
+    # XMI and QEA files. Follows MECE (Mutually Exclusive, Collectively
+    # Exhaustive) principles and Docker-like command conventions.
+    #
+    # Command categories:
+    # - Resource Lifecycle: build, info, validate
+    # - Viewing: ls, inspect, tree, stats
+    # - Querying: search, find
+    # - Output: export, docs, serve
+    # - Development: repl, verify
+    #
+    # This class serves as a thin delegation layer to individual
+    # command classes,
+    # keeping the Thor integration separate from business logic.
+    class UmlCommands < Thor
+      # Make Thor raise errors instead of exiting
+      def self.exit_on_failure?
+        false
+      end
+
+      # Command aliases for convenience
+      map "ls" => :list
+      map "t" => :tree
+
+      # ===================================================================
+      # RESOURCE LIFECYCLE COMMANDS
+      # ===================================================================
+
+      desc "build MODEL", "Build LUR package from XMI or QEA file"
+      Uml::BuildCommand.add_options_to(self, :build)
+      def build(model_path)
+        Uml::BuildCommand.new(options.to_h).run(model_path)
+      end
+
+      desc "info LUR", "Show package metadata"
+      Uml::InfoCommand.add_options_to(self, :info)
+      def info(lur_path)
+        Uml::InfoCommand.new(options.to_h).run(lur_path)
+      end
+
+      desc "validate FILE", "Validate LUR package or QEA file"
+      Uml::ValidateCommand.add_options_to(self, :validate)
+      def validate(file_path)
+        Uml::ValidateCommand.new(options.to_h).run(file_path)
+      end
+
+      # ===================================================================
+      # VIEWING COMMANDS
+      # ===================================================================
+
+      desc "ls LUR [PATH]", "List elements in repository"
+      Uml::LsCommand.add_options_to(self, :list)
+      def list(lur_path, path = nil)
+        Uml::LsCommand.new(options.to_h).run(lur_path, path)
+      end
+
+      desc "inspect LUR ELEMENT", "Show detailed element information"
+      Uml::InspectCommand.add_options_to(self, :inspect)
+      def inspect(lur_path, element_id)
+        Uml::InspectCommand.new(options.to_h).run(lur_path, element_id)
+      end
+
+      desc "tree LUR [PATH]", "Show hierarchical tree view"
+      Uml::TreeCommand.add_options_to(self, :tree)
+      def tree(lur_path, path = nil)
+        Uml::TreeCommand.new(options.to_h).run(lur_path, path)
+      end
+
+      desc "stats LUR [PATH]", "Show repository statistics"
+      Uml::StatsCommand.add_options_to(self, :stats)
+      def stats(lur_path, path = nil)
+        Uml::StatsCommand.new(options.to_h).run(lur_path, path)
+      end
+
+      # ===================================================================
+      # QUERY COMMANDS
+      # ===================================================================
+
+      desc "search LUR QUERY", "Full-text search in model"
+      Uml::SearchCommand.add_options_to(self, :search)
+      def search(lur_path, query)
+        Uml::SearchCommand.new(options.to_h).run(lur_path, query)
+      end
+
+      desc "find LUR", "Find elements by criteria"
+      Uml::FindCommand.add_options_to(self, :find)
+      def find(lur_path)
+        Uml::FindCommand.new(options.to_h).run(lur_path)
+      end
+
+      # ===================================================================
+      # OUTPUT COMMANDS
+      # ===================================================================
+
+      desc "export LUR", "Export to structured formats"
+      Uml::ExportCommand.add_options_to(self, :export)
+      def export(lur_path)
+        Uml::ExportCommand.new(options.to_h).run(lur_path)
+      end
+
+      desc "build-spa INPUT",
+           "Generate interactive SPA browser (single-file or multi-file)"
+      Uml::SpaCommand.add_options_to(self, :build_spa)
+      def build_spa(input_path)
+        Uml::SpaCommand.new(options.to_h).run(input_path)
+      end
+
+      desc "serve LUR", "Start interactive web UI"
+      Uml::ServeCommand.add_options_to(self, :serve)
+      def serve(lur_path)
+        Uml::ServeCommand.new(options.to_h).run(lur_path)
+      end
+
+      desc "diagram ACTION", "Diagram rendering commands"
+      Uml::DiagramCommand.add_options_to(self, :diagram)
+      def diagram(action, *args)
+        Uml::DiagramCommand.new(options.to_h).run(action, *args)
+      end
+
+      # ===================================================================
+      # DEVELOPMENT COMMANDS
+      # ===================================================================
+
+      desc "repl LUR", "Start interactive REPL shell"
+      Uml::ReplCommand.add_options_to(self, :repl)
+      def repl(lur_path)
+        Uml::ReplCommand.new(options.to_h).run(lur_path)
+      end
+
+      desc "verify XMI QEA", "Verify XMI/QEA equivalence"
+      Uml::VerifyCommand.add_options_to(self, :verify)
+      def verify(xmi_path, qea_path)
+        Uml::VerifyCommand.new(options.to_h).run(xmi_path, qea_path)
+      end
+    end
+  end
+end

data/lib/lutaml/cli.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "cli/uml_commands"
+require_relative "cli/lml_commands"
+
+module Lutaml
+  # Main CLI entry point for LutaML
+  #
+  # This is a pure Thor implementation with no custom routing logic.
+  # All commands are organized into subcommands:
+  # - uml: UML repository operations (XMI/QEA/LUR files)
+  # - diagram: DSL diagram generation (LutaML textual notation)
+  # - xmi: Deprecated alias for 'uml'
+  class CLI < Thor
+    desc "uml SUBCOMMAND", "UML repository operations (XMI/QEA/LUR files)"
+    long_desc <<-DESC
+      Perform operations on UML repositories from XMI, QEA, or LUR files.
+
+      Available subcommands:
+        build     - Build LUR package from XMI or QEA
+        validate  - Validate QEA or LUR file
+        info      - Show package metadata
+        ls        - List elements
+        inspect   - Show element details
+        tree      - Package hierarchy
+        stats     - Statistics
+        search    - Full-text search
+        find      - Criteria search
+        export    - Export data
+        docs      - Generate documentation
+        serve     - Web UI
+        repl      - Interactive shell
+        verify    - XMI/QEA equivalence
+
+      Examples:
+        lutaml uml build model.qea
+        lutaml uml validate model.lur
+        lutaml uml ls model.lur
+    DESC
+    subcommand "uml", Cli::UmlCommands
+
+    desc "lml SUBCOMMAND", "LutaML textual notation operations"
+    long_desc <<-DESC
+      Perform operations on LutaML textual DSL notation (.lutaml files).
+
+      Available subcommands:
+        generate  - Generate diagram from .lutaml DSL file
+        validate  - Validate DSL syntax
+
+      Examples:
+        lutaml lml generate model.lutaml -o diagram.png
+        lutaml lml validate model.lutaml
+    DESC
+    subcommand "lml", Cli::LmlCommands
+
+    desc "xmi SUBCOMMAND", "UML repository operations (⚠ deprecated, use 'uml')"
+    long_desc <<-DESC
+      DEPRECATED: This is an alias for 'uml' and will be removed in a future version.
+      Please use 'lutaml uml' instead.
+
+      Examples:
+        lutaml xmi build model.qea    # Use: lutaml uml build model.qea
+        lutaml xmi validate model.lur # Use: lutaml uml validate model.lur
+    DESC
+    subcommand "xmi", Cli::UmlCommands
+
+    def self.exit_on_failure?
+      true
+    end
+  end
+end

data/lib/lutaml/command_line.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "optparse"
 require "pathname"
-require "lutaml/formatter"
-require "lutaml/uml/has_attributes"
-require "lutaml/uml/parsers/attribute"
-require "lutaml/uml/parsers/dsl"
-require "lutaml/uml/parsers/yaml"
+require_relative "formatter"
+require_relative "uml/has_attributes"
+require_relative "uml/parsers/attribute"
+require_relative "uml/parsers/dsl"
+require_relative "uml/parsers/yaml"
 
 module Lutaml
   class CommandLine
@@ -15,7 +17,7 @@ module Lutaml
     include ::Lutaml::Uml::HasAttributes
 
     SUPPORTED_FORMATS = %w[yaml lutaml exp].freeze
-    DEFAULT_INPUT_FORMAT = "lutaml".freeze
+    DEFAULT_INPUT_FORMAT = "lutaml"
 
     def self.run(args, out_object, attributes = {})
       new(attributes, out_object).run(args)

data/lib/lutaml/converter/dsl_to_uml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lutaml
   module Converter
     module DslToUml

data/lib/lutaml/converter/xmi_to_uml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lutaml
   module Converter
     module XmiToUml
@@ -142,13 +144,13 @@ module Lutaml
       def create_uml_class_attributes(klass) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
         return [] if klass.owned_attribute.nil?
 
-        owned_attributes = klass.owned_attribute.select do |attr|
+        all_props = klass.owned_attribute.select do |attr|
           attr.type?("uml:Property")
         end
 
-        owned_attributes.map do |oa|
+        all_props.filter_map do |oa|
           create_uml_attribute(oa)
-        end.compact
+        end
       end
 
       def create_uml_attribute(owned_attr) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
@@ -160,7 +162,7 @@ module Lutaml
           attr.name = owned_attr.name
           attr.type = lookup_entity_name(uml_type_idref) || uml_type_idref
           attr.xmi_id = uml_type_idref
-          attr.is_derived = owned_attr.is_derived
+          attr.is_derived = !!owned_attr.is_derived
           attr.cardinality = ::Lutaml::Uml::Cardinality.new.tap do |car|
             car.min = owned_attr.lower_value&.value
             car.max = owned_attr.upper_value&.value
@@ -176,6 +178,8 @@ module Lutaml
       end
 
       def create_uml_cardinality(hash)
+        return nil unless hash
+
         ::Lutaml::Uml::Cardinality.new.tap do |cardinality|
           cardinality.min = hash[:min]
           cardinality.max = hash[:max]
@@ -258,8 +262,7 @@ module Lutaml
         uml_general.owned_props = uml_general.attributes.select do |attr|
           attr.association.nil?
         end
-        uml_general.assoc_props = uml_general
-          .attributes.select(&:association)
+        uml_general.assoc_props = uml_general.attributes.select(&:association)
 
         [uml_general, next_general_node_id]
       end
@@ -267,7 +270,7 @@ module Lutaml
       def get_uml_general_attributes(general_node) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         attrs = create_uml_class_attributes(general_node)
 
-        attrs.map do |attr|
+        attrs.sort_by { |a| [a.name.to_s, a.id] }.map do |attr|
           ::Lutaml::Uml::GeneralAttribute.new.tap do |gen_attr|
             gen_attr.id = attr.id
             gen_attr.name = attr.name
@@ -275,7 +278,7 @@ module Lutaml
             gen_attr.xmi_id = attr.xmi_id
             gen_attr.is_derived = !!attr.is_derived
             gen_attr.cardinality = attr.cardinality
-            gen_attr.definition = attr.definition
+            gen_attr.definition = attr.definition&.strip
             gen_attr.association = attr.association
             gen_attr.has_association = !!attr.association
             gen_attr.type_ns = attr.type_ns
@@ -323,14 +326,15 @@ module Lutaml
         end
       end
 
-      def create_uml_assoc_generalizations(klass)
+      def create_uml_assoc_generalizations(klass) # rubocop:disable Metrics/AbcSize
         return [] if klass.generalization.nil? || klass.generalization.empty?
 
         klass.generalization.map do |gen|
-          assoc_gen = ::Lutaml::Uml::AssociationGeneralization.new
-          assoc_gen.id = gen.id
-          assoc_gen.type = gen.type
-          assoc_gen.general = gen.general
+          ::Lutaml::Uml::AssociationGeneralization.new.tap do |assoc_gen|
+            assoc_gen.id = gen.id
+            assoc_gen.type = gen.type
+            assoc_gen.general = gen.general
+          end
         end
       end
 
@@ -345,7 +349,7 @@ module Lutaml
           links << link.association if link.association.any?
         end
 
-        links.flatten.compact.map do |assoc| # rubocop:disable Metrics/BlockLength
+        links.flatten.compact.filter_map do |assoc| # rubocop:disable Metrics/BlockLength
           link_member = assoc.start == xmi_id ? "end" : "start"
           link_owner = link_member == "start" ? "end" : "start"
 
@@ -357,6 +361,10 @@ module Lutaml
           doc_node = link_member == "start" ? "source" : "target"
           definition = fetch_definition_node_value(assoc.id, doc_node)
 
+          # Get owner_end_attribute_name from the ownedAttribute that
+          # references this association
+          owner_end_attribute_name = find_owner_attribute_name(xmi_id, assoc.id)
+
           if member_end &&
               (
                 (member_end_type != "aggregation") ||
@@ -374,28 +382,41 @@ module Lutaml
               association.member_end_xmi_id = member_end_xmi_id
               association.owner_end = owner_end
               association.owner_end_xmi_id = xmi_id
+              association.owner_end_attribute_name = owner_end_attribute_name
               association.definition = definition
             end
           end
-        end.compact
+        end
+      end
+
+      # Find the ownedAttribute name that references this association
+      # This gives us the role name from the owner's perspective
+      def find_owner_attribute_name(owner_xmi_id, assoc_id)
+        owner_node = find_packaged_element_by_id(owner_xmi_id)
+        return nil unless owner_node&.owned_attribute
+
+        owned_attr = owner_node.owned_attribute.find do |oa|
+          oa.association == assoc_id
+        end
+
+        owned_attr&.name
       end
 
       def create_uml_operations(klass) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         return [] if klass.owned_operation.nil?
 
-        klass.owned_operation.map do |operation|
+        klass.owned_operation.filter_map do |operation|
           uml_type = operation.uml_type.first
           uml_type_idref = uml_type.idref if uml_type
 
-          if operation.association.nil?
+          if !operation.respond_to?(:association) || operation.association.nil?
             ::Lutaml::Uml::Operation.new.tap do |op|
-              op.id = operation.id
               op.xmi_id = uml_type_idref
               op.name = operation.name
               op.definition = lookup_attribute_documentation(operation.id)
             end
           end
-        end.compact
+        end
       end
 
       def create_uml_constraints(klass_id) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize