expressir 2.1.22 → 2.1.23

data/lib/expressir/model/model_element.rb

@@ -15,151 +15,83 @@ module Expressir
       attribute :source, :string
       attribute :untagged_remarks, :string, collection: true
 
-      # TODO: Add basic mappings that can be inherited by all subclasses
+      POLYMORPHIC_CLASS_MAP = {
+        "Expressir::Model::Cache" => "Expressir::Model::Cache",
+        "Expressir::Model::Repository" => "Expressir::Model::Repository",
+        "Expressir::Model::DataTypes::Aggregate" => "Expressir::Model::DataTypes::Aggregate",
+        "Expressir::Model::DataTypes::Array" => "Expressir::Model::DataTypes::Array",
+        "Expressir::Model::DataTypes::Bag" => "Expressir::Model::DataTypes::Bag",
+        "Expressir::Model::DataTypes::Binary" => "Expressir::Model::DataTypes::Binary",
+        "Expressir::Model::DataTypes::Boolean" => "Expressir::Model::DataTypes::Boolean",
+        "Expressir::Model::DataTypes::EnumerationItem" => "Expressir::Model::DataTypes::EnumerationItem",
+        "Expressir::Model::DataTypes::Enumeration" => "Expressir::Model::DataTypes::Enumeration",
+        "Expressir::Model::DataTypes::GenericEntity" => "Expressir::Model::DataTypes::GenericEntity",
+        "Expressir::Model::DataTypes::Generic" => "Expressir::Model::DataTypes::Generic",
+        "Expressir::Model::DataTypes::Integer" => "Expressir::Model::DataTypes::Integer",
+        "Expressir::Model::DataTypes::List" => "Expressir::Model::DataTypes::List",
+        "Expressir::Model::DataTypes::Logical" => "Expressir::Model::DataTypes::Logical",
+        "Expressir::Model::DataTypes::Number" => "Expressir::Model::DataTypes::Number",
+        "Expressir::Model::DataTypes::Real" => "Expressir::Model::DataTypes::Real",
+        "Expressir::Model::DataTypes::Select" => "Expressir::Model::DataTypes::Select",
+        "Expressir::Model::DataTypes::Set" => "Expressir::Model::DataTypes::Set",
+        "Expressir::Model::DataTypes::String" => "Expressir::Model::DataTypes::String",
+        "Expressir::Model::Declarations::DerivedAttribute" => "Expressir::Model::Declarations::DerivedAttribute",
+        "Expressir::Model::Declarations::Attribute" => "Expressir::Model::Declarations::Attribute",
+        "Expressir::Model::Declarations::Constant" => "Expressir::Model::Declarations::Constant",
+        "Expressir::Model::Declarations::Entity" => "Expressir::Model::Declarations::Entity",
+        "Expressir::Model::Declarations::Function" => "Expressir::Model::Declarations::Function",
+        "Expressir::Model::Declarations::InterfaceItem" => "Expressir::Model::Declarations::InterfaceItem",
+        "Expressir::Model::Declarations::Interface" => "Expressir::Model::Declarations::Interface",
+        "Expressir::Model::Declarations::InterfacedItem" => "Expressir::Model::Declarations::InterfacedItem",
+        "Expressir::Model::Declarations::Parameter" => "Expressir::Model::Declarations::Parameter",
+        "Expressir::Model::Declarations::Procedure" => "Expressir::Model::Declarations::Procedure",
+        "Expressir::Model::Declarations::RemarkItem" => "Expressir::Model::Declarations::RemarkItem",
+        "Expressir::Model::Declarations::InformalPropositionRule" => "Expressir::Model::Declarations::InformalPropositionRule",
+        "Expressir::Model::Declarations::Rule" => "Expressir::Model::Declarations::Rule",
+        "Expressir::Model::Declarations::SchemaVersionItem" => "Expressir::Model::Declarations::SchemaVersionItem",
+        "Expressir::Model::Declarations::SchemaVersion" => "Expressir::Model::Declarations::SchemaVersion",
+        "Expressir::Model::Declarations::Schema" => "Expressir::Model::Declarations::Schema",
+        "Expressir::Model::Declarations::SubtypeConstraint" => "Expressir::Model::Declarations::SubtypeConstraint",
+        "Expressir::Model::Declarations::Type" => "Expressir::Model::Declarations::Type",
+        "Expressir::Model::Declarations::UniqueRule" => "Expressir::Model::Declarations::UniqueRule",
+        "Expressir::Model::Declarations::Variable" => "Expressir::Model::Declarations::Variable",
+        "Expressir::Model::Declarations::WhereRule" => "Expressir::Model::Declarations::WhereRule",
+        "Expressir::Model::Expressions::AggregateInitializerItem" => "Expressir::Model::Expressions::AggregateInitializerItem",
+        "Expressir::Model::Expressions::AggregateInitializer" => "Expressir::Model::Expressions::AggregateInitializer",
+        "Expressir::Model::Expressions::BinaryExpression" => "Expressir::Model::Expressions::BinaryExpression",
+        "Expressir::Model::Expressions::EntityConstructor" => "Expressir::Model::Expressions::EntityConstructor",
+        "Expressir::Model::Expressions::FunctionCall" => "Expressir::Model::Expressions::FunctionCall",
+        "Expressir::Model::Expressions::Interval" => "Expressir::Model::Expressions::Interval",
+        "Expressir::Model::Expressions::QueryExpression" => "Expressir::Model::Expressions::QueryExpression",
+        "Expressir::Model::Expressions::UnaryExpression" => "Expressir::Model::Expressions::UnaryExpression",
+        "Expressir::Model::Literals::Binary" => "Expressir::Model::Literals::Binary",
+        "Expressir::Model::Literals::Integer" => "Expressir::Model::Literals::Integer",
+        "Expressir::Model::Literals::Logical" => "Expressir::Model::Literals::Logical",
+        "Expressir::Model::Literals::Real" => "Expressir::Model::Literals::Real",
+        "Expressir::Model::Literals::String" => "Expressir::Model::Literals::String",
+        "Expressir::Model::References::AttributeReference" => "Expressir::Model::References::AttributeReference",
+        "Expressir::Model::References::GroupReference" => "Expressir::Model::References::GroupReference",
+        "Expressir::Model::References::IndexReference" => "Expressir::Model::References::IndexReference",
+        "Expressir::Model::References::SimpleReference" => "Expressir::Model::References::SimpleReference",
+        "Expressir::Model::Statements::Alias" => "Expressir::Model::Statements::Alias",
+        "Expressir::Model::Statements::Assignment" => "Expressir::Model::Statements::Assignment",
+        "Expressir::Model::Statements::CaseAction" => "Expressir::Model::Statements::CaseAction",
+        "Expressir::Model::Statements::Case" => "Expressir::Model::Statements::Case",
+        "Expressir::Model::Statements::Compound" => "Expressir::Model::Statements::Compound",
+        "Expressir::Model::Statements::Escape" => "Expressir::Model::Statements::Escape",
+        "Expressir::Model::Statements::If" => "Expressir::Model::Statements::If",
+        "Expressir::Model::Statements::Null" => "Expressir::Model::Statements::Null",
+        "Expressir::Model::Statements::ProcedureCall" => "Expressir::Model::Statements::ProcedureCall",
+        "Expressir::Model::Statements::Repeat" => "Expressir::Model::Statements::Repeat",
+        "Expressir::Model::Statements::Return" => "Expressir::Model::Statements::Return",
+        "Expressir::Model::Statements::Skip" => "Expressir::Model::Statements::Skip",
+        "Expressir::Model::SupertypeExpressions::BinarySupertypeExpression" => "Expressir::Model::SupertypeExpressions::BinarySupertypeExpression",
+        "Expressir::Model::SupertypeExpressions::OneofSupertypeExpression" => "Expressir::Model::SupertypeExpressions::OneofSupertypeExpression",
+      }.freeze
+
       key_value do
         map "_class", to: :_class, render_default: true,
