cljs: conversion fixes

src/main/clojure/clojure/data/xml.cljs

@@ -39,7 +39,8 @@
   "Use XMLSerializer to render an xml string"
   [e & {:keys []}]
   (. (js/XMLSerializer.)
-     (serializeToString e)))
+     (serializeToString
+      (node/coerce-to-dom e))))
 
 (defn extend-nodes-as-qname! []
   (extend-protocol AsQName
@@ -50,6 +51,11 @@
     (qname-local [e] (.-localName e))
     (qname-uri [e] (.-namespaceURI e))))
 
+(defn- as-node [n]
+  (if (instance? js/Text n)
+    (.-wholeText n) ;; .-data
+    n))
+
 (defn extend-dom-as-data! []
   (extend-type js/Element
     ILookup
@@ -74,20 +80,17 @@
          not-found))))
   (extend-type js/NodeList
     ISeqable
-    (-seq [nl] (array-seq nl))
+    (-seq [nl] (map as-node (array-seq nl)))
     ISequential
     ICounted
     (-count [nl] (.-length nl))
     IIndexed
     (-nth
       ([nl n]
-       (aget nl n))
+       (as-node (aget nl n)))
       ([nl n nf]
        (if (and (<= 0 n) (< n (.-length nl)))
-         (let [res (aget nl n)]
-           (if (instance? js/Text res)
-             (.-data res)
-             res))
+         (as-node (aget nl n))
          nf)))))
 
 (comment

src/main/clojure/clojure/data/xml/node.cljs

@@ -52,3 +52,12 @@
   "Create a Comment node"
   [content]
   (.createComment doc content))
+
+(defn coerce-to-dom [node]
+  (cond
+    (string? node) node
+    (instance? js/Element node) node
+    (satisfies? ILookup node) (element* (:tag node)
+                                        (:attrs node)
+                                        (map coerce-to-dom (:content node)))
+    :else (throw (ex-info "Cannot coerce" {:form node}))))