expressir 2.2.0 → 2.3.0

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,25 +92,19 @@ 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])
-                           say "Error: Manifest file not found: #{options[:manifest]}",
-                               :red
-                           exit 1
+                           raise Expressir::ManifestNotFoundError.new(options[:manifest])
                          end
 
                          # Override output if not provided
                          output ||= root_schema
                          unless output
-                           say "Error: OUTPUT path is required", :red
-                           say "Usage: expressir package build --manifest MANIFEST.yaml OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "OUTPUT path is required",
+                             usage_hint: "expressir package build --manifest MANIFEST.yaml OUTPUT.ler",
+                           )
                          end
 
                          # Build repository
@@ -132,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,29 +132,19 @@ module Expressir
                            # Check file existence
                            file_errors = validator.validate_file_existence
                            unless file_errors.empty?
-                             say "✗ Manifest validation failed", :red
-                             say ""
-                             file_errors.each do |e|
-                               say "  - #{e[:message]}", :red
-                             end
-                             exit 1
+                             raise Expressir::ManifestValidationError.new(
+                               "Manifest validation failed",
+                               errors: file_errors.map { |e| e[:message] },
+                             )
                            end
 
                            # Check referential integrity
                            reference_errors = validator.validate_referential_integrity
                            unless reference_errors.empty?
-                             say "✗ Manifest has unresolved dependencies", :red
-                             say ""
-                             say "The following schema references cannot be resolved:",
-                                 :red
-                             reference_errors.each do |e|
-                               say "  - #{e[:message]}", :red
-                             end
-                             say ""
-                             say "This package may be incomplete or inconsistent.",
-                                 :red
-                             say "To build anyway, use: --skip-verify", :yellow
-                             exit 1
+                             raise Expressir::ReferentialIntegrityError.new(
+                               reference_errors,
+                               message: "Manifest has unresolved dependencies",
+                             )
                            end
 
                            say "✓ Manifest verified", :green
@@ -199,9 +180,10 @@ module Expressir
                          end
 
                          unless errors.empty?
-                           say "Error: Manifest validation failed", :red
-                           errors.each { |e| say "  - #{e}", :red }
-                           exit 1
+                           raise Expressir::ManifestValidationError.new(
+                             "Manifest validation failed",
+                             errors: errors,
+                           )
                          end
 
                          if options[:verbose] && warnings.any?
@@ -214,18 +196,17 @@ module Expressir
                        else
                          # Auto-resolution mode
                          unless root_schema
-                           say "Error: ROOT_SCHEMA is required when not using --manifest",
-                               :red
-                           say "Usage: expressir package build ROOT_SCHEMA OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "ROOT_SCHEMA is required when not using --manifest",
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler",
+                           )
                          end
 
                          unless output
-                           say "Error: OUTPUT path is required", :red
-                           say "Usage: expressir package build ROOT_SCHEMA OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "OUTPUT path is required",
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler",
+                           )
                          end
 
                          say "Building LER package from #{root_schema}..." if options[:verbose]
@@ -272,35 +253,21 @@ module Expressir
           say "Validating repository..." if options[:verbose]
           validation = repo.validate
           unless validation[:valid?]
-            say "✗ Repository validation failed", :red
-            say ""
-            errors = validation[:errors] || []
-            say "Validation errors (#{errors.size}):", :red
-            errors.each_with_index do |e, i|
-              error_msg = if e.is_a?(Hash)
-                            # Format hash errors properly
-                            msg = e[:message] || "Unknown error"
-                            type = e[:type] ? "[#{e[:type]}] " : ""
-                            "#{type}#{msg}"
-                          else
-                            # Fallback for string errors
-                            e.to_s
-                          end
-              say "  #{i + 1}. #{error_msg}", :red
-              if e.is_a?(Hash) && e[:schema]
-                say "     Schema: #{e[:schema]}",
-                    :red
-              end
-              if e.is_a?(Hash) && e[:referenced_schema]
-                say "     Referenced: #{e[:referenced_schema]}",
-                    :red
-              end
-              if e.is_a?(Hash) && e[:interface_type]
-                say "     Interface: #{e[:interface_type]}",
-                    :red
-              end
-            end
-            exit 1
+            raise Expressir::SchemaValidationError.new(
+              "Repository validation failed",
+              errors: (validation[:errors] || []).map do |e|
+                if e.is_a?(Hash)
+                  msg = e[:message] || "Unknown error"
+                  type = e[:type] ? "[#{e[:type]}] " : ""
+                  schema = e[:schema] ? " (schema: #{e[:schema]})" : ""
+                  ref = e[:referenced_schema] ? " (referenced: #{e[:referenced_schema]})" : ""
+                  iface = e[:interface_type] ? " (interface: #{e[:interface_type]})" : ""
+                  "#{type}#{msg}#{schema}#{ref}#{iface}"
+                else
+                  e.to_s
+                end
+              end,
+            )
           end
           say "  ✓ Validation passed" if options[:verbose]
         end
@@ -311,10 +278,13 @@ module Expressir
 
         say "✓ Package created: #{output}", :green
         say "  Schemas: #{repo.schemas.size}", :green if options[:verbose]
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error building package: #{e.message}", :red
-        say e.backtrace.join("\n") if options[:verbose]
-        exit 1
+        raise Expressir::PackageBuildError.new(
+          "Error building package: #{e.message}",
+          command_name: "package build",
+        )
       end
 
       desc "info PACKAGE", "Display package metadata and statistics"
@@ -335,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)
 
