Allow maps and arrays as parameters in fn:transform

Author: Nico Verwer

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

@@ -31,13 +31,18 @@
 import org.exist.xquery.XPathException;
 import org.exist.xquery.functions.array.ArrayType;
 import org.exist.xquery.functions.fn.FnTransform;
+import org.exist.xquery.functions.map.AbstractMapType;
 import org.exist.xquery.value.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
+import io.lacuna.bifurcan.IEntry;
+
 import javax.xml.transform.dom.DOMSource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Type conversion to and from Saxon
@@ -128,6 +133,10 @@ XdmValue of(final Item item) throws XPathException {
                 return ofAtomic((AtomicValue) item);
             } else if (Type.subTypeOf(itemType, Type.NODE)) {
                 return ofNode((Node) item);
+            } else if (Type.subTypeOf(itemType, Type.MAP)) {
+                return ofMap((AbstractMapType) item);
+            } else if (Type.subTypeOf(itemType,  Type.ARRAY)) {
+                return ofArray((ArrayType) item);
             }
             throw new XPathException(ErrorCodes.XPTY0004,
                     "Item " + item + " of type " + Type.getTypeName(itemType) + COULD_NOT_BE_CONVERTED + "XdmValue");
@@ -144,14 +153,12 @@ static private XdmValue ofAtomic(final AtomicValue atomicValue) throws XPathExce
             } else if (Type.subTypeOf(itemType, Type.STRING)) {
                 return XdmValue.makeValue(((StringValue) atomicValue).getStringValue());
             }
-
             throw new XPathException(ErrorCodes.XPTY0004,
                     "Atomic value " + atomicValue + " of type " + Type.getTypeName(itemType) +
                             COULD_NOT_BE_CONVERTED + "XdmValue");
         }
 
         private XdmValue ofNode(final Node node) throws XPathException {
-
             final DocumentBuilder sourceBuilder = newDocumentBuilder();
             try {
                 if (node instanceof DocumentImpl) {
@@ -171,6 +178,25 @@ private XdmValue ofNode(final Node node) throws XPathException {
             }
         }
 
+        private XdmValue ofMap(final AbstractMapType map) throws XPathException {
+            Map<XdmAtomicValue, XdmValue> xdmMap = new HashMap<XdmAtomicValue, XdmValue>();
+            for (IEntry<AtomicValue, Sequence> entry : map) {
+                XdmAtomicValue key = (XdmAtomicValue) ofAtomic(entry.key());
+                XdmValue value = of(entry.value());
+                xdmMap.put(key, value);
+            }
+            return new XdmMap(xdmMap);
+        }
+
+        private XdmValue ofArray(final ArrayType array) throws XPathException {
+          int size = array.getSize();
+          XdmValue[] members = new XdmValue[size];
+          for (int i = 0; i < size; ++i) {
+            members[i] = of(array.get(i));
+          }
+          return new XdmArray(members);
+        }
+
         XdmValue[] of(final ArrayType values) throws XPathException {
             final int size = values.getSize();
             final XdmValue[] result = new XdmValue[size];