expressir 2.4.34 → 2.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ae98e1866bac67ff62c5a8f27abd2f06d94c62f8f7468c43d67554e1d4cd48
-  data.tar.gz: a4ee98f12efb95ca5d3302aa8835120b2bad67ca37181430c9c4fcc1bbc8c561
+  metadata.gz: 2fef762a5f189a2fa5e19af4e03b508ceecb9c51f4f70a805af7b0cfaa955c66
+  data.tar.gz: f4bfae05b286248e59f3bb54c83369c1c1bba957edeb5dc1e9e0aa8e7d0bc147
 SHA512:
-  metadata.gz: 0ec3c593547ace542482f7b5371d446dc7810e5e52f250281f0b5a6bca742d05c31abf15a8dc25456845314c98bdc673351a458a88384ea5e2d06b499904a411
-  data.tar.gz: b2f7b4a8c851a61024baa8601c826c649bcff17393d91934a4faf5d75ee2ecf0936697bd5178a92dd36d3c850a809ac9c6ed39cf70fda3fb4aba3646698b65b8
+  metadata.gz: 75be497abf1fc565aa7098271d933715ab0e2ccaa2eed76eda589d37fe511cb8b52a2c08ffa537e23011cb847d14c9a9647c99e814473cdb5820577e61b31af1
+  data.tar.gz: 5420b2a0edfd9f4135515c75cf163b68dbb147e6b60fd7900528671862672f3695936884ea919692036c8e09eabb60f85c13cc939c61fdc67c9ec8ad2e1571cd

data/lib/expressir/express/builder.rb

@@ -186,17 +186,29 @@ module Expressir
 
             case item
             when Array
-              item.each do |sub|
-                result << build(sub) unless sub.nil?
-              end
+              item.each { |sub| append_built(result, build(sub)) unless sub.nil? }
             else
-              built = build(item)
-              result << built if built
+              append_built(result, build(item))
             end
           end
           result
         end
 
+        # Builders for list productions (ExplicitAttrBuilder and friends)
+        # return Arrays of nodes. Splice those items into the parent list
+        # rather than nesting them — nested Arrays break every consumer
+        # that expects ModelElements (`x.kind`, tree walks, formatters).
+        def append_built(result, built)
+          case built
+          when nil
+            nil
+          when Array
+            built.each { |b| append_built(result, b) }
+          else
+            result << built
+          end
+        end
+
         # Fast build methods - call registered builder directly without hash wrapping
         # These are optimized for hot paths in expression building
         # NOTE: These assume data is already snake_case (no key conversion needed)

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

@@ -73,17 +73,17 @@ module Expressir
           if entity_body.is_a?(Hash)
             if entity_body[:explicit_attr]
               explicit_attrs = Builder.build_children(entity_body[:explicit_attr])
-              attributes.concat(explicit_attrs)
+              attributes.concat(flatten_items(explicit_attrs))
             end
 
             if entity_body[:derive_clause]
               derived = Builder.build({ derive_clause: entity_body[:derive_clause] })
-              attributes.push(derived) if derived
+              attributes.concat(flatten_items(derived))
             end
 
             if entity_body[:inverse_clause]
               inverse = Builder.build({ inverse_clause: entity_body[:inverse_clause] })
-              attributes.push(inverse) if inverse
+              attributes.concat(flatten_items(inverse))
             end
 
             if entity_body[:unique_clause]
@@ -103,13 +103,25 @@ module Expressir
             supertype_expression: supertype_expression,
             subtype_of: subtype_of,
             attributes: attributes,
-            unique_rules: [unique_rules].flatten,
-            where_rules: [where_rules].flatten,
+            unique_rules: flatten_items(unique_rules),
+            where_rules: flatten_items(where_rules),
           }
           entity_params[:abstract] = true if abstract
 
           Expressir::Model::Declarations::Entity.new(**entity_params)
         end
