expressir 2.2.1 → 2.3.1

data/lib/expressir/commands/package.rb

@@ -4,8 +4,6 @@ require "thor"
 require "json"
 require "yaml"
 require "pathname"
-require_relative "base"
-require_relative "../model/search_engine"
 
 module Expressir
   module Commands
@@ -94,10 +92,6 @@ module Expressir
       option :verbose, type: :boolean, default: false,
                        desc: "Enable verbose output"
       def build(root_schema = nil, output = nil)
-        require_relative "../model/dependency_resolver"
-        require_relative "../model/repository"
-        require_relative "../schema_manifest"
-
         schema_files = if options[:manifest]
                          # Manifest-based mode
                          unless File.exist?(options[:manifest])
@@ -109,7 +103,7 @@ module Expressir
                          unless output
                            raise Expressir::MissingRequiredArgumentError.new(
                              "OUTPUT path is required",
-                             usage_hint: "expressir package build --manifest MANIFEST.yaml OUTPUT.ler"
+                             usage_hint: "expressir package build --manifest MANIFEST.yaml OUTPUT.ler",
                            )
                          end
 
@@ -130,7 +124,6 @@ module Expressir
                            say ""
                          else
                            say "Verifying manifest integrity..."
-                           require_relative "../manifest/validator"
 
                            validator = Expressir::Manifest::Validator.new(
                              manifest, options.merge(verbose: true)
@@ -141,7 +134,7 @@ module Expressir
                            unless file_errors.empty?
                              raise Expressir::ManifestValidationError.new(
                                "Manifest validation failed",
-                               errors: file_errors.map { |e| e[:message] }
+                               errors: file_errors.map { |e| e[:message] },
                              )
                            end
 
@@ -150,7 +143,7 @@ module Expressir
                            unless reference_errors.empty?
                              raise Expressir::ReferentialIntegrityError.new(
                                reference_errors,
-                               message: "Manifest has unresolved dependencies"
+                               message: "Manifest has unresolved dependencies",
                              )
                            end
 
@@ -189,7 +182,7 @@ module Expressir
                          unless errors.empty?
                            raise Expressir::ManifestValidationError.new(
                              "Manifest validation failed",
-                             errors: errors
+                             errors: errors,
                            )
                          end
 
@@ -205,14 +198,14 @@ module Expressir
                          unless root_schema
                            raise Expressir::MissingRequiredArgumentError.new(
                              "ROOT_SCHEMA is required when not using --manifest",
-                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler"
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler",
                            )
                          end
 
                          unless output
                            raise Expressir::MissingRequiredArgumentError.new(
                              "OUTPUT path is required",
-                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler"
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler",
                            )
                          end
 
@@ -273,7 +266,7 @@ module Expressir
                 else
                   e.to_s
                 end
-              end
+              end,
             )
           end
           say "  ✓ Validation passed" if options[:verbose]
@@ -290,7 +283,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageBuildError.new(
           "Error building package: #{e.message}",
-          command_name: "package build"
+          command_name: "package build",
         )
       end
 
@@ -312,9 +305,6 @@ module Expressir
                       enum: ["text", "json", "yaml"],
                       desc: "Output format"
       def info(package_path)
-        require_relative "../model/repository"
-        require_relative "../package/reader"
-
         repo = load_package(package_path)
         metadata = load_package_metadata(package_path)
 
@@ -331,7 +321,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageReadError.new(
           "Error reading package info: #{e.message}",
-          command_name: "package info"
+          command_name: "package info",
         )
       end
 
@@ -377,8 +367,6 @@ module Expressir
                       enum: ["text", "json", "yaml"],
                       desc: "Output format"
       def validate(package_path)
