expressir 2.2.1 → 2.3.1

data/lib/expressir/express.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Express
+    autoload :Builder, "#{__dir__}/express/builder"
+    autoload :Builders, "#{__dir__}/express/builders"
+    # autoload :BuilderRegistry, "#{__dir__}/express/builder_registry"
+
+    # Core classes (autoloaded for lazy loading)
+    autoload :Cache, "#{__dir__}/express/cache"
+    autoload :Error, "#{__dir__}/express/error"
+    autoload :Formatter, "#{__dir__}/express/formatter"
+    autoload :Formatters, "#{__dir__}/express/formatters"
+    autoload :HyperlinkFormatter, "#{__dir__}/express/hyperlink_formatter"
+    autoload :ModelVisitor, "#{__dir__}/express/model_visitor"
+    autoload :Parser, "#{__dir__}/express/parser"
+    autoload :PrettyFormatter, "#{__dir__}/express/pretty_formatter"
+    autoload :RemarkAttacher, "#{__dir__}/express/remark_attacher"
+    autoload :ResolveReferencesModelVisitor,
+             "#{__dir__}/express/resolve_references_model_visitor"
+    autoload :SchemaHeadFormatter, "#{__dir__}/express/schema_head_formatter"
+    autoload :StreamingBuilder, "#{__dir__}/express/streaming_builder"
+
+    autoload :Transformer, "#{__dir__}/express/transformer"
+  end
+end
+
+# Eagerly load builders (they register themselves at load time)
+require_relative "express/builder_registry"

data/lib/expressir/manifest/resolver.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../model/dependency_resolver"
-
 module Expressir
   module Manifest
     # Resolves schema paths in manifests using pattern-based path discovery
@@ -131,7 +129,6 @@ module Expressir
       # @param schema_path [String] Path to the schema file
       # @return [String] The schema name declared in the file
       def extract_schema_name(schema_path)
-        require_relative "../express/parser"
         repo = Expressir::Express::Parser.from_file(schema_path)
         schema = repo.schemas.first
         schema&.id || File.basename(schema_path, ".*")

data/lib/expressir/manifest/validator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../model/dependency_resolver"
-
 module Expressir
   module Manifest
     # Validates schema manifests for completeness and integrity
@@ -159,7 +157,6 @@ module Expressir
       # @param schema_path [String] Path to the schema file
       # @return [String] The schema name declared in the file
       def extract_schema_name(schema_path)
-        require_relative "../express/parser"
         repo = Expressir::Express::Parser.from_file(schema_path)
         schema = repo.schemas.first
         schema&.id || File.basename(schema_path, ".*")

data/lib/expressir/manifest.rb

@@ -0,0 +1,6 @@
+module Expressir
+  module Manifest
+    autoload :Validator, "#{__dir__}/manifest/validator"
+    autoload :Resolver, "#{__dir__}/manifest/resolver"
+  end
+end

data/lib/expressir/model/cache.rb

@@ -5,7 +5,7 @@ module Expressir
       attribute :version, :string
       attribute :root_path, :string
       attribute :content, ModelElement
-      attribute :_class, :string, default: -> { send(:name) }
+      attribute :_class, :string, default: -> { self.class.name }
 
       key_value do
         map "_class", to: :_class, render_default: true

data/lib/expressir/model/concerns.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Model
+    # Marker for types that can have remark_items children
+    # These are types where RemarkItem children can be created
+    module HasRemarkItems; end
+
+    # Marker for scope containers (can contain declarations)
+    # Includes schemas, functions, procedures, rules, entities, types, and files
+    module ScopeContainer; end
+
+    # Marker for types supporting informal propositions
+    module HasInformalPropositions; end
+
+    # Marker for types supporting where rules
+    module HasWhereRules; end
+  end
+end

data/lib/expressir/model/data_types/aggregate.rb

@@ -7,7 +7,7 @@ module Expressir
         include Identifier
 
         attribute :base_type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/array.rb