+
+        private
+
+        # ExplicitAttrBuilder / DeriveClauseBuilder / InverseClauseBuilder
+        # return Arrays (one node per declaration). Call sites must splice
+        # those items into the parent list — nesting them leaves
+        # `entity.attributes` as Array-of-Array, which formatters then
+        # crash on (`undefined method 'kind' for an instance of Array`).
+        # lutaml-model 0.8.107 no longer flattens collection assignments.
+        def flatten_items(value)
+          Array(value).flatten.compact
+        end
       end
     end
   end

data/lib/expressir/express/formatters/declarations_formatter.rb

@@ -110,20 +110,15 @@ module Expressir
         end
 
         def format_declarations_entity(node)
-          if node.attributes.nil?
-            explicit_attributes = []
-            derived_attributes = []
-            inverse_attributes = []
-          else
-            explicit_attributes = node.attributes.select do |x|
-              x.kind == Model::Declarations::Attribute::EXPLICIT
-            end
-            derived_attributes = node.attributes.select do |x|
-              x.kind == Model::Declarations::Attribute::DERIVED
-            end
-            inverse_attributes = node.attributes.select do |x|
-              x.kind == Model::Declarations::Attribute::INVERSE
-            end
+          attrs = entity_attribute_items(node)
+          explicit_attributes = attrs.select do |x|
+            x.kind == Model::Declarations::Attribute::EXPLICIT
+          end
+          derived_attributes = attrs.select do |x|
+            x.kind == Model::Declarations::Attribute::DERIVED
+          end
+          inverse_attributes = attrs.select do |x|
+            x.kind == Model::Declarations::Attribute::INVERSE
           end
 
           indent_const = self.class.const_get(:INDENT)
@@ -231,6 +226,18 @@ module Expressir
           ].join("\n")
         end
 
+        # Entity#attributes is the Ruby-parse layout (every attribute kind
+        # in one list). The core path parks derived/inverse in their own
+        # collections instead. Both may also arrive as Array-of-Array when
+        # a builder nested list productions. Normalize to a flat list of
+        # Attribute-like nodes before selecting on `kind`.
+        def entity_attribute_items(node)
+          items = Array(node.attributes)
+          items += Array(node.derived_attributes) if node.respond_to?(:derived_attributes)
+          items += Array(node.inverse_attributes) if node.respond_to?(:inverse_attributes)
+          items.flatten.compact.uniq(&:object_id)
+        end
+
         def format_declarations_function(node)
           indent_char = self.class.const_get(:INDENT_CHAR)
           [

data/lib/expressir/express/pretty_formatter.rb

@@ -112,20 +112,15 @@ module Expressir
       # @param node [Model::Declarations::Entity] Entity node
       # @return [String] Formatted entity
       def format_declarations_entity(node)
-        if node.attributes.nil?
-          explicit_attributes = []
-          derived_attributes = []
-          inverse_attributes = []
-        else
-          explicit_attributes = node.attributes.select do |x|
-            x.kind == Model::Declarations::Attribute::EXPLICIT
-          end
-          derived_attributes = node.attributes.select do |x|
-            x.kind == Model::Declarations::Attribute::DERIVED
-          end
-          inverse_attributes = node.attributes.select do |x|
-            x.kind == Model::Declarations::Attribute::INVERSE
-          end
+        attrs = entity_attribute_items(node)
+        explicit_attributes = attrs.select do |x|
+          x.kind == Model::Declarations::Attribute::EXPLICIT
+        end
+        derived_attributes = attrs.select do |x|
+          x.kind == Model::Declarations::Attribute::DERIVED
+        end
+        inverse_attributes = attrs.select do |x|
+          x.kind == Model::Declarations::Attribute::INVERSE
         end
 
         indent_str = " " * @config.indent

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.34".freeze
+    VERSION = "2.4.35".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.34
+  version: 2.4.35
 platform: ruby
 authors:
 - Ribose Inc.