-                      polymorphic_map: {
-                        "Expressir::Model::Cache" =>
-                        "Expressir::Model::Cache",
-                        "Expressir::Model::Repository" =>
-            "Expressir::Model::Repository",
-                        "Expressir::Model::DataTypes::Aggregate" =>
-            "Expressir::Model::DataTypes::Aggregate",
-                        "Expressir::Model::DataTypes::Array" =>
-            "Expressir::Model::DataTypes::Array",
-                        "Expressir::Model::DataTypes::Bag" =>
-            "Expressir::Model::DataTypes::Bag",
-                        "Expressir::Model::DataTypes::Binary" =>
-            "Expressir::Model::DataTypes::Binary",
-                        "Expressir::Model::DataTypes::Boolean" =>
-            "Expressir::Model::DataTypes::Boolean",
-                        "Expressir::Model::DataTypes::EnumerationItem" =>
-            "Expressir::Model::DataTypes::EnumerationItem",
-                        "Expressir::Model::DataTypes::Enumeration" =>
-            "Expressir::Model::DataTypes::Enumeration",
-                        "Expressir::Model::DataTypes::GenericEntity" =>
-            "Expressir::Model::DataTypes::GenericEntity",
-                        "Expressir::Model::DataTypes::Generic" =>
-            "Expressir::Model::DataTypes::Generic",
-                        "Expressir::Model::DataTypes::Integer" =>
-            "Expressir::Model::DataTypes::Integer",
-                        "Expressir::Model::DataTypes::List" =>
-            "Expressir::Model::DataTypes::List",
-                        "Expressir::Model::DataTypes::Logical" =>
-            "Expressir::Model::DataTypes::Logical",
-                        "Expressir::Model::DataTypes::Number" =>
-            "Expressir::Model::DataTypes::Number",
-                        "Expressir::Model::DataTypes::Real" =>
-            "Expressir::Model::DataTypes::Real",
-                        "Expressir::Model::DataTypes::Select" =>
-            "Expressir::Model::DataTypes::Select",
-                        "Expressir::Model::DataTypes::Set" =>
-            "Expressir::Model::DataTypes::Set",
-                        "Expressir::Model::DataTypes::String" =>
-            "Expressir::Model::DataTypes::String",
-                        "Expressir::Model::Declarations::DerivedAttribute" =>
-            "Expressir::Model::Declarations::DerivedAttribute",
-                        "Expressir::Model::Declarations::Attribute" =>
-            "Expressir::Model::Declarations::Attribute",
-                        "Expressir::Model::Declarations::Constant" =>
-            "Expressir::Model::Declarations::Constant",
-                        "Expressir::Model::Declarations::Entity" =>
-            "Expressir::Model::Declarations::Entity",
-                        "Expressir::Model::Declarations::Function" =>
-            "Expressir::Model::Declarations::Function",
-                        "Expressir::Model::Declarations::InterfaceItem" =>
-            "Expressir::Model::Declarations::InterfaceItem",
-                        "Expressir::Model::Declarations::Interface" =>
-            "Expressir::Model::Declarations::Interface",
-                        "Expressir::Model::Declarations::InterfacedItem" =>
-            "Expressir::Model::Declarations::InterfacedItem",
-                        "Expressir::Model::Declarations::Parameter" =>
-            "Expressir::Model::Declarations::Parameter",
-                        "Expressir::Model::Declarations::Procedure" =>
-            "Expressir::Model::Declarations::Procedure",
-                        "Expressir::Model::Declarations::RemarkItem" =>
-            "Expressir::Model::Declarations::RemarkItem",
-                        "Expressir::Model::Declarations::Rule" =>
-            "Expressir::Model::Declarations::Rule",
-                        "Expressir::Model::Declarations::SchemaVersionItem" =>
-            "Expressir::Model::Declarations::SchemaVersionItem",
-                        "Expressir::Model::Declarations::SchemaVersion" =>
-            "Expressir::Model::Declarations::SchemaVersion",
-                        "Expressir::Model::Declarations::Schema" =>
-            "Expressir::Model::Declarations::Schema",
-                        "Expressir::Model::Declarations::SubtypeConstraint" =>
-            "Expressir::Model::Declarations::SubtypeConstraint",
-                        "Expressir::Model::Declarations::Type" =>
-            "Expressir::Model::Declarations::Type",
-                        "Expressir::Model::Declarations::UniqueRule" =>
-            "Expressir::Model::Declarations::UniqueRule",
-                        "Expressir::Model::Declarations::Variable" =>
-            "Expressir::Model::Declarations::Variable",
-                        "Expressir::Model::Declarations::WhereRule" =>
-            "Expressir::Model::Declarations::WhereRule",
-                        "Expressir::Model::Expressions::AggregateInitializerItem" =>
-            "Expressir::Model::Expressions::AggregateInitializerItem",
-                        "Expressir::Model::Expressions::AggregateInitializer" =>
-            "Expressir::Model::Expressions::AggregateInitializer",
-                        "Expressir::Model::Expressions::BinaryExpression" =>
-            "Expressir::Model::Expressions::BinaryExpression",
-                        "Expressir::Model::Expressions::EntityConstructor" =>
-            "Expressir::Model::Expressions::EntityConstructor",
-                        "Expressir::Model::Expressions::FunctionCall" =>
-            "Expressir::Model::Expressions::FunctionCall",
-                        "Expressir::Model::Expressions::Interval" =>
-            "Expressir::Model::Expressions::Interval",
-                        "Expressir::Model::Expressions::QueryExpression" =>
-            "Expressir::Model::Expressions::QueryExpression",
-                        "Expressir::Model::Expressions::UnaryExpression" =>
-            "Expressir::Model::Expressions::UnaryExpression",
-                        "Expressir::Model::Literals::Binary" =>
-            "Expressir::Model::Literals::Binary",
-                        "Expressir::Model::Literals::Integer" =>
-            "Expressir::Model::Literals::Integer",
-                        "Expressir::Model::Literals::Logical" =>
-            "Expressir::Model::Literals::Logical",
-                        "Expressir::Model::Literals::Real" =>
-            "Expressir::Model::Literals::Real",
-                        "Expressir::Model::Literals::String" =>
-            "Expressir::Model::Literals::String",
-                        "Expressir::Model::References::AttributeReference" =>
-            "Expressir::Model::References::AttributeReference",
-                        "Expressir::Model::References::GroupReference" =>
-            "Expressir::Model::References::GroupReference",
-                        "Expressir::Model::References::IndexReference" =>
-            "Expressir::Model::References::IndexReference",
-                        "Expressir::Model::References::SimpleReference" =>
-            "Expressir::Model::References::SimpleReference",
-                        "Expressir::Model::Statements::Alias" =>
-            "Expressir::Model::Statements::Alias",
-                        "Expressir::Model::Statements::Assignment" =>
-            "Expressir::Model::Statements::Assignment",
-                        "Expressir::Model::Statements::CaseAction" =>
-            "Expressir::Model::Statements::CaseAction",
-                        "Expressir::Model::Statements::Case" =>
-            "Expressir::Model::Statements::Case",
-                        "Expressir::Model::Statements::Compound" =>
-            "Expressir::Model::Statements::Compound",
-                        "Expressir::Model::Statements::Escape" =>
-            "Expressir::Model::Statements::Escape",
-                        "Expressir::Model::Statements::If" =>
-            "Expressir::Model::Statements::If",
-                        "Expressir::Model::Statements::Null" =>
-            "Expressir::Model::Statements::Null",
-                        "Expressir::Model::Statements::ProcedureCall" =>
-            "Expressir::Model::Statements::ProcedureCall",
-                        "Expressir::Model::Statements::Repeat" =>
-            "Expressir::Model::Statements::Repeat",
-                        "Expressir::Model::Statements::Return" =>
-            "Expressir::Model::Statements::Return",
-                        "Expressir::Model::Statements::Skip" =>
-            "Expressir::Model::Statements::Skip",
-                        "Expressir::Model::SupertypeExpressions::BinarySupertypeExpression" =>
-            "Expressir::Model::SupertypeExpressions::BinarySupertypeExpression",
-                        "Expressir::Model::SupertypeExpressions::OneofSupertypeExpression" =>
-            "Expressir::Model::SupertypeExpressions::OneofSupertypeExpression",
-                      }
+                      polymorphic_map: POLYMORPHIC_CLASS_MAP
       end
 
       def source
