lutaml-xsd 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 689df8d8930b23eb8ca6b52c4d435c0e52ea9d654bf64cc51b546fbfe2fcb69e
-  data.tar.gz: 0e58e44689241fdd080621539f438a3f64d7dad94ca55ff72f06740b93320be9
+  metadata.gz: da77a9a03a7bdbb0a9ea2092de4634b5151a6bafe0781592d58fbf869aacb542
+  data.tar.gz: 11c964841aa88464f5ab94c176f18757b1ff5bdc33813030d24cb7429957b828
 SHA512:
-  metadata.gz: 77edb222b3737cc289729cdafe818c083bf12f3aed2f0b3a8251657a92dec54fb9dcd6f0a2464d4da20fb58a39dc9884ca68bf3e5abeeb9ff6122cb3dc269d6c
-  data.tar.gz: 96ccd234460bdfee103628897e869e7c999e510d6d76ddc0a989f990757743dfeea0f7848c9bada3212db900096931fdeaf3e832f4b4f31b6e0a62e6072a4b92
+  metadata.gz: 96be4d45cabc55c0e0839a456ce4d6948cbe326bc25d72e1f5f228ead717a4a578871295f3b1bbeb9714657997217345657ba2c0f1b9af8a502211d62e9748cd
+  data.tar.gz: 55c6018abace93a782f1d661706568aeb9c48ed3c2c88b31fc64504a6586bb5ae3661fbdcbf312f0ffe75fd3e782e8c11c392387f54548bcbaab19be72892714

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lutaml-xsd (1.2.2)
+    lutaml-xsd (1.2.3)
       liquid (>= 4.0, < 6.0)
       lutaml-model (~> 0.8.123)
       lutaml-store (~> 0.3)
@@ -264,7 +264,7 @@ CHECKSUMS
   liquid (5.14.0) sha256=e1020c2b2ee58c7a4d3bfdc7a331537bd27a783353748bff0bf27c6ac0c17065
   lutaml-model (0.8.123) sha256=475f391371965f5baee2a9d018a7c9da8361c3774d3802749aa8805ee1253fde
   lutaml-store (0.3.2) sha256=9c455dbab32b4c635c48a27213f6f56fda191731c4574eb6187184ba0588a672
-  lutaml-xsd (1.2.2)
+  lutaml-xsd (1.2.3)
   memo_wise (1.13.0) sha256=30220c38c4cef410849bc73553c58664dc2c91c6379e4a1df22aea02358b716b
   moxml (0.5.153) sha256=561c6df843edd4a3b7f4c6785f9cfd6fef61050df7f1113fdcd45d8495704fc2
   nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f

data/TODO.conformance.md

@@ -3,17 +3,17 @@
 Goal: conformance is a number, not a feeling. Vendor the W3C XML Schema
 test-suite categories, build the harness, publish the pass-rate, grow it.
 
-## Baseline (2026-10-23, 21 cases / 45 checks, full pass)
+## Baseline (2026-10-23, 22 cases / 47 checks, full pass)
 
-Corpus: 21 case classes under `spec/conformance/cases/`, modelled on the
+Corpus: 22 case classes under `spec/conformance/cases/`, modelled on the
 W3C XML Schema Test Suite category taxonomy — self-authored because the
 canonical 2007 suite distribution is no longer served from w3.org (owner
 can vendor a tarball later; provenance README goes with it).
 
 | mode | pass-rate |
 |---|---|
-| engine (Moxml::XSD tier-1, leptris 1.9.380.2) | 38/42 (90.5%, 1 case unsupported) |
-| pipeline (ValidationJob + wired rule engine) | 45/45 (100.0%) |
+| engine (Moxml::XSD tier-1, leptris 1.9.380.2) | 38/42 (90.5%, 2 cases unsupported) |
+| pipeline (ValidationJob + wired rule engine) | 47/47 (100.0%) |
 
 The pipeline now passes every check in the corpus. The engine trails on
 four: strict wildcard/anyAttribute under-detection, xsi:nil on
@@ -28,7 +28,8 @@ baseline 34/39 (87.2%); gap rules 37/39 (94.9%); anyAttribute 40/42
 (95.2%); keyref activation via lutaml-model 0.8.121 → 41/42 (97.6%);
 lutaml-model 0.8.123 (complexType/extension anyAttribute mappings) +
 leptris 1.9.380.2 → 42/42 (100.0%); xs:group expansion in the content
-and occurrence walks grew the corpus to 45 checks → 45/45 (100.0%).
+and occurrence walks grew the corpus to 45 checks → 45/45 (100.0%);
+abstract-element usage checking → 47/47 (100.0%).
 
 Remaining engine-mode gaps (tracked, moxml/leptris-side):
 

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

@@ -59,7 +59,7 @@ module Lutaml
           def validate(xml_element, schema_def, collector, repository: nil)
             return unless schema_def
 
