expressir 2.1.18 → 2.1.20

data/lib/expressir/model.rb

@@ -1,72 +1,95 @@
-require_relative "model/model_element"
-require_relative "model/cache"
-require_relative "model/identifier"
-require_relative "model/repository"
+# This file is kept for backward compatibility and to ensure all model classes are loaded
+# when explicitly requiring 'expressir/model'. The actual autoload definitions are in the main
+# expressir.rb file.
 
-require_relative "model/data_types/aggregate"
-require_relative "model/data_types/array"
-require_relative "model/data_types/bag"
-require_relative "model/data_types/binary"
-require_relative "model/data_types/boolean"
-require_relative "model/data_types/enumeration"
-require_relative "model/data_types/enumeration_item"
-require_relative "model/data_types/generic_entity"
-require_relative "model/data_types/generic"
-require_relative "model/data_types/integer"
-require_relative "model/data_types/list"
-require_relative "model/data_types/logical"
-require_relative "model/data_types/number"
-require_relative "model/data_types/real"
-require_relative "model/data_types/set"
-require_relative "model/data_types/select"
-require_relative "model/data_types/string"
-require_relative "model/declarations/attribute"
-require_relative "model/declarations/constant"
-require_relative "model/declarations/entity"
-require_relative "model/declarations/function"
-require_relative "model/declarations/interface"
-require_relative "model/declarations/interface_item"
-require_relative "model/declarations/interfaced_item"
-require_relative "model/declarations/parameter"
-require_relative "model/declarations/procedure"
-require_relative "model/declarations/remark_item"
-require_relative "model/declarations/rule"
-require_relative "model/declarations/schema"
-require_relative "model/declarations/schema_version"
-require_relative "model/declarations/schema_version_item"
-require_relative "model/declarations/subtype_constraint"
-require_relative "model/declarations/type"
-require_relative "model/declarations/unique_rule"
-require_relative "model/declarations/variable"
-require_relative "model/declarations/where_rule"
-require_relative "model/expressions/aggregate_initializer"
-require_relative "model/expressions/aggregate_initializer_item"
-require_relative "model/expressions/binary_expression"
-require_relative "model/expressions/entity_constructor"
-require_relative "model/expressions/function_call"
-require_relative "model/expressions/interval"
-require_relative "model/expressions/query_expression"
-require_relative "model/expressions/unary_expression"
-require_relative "model/literals/binary"
-require_relative "model/literals/integer"
-require_relative "model/literals/logical"
-require_relative "model/literals/real"
-require_relative "model/literals/string"
-require_relative "model/references/attribute_reference"
-require_relative "model/references/group_reference"
-require_relative "model/references/index_reference"
-require_relative "model/references/simple_reference"
-require_relative "model/statements/alias"
-require_relative "model/statements/assignment"
-require_relative "model/statements/case"
-require_relative "model/statements/case_action"
-require_relative "model/statements/compound"
-require_relative "model/statements/escape"
-require_relative "model/statements/if"
-require_relative "model/statements/null"
-require_relative "model/statements/procedure_call"
-require_relative "model/statements/repeat"
-require_relative "model/statements/return"
-require_relative "model/statements/skip"
-require_relative "model/supertype_expressions/binary_supertype_expression"
-require_relative "model/supertype_expressions/oneof_supertype_expression"
+# Ensure all model classes are loaded by referencing them
+# This triggers the autoload mechanism for each class
+
+# Core model classes
+Expressir::Model::ModelElement
+Expressir::Model::Cache
+Expressir::Model::Identifier
+Expressir::Model::Repository
+
+# Data types
+Expressir::Model::DataTypes::Aggregate
+Expressir::Model::DataTypes::Array
+Expressir::Model::DataTypes::Bag
+Expressir::Model::DataTypes::Binary
+Expressir::Model::DataTypes::Boolean
+Expressir::Model::DataTypes::Enumeration
+Expressir::Model::DataTypes::EnumerationItem
+Expressir::Model::DataTypes::GenericEntity
+Expressir::Model::DataTypes::Generic
+Expressir::Model::DataTypes::Integer
+Expressir::Model::DataTypes::List
+Expressir::Model::DataTypes::Logical
+Expressir::Model::DataTypes::Number
+Expressir::Model::DataTypes::Real
+Expressir::Model::DataTypes::Select
+Expressir::Model::DataTypes::Set
+Expressir::Model::DataTypes::String
+
+# Declarations
+Expressir::Model::Declarations::Attribute
+Expressir::Model::Declarations::Constant
+Expressir::Model::Declarations::DerivedAttribute
+Expressir::Model::Declarations::Entity
+Expressir::Model::Declarations::Function
+Expressir::Model::Declarations::Interface
+Expressir::Model::Declarations::InterfaceItem
+Expressir::Model::Declarations::InterfacedItem
+Expressir::Model::Declarations::InverseAttribute
+Expressir::Model::Declarations::Parameter
+Expressir::Model::Declarations::Procedure
+Expressir::Model::Declarations::RemarkItem
+Expressir::Model::Declarations::Rule
+Expressir::Model::Declarations::Schema
+Expressir::Model::Declarations::SchemaVersion
+Expressir::Model::Declarations::SchemaVersionItem
+Expressir::Model::Declarations::SubtypeConstraint
+Expressir::Model::Declarations::Type
+Expressir::Model::Declarations::UniqueRule
+Expressir::Model::Declarations::Variable
+Expressir::Model::Declarations::WhereRule
+
+# Expressions
+Expressir::Model::Expressions::AggregateInitializer
+Expressir::Model::Expressions::AggregateInitializerItem
+Expressir::Model::Expressions::BinaryExpression
+Expressir::Model::Expressions::EntityConstructor
+Expressir::Model::Expressions::FunctionCall
+Expressir::Model::Expressions::Interval
+Expressir::Model::Expressions::QueryExpression
+Expressir::Model::Expressions::UnaryExpression
+
+# Literals
+Expressir::Model::Literals::Binary
+Expressir::Model::Literals::Integer
+Expressir::Model::Literals::Logical
+Expressir::Model::Literals::Real
+Expressir::Model::Literals::String
+
+# References
+Expressir::Model::References::AttributeReference
+Expressir::Model::References::GroupReference
+Expressir::Model::References::IndexReference
+Expressir::Model::References::SimpleReference
+
+# Statements
+Expressir::Model::Statements::Alias
+Expressir::Model::Statements::Assignment
+Expressir::Model::Statements::Case
+Expressir::Model::Statements::CaseAction
+Expressir::Model::Statements::Compound
+Expressir::Model::Statements::Escape
+Expressir::Model::Statements::If
+Expressir::Model::Statements::Null
+Expressir::Model::Statements::ProcedureCall
+Expressir::Model::Statements::Repeat
+Expressir::Model::Statements::Return
+Expressir::Model::Statements::Skip
+
+# Supertype expressions
+Expressir::Model::SupertypeExpressions::BinarySupertypeExpression
+Expressir::Model::SupertypeExpressions::OneofSupertypeExpression

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.18".freeze
+  VERSION = "2.1.20".freeze
 end

