Merge pull request #376 from Mas0nShi/task/373-Fixes-non-parsed-conte…

…nt-tags-for-xmlparser #373@patch: Fixes xmlparser error parse with tags which contain non-parsed content.
capricorn86 · Feb 22, 2022 · 084023a · 084023a
2 parents 5d9ef5c + f499b39
commit 084023a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/packages/happy-dom/src/config/ChildLessElements.ts b/packages/happy-dom/src/config/ChildLessElements.ts
@@ -0,0 +1 @@
+export default ['style', 'script', 'template'];
diff --git a/packages/happy-dom/src/index.ts b/packages/happy-dom/src/index.ts
@@ -102,6 +102,7 @@ import XMLSerializer from './xml-serializer/XMLSerializer';
 import ElementTag from './config/ElementTag';
 import SelfClosingElements from './config/SelfClosingElements';
 import UnclosedElements from './config/UnclosedElements';
+import ChildLessElements from './config/ChildLessElements';
 import CSSStyleSheet from './css/CSSStyleSheet';
 import Storage from './storage/Storage';
 import URLSearchParams from './url-search-params/URLSearchParams';
@@ -211,6 +212,7 @@ export {
 	ElementTag,
 	SelfClosingElements,
 	UnclosedElements,
+	ChildLessElements,
 	CSSStyleSheet,
 	Storage,
 	URLSearchParams

diff --git a/packages/happy-dom/src/xml-parser/XMLParser.ts b/packages/happy-dom/src/xml-parser/XMLParser.ts
@@ -3,6 +3,7 @@ import Element from '../nodes/element/Element';
 import IDocument from '../nodes/document/IDocument';
 import SelfClosingElements from '../config/SelfClosingElements';
 import UnnestableElements from '../config/UnnestableElements';
+import ChildLessElements from '../config/ChildLessElements';
 import { decode } from 'he';
 import NamespaceURI from '../config/NamespaceURI';
 import HTMLScriptElement from '../nodes/html-script-element/HTMLScriptElement';
@@ -36,6 +37,7 @@ export default class XMLParser {
 		let parentUnnestableTagName = null;
 		let lastTextIndex = 0;
 		let match: RegExpExecArray;
+		let childLessIndex = 0;
 
 		while ((match = markupRegexp.exec(data))) {
 			const tagName = match[2].toLowerCase();
@@ -86,8 +88,16 @@ export default class XMLParser {
 				} else {
 					parent.appendChild(newElement);
 				}
+				lastTextIndex = childLessIndex = markupRegexp.lastIndex;
 
-				lastTextIndex = markupRegexp.lastIndex;
+				// Tags which contain non-parsed content
+				// For example: <script> JavaScript should not be parsed
+				if (ChildLessElements.includes(tagName)) {
+					while (markupRegexp.exec(data)[2].toLowerCase() != tagName) {
+						childLessIndex = markupRegexp.lastIndex;
+					}
+					markupRegexp.lastIndex = childLessIndex;
+				}
 			} else {
 				stack.pop();
 				parent = stack[stack.length - 1] || root;