lutaml-xsd 1.2.92 → 1.2.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a629abe9ac053899019037981e12e3c502bbbd17c0f6456787190dd52b7713
-  data.tar.gz: a403d2c8184c297216afffa96ff9f236e656f6027d1e8595f9afa794cb5362a6
+  metadata.gz: 6ad03adc4f701faa3d3c132f2704c5dc7e01033e7403750352156cbe7a2333a9
+  data.tar.gz: b861d33acb72791876fee6e23ba03bc94a662d570b127056803a75de319a2a4a
 SHA512:
-  metadata.gz: 76a79f3d5e6ff50291fe0d8e9f29cd53325ae38b7a8eb679ef758829cac8069bb6f3911f4cf2c7739522db3cfe80f6514107c88813316f849ab2cd4e49e5ab74
-  data.tar.gz: 4f44e60f03e3145daee06ec180e6a4fdbbd0d03618104641c19991989a8d028f23d5a2f4209adbfb05fa80cfb10dc0a6e10450e8debade2208debdb35e93dd49
+  metadata.gz: 1d64f1ba11d11333972f2cbdbe32c083d423effecefea95b3aca7b99200c0edc314a0861502129ec0a7f58c77a0e7e34474473f2600fd91e6314d25fb83c2949
+  data.tar.gz: 3e1f6cfbda1193da0844c8e25c6579503c1ceab084acb5d00674e1682c344326167ff00e5f07881655c898a21fed46f9c0e316174a63d3f4491341085cf4126a

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

@@ -604,7 +604,12 @@ module Lutaml
             return nil unless repository
 
             local = particle.ref.to_s.split(":").last
-            (owner_ns && repository.resolve_global(local, owner_ns)) ||
+            exact_ns = repository&.ref_namespace(particle)
+            exact_target =
+              if exact_ns || owner_ns
+                repository.resolve_global(local, exact_ns || owner_ns)
+              end
+            exact_target ||
               repository.resolve(local, child.namespace_uri) ||
               repository.resolve(local, nil)
           end

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

@@ -65,6 +65,11 @@ module Lutaml
           # redefined enumeration). The facet walk never recurses into
           # named bases, so the body's base reference terminates here.
           @redefined_simple_bodies = {}
+          # Exact namespaces for PREFIXED ref particles, from the
+          # owning schema's xmlns declarations (lutaml-model 0.8.167
+          # retains them — #1131). The prefix IS the semantics: a ref
+          # names the declaration its prefix binds, exactly.
+          @ref_namespaces = {}.compare_by_identity
           @elements = index_elements
         end
 
@@ -597,6 +602,96 @@ module Lutaml
                                    schema.to_xml]
         end
 
+        # Exact namespaces for every PREFIXED ref particle in the
+        # document, resolved through the document's own xmlns
+        # declarations (lutaml-model 0.8.167+ retains them — #1131).
+        # The prefix IS the semantics: a ref names the declaration its
+        # prefix binds. Documents parsed by older lutaml-models carry
+        # no declarations and simply contribute nothing.
+        #
+        # @return [void]
+        def register_ref_namespaces(schema)
+          declarations = schema.respond_to?(:xmlns_declarations) &&
+            schema.xmlns_declarations
+          return unless declarations.is_a?(Hash)
+
+          descend = lambda do |node, depth|
+            return if depth > 10
+            return unless node
+
+            if node.is_a?(Array)
+              node.each { |child| descend.call(child, depth) }
+              return
+            end
+
+            if node.is_a?(Lutaml::Xml::Schema::Xsd::Element)
+              ref = node.ref.to_s
+              if ref.include?(":")
+                uri = declarations[ref.split(":").first]
+                @ref_namespaces[node] = uri if uri
+              end
+              return
+            end
+            if node.is_a?(Lutaml::Xml::Schema::Xsd::Group)
+              declaration =
+                resolve_group((node.ref || node.name).to_s.split(":").last)
+              container = declaration &&
+                (Array(declaration.sequence).first ||
+                 Array(declaration.choice).first ||
+                 Array(declaration.all).first)
+              descend.call(container, depth + 1) if container
+              return
+            end
+
+            containers = {
+              Lutaml::Xml::Schema::Xsd::Schema =>
+                %i[element complex_type simple_type attribute
+                   attribute_group group import include redefine],
+              Lutaml::Xml::Schema::Xsd::ComplexType =>
+                %i[sequence choice all group complex_content
+                   simple_content],
+              Lutaml::Xml::Schema::Xsd::ExtensionComplexContent =>
+                %i[sequence choice all group],
+              Lutaml::Xml::Schema::Xsd::RestrictionComplexContent =>
+                %i[sequence choice all group],
+              Lutaml::Xml::Schema::Xsd::ComplexContent =>
+                %i[extension restriction],
+              Lutaml::Xml::Schema::Xsd::SimpleContent =>
+                %i[extension restriction],
+              Lutaml::Xml::Schema::Xsd::Sequence =>
+                %i[element any sequence choice group],
+              Lutaml::Xsd::Sequence =>
+                %i[element any sequence choice group],
+              Lutaml::Xml::Schema::Xsd::Choice =>
+                %i[element any sequence choice group],
+              Lutaml::Xsd::Choice =>
+                %i[element any sequence choice group],
+              Lutaml::Xml::Schema::Xsd::All => %i[element],
+              Lutaml::Xsd::All => %i[element],
+            }[node.class]
+            return unless containers
+
+            containers.each do |accessor|
+              Array(node.public_send(accessor)).each do |child|
+                descend.call(child, depth + 1)
+              end
+            end
+          end
+          descend.call(schema, 0)
+        end
+
+        public
+
+        # The exact namespace a PREFIXED ref particle names, when the
+        # owning document's prefix map is retained (0.8.167+); nil
+        # otherwise (the owner-namespace heuristic applies).
+        #
+        # @param particle [Object]
+        # @return [String, nil]
+        def ref_namespace(particle)
+          @ref_namespaces[particle]
+        end
+
         def index_schema(index, schema, held_signatures = [],
                          chameleon_namespace = nil,
                          chameleon_includer = nil)
@@ -607,6 +702,7 @@ module Lutaml
           chameleon = raw_namespace.to_s.empty? && chameleon_namespace
           namespace = chameleon ? chameleon_namespace : raw_namespace
           defaults_schema = chameleon ? chameleon_includer : schema
+          register_ref_namespaces(schema)
           Array(schema.element).each do |element|
             index_element(index, element, namespace, :top, defaults_schema)
             # A global element's INLINE complexType carries local

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

@@ -254,9 +254,14 @@ module Lutaml
             # matches no-namespace declarations, and a hint-loaded
             # document can supply a foreign namesake. The owner probe
             # is GLOBAL-only: a ref names a global declaration, and an
-            # inline namesake must not satisfy it.
+            # inline namesake must not satisfy it. A RETAINED prefix
+            # map (lutaml-model 0.8.167+, #1131) resolves the ref
+            # EXACTLY — the prefix is the semantics.
+            exact_ns = repository&.ref_namespace(particle)
             declaration =
-              (owner_ns && repository&.resolve_global(local, owner_ns)) ||
+              if exact_ns || owner_ns
+                repository&.resolve_global(local, exact_ns || owner_ns)
+              end ||
               repository&.resolve(local, child.namespace_uri) ||
               repository&.resolve(local, nil)
             # An unresolvable ref (particlesQ032: a no-namespace document

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.2.92"
+    VERSION = "1.2.93"
   end
 end

metadata

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