@@ -183,7 +115,12 @@ module Expressir
         current_node = self
         path_parts = []
         loop do
-          if current_node.class.method_defined?(:id) && !(current_node.is_a? References::SimpleReference)
+          # Skip adding the id if this is a RemarkItem that belongs to an InformalPropositionRule
+          # and has the same id as its parent
+          if !(current_node.is_a? References::SimpleReference) && current_node.class.method_defined?(:id) &&
+              !(is_a?(Declarations::RemarkItem) &&
+                parent.is_a?(Declarations::InformalPropositionRule) &&
+                id == parent.id)
             path_parts << current_node.id
           end
 
@@ -237,7 +174,9 @@ module Expressir
 
       # @return [Hash<String, Declaration>]
       def children_by_id
-        @children_by_id ||= children.select(&:id).map { |x| [x.id.safe_downcase, x] }.to_h
+        @children_by_id ||= children.select(&:id).to_h do |x|
+          [x.id.safe_downcase, x]
+        end
       end
 
       # @return [nil]

data/lib/expressir/model/repository.rb

@@ -2,7 +2,8 @@ module Expressir
   module Model
     # Multi-schema global scope
     class Repository < ModelElement
-      attribute :schemas, Expressir::Model::Declarations::Schema, collection: true
+      attribute :schemas, Expressir::Model::Declarations::Schema,
+                collection: true
       attribute :_class, :string, default: -> { send(:name) }
 
       key_value do