data/lib/expressir.rb

@@ -1,8 +1,8 @@
-require "zeitwerk"
 require_relative "expressir/version"
 require_relative "expressir/cli"
 require_relative "expressir/config"
 require_relative "expressir/benchmark"
+require_relative "expressir/coverage"
 require "lutaml/model"
 require "liquid" # To enable Lutaml::Model::Liquefiable
 
@@ -35,13 +35,129 @@ module Expressir
   def self.root_path
     @root_path ||= Pathname.new(Expressir.root)
   end
-end
 
-loader = Zeitwerk::Loader.for_gem
-loader.setup
+  # Autoload for Express module classes
+  module Express
+    autoload :Cache, "expressir/express/cache"
+    autoload :Error, "expressir/express/error"
+    autoload :Formatter, "expressir/express/formatter"
+    autoload :HyperlinkFormatter, "expressir/express/hyperlink_formatter"
+    autoload :ModelVisitor, "expressir/express/model_visitor"
+    autoload :Parser, "expressir/express/parser"
+    autoload :ResolveReferencesModelVisitor, "expressir/express/resolve_references_model_visitor"
+    autoload :SchemaHeadFormatter, "expressir/express/schema_head_formatter"
+    autoload :Visitor, "expressir/express/visitor"
+  end
+
+  # Autoload for Model module classes
+  module Model
+    autoload :ModelElement, "expressir/model/model_element"
+    autoload :Cache, "expressir/model/cache"
+    autoload :Identifier, "expressir/model/identifier"
+    autoload :Repository, "expressir/model/repository"
+
+    module DataTypes
+      autoload :Aggregate, "expressir/model/data_types/aggregate"
+      autoload :Array, "expressir/model/data_types/array"
+      autoload :Bag, "expressir/model/data_types/bag"
+      autoload :Binary, "expressir/model/data_types/binary"
+      autoload :Boolean, "expressir/model/data_types/boolean"
+      autoload :Enumeration, "expressir/model/data_types/enumeration"
+      autoload :EnumerationItem, "expressir/model/data_types/enumeration_item"
+      autoload :GenericEntity, "expressir/model/data_types/generic_entity"
+      autoload :Generic, "expressir/model/data_types/generic"
+      autoload :Integer, "expressir/model/data_types/integer"
+      autoload :List, "expressir/model/data_types/list"
+      autoload :Logical, "expressir/model/data_types/logical"
+      autoload :Number, "expressir/model/data_types/number"
+      autoload :Real, "expressir/model/data_types/real"
+      autoload :Select, "expressir/model/data_types/select"
+      autoload :Set, "expressir/model/data_types/set"
+      autoload :String, "expressir/model/data_types/string"
+    end
+
+    module Declarations
+      autoload :Attribute, "expressir/model/declarations/attribute"
+      autoload :Constant, "expressir/model/declarations/constant"
+      autoload :DerivedAttribute, "expressir/model/declarations/derived_attribute"
+      autoload :Entity, "expressir/model/declarations/entity"
+      autoload :Function, "expressir/model/declarations/function"
+      autoload :Interface, "expressir/model/declarations/interface"
+      autoload :InterfaceItem, "expressir/model/declarations/interface_item"
+      autoload :InterfacedItem, "expressir/model/declarations/interfaced_item"
+      autoload :InverseAttribute, "expressir/model/declarations/inverse_attribute"
+      autoload :Parameter, "expressir/model/declarations/parameter"
+      autoload :Procedure, "expressir/model/declarations/procedure"
+      autoload :RemarkItem, "expressir/model/declarations/remark_item"
+      autoload :Rule, "expressir/model/declarations/rule"
+      autoload :Schema, "expressir/model/declarations/schema"
+      autoload :SchemaVersion, "expressir/model/declarations/schema_version"
+      autoload :SchemaVersionItem, "expressir/model/declarations/schema_version_item"
+      autoload :SubtypeConstraint, "expressir/model/declarations/subtype_constraint"
+      autoload :Type, "expressir/model/declarations/type"
+      autoload :UniqueRule, "expressir/model/declarations/unique_rule"
+      autoload :Variable, "expressir/model/declarations/variable"
+      autoload :WhereRule, "expressir/model/declarations/where_rule"
+    end
 
