expressir 2.4.44 → 2.4.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb19f12779500cf95395e7422a425bbb59e6e4e3f10cc1c62f5946f79cc4644
-  data.tar.gz: 227a77557ce585cb6313944dbc7cd6e5104f5e5594214c48a9c59955dce4a4b7
+  metadata.gz: dfc39b74ae5aed552c9487f7fe8a8e642947c76af8faaeb6a3efb9394b975e68
+  data.tar.gz: 38b6d067b885aa364b2027916b27b4ee2ab706a43c6a98da157c654638d309d8
 SHA512:
-  metadata.gz: 80e48ee59df97ce558cd507a89eccae20c9063c3031f51dc77803b8ca5f148ac0cb5344dc969c3e0c639fd706f95d3db80788b0de1d56a411ccf10ea75f8e580
-  data.tar.gz: 043ec4835ace4e4922f166ceef3c216c2a8b6f2b06c591aca93a954172b31ec50d2cddc97c54e517ce84004a305a8f39249c95f3abd7c3a3311c831c9e63898e
+  metadata.gz: e6554fc3447df08d8093e4bbde2956485b6fbcbeede516899a2f013f0fe81c7bc1afc7635ad6c5afb46ee69c82cc14c36d415997ff10b742307ae8028c6088e9
+  data.tar.gz: 8d069223f80dbaa4c7e282467c054e6488ca02f5a2def0860cd1c6ddb7bdf147a0c515e572e17310a7250124218cf8ac25ff760c69c7989e2b4bdacd349948d0

data/.github/workflows/conformance.yml

@@ -15,6 +15,10 @@ jobs:
           repository: metanorma/iso-10303-stepmod
           path: stepmod
           sparse-checkout: data/resources
+          # the stepmod corpus is a PRIVATE metanorma repo; the default
+          # GITHUB_TOKEN is scoped to lutaml/expressir and got a 404 on
+          # every scheduled run since the workflow was added (2026-10-21)
+          token: ${{ secrets.LUTAML_CI_PAT_TOKEN }}
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"

data/.github/workflows/gemspec-floor.yml