data/lib/expressir/schema_manifest.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "schema_manifest_entry"
+
+module Expressir
+  class SchemaManifest < Lutaml::Model::Serializable
+    attribute :schemas, SchemaManifestEntry, collection: true,
+                                             initialize_empty: true
+    attribute :path, Lutaml::Model::Type::String
+    attr_accessor :output_path
+
+    def initialize(**args)
+      @path = path_relative_to_absolute(path) if path
+      super
+    end
+
+    def base_path
+      File.dirname(@path)
+    end
+
+    yaml do
+      map "schemas", with: { from: :schemas_from_yaml, to: :schemas_to_yaml }
+    end
+
+    def self.from_file(path)
+      from_yaml(File.read(path)).tap do |x|
+        x.set_initial_path(path)
+      end
+    rescue StandardError => e
+      raise InvalidSchemaManifestError, "Invalid schema manifest format: #{e.message}"
+    end
+
+    def to_file(to_path = path)
+      FileUtils.mkdir_p(File.dirname(to_path))
+      File.write(to_path, to_yaml)
+    end
+
+    def set_initial_path(new_path)
+      @path = path_relative_to_absolute(new_path)
+      schemas.each do |schema|
+        schema.path = path_relative_to_absolute(schema.path)
+        schema.container_path = File.expand_path(@path)
+      end
+    end
+
+    def schemas_from_yaml(model, value)
+      model.schemas = value.map do |k, v|
+        SchemaManifestEntry.new(id: k,
+                                path: path_relative_to_absolute(v["path"]))
+      end
+    end
+
+    def schemas_to_yaml(model, doc)
+      doc["schemas"] = model.schemas.sort_by(&:id).to_h do |schema|
+        # We are outputting the schemas collection file to the directory where
+        # the collection config is at (assumed to be Dir.pwd), not to the
+        # directory we sourced the manifest from, e.g.
+        # documents/iso-10303-41/schemas.yaml.
+
+        # So the schema.container_path = @config.path is not
+        # in fact needed, as the files are already absolute. This notion of
+        # using @path to create relative paths was misconceived
+        [
+          schema.id,
+          {
+            "path" => path_absolute_to_relative(
+              schema.path,
+              model.output_path || Dir.pwd,
+            ),
+          },
+        ]
+      end
+    end
+
+    def path_relative_to_absolute(relative_path)
+      eval_path = Pathname.new(relative_path)
+      return relative_path if eval_path.absolute?
+
+      # Or based on current working directory?
+      return relative_path unless @path
+
+      # ... but if this calculates path, we end up expanding it anyway
+
+      Pathname.new(File.dirname(@path)).join(eval_path).expand_path.to_s
+    end
+
+    def path_absolute_to_relative(absolute_path, container_path)
+      container_path ||= @path
+      return absolute_path unless container_path
+
+      p = Pathname.new(container_path)
+      container = p.directory? ? p.to_s : p.dirname
+      Pathname.new(absolute_path).relative_path_from(container).to_s
+    end
+
+    def update_path(new_path)
+      if @path.nil?
+        @path = new_path
+        return @path
+      end
+
+      old_base_path = File.dirname(@path)
+      new_base_path = File.dirname(new_path)
+      update_schema_path(old_base_path, new_base_path)
+
+      @path = new_path
+    end
+
+    def concat(another_config)
+      unless another_config.is_a?(self.class)
+        raise StandardError,
+              "Can only concat a SchemaManifest object."
+      end
+
+      # We need to update the relative paths when paths exist
+      if path && another_config.path && path != another_config.path
+        new_config = another_config.dup
+        new_config.update_path(path)
+      end
+
+      schemas.concat(another_config.schemas)
+    end
+
+    def save_to_path(filename)
+      new_config = dup.tap do |c|
+        c.path = filename
+        c.update_path(File.dirname(filename))
+        c.output_path = filename
+      end
+
+      File.open(filename, "w") do |f|
+        puts "Writing #{filename}..."
+        f.write(new_config.to_yaml)
+        puts "Done."
+      end
+    end
+
+    def update_schema_path(old_base_path, new_base_path)
+      schemas.each do |schema|
+        schema_path = Pathname.new(schema.path)
+        next if schema_path.absolute?
+
+        schema_path = (Pathname.new(old_base_path) + schema_path).cleanpath
+        # This is the new relative schema_path
+        schema.path = schema_path.relative_path_from(new_base_path)
+      end
+    end
+  end
+end