-        require_relative "../model/repository"
-
         repo = load_package(package_path)
         validation = repo.validate(
           strict: options[:strict],
@@ -396,7 +384,7 @@ module Expressir
         unless validation[:valid?]
           raise Expressir::PackageValidationError.new(
             "Package validation failed",
-            errors: validation[:errors] || []
+            errors: validation[:errors] || [],
           )
         end
       rescue Expressir::Error
@@ -404,7 +392,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageValidationError.new(
           "Error validating package: #{e.message}",
-          command_name: "package validate"
+          command_name: "package validate",
         )
       end
 
@@ -431,7 +419,7 @@ module Expressir
         unless options[:output]
           raise Expressir::MissingRequiredArgumentError.new(
             "output directory is required",
-            usage_hint: "expressir package extract PACKAGE --output OUTPUT_DIR"
+            usage_hint: "expressir package extract PACKAGE --output OUTPUT_DIR",
           )
         end
 
@@ -455,7 +443,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageExtractError.new(
           "Error extracting package: #{e.message}",
-          command_name: "package extract"
+          command_name: "package extract",
         )
       end
 
@@ -521,7 +509,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageListError.new(
           "Error listing elements: #{e.message}",
-          command_name: "package list"
+          command_name: "package list",
         )
       end
 
@@ -605,7 +593,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageSearchError.new(
           "Error searching: #{e.message}",
-          command_name: "package search"
+          command_name: "package search",
         )
       end
       desc "tree PACKAGE", "Display hierarchical tree view of package contents"
@@ -676,7 +664,7 @@ module Expressir
       rescue StandardError => e
         raise Expressir::PackageTreeError.new(
           "Error displaying tree: #{e.message}",
-          command_name: "package tree"
+          command_name: "package tree",
         )
       end
 
@@ -711,7 +699,6 @@ module Expressir
       # @return [Package::Metadata] Package metadata
       def load_package_metadata(package_path)
         require "zip"
-        require_relative "../package/metadata"
 
         Zip::File.open(package_path) do |zip|
           entry = zip.find_entry("metadata.yaml")

data/lib/expressir/commands/validate.rb

@@ -30,7 +30,6 @@ module Expressir
       method_option :verbose, type: :boolean, default: false,
                               desc: "Show verbose output"
       def load(*paths)
-        require_relative "validate_load"
         ValidateLoad.new(options).run(paths)
       end
 
@@ -78,7 +77,6 @@ module Expressir
       method_option :verbose, type: :boolean, default: false,
                               desc: "Show verbose output"
       def ascii(path)
-        require_relative "validate_ascii"
         ValidateAscii.new(options).run(path)
       end
     end

data/lib/expressir/commands/validate_ascii.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "paint"
 require "table_tennis"
 

data/lib/expressir/commands/validate_load.rb

@@ -61,7 +61,7 @@ module Expressir
         unless [no_valid, no_version].all?(&:empty?)
           raise Expressir::SchemaValidationError.new(
             "Schema validation failed",
-            errors: no_valid + no_version
+            errors: no_valid + no_version,
           )
         end
 

data/lib/expressir/commands.rb

@@ -0,0 +1,20 @@
+# lib/expressir/commands.rb
+module Expressir
+  module Commands
+    autoload :Base, "#{__dir__}/commands/base"
+    autoload :Benchmark, "#{__dir__}/commands/benchmark"
+    autoload :BenchmarkCache, "#{__dir__}/commands/benchmark_cache"
+    autoload :Clean, "#{__dir__}/commands/clean"
+    autoload :Coverage, "#{__dir__}/commands/coverage"
+    autoload :Format, "#{__dir__}/commands/format"
+    autoload :Validate, "#{__dir__}/commands/validate"
+    autoload :ValidateLoad, "#{__dir__}/commands/validate_load"
+    autoload :ValidateAscii, "#{__dir__}/commands/validate_ascii"
+    autoload :Changes, "#{__dir__}/commands/changes"
+    autoload :ChangesValidate, "#{__dir__}/commands/changes_validate"
+    autoload :ChangesImportEengine, "#{__dir__}/commands/changes_import_eengine"
+    autoload :Version, "#{__dir__}/commands/version"
+    autoload :Package, "#{__dir__}/commands/package"
+    autoload :Manifest, "#{__dir__}/commands/manifest"
+  end
+end

data/lib/expressir/config.rb

@@ -57,6 +57,4 @@ module Expressir
       @benchmark_enabled && @benchmark_parallel
     end
   end
-
-  extend Config
 end

data/lib/expressir/coverage.rb

@@ -304,16 +304,23 @@ module Expressir
     end
 
     # Find all entities in a schema or repository
-    # @param schema_or_repo [Expressir::Model::Declarations::Schema, Expressir::Model::Repository] The schema or repository to analyze
+    # @param schema_or_repo [Expressir::Model::Declarations::Schema, Expressir::Model::Repository, Expressir::Model::ExpFile] The schema, repository, or file to analyze
     # @param skip_types [Array<String>] Array of entity type names to skip from coverage
     # @return [Array<Expressir::Model::ModelElement>] Array of entities
     def self.find_entities(schema_or_repo, skip_types = [])
       entities = []
 
-      # Handle both repository and schema inputs
+      # Handle repository, exp_file, and schema inputs
       if schema_or_repo.is_a?(Expressir::Model::Repository)
-        # If it's a repository, process all schemas
-        schema_or_repo.schemas.each do |schema|
+        # If it's a repository, process all files
+        schema_or_repo.files&.each do |file|
+          file.schemas&.each do |schema|
+            entities.concat(find_entities_in_schema(schema))
+          end
+        end
+      elsif schema_or_repo.is_a?(Expressir::Model::ExpFile)
+        # If it's an ExpFile, process all schemas in the file
+        schema_or_repo.schemas&.each do |schema|
           entities.concat(find_entities_in_schema(schema))
         end
       else

data/lib/expressir/eengine/arm_compare_report.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "changes_section"
-require_relative "modified_object"
-
 module Expressir
   module Eengine
     # Represents an Eengine ARM comparison XML report
@@ -13,7 +9,7 @@ module Expressir
       attribute :deletions, ChangesSection
 
       xml do
-        root "arm.changes"
+        element "arm.changes"
         map_element "arm.modifications", to: :modifications
         map_element "arm.additions", to: :additions
         map_element "arm.deletions", to: :deletions

data/lib/expressir/eengine/changes_section.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "modified_object"
-
 module Expressir
   module Eengine
     # Represents a section of changes (modifications, additions, or deletions)
@@ -11,7 +8,7 @@ module Expressir
       attribute :modified_objects, ModifiedObject, collection: true
 
       xml do
-        root "changes.section"
+        element "changes.section"
         map_element "modified.object", to: :modified_objects
       end
     end

data/lib/expressir/eengine/compare_report.rb

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
-Lutaml::Model::Config.configure do |config|
-  require "lutaml/model/xml_adapter/nokogiri_adapter"
-  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
-end
-
-require_relative "changes_section"
-require_relative "modified_object"
-require_relative "arm_compare_report"
-require_relative "mim_compare_report"
-
 module Expressir
   module Eengine
     # Represents an Eengine comparison XML report
@@ -22,7 +10,7 @@ module Expressir
       attribute :deletions, ChangesSection
 
       xml do
-        root "schema.changes"
+        element "schema.changes"
         map_element "schema.modifications", to: :modifications
         map_element "schema.additions", to: :additions
         map_element "schema.deletions", to: :deletions

data/lib/expressir/eengine/mim_compare_report.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "changes_section"
-require_relative "modified_object"
-
 module Expressir
   module Eengine
     # Represents an Eengine MIM comparison XML report
@@ -13,7 +9,7 @@ module Expressir
       attribute :deletions, ChangesSection
 
       xml do
-        root "mim.changes"
+        element "mim.changes"
         map_element "mim.modifications", to: :modifications
         map_element "mim.additions", to: :additions
         map_element "mim.deletions", to: :deletions

data/lib/expressir/eengine/modified_object.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Expressir
   module Eengine
     # Represents a modified EXPRESS object in an Eengine comparison report
@@ -12,7 +10,7 @@ module Expressir
       attribute :description, :string
 
       xml do
-        root "modified.object"
+        element "modified.object"
         map_attribute "type", to: :type
         map_attribute "name", to: :name
         map_attribute "interfaced.items", to: :interfaced_items

data/lib/expressir/eengine.rb

@@ -0,0 +1,9 @@
+module Expressir
+  module Eengine
+    autoload :ModifiedObject, "#{__dir__}/eengine/modified_object"
+    autoload :ChangesSection, "#{__dir__}/eengine/changes_section"
+    autoload :CompareReport, "#{__dir__}/eengine/compare_report"
+    autoload :ArmCompareReport, "#{__dir__}/eengine/arm_compare_report"
+    autoload :MimCompareReport, "#{__dir__}/eengine/mim_compare_report"
+  end
+end

data/lib/expressir/errors.rb

@@ -80,7 +80,8 @@ module Expressir
   class ReferentialIntegrityError < ValidationError
     attr_reader :unresolved_references
 
-    def initialize(unresolved_references, message: "Referential integrity check failed")
+    def initialize(unresolved_references,
+message: "Referential integrity check failed")
       @unresolved_references = unresolved_references
       super(message)
     end
@@ -88,7 +89,7 @@ module Expressir
 
   class NoValidSchemaPathsError < ValidationError
     def initialize(message = "No valid schema paths found")
-      super(message)
+      super
     end
   end
 
@@ -109,7 +110,4 @@ module Expressir
   class PackageListError < CommandError; end
   class PackageSearchError < CommandError; end
   class PackageTreeError < CommandError; end
-
-  # Backward compatibility - alias the old name to the new class
-  InvalidSchemaManifestError = ManifestValidationError
 end

data/lib/expressir/express/builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "error"
-
 module Expressir
   module Express
     # Builder registry for AST node type handlers.
@@ -28,6 +26,21 @@ module Expressir
         # @param source [String, nil] The original source code
         # @param include_source [Boolean, nil] Whether to include source
         # @return [Model::ModelElement] The built model object
+        # Operator tokens that return nil (separators, punctuation)
+        # When these appear as the first key in a multi-key hash, they should be
+        # skipped in favor of the content key. This handles grammar patterns like
+        # `element >> (op_comma >> element).repeat` which produce
+        # {:op_comma => ..., :element => {...}}.
+        OPERATOR_TOKENS = Set.new(%i[
+                                    op_comma op_colon op_decl op_delim op_leftparen op_rightparen
+                                    op_leftbracket op_rightbracket op_left_curly_brace op_right_curly_brace
+                                    op_period op_pipe op_double_backslash op_double_pipe op_double_asterisk
+                                    op_asterisk op_slash op_plus op_minus op_less_equal op_greater_equal
+                                    op_less_greater op_less_than op_greater_than op_equals
+                                    op_colon_less_greater_colon op_colon_equals_colon
+                                    op_query_begin op_query_end op_question_mark
+                                  ]).freeze
+
         def build(ast, source: nil, include_source: nil)
           return nil unless ast
 
@@ -46,25 +59,41 @@ module Expressir
             snake_data = fast_convert_keys(node_data)
 
             builder = @register[handler_key]
-            raise Error::UnknownNodeTypeError, node_type unless builder
-
-            result = builder.call(snake_data)
-
-            # Always store source_offset for remark attachment (if source is available)
-            # Only store source text when include_source is requested
-            if @source && result.is_a?(Model::ModelElement)
-              source_info = extract_source_info(node_data)
-              if source_info
-                # Store offset for remark attachment (always needed)
-                result.source_offset = source_info[:offset]
-                # Store source text only when explicitly requested
-                if @include_source
-                  result.source = source_info[:text]
+            if builder
+              result = builder.call(snake_data)
+
+              # Fast path: single-key hash or non-nil result
+              if !result.nil? || ast.keys.length <= 1
+                attach_source_info(result, node_data)
+                return result
+              end
+
+              # Slow path: operator token returned nil in multi-key hash.
+              # Try other keys for actual content. This handles
+              # {:op_comma => ..., :element => {...}} where the first key
+              # is an operator separator rather than a content key.
+              if OPERATOR_TOKENS.include?(handler_key)
+                ast.each_key do |key|
+                  next if key == node_type
+
+                  h_key = cached_snake_case(key)
+                  h_builder = @register[h_key]
+                  next unless h_builder
+
+                  n_data = ast[key]
+                  s_data = fast_convert_keys(n_data)
+                  result = h_builder.call(s_data)
+
+                  unless result.nil?
+                    attach_source_info(result, n_data)
+                    return result
+                  end
                 end
               end
+            else
+              raise Error::UnknownNodeTypeError, node_type
             end
-
-            result
+            nil
           when Array
             ast.map do |item|
               build(item)
@@ -85,7 +114,9 @@ module Expressir
 
           result = build(ast)
 
-          if source && result
+          # Only attach remarks if include_source is explicitly true
+          # (nil means use default behavior - attach remarks)
+          if source && result && include_source != false
             attacher = RemarkAttacher.new(source)
             attacher.attach(result)
           end
@@ -110,14 +141,29 @@ module Expressir
           build(ast)
         end
 
+        # Normalize a value to an Array for iteration.
+        # Handles: nil → [], Parsanol::Slice → [], Array → Array, other → [other]
+        def ensure_array(value)
+          return [] if value.nil?
+          return [] if value.is_a?(Parsanol::Slice)
+
+          value.is_a?(Array) ? value : [value]
+        end
+
         # Build children (array of AST nodes)
         # Optimized to avoid intermediate array allocations
         def build_children(ast_array)
-          return [] unless ast_array
+          return [] if ast_array.nil?
+
+          # Handle Parsanol::Slice (empty Slices from optional rules)
+          # Convert to empty Array
+          if ast_array.is_a?(Parsanol::Slice)
+            return []
+          end
 
           # Handle single element (common case)
           unless ast_array.is_a?(Array)
-            return ast_array.nil? ? [] : [build(ast_array)].compact
+            return [build(ast_array)].compact
           end
 
           # Build result in single pass, avoiding flatten/compact/map chain
@@ -125,6 +171,11 @@ module Expressir
           ast_array.each do |item|
             next if item.nil?
 
+            # Empty Slices from optional rules should be treated as empty arrays
+            if item.is_a?(Parsanol::Slice)
+              next
+            end
+
             case item
             when Array
               item.each do |sub|
@@ -310,6 +361,16 @@ module Expressir
           }
         end
 
+        def attach_source_info(result, data)
+          return unless @source && result.is_a?(Model::ModelElement)
+
+          source_info = extract_source_info(data)
+          return unless source_info
+
+          result.source_offset = source_info[:offset]
+          result.source = source_info[:text] if @include_source
+        end
+
         def find_slice(data, depth = 0)
           return nil if depth > 10
 
@@ -345,6 +406,3 @@ module Expressir
     end
   end
 end
-
-# Top-level alias for convenience in builder files
-Builder = Expressir::Express::Builder