lutaml-xsd 1.2.109 → 1.2.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b72159d7cf64cd93b73f0cc4e9801dfa46c57b4aba669421395ae0faa88cc6d
-  data.tar.gz: c6b1f7d7ecf76b6d9deb32ec13a261d70c87d7292c01be0f61e9b5ed0a1d0646
+  metadata.gz: c211adda1289222691ae1cd3d77ee6482ed88f3076e036fbaaf0937124906669
+  data.tar.gz: ad8339c42573c9152a1a94ef409aad142b2db3a2f13d98975f8b70f650fb2f1a
 SHA512:
-  metadata.gz: 6cfc032057ed3bbf9048ae3f0a8b8f9ff2b75eed8553e323089e3c79c1918ae883d3d16dd5dfb352e2f6ee63f2fee409865cbb93e7af36ed49d9ea41c9b1814f
-  data.tar.gz: d140656abba61dd935ae4ecc166d8f0dafa612d65a011c9acc56cf17e59393381dbcc5fe6888431094255e4b0762546da3f8320651c36fb3bd0eb01dc54d3585
+  metadata.gz: f51b044be371db36a1df22a0dc961dfca6f3e4742407d21ca277329ddebc8df51e80313376aea4389b8773fc6dde346ce7be7a4a086ae54c49498a6f0bda5f58
+  data.tar.gz: 8ed8f68bc2de75248980a699b0a022216b6a328e55ebc3829d721dc63c9a7db079db22fefa4d42803b6b3d3d6563ac07c6b3ce531a7825d7f86dcb58c6c4f1e0

data/TODO.conformance.md

@@ -546,26 +546,48 @@ tuple keys, node-set field violations and absent-field rows handled, cross-eleme
   and the schG1/G4/G7 drift (fail in fresh isolation on origin/main
   stash-verified — inputs/gems/ruby verified identical to the 4641
   era; mechanism not isolated in-round; owner follow-up).
-- SCH R2 STACK OVERFLOW (2026-11-11): Schema_w3c/schR2/schR2.i
-  (expected invalid) crashes the assessment with a SystemStackError
-  in lutaml-model 0.8.167's Base#resolved_element_order/
-  delete_deletables — an unguarded recursion over the cyclic
-  redefine graph schR2's documents build (called from our
-  collect_particles). The crash ESCAPES measure()'s rescue
-  (SystemStackError is not a StandardError); in every prior ledger
-  the case silently recorded as a pass via the crash-as-invalid
-  convention on its expected-invalid expectation, so the ledger
-  number never moved. Files/gems/ruby verified identical to the
-  baseline era; the crash reproduces in fresh single-case runs on
-  origin/main on both trains today. Finding for lutaml-model: a
-  cycle guard in resolved_element_order (our org's repo; owner
-  decides the upstream action).
+- NESTED-TYPE-CANDIDATES ROUND (2026-11-11): +2 (schG2 — a baseline
+  parked failure — and the schG1/G4/G7 "drift" trio resolved as REAL
+  DEFECTS, not environment: named_type_candidates appended only ONE
+  nested candidate per root schema — find_nested_named_type returned
+  the first depth-first match and stopped, so a composition importing
+  same-named types two levels deep (schG1: a→b→c) NEVER listed the
+  deepest candidate; the owner-ns preference missed and list.first
+  (ns-a's ct-A) typed the ns-c element — the '123'-is-not-boolean
+  swap. find_nested_named_types now collects EVERY match across the
+  whole nested tree in document order). SUITE 4637/4696 measured +
+  5 budget exclusions (reZ nested-repeat, unchanged), ZERO
+  regressions (stash-attributed per row), rspec 1663 green,
+  rubocop clean. schR2 stack-overflow note unchanged (crash masked
+  by expected-invalid, counted per convention).
+- SCH R2 STACK OVERFLOW FIXED (2026-11-12, round shipped): the
+  SystemStackError on Schema_w3c/schR2/schR2.i (expected invalid;
+  masked as pass by the crash-as-invalid convention) is OURS, not
+  lutaml-model's — the infinite recursion cycles between the
+  §4.2.2 redefined group body and the redefine TARGET (two DISTINCT
+  objects reachable by the same group name b-g2), so an OBJECT-keyed
+  guard misses it; the cut is NAME-keyed and PATH-scoped in both
+  walkers: leaf_particles marks the group name on its ancestry
+  (same name cannot expand within its own ancestry; sibling reuse
+  still expands fresh) and ContentModelMatcher#compile_group keeps
+  the same path discipline over resolved containers. LEDGER vs the
+  1.2.110 baseline: 4637/4696 measured + the same 5 reZ budget
+  exclusions, ZERO regressions, and batch 4450's crash list is
+  EMPTY (schR2.i now assesses honestly to invalid instead of
+  overflowing). PROVENANCE: batch 03000 was carried over from the
+  1.2.110 ledger — regex-pattern-only cases whose walk never
+  touches the guards (the batch's reI003 quadratic tax made a
+  re-run cost-prohibitive on the contended machine). Also filed
+  lutaml/moxml#540 this round (the 0.6.4 attribute char-ref
+  regression below; repro included).
 - TRAIN ADOPTION REGRESSION — CHARACTER REFERENCES (2026-11-11):
   the 2026-11-10 adoption verdict ("conformance-IDENTICAL") was
   WRONG for one class: moxml 0.6.4 stopped decoding numeric
   character references in attribute values. Minimal repro:
   `Moxml::Context.new.parse('<x a="&#x2190;"/>').root.attributes.
   first.value` → "←" on moxml 0.6.2, literal "&#x2190;" on 0.6.4.
+  FILED lutaml/moxml#540 (2026-11-12; repro: attribute values keep
+  the reference literal while element text decodes on 0.6.4).
   Downstream this breaks the whole UNICODE-BLOCK pattern-facet
   class — Regex_w3c Arrows/MathematicalOperators/
   ArabicPresentationForms-A/CJKCompatibilityForms/

data/lib/lutaml/xsd/validation/content_model_matcher.rb

@@ -225,7 +225,20 @@ module Lutaml
           container = Array(@group_particles.call(particle)).first
           return empty_fragment unless container
 
-          with_occurrence(particle) { compile_container_body(container) }
+          # §4.2.2 redefine bodies self-reference by name; the body and
+          # the redefine target are distinct objects, so the compile
+          # path set keys on the resolved container's identity — a
+          # container may not compile within its own ancestry, while
+          # sibling reuse still compiles fresh.
+          @group_path ||= []
+          return empty_fragment if @group_path.include?(container)
+
+          @group_path.push(container)
+          fragment = with_occurrence(particle) do
+            compile_container_body(container)
+          end
+          @group_path.pop
+          fragment
         end
 
         # A group ref expands to its declaration's container, whose own

data/lib/lutaml/xsd/validation/rules/content_model_validation_rule.rb

@@ -368,14 +368,31 @@ module Lutaml
             end
           end
 
-          def leaf_particles(particles, repository)
+          def leaf_particles(particles, repository, ancestors = nil)
+            ancestors ||= {}
             particles.flat_map do |particle|
               case particle
               when Lutaml::Xml::Schema::Xsd::Group
-                leaf_particles(expand_group_container(particle, repository),
-                               repository)
+                # §4.2.2 redefine bodies self-reference by NAME; the
+                # body and the redefine target are DISTINCT objects, so
+                # the path set keys on the group name — the same name
+                # cannot expand within its own ancestry, while sibling
+                # reuse still expands fresh.
+                group_name = if particle.name.to_s.empty?
+                               particle.ref.to_s
+                             else
+                               particle.name.to_s
+                             end
+                next [] if group_name.empty? || ancestors.key?(group_name)
+
+                ancestors[group_name] = true
+                body = expand_group_container(particle, repository)
+                leaves = body.nil? ? [] : leaf_particles(body, repository, ancestors)
+                ancestors.delete(group_name)
+                leaves
               when Lutaml::Xsd::Sequence, Lutaml::Xsd::Choice, Lutaml::Xsd::All
-                leaf_particles(collect_particles(particle), repository)
+                leaf_particles(collect_particles(particle), repository,
+                               ancestors)
               else
                 [particle]
               end

data/lib/lutaml/xsd/validation/schema_definition_resolver.rb

@@ -290,8 +290,8 @@ module Lutaml
             end
             list << found if found
 
-            nested = find_nested_named_type(local_name, schema)
-            list << nested if nested
+            nested = find_nested_named_types(local_name, schema)
+            list.concat(nested)
           end
           unless @redefined_body_names.include?(local_name)
             @redefined_targets.each do |schema|
@@ -307,16 +307,18 @@ module Lutaml
           cache[local_name] = list.uniq
         end
 
-        # Named types declared in documents reached through resolved
-        # includes/imports — chameleon types (ctE018) live in a
-        # no-namespace include target.
+        # EVERY same-named type across the whole nested include/import
+        # tree, in document order. The single-match walk stopped at the
+        # FIRST hit (schG1: ns-b's ct-A shadowed ns-c's two imports
+        # deep, so the owner-ns preference missed and ns-a's type won
+        # for the ns-c element — a same-local-name swap).
         #
-        # @return [Object, nil]
-        def find_nested_named_type(local_name, schema, depth = 0)
-          return nil if depth > 8
+        # @return [Array<Object>]
+        def find_nested_named_types(local_name, schema, depth = 0)
+          return [] if depth > 8
 
-          (Array(schema.include) + Array(schema.import)).each do |nested|
-            next unless nested.is_a?(Lutaml::Xml::Schema::Xsd::Schema)
+          (Array(schema.include) + Array(schema.import)).flat_map do |nested|
+            next [] unless nested.is_a?(Lutaml::Xml::Schema::Xsd::Schema)
 
             found = Array(nested.complex_type).find do |ct|
               ct.name == local_name
@@ -324,12 +326,9 @@ module Lutaml
             found ||= Array(nested.simple_type).find do |st|
               st.name == local_name
             end
-            return found if found
-
-            found = find_nested_named_type(local_name, nested, depth + 1)
-            return found if found
+            [found, *find_nested_named_types(local_name, nested, depth + 1)]
+              .compact
           end
-          nil
         end
 
         # Builtin numeric types: values compare in the numeric value

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.2.109"
+    VERSION = "1.2.111"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xsd
 version: !ruby/object:Gem::Version
-  version: 1.2.109
+  version: 1.2.111
 platform: ruby
 authors:
 - Ribose Inc.