[bugfix] AnyURI should not be string subtype

This seems to break a number of tests outside of fn:transform. Instead, adapt the option handling for fn:transform to do an explicit check on the case of requiring a string, and supply the StringValue of an atomic value if the value is not of string subtype.

Author: alanpaxton

exist-core/src/main/java/org/exist/xquery/functions/fn/transform/Options.java

@@ -420,6 +420,8 @@ public Optional<T> get(final MapType options) throws XPathException {
                 if (item0 != null) {
                     if (Type.subTypeOf(item0.getType(), itemSubtype)) {
                         return Optional.of((T) item0);
+                    } else if (itemSubtype == Type.STRING && Type.subTypeOf(item0.getType(), Type.ATOMIC)) {
+                        return Optional.of((T)new StringValue(item0.getStringValue()));
                     } else {
                         throw new XPathException(
                                 ErrorCodes.XPTY0004, "Type error: expected " + Type.getTypeName(itemSubtype) + ", got " + Type.getTypeName(item0.getType()));

exist-core/src/main/java/org/exist/xquery/value/Type.java

@@ -201,7 +201,6 @@ public class Type {
 
         // STRING sub-types
         defineSubType(STRING, NORMALIZED_STRING);
-        defineSubType(STRING, ANY_URI); // we can always treat a URI as a string
 
         // NORMALIZED_STRING sub-types
         defineSubType(NORMALIZED_STRING, TOKEN);

exist-core/src/test/xquery/xquery3/transform/fnTransform33.xqm

@@ -0,0 +1,50 @@
+(:
+ : eXist-db Open Source Native XML Database
+ : Copyright (C) 2001 The eXist-db Authors
+ :
+ : [email protected]
+ : http://www.exist-db.org
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; either
+ : version 2.1 of the License, or (at your option) any later version.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+
+xquery version "3.1";
+
+module namespace testTransform="http://exist-db.org/xquery/test/function_transform";
+
+declare namespace test="http://exist-db.org/xquery/xqsuite";
+
+declare variable $testTransform:transform-33-xsl := "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='3.0'>
+                                                                    <xsl:template match='/'> <xsl:for-each select='//section'>
+                                                                    <xsl:result-document href='section{position()}.html'> <!-- instructions content here -->
+                                                                    </xsl:result-document> </xsl:for-each>
+                                                                    </xsl:template> </xsl:stylesheet>";
+
+declare variable $testTransform:transform-33-xml := "<doc>
+                                                                                                       <section>sect1</section>
+                                                                                                       <section>sect2</section>
+                                                                                                       <section>sect3</section>
+                                                                                                       </doc>";
+
+declare
+    %test:assertTrue
+function testTransform:transform-33() {
+    let $xsl := $testTransform:transform-33-xsl
+    let $xml := $testTransform:transform-33-xml
+    let $result := fn:transform(map {"stylesheet-text": $xsl, "source-node": parse-xml($xml),
+                "base-output-uri" : resolve-uri("transform/sandbox/fn-transform-33.xml", "http://www.w3.org/fots/fn/transform/staticbaseuri.xsl"),
+                "delivery-format":"serialized"})
+    return (contains(string-join(map:keys($result)),"section2"))
+};