data/lib/expressir/schema_manifest_entry.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Expressir
+  class SchemaManifestEntry < Lutaml::Model::Serializable
+    attribute :id, Lutaml::Model::Type::String
+    attribute :path, Lutaml::Model::Type::String
+    # attribute :schemas_only, Lutaml::Model::Type::Boolean
+
+    # container_path is a copy of Expressir::SchemaManifest.path,
+    # used to resolve the path of each schema within
+    # Expressir::SchemaManifest.schemas,
+    # when Expressir::SchemaManifest.schemas is recursively flattened
+    attr_accessor :container_path
+  end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.22".freeze
+  VERSION = "2.1.23".freeze
 end

data/lib/expressir.rb

@@ -3,6 +3,8 @@ 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
 
@@ -27,6 +29,7 @@ end
 
 module Expressir
   class Error < StandardError; end
+  class InvalidSchemaManifestError < Error; end
 
   def self.root
     File.dirname(__dir__)
@@ -44,7 +47,8 @@ module Expressir
     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 :ResolveReferencesModelVisitor,
+             "expressir/express/resolve_references_model_visitor"
     autoload :SchemaHeadFormatter, "expressir/express/schema_head_formatter"
     autoload :Visitor, "expressir/express/visitor"
   end
@@ -79,32 +83,42 @@ module Expressir
     module Declarations
       autoload :Attribute, "expressir/model/declarations/attribute"
       autoload :Constant, "expressir/model/declarations/constant"
