Fix JVM DOM unsafe to support XML with no root element

Fixes #83
Kotlin · May 4, 2018 · 3517e75 · 3517e75
1 parent 833a1a5
commit 3517e75
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/jvm/src/main/kotlin/dom-jvm.kt b/jvm/src/main/kotlin/dom-jvm.kt
@@ -15,7 +15,7 @@ import javax.xml.transform.stream.*
 class HTMLDOMBuilder(val document : Document) : TagConsumer<Element> {
     private val path = arrayListOf<Element>()
     private var lastLeaved : Element? = null
-    private val documentBuilder by lazy { DocumentBuilderFactory.newInstance().newDocumentBuilder() }
+    private val documentBuilder: DocumentBuilder by lazy { DocumentBuilderFactory.newInstance().newDocumentBuilder() }
 
     override fun onTagStart(tag: Tag) {
         val element = when {
@@ -84,13 +84,20 @@ class HTMLDOMBuilder(val document : Document) : TagConsumer<Element> {
         UnsafeImpl.block()
     }
 
-    val UnsafeImpl = object : Unsafe {
+    private val UnsafeImpl = object : Unsafe {
         override operator fun String.unaryPlus() {
             val element = documentBuilder
-                .parse(InputSource(StringReader(this)))
+                .parse(InputSource(StringReader("<unsafeRoot>" + this + "</unsafeRoot>")))
                 .documentElement
+
             val importNode = document.importNode(element, true)
-            path.last().appendChild(importNode)
+
+            check(importNode.nodeName == "unsafeRoot") { "the document factory hasn't created an unsafeRoot node"}
+
+            val last = path.last()
+            while (importNode.hasChildNodes()) {
+                last.appendChild(importNode.removeChild(importNode.firstChild))
+            }
         }
     }
 

diff --git a/jvm/src/test/kotlin/dom-trees.kt b/jvm/src/test/kotlin/dom-trees.kt
@@ -180,4 +180,23 @@ class TestDOMTrees {
             }
         }
     }
+
+    @test fun `script content`() {
+        val document = document {
+            append.html {
+                head {
+                    script(ScriptType.textJavaScript) {
+                        unsafe {
+                            raw("fun f() { return 1; }")
+                        }
+                    }
+                }
+            }
+        }
+
+
+        assertEquals("<!DOCTYPE html>\n" +
+                "<html><head><META http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script type=\"text/javascript\">fun f() { return 1; }</script></head></html>",
+            document.serialize(false).trim().replace("\r\n", "\n"))
+    }
 }