@@ -9,7 +9,7 @@ module Expressir
         attribute :optional, :boolean
         attribute :unique, :boolean
         attribute :base_type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/bag.rb

@@ -7,7 +7,7 @@ module Expressir
         attribute :bound1, ModelElement
         attribute :bound2, ModelElement
         attribute :base_type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/binary.rb

@@ -6,7 +6,7 @@ module Expressir
       class Binary < ModelElement
         attribute :width, ModelElement
         attribute :fixed, :boolean
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/boolean.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 8.1.5 Boolean data type
       class Boolean < ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/enumeration.rb

@@ -7,7 +7,7 @@ module Expressir
         attribute :extensible, :boolean
         attribute :based_on, ModelElement
         attribute :items, EnumerationItem, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/enumeration_item.rb

@@ -6,7 +6,7 @@ module Expressir
       class EnumerationItem < ModelElement
         include Identifier
 
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/generic.rb

@@ -6,7 +6,7 @@ module Expressir
       class Generic < ModelElement
         include Identifier
 
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/generic_entity.rb

@@ -6,7 +6,7 @@ module Expressir
       class GenericEntity < ModelElement
         include Identifier
 
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/integer.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 8.1.3 Integer data type
       class Integer < ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/list.rb

@@ -8,7 +8,7 @@ module Expressir
         attribute :bound2, ModelElement
         attribute :unique, :boolean
         attribute :base_type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/logical.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 8.1.4 Logical data type
       class Logical < ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/number.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 8.1.1 Number data type
       class Number < ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/real.rb

@@ -5,7 +5,7 @@ module Expressir
       # - section 8.1.2 Real data type
       class Real < ModelElement
         attribute :precision, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/select.rb

@@ -8,7 +8,7 @@ module Expressir
         attribute :generic_entity, :boolean
         attribute :based_on, ModelElement
         attribute :items, ModelElement, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/set.rb

@@ -7,7 +7,7 @@ module Expressir
         attribute :bound1, ModelElement
         attribute :bound2, ModelElement
         attribute :base_type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types/string.rb

@@ -6,7 +6,7 @@ module Expressir
       class String < ModelElement
         attribute :width, ModelElement
         attribute :fixed, :boolean
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/data_types.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Model
+    module DataTypes
+      autoload :Aggregate, "#{__dir__}/data_types/aggregate"
+      autoload :Array, "#{__dir__}/data_types/array"
+      autoload :Bag, "#{__dir__}/data_types/bag"
+      autoload :Binary, "#{__dir__}/data_types/binary"
+      autoload :Boolean, "#{__dir__}/data_types/boolean"
+      autoload :Enumeration, "#{__dir__}/data_types/enumeration"
+      autoload :EnumerationItem, "#{__dir__}/data_types/enumeration_item"
+      autoload :GenericEntity, "#{__dir__}/data_types/generic_entity"
+      autoload :Generic, "#{__dir__}/data_types/generic"
+      autoload :Integer, "#{__dir__}/data_types/integer"
+      autoload :List, "#{__dir__}/data_types/list"
+      autoload :Logical, "#{__dir__}/data_types/logical"
+      autoload :Number, "#{__dir__}/data_types/number"
+      autoload :Real, "#{__dir__}/data_types/real"
+      autoload :Select, "#{__dir__}/data_types/select"
+      autoload :Set, "#{__dir__}/data_types/set"
+      autoload :String, "#{__dir__}/data_types/string"
+    end
+  end
+end

data/lib/expressir/model/declarations/attribute.rb

@@ -15,7 +15,7 @@ module Expressir
         attribute :optional, :boolean
         attribute :type, ModelElement
         attribute :expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/constant.rb

@@ -8,7 +8,7 @@ module Expressir
 
         attribute :type, ModelElement
         attribute :expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/derived_attribute.rb