@@ -349,9 +316,13 @@ module Expressir
         else
           output_text_info(metadata, repo)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error reading package info: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageReadError.new(
+          "Error reading package info: #{e.message}",
+          command_name: "package info",
+        )
       end
 
       desc "validate PACKAGE", "Validate package structure and integrity"
@@ -396,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],
@@ -412,10 +381,19 @@ module Expressir
           output_text_validation(validation)
         end
 
-        exit 1 unless validation[:valid?]
+        unless validation[:valid?]
+          raise Expressir::PackageValidationError.new(
+            "Package validation failed",
+            errors: validation[:errors] || [],
+          )
+        end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error validating package: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageValidationError.new(
+          "Error validating package: #{e.message}",
+          command_name: "package validate",
+        )
       end
 
       desc "extract PACKAGE", "Extract package contents to directory"
@@ -439,10 +417,10 @@ module Expressir
         require "fileutils"
 
         unless options[:output]
-          say "Error: output directory is required", :red
-          say "Usage: expressir package extract PACKAGE --output OUTPUT_DIR",
-              :yellow
-          exit 1
+          raise Expressir::MissingRequiredArgumentError.new(
+            "output directory is required",
+            usage_hint: "expressir package extract PACKAGE --output OUTPUT_DIR",
+          )
         end
 
         output_dir = options[:output]
@@ -460,9 +438,13 @@ module Expressir
         say "  Files extracted: #{Dir.glob(File.join(output_dir, '**', '*')).select do |f|
           File.file?(f)
         end.size}", :green
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error extracting package: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageExtractError.new(
+          "Error extracting package: #{e.message}",
+          command_name: "package extract",
+        )
       end
 
       desc "list PACKAGE", "List all elements of a specific type"
@@ -522,9 +504,13 @@ module Expressir
           output_text_list(results, options[:type], options[:schema],
                            options[:category])
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error listing elements: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageListError.new(
+          "Error listing elements: #{e.message}",
+          command_name: "package list",
+        )
       end
 
       desc "search PACKAGE PATTERN", "Search for elements matching a pattern"
@@ -602,9 +588,13 @@ module Expressir
         else
           output_text_search_results(results, pattern)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error searching: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageSearchError.new(
+          "Error searching: #{e.message}",
+          command_name: "package search",
+        )
       end
       desc "tree PACKAGE", "Display hierarchical tree view of package contents"
       long_desc <<~DESC
@@ -669,9 +659,13 @@ module Expressir
           is_last_schema = idx == schemas.size - 1
           display_schema_tree(schema, is_last_schema, "", 1)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error displaying tree: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageTreeError.new(
+          "Error displaying tree: #{e.message}",
+          command_name: "package tree",
+        )
       end
 
       private
@@ -694,8 +688,7 @@ module Expressir
       # @return [Model::Repository] Loaded repository
       def load_package(package_path)
         unless File.exist?(package_path)
-          say "Package file not found: #{package_path}", :red
-          exit 1
+          raise Expressir::PackageNotFoundError.new(package_path)
         end
 
         Expressir::Model::Repository.from_package(package_path)
@@ -706,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

@@ -559,8 +559,7 @@ module Expressir
 
       def validate_from_manifest(manifest_path)
         unless File.exist?(manifest_path)
-          say "Error: Manifest file not found: #{manifest_path}", :red
-          exit 1
+          raise Expressir::ManifestNotFoundError.new(manifest_path)
         end
 
         say "Loading manifest: #{manifest_path}..." if options[:verbose]
@@ -574,8 +573,7 @@ module Expressir
         end
 
         if exp_files.empty?
-          say "Error: No valid schema paths found in manifest", :red
-          exit 1
+          raise Expressir::NoValidSchemaPathsError.new("No valid schema paths found in manifest")
         end
 
         say "Validating #{exp_files.size} schema(s) from manifest for ASCII compliance..." if options[:verbose]

data/lib/expressir/commands/validate_load.rb

@@ -16,8 +16,7 @@ module Expressir
 
       def validate_from_manifest(manifest_path)
         unless File.exist?(manifest_path)
-          say "Error: Manifest file not found: #{manifest_path}", :red
-          exit 1
+          raise Expressir::ManifestNotFoundError.new(manifest_path)
         end
 
         say "Loading manifest: #{manifest_path}..." if options[:verbose]
@@ -29,8 +28,7 @@ module Expressir
         paths = manifest.schemas.map(&:path).reject { |p| p.nil? || p.empty? }
 
         if paths.empty?
-          say "Error: No valid schema paths found in manifest", :red
-          exit 1
+          raise Expressir::NoValidSchemaPathsError.new("No valid schema paths found in manifest")
         end
 
         say "Validating #{paths.size} schema(s) from manifest..." if options[:verbose]
@@ -60,7 +58,12 @@ module Expressir
         print_validation_errors(:failed_to_parse, no_valid)
         print_validation_errors(:missing_version_string, no_version)
 
-        exit 1 unless [no_valid, no_version].all?(&:empty?)
+        unless [no_valid, no_version].all?(&:empty?)
+          raise Expressir::SchemaValidationError.new(
+            "Schema validation failed",
+            errors: no_valid + no_version,
+          )
+        end
 
         say "Validation passed for all EXPRESS schemas."
       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,8 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "changes_section"
-require_relative "modified_object"
 
 module Expressir
   module Eengine
@@ -13,7 +10,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,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "modified_object"
 
 module Expressir
   module Eengine
@@ -11,7 +9,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,8 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "changes_section"
-require_relative "modified_object"
 
 module Expressir
   module Eengine
@@ -13,7 +10,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,6 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
 
 module Expressir
   module Eengine
@@ -12,7 +11,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