@@ -0,0 +1,61 @@
+# Floor guard: every released expressir must LOAD under the OLDEST
+# lutaml-model its own gemspec admits. v2.4.4/v2.4.5 shipped `map ...,
+# serialize: false` while declaring `lutaml-model ~> 0.8.0` — the
+# keyword first exists in 0.8.43 — so any bundle resolving that pair
+# died at class-load time (issue #566). This job pins lutaml-model to
+# the exact gemspec floor and loads the model classes against it.
+name: gemspec-floor
+
+on:
+  push:
+    branches: [ master, main ]
+  pull_request:
+
+jobs:
+  floor:
+    runs-on: ubuntu-latest
+    name: lutaml-model at the gemspec floor
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+
+      - name: Extract the lutaml-model floor from the gemspec
+        id: floor
+        run: |
+          floor=$(ruby -e '
+            spec = Gem::Specification.load(Dir["*.gemspec"].first)
+            dep = spec.dependencies.find { |d| d.name == "lutaml-model" }
+            candidates = dep.requirement.requirements
+              .select { |op, _| [">=", "~>"].include?(op) }
+              .map { |_, v| v.version }
+            abort "no lutaml-model floor in the gemspec" if candidates.empty?
+            puts candidates.min
+          ')
+          echo "floor=$floor" >> "$GITHUB_OUTPUT"
+          echo "lutaml-model floor: $floor"
+
+      - name: Pin lutaml-model exactly at the floor
+        run: |
+          cat >> Gemfile <<'GEMFILE'
+
+          gem "lutaml-model", "= ${{ steps.floor.outputs.floor }}"
+          GEMFILE
+          bundle install
+
+      - name: Load the model classes under the floor
+        run: |
+          bundle exec ruby -e '
+            require "lutaml/model"
+            resolved = Gem.loaded_specs["lutaml-model"].version.to_s
+            abort "resolved #{resolved}, expected ${{ steps.floor.outputs.floor }}" unless resolved == "${{ steps.floor.outputs.floor }}"
+            require "expressir"
+            require "expressir/model/model_element"
+            require "expressir/model"
+            puts "model classes load under lutaml-model #{resolved}"
+          '
+
+      - name: Model specs under the floor
+        run: bundle exec rspec spec/expressir/model

data/.github/workflows/performance-release.yml

@@ -105,7 +105,9 @@ jobs:
           TAG=${TAG:-$(gh release view --json tagName --jq .tagName)}
           echo "Reporting against $TAG"
           gh release view "$TAG" --json body --jq .body > /tmp/body.md
-          ruby -e '
+          # bundle exec: the expressir gem is linked through the Gemfile's
+          # gemspec — bare ruby cannot load it (LoadError, 2026-10-26+ runs)
+          bundle exec ruby -e '
             require "json"
             require "expressir"
             require "expressir/scoreboard"

data/lib/expressir/coverage.rb

@@ -465,9 +465,11 @@ module Expressir
         elsif entity_class == "Expressir::Model::Declarations::Type" && type_subtype_skips.any?
           entity_subtype = get_type_subtype(entity)
           type_subtype_skips.include?(entity_subtype)
-        # Check FUNCTION:INNER exclusions
-        elsif entity_class == "Expressir::Model::Declarations::Function" && function_subtype_skips.include?("INNER")
-          inner_function?(entity)
+        # Check FUNCTION:INNER exclusions — the whole inner-function
+        # subtree is excluded, its parameters and nested declarations
+        # included, not only the function entity itself
+        elsif function_subtype_skips.include?("INNER") && within_inner_function?(entity)
+          true
         else
           false
         end
@@ -506,5 +508,19 @@ module Expressir
         parent.is_a?(Expressir::Model::Declarations::Rule) ||
         parent.is_a?(Expressir::Model::Declarations::Procedure)
     end
+
+    # Check if an entity is an inner function or a declaration belonging to one
+    # (its parameters, nested types, nested functions, ...)
+    # @param entity [Expressir::Model::ModelElement] The entity to check
+    # @return [Boolean] True if the entity or any of its ancestors is an inner function
+    def self.within_inner_function?(entity)
+      current = entity
+      while current
+        return true if current.is_a?(Model::Declarations::Function) && inner_function?(current)
+
+        current = current.respond_to?(:parent) ? current.parent : nil
+      end
+      false
+    end
   end
 end

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

@@ -6,7 +6,7 @@ module Expressir
       class Enumeration < ModelElement
         attribute :extensible, :boolean
         attribute :based_on, ModelElement
-        attribute :items, EnumerationItem, collection: true
+        attribute :items, EnumerationItem, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -7,7 +7,7 @@ module Expressir
         attribute :extensible, :boolean
         attribute :generic_entity, :boolean
         attribute :based_on, ModelElement
-        attribute :items, ModelElement, collection: true
+        attribute :items, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -16,19 +16,19 @@ module Expressir
 
         attribute :abstract, :boolean
         attribute :supertype_expression, ModelElement
-        attribute :subtype_of, ModelElement, collection: true
+        attribute :subtype_of, ModelElement, collection: true, initialize_empty: true
         # Heterogeneous by design: Attribute, DerivedAttribute, and
         # InverseAttribute all live here (the builders concatenate the
         # three clauses in declaration order). The ModelElement base
         # keeps from_hash polymorphic via the _class marker, exactly
         # like the Ruby-built model.
-        attribute :attributes, ModelElement, collection: true
-        attribute :derived_attributes, DerivedAttribute, collection: true
-        attribute :inverse_attributes, InverseAttribute, collection: true
-        attribute :unique_rules, UniqueRule, collection: true
-        attribute :where_rules, WhereRule, collection: true
+        attribute :attributes, ModelElement, collection: true, initialize_empty: true
+        attribute :derived_attributes, DerivedAttribute, collection: true, initialize_empty: true
+        attribute :inverse_attributes, InverseAttribute, collection: true, initialize_empty: true
+        attribute :unique_rules, UniqueRule, collection: true, initialize_empty: true
+        attribute :where_rules, WhereRule, collection: true, initialize_empty: true
         attribute :informal_propositions, InformalPropositionRule,
-                  collection: true
+                  collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -12,16 +12,16 @@ module Expressir
                               :constants, :variables, :statements,
                               :remark_items
 
-        attribute :parameters, Parameter, collection: true
+        attribute :parameters, Parameter, collection: true, initialize_empty: true
         attribute :return_type, ModelElement
-        attribute :types, ModelElement, collection: true
-        attribute :entities, Entity, collection: true
-        attribute :subtype_constraints, SubtypeConstraint, collection: true
-        attribute :functions, Function, collection: true
-        attribute :procedures, Procedure, collection: true
-        attribute :constants, Constant, collection: true
-        attribute :variables, Variable, collection: true
-        attribute :statements, ModelElement, collection: true
+        attribute :types, ModelElement, collection: true, initialize_empty: true
+        attribute :entities, Entity, collection: true, initialize_empty: true
+        attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
+        attribute :functions, Function, collection: true, initialize_empty: true
+        attribute :procedures, Procedure, collection: true, initialize_empty: true
+        attribute :constants, Constant, collection: true, initialize_empty: true
+        attribute :variables, Variable, collection: true, initialize_empty: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -12,7 +12,7 @@ module Expressir
 
         attribute :kind, :string, values: %w[USE REFERENCE]
         attribute :schema, ModelElement
-        attribute :items, InterfaceItem, collection: true
+        attribute :items, InterfaceItem, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         # Registers :items with the tree-walker registry: the position index

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

@@ -8,8 +8,8 @@ module Expressir
         include HasRemarks
 
         attribute :id, :string
-        attribute :remarks, :string, collection: true
-        attribute :remark_items, RemarkItem, collection: true
+        attribute :remarks, :string, collection: true, initialize_empty: true
+        attribute :remark_items, RemarkItem, collection: true, initialize_empty: true
         attribute :base_item, ModelElement
         attribute :_class, :string, default: -> { self.class.name }
 

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

@@ -12,15 +12,15 @@ module Expressir
                               :constants, :variables, :statements,
                               :remark_items
 
-        attribute :parameters, Parameter, collection: true
-        attribute :types, ModelElement, collection: true
-        attribute :entities, Entity, collection: true
-        attribute :subtype_constraints, SubtypeConstraint, collection: true
-        attribute :functions, Function, collection: true
-        attribute :procedures, Procedure, collection: true
-        attribute :constants, Constant, collection: true
-        attribute :variables, Variable, collection: true
-        attribute :statements, ModelElement, collection: true
+        attribute :parameters, Parameter, collection: true, initialize_empty: true
+        attribute :types, ModelElement, collection: true, initialize_empty: true
+        attribute :entities, Entity, collection: true, initialize_empty: true
+        attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
+        attribute :functions, Function, collection: true, initialize_empty: true
+        attribute :procedures, Procedure, collection: true, initialize_empty: true
+        attribute :constants, Constant, collection: true, initialize_empty: true
+        attribute :variables, Variable, collection: true, initialize_empty: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -7,7 +7,7 @@ module Expressir
         include HasRemarks
 
         attribute :id, :string
-        attribute :remarks, :string, collection: true
+        attribute :remarks, :string, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -15,18 +15,18 @@ module Expressir
                               :where_rules, :informal_propositions,
                               :remark_items
 
-        attribute :applies_to, ModelElement, collection: true
-        attribute :types, ModelElement, collection: true
-        attribute :entities, Entity, collection: true
-        attribute :subtype_constraints, SubtypeConstraint, collection: true
-        attribute :functions, Function, collection: true
-        attribute :procedures, Procedure, collection: true
-        attribute :constants, Constant, collection: true
-        attribute :variables, Variable, collection: true
-        attribute :statements, ModelElement, collection: true
-        attribute :where_rules, WhereRule, collection: true
+        attribute :applies_to, ModelElement, collection: true, initialize_empty: true
+        attribute :types, ModelElement, collection: true, initialize_empty: true
+        attribute :entities, Entity, collection: true, initialize_empty: true
+        attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
+        attribute :functions, Function, collection: true, initialize_empty: true
+        attribute :procedures, Procedure, collection: true, initialize_empty: true
+        attribute :constants, Constant, collection: true, initialize_empty: true
+        attribute :variables, Variable, collection: true, initialize_empty: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
+        attribute :where_rules, WhereRule, collection: true, initialize_empty: true
         attribute :informal_propositions, InformalPropositionRule,
-                  collection: true
+                  collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -25,14 +25,14 @@ module Expressir
 
         attribute :file, :string
         attribute :version, SchemaVersion
-        attribute :interfaces, Interface, collection: true
-        attribute :constants, Constant, collection: true
-        attribute :types, ModelElement, collection: true
-        attribute :entities, Entity, collection: true
-        attribute :subtype_constraints, SubtypeConstraint, collection: true
-        attribute :functions, Function, collection: true
-        attribute :rules, Rule, collection: true
-        attribute :procedures, Procedure, collection: true
+        attribute :interfaces, Interface, collection: true, initialize_empty: true
+        attribute :constants, Constant, collection: true, initialize_empty: true
+        attribute :types, ModelElement, collection: true, initialize_empty: true
+        attribute :entities, Entity, collection: true, initialize_empty: true
+        attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
+        attribute :functions, Function, collection: true, initialize_empty: true
+        attribute :rules, Rule, collection: true, initialize_empty: true
+        attribute :procedures, Procedure, collection: true, initialize_empty: true
         attribute :header, :string
         attribute :_class, :string, default: -> { self.class.name }
         attribute :selected, :boolean, default: false

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

@@ -5,7 +5,7 @@ module Expressir
       # - section 9.3 Schema
       class SchemaVersion < ModelElement
         attribute :value, :string
-        attribute :items, SchemaVersionItem, collection: true
+        attribute :items, SchemaVersionItem, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -8,7 +8,7 @@ module Expressir
 
         attribute :applies_to, ModelElement
         attribute :abstract, :boolean
-        attribute :total_over, ModelElement, collection: true
+        attribute :total_over, ModelElement, collection: true, initialize_empty: true
         attribute :supertype_expression, ModelElement
         attribute :_class, :string, default: -> { self.class.name }
 

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

@@ -13,9 +13,9 @@ module Expressir
                               :remark_items
 
         attribute :underlying_type, ModelElement
-        attribute :where_rules, WhereRule, collection: true
+        attribute :where_rules, WhereRule, collection: true, initialize_empty: true
         attribute :informal_propositions, InformalPropositionRule,
-                  collection: true
+                  collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

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

@@ -6,7 +6,7 @@ module Expressir
       class UniqueRule < ModelElement
         include Identifier
 
-        attribute :attributes, ModelElement, collection: true
+        attribute :attributes, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/exp_file.rb

@@ -17,7 +17,7 @@ module Expressir
       collection_attributes :schemas
 
       attribute :path, :string
-      attribute :schemas, Declarations::Schema, collection: true,
+      attribute :schemas, Declarations::Schema, collection: true, initialize_empty: true,
                                                 initialize_empty: true
       attribute :_class, :string, default: -> { self.class.name }
 

data/lib/expressir/model/expressions/aggregate_initializer.rb

@@ -5,7 +5,7 @@ module Expressir
       # - section 12.9 Aggregate initializer
       class AggregateInitializer < ModelElement
         child_attributes :items
-        attribute :items, ModelElement, collection: true
+        attribute :items, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/expressions/entity_constructor.rb

@@ -6,7 +6,7 @@ module Expressir
       class EntityConstructor < ModelElement
         child_attributes :parameters
         attribute :entity, ModelElement
-        attribute :parameters, ModelElement, collection: true
+        attribute :parameters, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/expressions/function_call.rb

@@ -6,7 +6,7 @@ module Expressir
       class FunctionCall < ModelElement
         child_attributes :parameters
         attribute :function, ModelElement
-        attribute :parameters, ModelElement, collection: true
+        attribute :parameters, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/identifier.rb

@@ -8,11 +8,11 @@ module Expressir
         mod.include(HasRemarks)
 
         mod.attribute :id, :string
-        mod.attribute :remarks, :string, collection: true
+        mod.attribute :remarks, :string, collection: true, initialize_empty: true
         mod.attribute :remark_items,
-                      ::Expressir::Model::Declarations::RemarkItem, collection: true
+                      ::Expressir::Model::Declarations::RemarkItem, collection: true, initialize_empty: true
         mod.attribute :untagged_remarks, ::Expressir::Model::RemarkInfo,
-                      collection: true
+                      collection: true, initialize_empty: true
 
         mod.key_value do
           map "id", to: :id

data/lib/expressir/model/model_element.rb

@@ -75,7 +75,7 @@ module Expressir
                                   polymorphic_class: true
       attribute :source, :string
       attribute :source_offset, :integer
-      attribute :untagged_remarks, RemarkInfo, collection: true
+      attribute :untagged_remarks, RemarkInfo, collection: true, initialize_empty: true
 
       POLYMORPHIC_CLASS_MAP = {
         "Expressir::Model::Cache" => "Expressir::Model::Cache",

data/lib/expressir/model/statements/alias.rb

@@ -9,7 +9,7 @@ module Expressir
 
         collection_attributes :statements
         attribute :expression, ModelElement
-        attribute :statements, ModelElement, collection: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/statements/case.rb

@@ -15,7 +15,7 @@ module Expressir
 
         child_attributes :expression
         attribute :expression, ModelElement
-        attribute :actions, CaseAction, collection: true
+        attribute :actions, CaseAction, collection: true, initialize_empty: true
         attribute :otherwise_statement, ModelElement
         attribute :_class, :string, default: -> { self.class.name }
 

data/lib/expressir/model/statements/case_action.rb

@@ -5,7 +5,7 @@ module Expressir
       # - section 13.4 Case statement
       class CaseAction < ModelElement
         child_attributes :expression
-        attribute :labels, ModelElement, collection: true
+        attribute :labels, ModelElement, collection: true, initialize_empty: true
         attribute :statement, ModelElement
         attribute :_class, :string, default: -> { self.class.name }
 

data/lib/expressir/model/statements/compound.rb

@@ -7,7 +7,7 @@ module Expressir
         include Statement
 
         collection_attributes :statements
-        attribute :statements, ModelElement, collection: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/statements/if.rb

@@ -9,8 +9,8 @@ module Expressir
         collection_attributes :statements, :else_statements
         child_attributes :expression
         attribute :expression, ModelElement
-        attribute :statements, ModelElement, collection: true
-        attribute :else_statements, ModelElement, collection: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
+        attribute :else_statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/statements/procedure_call.rb

@@ -7,7 +7,7 @@ module Expressir
         include Statement
 
         attribute :procedure, ModelElement
-        attribute :parameters, ModelElement, collection: true
+        attribute :parameters, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/statements/repeat.rb

@@ -14,7 +14,7 @@ module Expressir
         attribute :increment, ModelElement
         attribute :while_expression, ModelElement
         attribute :until_expression, ModelElement
-        attribute :statements, ModelElement, collection: true
+        attribute :statements, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.2.5.2 ONEOF
       class OneofSupertypeExpression < ModelElement
-        attribute :operands, ModelElement, collection: true
+        attribute :operands, ModelElement, collection: true, initialize_empty: true
         attribute :_class, :string, default: -> { self.class.name }
 
         key_value do

data/lib/expressir/p28/xsd.rb

@@ -372,6 +372,16 @@ module Expressir
       # 7.6.3: one accessor element per mapped attribute; OPTIONAL
       # attributes are minOccurs="0"; aggregates carry their
       # occurrence bounds.
+      #
+      # Entity-typed accessors carry the REF form (exp:Entity —
+      # content-free, the ref/href IDREF attributes): a P21
+      # entity-valued position holds a reference (#N), never inline
+      # content, and the full validated form stays on the GLOBAL
+      # entity element (substitutionGroup exp:Entity). Typing the
+      # accessor with the entity's own complexType demanded that
+      # content inside by-reference occurrences — `<Widget ref="id2"/>`
+      # could not validate (#565, exposed by leptris 1.9.383 fixing
+      # the empty-instance bypass #1860).
       def accessor_node(doc, schema, prefix, attribute, inline, config = nil,
                         scope = nil)
         type = attribute.type
@@ -383,11 +393,14 @@ module Expressir
         node.set_attributes("minOccurs" => "0") if optional
         case kind
         when :entity
-          target = entity_id_of(schema, type)
-          node.set_attributes("type" => "#{prefix}:#{mapped(target, config, :entity)}")
+          # exp:Entity is abstract — an element cannot use it as its
+          # type directly (libxml2 rejects the schema); the concrete
+          # ref form is an anonymous empty extension carrying the
+          # base's ref/href attributes.
+          node.add_child(ref_form_node(doc, inline, prefix))
         when :entity_aggregate
           node.add_child(aggregate_content_node(doc, schema, prefix, type,
-                                                config))
+                                                config, inline: inline))
         when :aggregate
           node.add_child(inline_list_node(doc, schema, type, inline))
         when :select