-      autoload :DerivedAttribute, "expressir/model/declarations/derived_attribute"
+      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 :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 :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 :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"
@@ -120,7 +134,8 @@ module Expressir
     end
 
     module References
-      autoload :AttributeReference, "expressir/model/references/attribute_reference"
+      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"
@@ -142,8 +157,10 @@ module Expressir
     end
 
     module SupertypeExpressions
-      autoload :BinarySupertypeExpression, "expressir/model/supertype_expressions/binary_supertype_expression"
-      autoload :OneofSupertypeExpression, "expressir/model/supertype_expressions/oneof_supertype_expression"
+      autoload :BinarySupertypeExpression,
+               "expressir/model/supertype_expressions/binary_supertype_expression"
+      autoload :OneofSupertypeExpression,
+               "expressir/model/supertype_expressions/oneof_supertype_expression"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.22
+  version: 2.1.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2025-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -214,6 +214,7 @@ files:
 - lib/expressir/model/declarations/derived_attribute.rb
 - lib/expressir/model/declarations/entity.rb
 - lib/expressir/model/declarations/function.rb
+- lib/expressir/model/declarations/informal_proposition_rule.rb
 - lib/expressir/model/declarations/interface.rb
 - lib/expressir/model/declarations/interface_item.rb
 - lib/expressir/model/declarations/interfaced_item.rb
@@ -264,6 +265,8 @@ files:
 - lib/expressir/model/statements/skip.rb
 - lib/expressir/model/supertype_expressions/binary_supertype_expression.rb
 - lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb
+- lib/expressir/schema_manifest.rb
+- lib/expressir/schema_manifest_entry.rb
 - lib/expressir/version.rb
 homepage: https://github.com/lutaml/expressir
 licenses: