expressir 2.2.1 → 2.3.1

data/lib/expressir.rb

@@ -1,11 +1,6 @@
 require_relative "expressir/version"
 require_relative "expressir/errors"
-require_relative "expressir/cli"
-require_relative "expressir/config"
-require_relative "expressir/benchmark"
-require_relative "expressir/coverage"
-require_relative "expressir/schema_manifest"
-require_relative "expressir/schema_manifest_entry"
+
 require "lutaml/model"
 require "liquid" # To enable Lutaml::Model::Liquefiable
 
@@ -29,6 +24,28 @@ else
 end
 
 module Expressir
+  # Namespace modules - autoload loads the namespace file which contains
+  # autoload definitions for classes within that namespace
+  autoload :Config, "#{__dir__}/expressir/config"
+  extend Config
+
+  autoload :Benchmark, "#{__dir__}/expressir/benchmark"
+  autoload :Coverage, "#{__dir__}/expressir/coverage"
+
+  autoload :Express, "#{__dir__}/expressir/express"
+  autoload :Model, "#{__dir__}/expressir/model"
+  autoload :Commands, "#{__dir__}/expressir/commands"
+  autoload :Changes, "#{__dir__}/expressir/changes"
+  autoload :Package, "#{__dir__}/expressir/package"
+  autoload :Manifest, "#{__dir__}/expressir/manifest"
+  autoload :Eengine, "#{__dir__}/expressir/eengine"
+  autoload :SchemaManifest, "#{__dir__}/expressir/schema_manifest"
+  autoload :SchemaManifestEntry, "#{__dir__}/expressir/schema_manifest_entry"
+
+  # CLI is loaded last so that namespace autoloads are defined first
+  # CLI uses Expressir::Commands::* which triggers autoload
+  autoload :Cli, "#{__dir__}/expressir/cli"
+
   def self.root
     File.dirname(__dir__)
   end
@@ -36,169 +53,4 @@ module Expressir
   def self.root_path
     @root_path ||= Pathname.new(Expressir.root)
   end
-
-  # Autoload for Express module classes
-  module Express
-    autoload :Builder, "expressir/express/builder"
-    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 :PrettyFormatter, "expressir/express/pretty_formatter"
-    autoload :RemarkAttacher, "expressir/express/remark_attacher"
-    autoload :ResolveReferencesModelVisitor,
-             "expressir/express/resolve_references_model_visitor"
-    autoload :SchemaHeadFormatter, "expressir/express/schema_head_formatter"
-    autoload :StreamingBuilder, "expressir/express/streaming_builder"
-  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"
-    autoload :RepositoryValidator, "expressir/model/repository_validator"
-    autoload :DependencyResolver, "expressir/model/dependency_resolver"
-    autoload :RemarkInfo, "expressir/model/remark_info"
-
-    module Indexes
-      autoload :EntityIndex, "expressir/model/indexes/entity_index"
-      autoload :TypeIndex, "expressir/model/indexes/type_index"
-      autoload :ReferenceIndex, "expressir/model/indexes/reference_index"
-    end
-
-    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"
-      autoload :InformalPropositionRule,
-               "expressir/model/declarations/informal_proposition_rule"
-    end
-
-    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 Package module classes
-  module Package
-    autoload :Metadata, "expressir/package/metadata"
-    autoload :Builder, "expressir/package/builder"
-    autoload :Reader, "expressir/package/reader"
-  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 :ImportComparison, "expressir/commands/import_comparison"
-    autoload :Coverage, "expressir/commands/coverage"
-    autoload :Format, "expressir/commands/format"
-    autoload :Validate, "expressir/commands/validate"
-    autoload :Version, "expressir/commands/version"
-  end
-
-  # Autoload for Changes module classes
-  module Changes
-    autoload :SchemaChange, "expressir/changes/schema_change"
-    autoload :VersionChange, "expressir/changes/version_change"
-    autoload :ItemChange, "expressir/changes/item_change"
-    autoload :MappingChange, "expressir/changes/mapping_change"
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-13 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -82,6 +82,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: moxml
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,14 +142,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.9
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.9
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +236,9 @@ files:
 - Gemfile
 - README.adoc
 - Rakefile
+- benchmark/srl_benchmark.rb
+- benchmark/srl_native_benchmark.rb
+- benchmark/srl_ruby_benchmark.rb
 - bin/console
 - bin/rspec
 - bin/setup
@@ -297,6 +320,7 @@ files:
 - lib/expressir/changes/schema_change.rb
 - lib/expressir/changes/version_change.rb
 - lib/expressir/cli.rb
+- lib/expressir/commands.rb
 - lib/expressir/commands/base.rb
 - lib/expressir/commands/benchmark.rb
 - lib/expressir/commands/benchmark_cache.rb
@@ -314,13 +338,16 @@ files:
 - lib/expressir/commands/version.rb
 - lib/expressir/config.rb
 - lib/expressir/coverage.rb
+- lib/expressir/eengine.rb
 - lib/expressir/eengine/arm_compare_report.rb
 - lib/expressir/eengine/changes_section.rb
 - lib/expressir/eengine/compare_report.rb
 - lib/expressir/eengine/mim_compare_report.rb
 - lib/expressir/eengine/modified_object.rb
 - lib/expressir/errors.rb
+- lib/expressir/express.rb
 - lib/expressir/express/builder.rb
+- lib/expressir/express/builder_registry.rb
 - lib/expressir/express/builders.rb
 - lib/expressir/express/builders/attribute_decl_builder.rb
 - lib/expressir/express/builders/built_in_builder.rb
@@ -350,7 +377,6 @@ files:
 - lib/expressir/express/builders/statement_builder.rb
 - lib/expressir/express/builders/subtype_constraint_builder.rb
 - lib/expressir/express/builders/syntax_builder.rb
-- lib/expressir/express/builders/token_builder.rb
 - lib/expressir/express/builders/type_builder.rb
 - lib/expressir/express/builders/type_decl_builder.rb
 - lib/expressir/express/builders/unique_clause_builder.rb
@@ -359,6 +385,7 @@ files:
 - lib/expressir/express/cache.rb
 - lib/expressir/express/error.rb
 - lib/expressir/express/formatter.rb
+- lib/expressir/express/formatters.rb
 - lib/expressir/express/formatters/data_types_formatter.rb
 - lib/expressir/express/formatters/declarations_formatter.rb
 - lib/expressir/express/formatters/expressions_formatter.rb
@@ -378,10 +405,13 @@ files:
 - lib/expressir/express/streaming_builder.rb
 - lib/expressir/express/transformer/remark_handling.rb
 - lib/expressir/liquid.rb
+- lib/expressir/manifest.rb
 - lib/expressir/manifest/resolver.rb
 - lib/expressir/manifest/validator.rb
 - lib/expressir/model.rb
 - lib/expressir/model/cache.rb
+- lib/expressir/model/concerns.rb
+- lib/expressir/model/data_types.rb
 - lib/expressir/model/data_types/aggregate.rb
 - lib/expressir/model/data_types/array.rb
 - lib/expressir/model/data_types/bag.rb
@@ -399,6 +429,7 @@ files:
 - lib/expressir/model/data_types/select.rb
 - lib/expressir/model/data_types/set.rb
 - lib/expressir/model/data_types/string.rb
+- lib/expressir/model/declarations.rb
 - lib/expressir/model/declarations/attribute.rb
 - lib/expressir/model/declarations/constant.rb
 - lib/expressir/model/declarations/derived_attribute.rb
@@ -422,6 +453,8 @@ files:
 - lib/expressir/model/declarations/variable.rb
 - lib/expressir/model/declarations/where_rule.rb
 - lib/expressir/model/dependency_resolver.rb
+- lib/expressir/model/exp_file.rb
+- lib/expressir/model/expressions.rb
 - lib/expressir/model/expressions/aggregate_initializer.rb
 - lib/expressir/model/expressions/aggregate_initializer_item.rb
 - lib/expressir/model/expressions/binary_expression.rb
@@ -431,16 +464,19 @@ files:
 - lib/expressir/model/expressions/query_expression.rb
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/identifier.rb
+- lib/expressir/model/indexes.rb
 - lib/expressir/model/indexes/entity_index.rb
 - lib/expressir/model/indexes/reference_index.rb
 - lib/expressir/model/indexes/type_index.rb
 - lib/expressir/model/interface_validator.rb
+- lib/expressir/model/literals.rb
 - lib/expressir/model/literals/binary.rb
 - lib/expressir/model/literals/integer.rb
 - lib/expressir/model/literals/logical.rb
 - lib/expressir/model/literals/real.rb
 - lib/expressir/model/literals/string.rb
 - lib/expressir/model/model_element.rb
+- lib/expressir/model/references.rb
 - lib/expressir/model/references/attribute_reference.rb
 - lib/expressir/model/references/group_reference.rb
 - lib/expressir/model/references/index_reference.rb
@@ -449,6 +485,7 @@ files:
 - lib/expressir/model/repository.rb
 - lib/expressir/model/repository_validator.rb
 - lib/expressir/model/search_engine.rb
+- lib/expressir/model/statements.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/case.rb
@@ -461,13 +498,16 @@ files:
 - lib/expressir/model/statements/repeat.rb
 - lib/expressir/model/statements/return.rb
 - lib/expressir/model/statements/skip.rb
+- lib/expressir/model/supertype_expressions.rb
 - lib/expressir/model/supertype_expressions/binary_supertype_expression.rb
 - lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb
+- lib/expressir/package.rb
 - lib/expressir/package/builder.rb
 - lib/expressir/package/metadata.rb
 - lib/expressir/package/reader.rb
 - lib/expressir/schema_manifest.rb
 - lib/expressir/schema_manifest_entry.rb
+- lib/expressir/transformer.rb
 - lib/expressir/version.rb
 homepage: https://github.com/lutaml/expressir
 licenses:

data/lib/expressir/express/builders/token_builder.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Token builders - operator tokens that return nil.
-# These are used as separators in lists and don't produce model objects.
-
-# Operator tokens - return nil
-%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].each do |token|
-  Builder.register(token) { |_d| nil }
-end