@@ -9,7 +9,7 @@ module Expressir
         DERIVED = "DERIVED".freeze
 
         attribute :kind, :string, default: -> { DERIVED }
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/entity.rb

@@ -5,6 +5,9 @@ module Expressir
       # - section 9.2 Entity declaration
       class Entity < ModelElement
         include Identifier
+        include ScopeContainer
+        include HasInformalPropositions
+        include HasWhereRules
 
         attribute :abstract, :boolean
         attribute :supertype_expression, ModelElement
@@ -16,7 +19,7 @@ module Expressir
         attribute :where_rules, WhereRule, collection: true
         attribute :informal_propositions, InformalPropositionRule,
                   collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/function.rb

@@ -5,6 +5,8 @@ module Expressir
       # - section 9.5.1 Function
       class Function < ModelElement
         include Identifier
+        include ScopeContainer
+        include HasWhereRules
 
         attribute :parameters, Parameter, collection: true
         attribute :return_type, ModelElement
@@ -16,7 +18,7 @@ module Expressir
         attribute :constants, Constant, collection: true
         attribute :variables, Variable, collection: true
         attribute :statements, ModelElement, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/informal_proposition_rule.rb

@@ -4,9 +4,10 @@ module Expressir
       # Informal proposition rules are used to specify constraints that cannot be formally expressed
       class InformalPropositionRule < ModelElement
         include Identifier
+        include HasInformalPropositions
 
         attribute :expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/interface.rb

@@ -10,7 +10,7 @@ module Expressir
         attribute :kind, :string, values: %w[USE REFERENCE]
         attribute :schema, ModelElement
         attribute :items, InterfaceItem, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/interface_item.rb

@@ -6,7 +6,7 @@ module Expressir
       class InterfaceItem < ModelElement
         attribute :ref, ModelElement
         attribute :id, :string
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/interfaced_item.rb

@@ -8,7 +8,7 @@ module Expressir
         attribute :remarks, :string, collection: true
         attribute :remark_items, RemarkItem, collection: true
         attribute :base_item, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/inverse_attribute.rb

@@ -9,7 +9,7 @@ module Expressir
         INVERSE = "INVERSE".freeze
 
         attribute :kind, :string, default: -> { INVERSE }
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/parameter.rb

@@ -8,7 +8,7 @@ module Expressir
 
         attribute :var, :boolean
         attribute :type, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/procedure.rb

@@ -5,6 +5,8 @@ module Expressir
       # - section 9.5.2 Procedure
       class Procedure < ModelElement
         include Identifier
+        include ScopeContainer
+        include HasWhereRules
 
         attribute :parameters, Parameter, collection: true
         attribute :types, ModelElement, collection: true
@@ -15,7 +17,7 @@ module Expressir
         attribute :constants, Constant, collection: true
         attribute :variables, Variable, collection: true
         attribute :statements, ModelElement, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/remark_item.rb

@@ -5,7 +5,7 @@ module Expressir
       class RemarkItem < ModelElement
         attribute :id, :string
         attribute :remarks, :string, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/rule.rb

@@ -5,6 +5,9 @@ module Expressir
       # - section 9.6 Rule
       class Rule < ModelElement
         include Identifier
+        include ScopeContainer
+        include HasInformalPropositions
+        include HasWhereRules
 
         attribute :applies_to, ModelElement, collection: true
         attribute :types, ModelElement, collection: true
@@ -18,7 +21,7 @@ module Expressir
         attribute :where_rules, WhereRule, collection: true
         attribute :informal_propositions, InformalPropositionRule,
                   collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/schema.rb

@@ -5,6 +5,7 @@ module Expressir
       # - section 9.3 Schema
       class Schema < ModelElement
         include Identifier
+        include ScopeContainer
 
         attribute :file, :string
         attribute :version, SchemaVersion
@@ -16,7 +17,7 @@ module Expressir
         attribute :functions, Function, collection: true
         attribute :rules, Rule, collection: true
         attribute :procedures, Procedure, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
         attribute :selected, :boolean, default: false
         attribute :formatted, :string
         attribute :file_basename, :string