-Dir[File.join(__dir__, "expressir", "express", "*.rb")].sort.each do |fea|
-  require fea
+    module Expressions
+      autoload :AggregateInitializer, "expressir/model/expressions/aggregate_initializer"
+      autoload :AggregateInitializerItem, "expressir/model/expressions/aggregate_initializer_item"
+      autoload :BinaryExpression, "expressir/model/expressions/binary_expression"
+      autoload :EntityConstructor, "expressir/model/expressions/entity_constructor"
+      autoload :FunctionCall, "expressir/model/expressions/function_call"
+      autoload :Interval, "expressir/model/expressions/interval"
+      autoload :QueryExpression, "expressir/model/expressions/query_expression"
+      autoload :UnaryExpression, "expressir/model/expressions/unary_expression"
+    end
+
+    module Literals
+      autoload :Binary, "expressir/model/literals/binary"
+      autoload :Integer, "expressir/model/literals/integer"
+      autoload :Logical, "expressir/model/literals/logical"
+      autoload :Real, "expressir/model/literals/real"
+      autoload :String, "expressir/model/literals/string"
+    end
+
+    module References
+      autoload :AttributeReference, "expressir/model/references/attribute_reference"
+      autoload :GroupReference, "expressir/model/references/group_reference"
+      autoload :IndexReference, "expressir/model/references/index_reference"
+      autoload :SimpleReference, "expressir/model/references/simple_reference"
+    end
+
+    module Statements
+      autoload :Alias, "expressir/model/statements/alias"
+      autoload :Assignment, "expressir/model/statements/assignment"
+      autoload :Case, "expressir/model/statements/case"
+      autoload :CaseAction, "expressir/model/statements/case_action"
+      autoload :Compound, "expressir/model/statements/compound"
+      autoload :Escape, "expressir/model/statements/escape"
+      autoload :If, "expressir/model/statements/if"
+      autoload :Null, "expressir/model/statements/null"
+      autoload :ProcedureCall, "expressir/model/statements/procedure_call"
+      autoload :Repeat, "expressir/model/statements/repeat"
+      autoload :Return, "expressir/model/statements/return"
+      autoload :Skip, "expressir/model/statements/skip"
+    end
+
+    module SupertypeExpressions
+      autoload :BinarySupertypeExpression, "expressir/model/supertype_expressions/binary_supertype_expression"
+      autoload :OneofSupertypeExpression, "expressir/model/supertype_expressions/oneof_supertype_expression"
+    end
+  end
+
+  # Autoload for Commands module classes
+  module Commands
+    autoload :Base, "expressir/commands/base"
+    autoload :Benchmark, "expressir/commands/benchmark"
+    autoload :BenchmarkCache, "expressir/commands/benchmark_cache"
+    autoload :Clean, "expressir/commands/clean"
+    autoload :Coverage, "expressir/commands/coverage"
+    autoload :Format, "expressir/commands/format"
+    autoload :Validate, "expressir/commands/validate"
+    autoload :Version, "expressir/commands/version"
+  end
 end
 
 require_relative "expressir/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.18
