[MOD] treat variable nodes correctly in compiled schemas; only append…

… data() to value-of results of type node()

compile.xqm

@@ -197,7 +197,8 @@ declare function compile:assertion-message-content($content as node()*)
           then ('{(' || $compile:RULE_CONTEXT || ')/' || $node/@path || '}') 
           else '{name(' || $compile:RULE_CONTEXT || ')}'
       case element(sch:value-of)
-        return ('{(' || $compile:RULE_CONTEXT || ')/' || $node/@select || '/data()}')
+        return ('{let $result := (' || $compile:RULE_CONTEXT || ')/' || $node/@select
+           || ' return if($result instance of node()) then $result/data() else $result}')
       case element(sch:emph)
         return output:assertion-child-elements($node)
       case element(sch:dir)
@@ -222,7 +223,7 @@ as xs:string?
       if($var/@value instance of xs:anyAtomicType+)
       then $var/@value/data() => util:escape()
       else 
-      $compile:INSTANCE_DOC || '/(' || $var/@value => util:escape() || ')'
+      $compile:INSTANCE_DOC || '/(' || util:variable-value($var) || ')'
     )
     || ';'
   )

test/test-compile.xqm

@@ -288,7 +288,8 @@ declare %unit:test function _:properties()
   )
   let $result := xquery:eval(
     $compiled,
-    map{$_:DOC_PARAM:document{<foo/>}}
+    map{$_:DOC_PARAM:document{<foo/>}},
+    map{'pass':'true'}
   )
   return (
     unit:assert-equals(

utils.xqm

@@ -49,7 +49,7 @@ as xs:string
  : current context. If no value attribute is specified, the value of the 
  : attribute is the element content of the let element."
  :)
-declare %private function util:variable-value($var as element(sch:let))
+declare function util:variable-value($var as element(sch:let))
 as xs:string
 {
   if($var/@value) then $var/@value/data() => util:escape() else serialize($var/*)