@@ -415,24 +428,41 @@ module Expressir
       # Aggregates of entity base: the accessor wraps unqualified
       # component elements typed by the component entity (9.2.6.1
       # worked example shape).
-      def aggregate_content_node(doc, schema, prefix, aggregate, config = nil)
+      def aggregate_content_node(doc, schema, prefix, aggregate, config = nil,
+                                 inline: false)
         base = aggregate.base_type
         target = entity_id_of(schema, base)
         name = mapped(target, config, :entity)
         content = doc.create_element("xs:complexType")
         sequence = doc.create_element("xs:sequence")
         component = doc.create_element("xs:element")
+        # Aggregate members hold REFERENCES to entity instances
+        # (P21 #N ids), so the component element carries the
+        # content-free ref form (exp:Entity) — the full validated
+        # form stays on the global entity element (#565).
         component.set_attributes(
           "name" => name,
-          "type" => "#{prefix}:#{name}",
           "minOccurs" => "0",
           "maxOccurs" => "unbounded",
         )
+        component.add_child(ref_form_node(doc, inline, prefix))
         sequence.add_child(component)
         content.add_child(sequence)
         content
       end
 
+      # The concrete ref form: an anonymous empty extension of
+      # exp:Entity — content-free, carrying the base's ref/href
+      # attributes. Entity-valued positions in a P21 instance hold
+      # references (#N ids), never inline content (#565).
+      def ref_form_node(doc, inline, prefix)
+        content = doc.create_element("xs:complexContent")
+        extension = doc.create_element("xs:extension")
+        extension.set_attributes("base" => exp_name("Entity", inline, prefix))
+        content.add_child(extension)
+        content
+      end
+
       # 7.8: the context-schema specific uos element — in the
       # exp:uos substitution group, extending the exp:uos carrier,
       # with a repeating choice over the exp:Entity substitution

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.44".freeze
+    VERSION = "2.4.46".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.44
+  version: 2.4.46
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-26 00:00:00.000000000 Z
+date: 2026-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -242,6 +242,7 @@ files:
 - ".github/workflows/codeql.yml"
 - ".github/workflows/conformance.yml"
 - ".github/workflows/docs.yml"
+- ".github/workflows/gemspec-floor.yml"
 - ".github/workflows/links.yml"
 - ".github/workflows/native-gems.yml"
 - ".github/workflows/performance-release.yml"