data/lib/expressir/model/declarations/schema_version.rb

@@ -6,7 +6,7 @@ module Expressir
       class SchemaVersion < ModelElement
         attribute :value, :string
         attribute :items, SchemaVersionItem, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/schema_version_item.rb

@@ -6,7 +6,7 @@ module Expressir
       class SchemaVersionItem < ModelElement
         attribute :name, :string
         attribute :value, :string
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/subtype_constraint.rb

@@ -10,7 +10,7 @@ module Expressir
         attribute :abstract, :boolean
         attribute :total_over, ModelElement, collection: true
         attribute :supertype_expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/type.rb

@@ -5,12 +5,15 @@ module Expressir
       # - section 9.1 Type declaration
       class Type < ModelElement
         include Identifier
+        include ScopeContainer
+        include HasInformalPropositions
+        include HasWhereRules
 
         attribute :underlying_type, ModelElement
         attribute :where_rules, WhereRule, collection: true
         attribute :informal_propositions, InformalPropositionRule,
                   collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/unique_rule.rb

@@ -7,7 +7,7 @@ module Expressir
         include Identifier
 
         attribute :attributes, ModelElement, collection: true
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/variable.rb

@@ -8,7 +8,7 @@ module Expressir
 
         attribute :type, ModelElement
         attribute :expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations/where_rule.rb

@@ -7,7 +7,7 @@ module Expressir
         include Identifier
 
         attribute :expression, ModelElement
-        attribute :_class, :string, default: -> { send(:name) }
+        attribute :_class, :string, default: -> { self.class.name }
 
         key_value do
           map "_class", to: :_class, render_default: true

data/lib/expressir/model/declarations.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Model
+    module Declarations
+      autoload :Attribute, "#{__dir__}/declarations/attribute"
+      autoload :Constant, "#{__dir__}/declarations/constant"
+      autoload :DerivedAttribute, "#{__dir__}/declarations/derived_attribute"
+      autoload :Entity, "#{__dir__}/declarations/entity"
+      autoload :Function, "#{__dir__}/declarations/function"
+      autoload :Interface, "#{__dir__}/declarations/interface"
+      autoload :InterfaceItem, "#{__dir__}/declarations/interface_item"
+      autoload :InterfacedItem, "#{__dir__}/declarations/interfaced_item"
+      autoload :InverseAttribute, "#{__dir__}/declarations/inverse_attribute"
+      autoload :Parameter, "#{__dir__}/declarations/parameter"
+      autoload :Procedure, "#{__dir__}/declarations/procedure"
+      autoload :RemarkItem, "#{__dir__}/declarations/remark_item"
+      autoload :Rule, "#{__dir__}/declarations/rule"
+      autoload :Schema, "#{__dir__}/declarations/schema"
+      autoload :SchemaVersion, "#{__dir__}/declarations/schema_version"
+      autoload :SchemaVersionItem, "#{__dir__}/declarations/schema_version_item"
+      autoload :SubtypeConstraint, "#{__dir__}/declarations/subtype_constraint"
+      autoload :Type, "#{__dir__}/declarations/type"
+      autoload :UniqueRule, "#{__dir__}/declarations/unique_rule"
+      autoload :Variable, "#{__dir__}/declarations/variable"
+      autoload :WhereRule, "#{__dir__}/declarations/where_rule"
+      autoload :InformalPropositionRule,
+               "#{__dir__}/declarations/informal_proposition_rule"
+    end
+  end
+end

data/lib/expressir/model/dependency_resolver.rb

@@ -50,8 +50,6 @@ module Expressir
       # @param schema_path [String] Path to schema file
       # @return [Array<Hash>] List of interfaces with :kind, :schema_name
       def extract_interfaces(schema_path)
-        require_relative "../express/parser"
-
         interfaces = []
 
         # Parse the schema file properly