Fix #106 - Prepend the <head> and place the <body> after, if not there already

WebReflection · WebReflection · commit 535c5bc9508e · 2022-02-11T12:02:43.000+01:00
diff --git a/cjs/html/document.js b/cjs/html/document.js
@@ -53,7 +53,7 @@ class HTMLDocument extends Document {
   get head() {
     const {documentElement} = this;
     let {firstElementChild} = documentElement;
-    if (!firstElementChild) {
+    if (!firstElementChild || firstElementChild.tagName !== 'HEAD') {
       firstElementChild = this.createElement('head');
       documentElement.prepend(firstElementChild);
     }
@@ -66,7 +66,7 @@ class HTMLDocument extends Document {
   get body() {
     const {head} = this;
     let {nextElementSibling} = head;
-    if (!nextElementSibling) {
+    if (!nextElementSibling || nextElementSibling.tagName !== 'BODY') {
       nextElementSibling = this.createElement('body');
       head.after(nextElementSibling);
     }
diff --git a/esm/html/document.js b/esm/html/document.js
@@ -52,7 +52,7 @@ export class HTMLDocument extends Document {
   get head() {
     const {documentElement} = this;
     let {firstElementChild} = documentElement;
-    if (!firstElementChild) {
+    if (!firstElementChild || firstElementChild.tagName !== 'HEAD') {
       firstElementChild = this.createElement('head');
       documentElement.prepend(firstElementChild);
     }
@@ -65,7 +65,7 @@ export class HTMLDocument extends Document {
   get body() {
     const {head} = this;
     let {nextElementSibling} = head;
-    if (!nextElementSibling) {
+    if (!nextElementSibling || nextElementSibling.tagName !== 'BODY') {
       nextElementSibling = this.createElement('body');
       head.after(nextElementSibling);
     }
diff --git a/test/html/document.js b/test/html/document.js
@@ -64,3 +64,5 @@ window.addEventListener = window.removeEventListener = window.dispatchEvent = nu
 assert(window.addEventListener, null);
 
 assert(typeof window.performance.now(), 'number');
+
+assert(parseHTML('<html><body><div>asdf</div></body></html>').document.body.outerHTML, '<body><div>asdf</div></body>');
diff --git a/worker.js b/worker.js
@@ -16711,7 +16711,7 @@ class HTMLDocument extends Document$1 {
   get head() {
     const {documentElement} = this;
     let {firstElementChild} = documentElement;
-    if (!firstElementChild) {
+    if (!firstElementChild || firstElementChild.tagName !== 'HEAD') {
       firstElementChild = this.createElement('head');
       documentElement.prepend(firstElementChild);
     }
@@ -16724,7 +16724,7 @@ class HTMLDocument extends Document$1 {
   get body() {
     const {head} = this;
     let {nextElementSibling} = head;
-    if (!nextElementSibling) {
+    if (!nextElementSibling || nextElementSibling.tagName !== 'BODY') {
       nextElementSibling = this.createElement('body');
       head.after(nextElementSibling);
     }
