converters from/to XmlNode

karax/xdom.nim

@@ -1,15 +1,21 @@
-import std/[xmltree, strtabs, strutils]
+import std/[xmltree, htmlparser, strtabs, strutils]
 import ./vdom
 
 converter toXmlNode*(el: VNode): XmlNode =
-  let xAttrs = @[].toXmlAttributes
-  for k, v in el.attrs:
-    xAttrs[k] = v
-  var kids: seq[XmlNode]
-  if el.len > 0:
-    for k in el:
-      kids.add k.toXmlNode
-  result = newXmlTree($el.kind, kids, attributes = xAttrs)
+  case el.kind:
+    of VNodeKind.verbatim:
+      parseHtml($el)
+    of VNodeKind.text:
+      newText(el.text)
+    else:
+      let xAttrs = @[].toXmlAttributes
+      for k, v in el.attrs:
+        xAttrs[k] = v
+      var kids: seq[XmlNode]
+      if el.len > 0:
+        for k in el:
+          kids.add k.toXmlNode
+      newXmlTree($el.kind, kids, attributes = xAttrs)
 
 converter toVNode*(el: XmlNode): VNode =
   try:

tests/xmlNodeConversionTests.nim

@@ -1,12 +1,19 @@
-import xmltree
+import std/xmltree
 import "../karax"/[vdom, xdom]
 
 let xn = newXmlTree("div", @[], attributes = [("a", "b")].toXmlAttributes)
 let vn = tree(tdiv, attrs = (@[("a", "b"), ("c", "d")]))
 vn.add newVNode(a)
+vn[0].add vn("bbb")
+vn.add verbatim("<app>abc</app>")
 xn.add newXmlTree("i", @[], attributes = [("a", "b")].toXmlAttributes)
 
-doassert $vn.toXmlNode == """<div c="d" a="b">
-  <a />
+let vnX = vn.toXmlNode
+
+doassert vnX[0].len == 1 and vnX[1][0].kind == xnText
+doassert $vnX[1].tag == "app"
+doassert $vnX == """<div c="d" a="b">
+  <a>bbb</a>
+  <app>abc</app>
 </div>"""
 doassert $xn.toVNode == """<div a="b"><i a="b"></i></div>"""