-            return if engine_content_check(xml_element, collector) == :handled
+            handled = engine_content_check(xml_element, collector) == :handled
 
             particles = effective_particles(
               xml_element, schema_def, repository
@@ -68,6 +68,12 @@ module Lutaml
             # rule already reports it, so no content walk runs here.
             return if particles.nil? || particles.empty?
 
+            # The engine does not check abstract-element usage; scan for
+            # it regardless of whether the engine answered.
+            scan_abstract_usage(xml_element, particles, collector,
+                                repository)
+            return if handled
+
             validate_particle_sequence(xml_element, particles, collector,
                                        repository)
           end
@@ -165,6 +171,48 @@ module Lutaml
             particles
           end
 
+          # Engine-accepted content still needs the checks the engine
+          # lacks: abstract element declarations cannot appear in
+          # instances. Containers flatten to their leaf declarations —
+          # the walk keeps them whole, the scan needs the leaves.
+          def scan_abstract_usage(xml_element, particles, collector,
+                                  repository)
+            leaves = leaf_particles(particles, repository)
+            xml_element.children.each do |child|
+              leaves.each do |particle|
+                next unless particle.is_a?(Lutaml::Xsd::Element)
+                next unless particle_matches?(child, particle, repository,
+                                              parent: xml_element)
+                next unless element_declaration_abstract?(particle, child,
+                                                          repository)
+
+                report_error(
+                  collector,
+                  code: "abstract_element_used",
+                  message: "Element '#{child.qualified_name}' is " \
+                           "abstract and cannot appear in the instance",
+                  location: child.xpath,
+                  context: { element: child.qualified_name },
+                )
+                break
+              end
+            end
+          end
+
+          def leaf_particles(particles, repository)
+            particles.flat_map do |particle|
+              case particle
+              when Lutaml::Xml::Schema::Xsd::Group
+                leaf_particles(expand_group_container(particle, repository),
+                               repository)
+              when Lutaml::Xsd::Sequence, Lutaml::Xsd::Choice, Lutaml::Xsd::All
+                leaf_particles(collect_particles(particle), repository)
+              else
+                [particle]
+              end
+            end
+          end
+
           # Sequential walk over a particle list (min/max per particle,
           # recursive matching, wildcard permission for unmatched tails).
           #
@@ -202,6 +250,16 @@ module Lutaml
                 if particle.is_a?(Lutaml::Xsd::Any)
                   check_strict_wildcard_child(child, particle, collector,
                                               repository)
+                elsif particle.is_a?(Lutaml::Xsd::Element) &&
+                    element_declaration_abstract?(particle, child, repository)
+                  report_error(
+                    collector,
+                    code: "abstract_element_used",
+                    message: "Element '#{child.qualified_name}' is " \
+                             "abstract and cannot appear in the instance",
+                    location: child.xpath,
+                    context: { element: child.qualified_name },
+                  )
                 end
 
                 matched_count += 1
@@ -249,6 +307,30 @@ module Lutaml
             end
           end
 
+          # Whether the matched declaration is abstract: abstract element
+          # declarations cannot appear directly in instances (substitution
+          # members remain legal). Direct declarations carry their own
+          # abstract flag; references resolve to the global declaration.
+          def element_declaration_abstract?(particle, child, repository)
+            declaration = declaration_for(particle, child, repository)
+            return false unless declaration
+
+            truthy?(declaration.abstract) && child.name == declaration.name
+          end
+
+          def declaration_for(particle, child, repository)
+            return particle if particle.name.to_s.match?(/\S/)
+            return nil unless repository
+
+            local = particle.ref.to_s.split(":").last
+            repository.resolve(local, child.namespace_uri) ||
+              repository.resolve(local, nil)
+          end
+
+          def truthy?(value)
+            value.to_s == "true"
+          end
+
           # Report an unsatisfied minimum occurrence: a choice container
           # names its alternatives, anything else reports generically.
           #
@@ -471,6 +553,13 @@ module Lutaml
           # @param repository [SchemaDefinitionResolver, nil]
           # @return [Boolean]
           def element_matches?(xml_element, schema_element, repository = nil)
+            local_ref = schema_element.name.to_s.empty? && schema_element.ref
+            if local_ref && repository
+              return ref_element_matches?(xml_element, schema_element,
+                                          local_ref.to_s.split(":").last,
+                                          repository)
+            end
+
             if xml_element.name == schema_element.name
               return namespaces_match_instance?(
                 xml_element,
@@ -481,6 +570,24 @@ module Lutaml
             substitution_member?(xml_element, schema_element, repository)
           end
 
+          # An xs:ref particle takes the name and target namespace of the
+          # global declaration it references; substitution members of that
+          # declaration match too.
+          def ref_element_matches?(xml_element, schema_element, local,
+                                   repository)
+            declaration = repository.resolve(local,
+                                             xml_element.namespace_uri) ||
+              repository.resolve(local, nil)
+            return false unless declaration
+
+            return true if xml_element.name == declaration.name &&
+              namespaces_match_instance?(
+                xml_element, repository.target_namespace_for(declaration)
+              )
+
+            substitution_member?(xml_element, schema_element, repository)
+          end
+
           # Whether the instance element's declaration is in the
           # substitution group headed by the particle's name/ref.
           #

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

metadata

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