+  version: 2.1.20
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -95,33 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Expressir ("EXPRESS in Ruby") is a Ruby parser for EXPRESS and a set
   of tools for accessing EXPRESS data models.
 email:
@@ -156,7 +170,16 @@ files:
 - lib/expressir.rb
 - lib/expressir/benchmark.rb
 - lib/expressir/cli.rb
+- lib/expressir/commands/base.rb
+- lib/expressir/commands/benchmark.rb
+- lib/expressir/commands/benchmark_cache.rb
+- lib/expressir/commands/clean.rb
+- lib/expressir/commands/coverage.rb
+- lib/expressir/commands/format.rb
+- lib/expressir/commands/validate.rb
+- lib/expressir/commands/version.rb
 - lib/expressir/config.rb
+- lib/expressir/coverage.rb
 - lib/expressir/express/cache.rb
 - lib/expressir/express/error.rb
 - lib/expressir/express/formatter.rb
@@ -188,11 +211,13 @@ files:
 - lib/expressir/model/data_types/string.rb
 - lib/expressir/model/declarations/attribute.rb
 - lib/expressir/model/declarations/constant.rb
+- lib/expressir/model/declarations/derived_attribute.rb
 - lib/expressir/model/declarations/entity.rb
 - lib/expressir/model/declarations/function.rb
 - lib/expressir/model/declarations/interface.rb
 - lib/expressir/model/declarations/interface_item.rb
 - lib/expressir/model/declarations/interfaced_item.rb
+- lib/expressir/model/declarations/inverse_attribute.rb
 - lib/expressir/model/declarations/parameter.rb
 - lib/expressir/model/declarations/procedure.rb
 - lib/expressir/model/declarations/remark_item.rb