lutaml-model 0.8.47 → 0.8.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ba22dbb3a53b5ba0cdb11840f7940507da76da3d3b7b3ccd64e52f597bdfe1
-  data.tar.gz: '09d45f38541abb51224c9af9a4aff11d3207a99c4c9f79206cc0a6041caa382e'
+  metadata.gz: a482362c928135d0733413ae200b20e5a9a7f05af8faf57696bc4461b093d691
+  data.tar.gz: 3b22e8a6881ad4a832d90a6b064d6999a5e5b8a969d507fd467d44c66f7c0279
 SHA512:
-  metadata.gz: 2a9fa0ec81775e5b928dbeb8d75b8b812d8e00c076176c1f6367e024d0bd85fd10ea27b3361160211dc47d275edff90b6d569e2ebf87b63a2f8bbba1ebf12024
-  data.tar.gz: '089b06566a9ec168c0491b7c584e95e68dc0bcb2c219b8932062aa3b33c3e5d696445e26782107c292c405cdead641ba33ad6571ac31f59403b2ac90d5f9a71d'
+  metadata.gz: a6047ddb9f43fa9a7012e794070891a0d997ca261f2c76f324223a1c1414bab39f1f05b5f627ecde1e21a083b971c4cc002d15928db410e97411b5dcca9a5b97
+  data.tar.gz: b849ae1daa34c19f6f570d1389a2ea43cf3af5ffba5db32bdef33e53a0b7ba960736b511ecfc5f520a926690134a4247227b1fa7a437923a8774a511569f6e88

data/README.adoc

@@ -2693,6 +2693,41 @@ references:
 ====
 
 
+==== Attribute-value dispatch on a shared name (`when_attribute`)
+
+Polymorphism selects the *class* of each item. The other dispatch axis
+selects *which attribute* an occurrence belongs to, keyed by a sibling
+value — every `<component>` below goes to a different attribute by its
+`type`:
+
+[source,ruby]
+----
+class Requirement < Lutaml::Model::Serializable
+  attribute :guidance, Component, collection: true
+  attribute :purpose, Component, collection: true
+
+  xml do
+    element "requirement"
+    map_element "component", when_attribute: "type",
+                             to: { "guidance" => :guidance,
+                                   "purpose" => :purpose }
+  end
+end
+----
+
+The same declaration works for key-value formats (`json`/`yaml`/`toml`/
+`hsh` blocks use `map`), where the discriminator is an object key's
+value. Every occurrence is captured exactly once, the discriminator is
+re-emitted on serialization, `unmatched: :raise` fails the parse on
+values no rule claims, and `ordered` XML mappings round-trip the
+original interleaving. The two axes compose on one rule — partition by
+value while dispatching classes with `polymorphic`.
+
+See
+link:docs/_guides/advanced-mapping.adoc[the advanced mapping guide]
+for the full semantics.
+
+
 
 === Union attributes
 

data/docs/_guides/index.adoc

@@ -23,6 +23,10 @@ Task-oriented guides for accomplishing specific goals with Lutaml::Model.
 * link:../keyvalue-serialization[Key-Value Serialization] - JSON/YAML/TOML/Hash
 * link:../collection-serialization[Collection Serialization] - JSONL and YAML Stream
 
+== Advanced mapping
+
+* link:../advanced-mapping[Advanced Attribute Mapping] - Same-name dispatch on attribute values (`when_attribute`), grouped declarations, custom methods, delegation
+
 == Performance
 
 * link:../native-engines[Native engines (leptris / yeptris / teptris)] - Drop-in XML/YAML/JSON/TOML engine upgrades via bundle opt-in

data/docs/_guides/keyvalue-serialization.adoc

@@ -116,6 +116,40 @@ desc: A ceramic with a navy blue color and clear glaze.
 ----
 ====
 
+=== Dispatching a shared key by a discriminator value
+
+When one wire key holds a list of objects distinguished by a sibling
+key's value, `when_attribute` routes each item to its own attribute —
+one declaration covers the whole partition:
+
+[source,ruby]
+----
+class Requirement < Lutaml::Model::Serializable
+  attribute :guidance, Component, collection: true
+  attribute :purpose, Component, collection: true
+
+  json do
+    map "component", when_attribute: "type",
+                     to: { "guidance" => :guidance, "purpose" => :purpose }
+  end
+end
+----
+
+[source,json]
+----
+{ "component": [
+  { "type": "guidance", "text": "g1" },
+  { "type": "purpose",  "text": "p1" }
+] }
+----
+
+`guidance` holds `g1`, `purpose` holds `p1`. Serialization merges the
+items back under the one key, each stamped with its discriminator.
+`unmatched: :raise` fails the parse on items no rule claims. Works for
+all key-value formats. See
+link:advanced-mapping.adoc[the advanced mapping guide] for the full
+semantics, including the per-rule form.
+
 === Specific format mappings
 
 Specific key value formats can be mapping independently of other formats.

data/lib/lutaml/key_value/transform.rb

@@ -5,9 +5,12 @@ module Lutaml
         # Use child's own default register if it has one
         # This ensures versioned schemas (e.g., MML v2 with lutaml_default_register = :mml_v2)
         # are instantiated with their native context
-        child_register = Lutaml::Model::Register.resolve_for_child(
-          model_class, lutaml_register
-        )
+        # TODO.max-perf/32: constant per (model class, register) — the
+        # transform itself is cached per that pair, so resolve once.
+        child_register = @kv_child_register ||= Lutaml::Model::Register
+          .resolve_for_child(
+            model_class, lutaml_register
+          )
 
         if model_class.include?(Lutaml::Model::Serialize)
           instance = model_class.new(lutaml_register: child_register)
@@ -449,7 +452,7 @@ partition = nil)
         if partitioned.nil? && (plan = kv_rule_plan(format, rule, attr)) &&
             (value = kv_fast_extract(doc, plan))
           rule.deserialize(instance, kv_fast_cast(value, plan, instance),
-                           attributes, self, options[:context])
+                           attributes, self, options[:context], pre_cast: true)
           return
         end
 
@@ -485,6 +488,10 @@ partition = nil)
         if attr.collection? || !instance.is_a?(Lutaml::Model::Serialize)
           attr.valid_collection!(value, context)
         end
+        # No pre_cast here: the interpretive attr.cast is not the full
+        # cast chain — whole-value Type policies (e.g. a custom
+        # Type::Value that receives the whole hash) are shaped by the
+        # setter's cast_value, which must still run.
         rule.deserialize(instance, value, attributes, self,
                          options[:context])
       end

data/lib/lutaml/model/mapping/mapping_rule.rb

@@ -324,13 +324,15 @@ module Lutaml
       end
 
       def deserialize(model, value, attributes, mapper_class = nil,
-context = nil)
+context = nil, pre_cast: false)
         if @needs_full_deserialize
           handle_custom_method(model, value, mapper_class, context) ||
             handle_delegate(model, value, attributes) ||
-            handle_transform_method(model, value, attributes, context)
+            handle_transform_method(model, value, attributes, context,
+                                    pre_cast: pre_cast)
         else
-          handle_transform_method(model, value, attributes, context)
+          handle_transform_method(model, value, attributes, context,
+                                  pre_cast: pre_cast)
         end
       end
 
@@ -446,6 +448,24 @@ context = nil)
       # :import — hash/proc transformers go through ImportTransformer.
       TRANSFORM_DISPATCH = {}.compare_by_identity
 
+      def self.parsed_assign_writer(model_class, target)
+        key = [model_class, target]
+        writer = PARSED_ASSIGN_WRITERS[key]
+        return writer unless writer.nil?
+
+        name = :"__assign_parsed_#{target}="
+        writer = model_class.method_defined?(name) ? name : false
+        PARSED_ASSIGN_WRITERS[key] = writer
+        writer
+      end
+
+      # [model class, target] -> the parsed-assign writer compiled for
+      # that class's attribute, or nil when only a casting writer
+      # exists (custom writers, reflective names, enum shorthands).
+      # Class-level because mapping rules may be frozen (see the
+      # name-string note above TRANSFORM_DISPATCH).
+      PARSED_ASSIGN_WRITERS = {}.compare_by_identity
+
       def self.transform_dispatch(rule, attr)
         per_attr = TRANSFORM_DISPATCH[rule]
         if per_attr.nil?
@@ -556,7 +576,8 @@ context = nil)
                           attributes[delegate].type(model.lutaml_register).new)
       end
 
-      def handle_transform_method(model, value, attributes, context = nil)
+      def handle_transform_method(model, value, attributes, context = nil,
+pre_cast: false)
         attr = attributes[to]
         # The transform verdict (none / class-based already applied /
         # hash-proc via ImportTransformer) is static per (rule, attr) —
@@ -566,12 +587,28 @@ context = nil)
           transformed = ImportTransformer.call(value, self, attr,
                                                context: context)
           assign_value(model, transformed)
+        elsif pre_cast && collection_shaped?(value, attr) &&
+            (writer = self.class.parsed_assign_writer(model.class, to))
+          # TODO.max-perf/31: the deserializing transform already cast
+          # the value through the format-aware path — assign without
+          # repeating the cast. Custom writers and reflective names
+          # resolve nil here and keep the casting setter.
+          model.public_send(writer, value)
         else
           assign_value(model, value)
         end
         true
       end
 
+      # Whether the value already carries the attribute's final shape:
+      # a bare single occurrence still owes the setter's one-element
+      # collection coercion, so only collection instances (and every
+      # singular value, whose cast is complete) take the no-recast lane.
+      def collection_shaped?(value, attr)
+        attr.nil? || !attr.collection? || value.is_a?(::Array) ||
+          value.is_a?(Lutaml::Model::Collection)
+      end
+
       def assign_value(model, value)
         model.public_send(@setter_name, value)
       end

data/lib/lutaml/model/serialize/attribute_definition.rb

@@ -297,6 +297,21 @@ module Lutaml
                 end
                 record_mutation_collection(:#{name}, value)
               end
+
+              # TODO.max-perf/31: the deserialization transforms already
+              # cast through the format-aware path; this writer skips the
+              # setter's re-cast while keeping value_set_for marking and
+              # mutation recording. Public assignment keeps the caster.
+              def __assign_parsed_#{name}=(value)
+                value_set_for(:#{name})
+                current = @#{name}
+                if current.equal?(Lutaml::Model::Serialize::LAZY_EMPTY_COLLECTION) &&
+                    (value.nil? || Lutaml::Model::Utils.uninitialized?(value))
+                else
+                  @#{name} = value
+                end
+                record_mutation_collection(:#{name}, value)
+              end
             RUBY
           else
             class_eval(<<~RUBY, __FILE__, __LINE__ + 1) # rubocop:disable Style/DocumentDynamicEvalDefinition
@@ -306,6 +321,13 @@ module Lutaml
                 @#{name} = value
                 record_mutation(:#{name}, value)
               end
+
+              # TODO.max-perf/31: see the collection branch above.
+              def __assign_parsed_#{name}=(value)
+                value_set_for(:#{name})
+                @#{name} = value
+                record_mutation(:#{name}, value)
+              end
             RUBY
           end
         end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.47"
+    VERSION = "0.8.48"
   end
 end

data/lib/lutaml/xml/model_transform.rb

@@ -48,9 +48,12 @@ module Lutaml
         # Use child's own default register if it has one
         # This ensures versioned schemas (e.g., MML v2 with lutaml_default_register = :mml_v2)
         # are instantiated with their native context
-        child_register = Lutaml::Model::Register.resolve_for_child(
-          model_class, lutaml_register
-        )
+        # TODO.max-perf/32: constant per (model class, register) — the
+        # transform itself is cached per that pair, so resolve once.
+        child_register = @xml_child_register ||= Lutaml::Model::Register
+          .resolve_for_child(
+            model_class, lutaml_register
+          )
 
         instance_is_serialize = model_class.include?(::Lutaml::Model::Serialize)
         if instance_is_serialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.47
+  version: 0.8.48
 platform: ruby
 authors:
 - Ribose Inc.