fix: [#1566] Fixes incorrect serialization of special characters in r…

…aw text elements such as <script> and <style> (#1566) Co-authored-by: David Ortner <david@ortner.se>
capricorn86 · Nov 6, 2024 · c80a0e9 · c80a0e9
1 parent 32f7510
commit c80a0e9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/packages/happy-dom/src/xml-serializer/XMLSerializer.ts b/packages/happy-dom/src/xml-serializer/XMLSerializer.ts
@@ -87,6 +87,13 @@ export default class XMLSerializer {
 				// TODO: Add support for processing instructions.
 				return `<!--?${(<ProcessingInstruction>root).target} ${root.textContent}?-->`;
 			case NodeTypeEnum.textNode:
+				const parentElement = root.parentElement;
+				if (parentElement) {
+					const parentConfig = HTMLElementConfig[parentElement[PropertySymbol.localName]];
+					if (parentConfig?.contentModel === HTMLElementConfigContentModelEnum.rawText) {
+						return root.textContent;
+					}
+				}
 				return Entities.escapeText(root.textContent);
 			case NodeTypeEnum.documentTypeNode:
 				const doctype = <DocumentType>root;

diff --git a/packages/happy-dom/test/dom-parser/DOMParser.test.ts b/packages/happy-dom/test/dom-parser/DOMParser.test.ts
@@ -82,7 +82,7 @@ describe('DOMParser', () => {
 				`<html>
 					<body>
 						<script>
-                        var test = {className:"meta",begin:/&lt;![a-z]/,end:/&gt;/,contains:[t,i,l,c]};
+							var test = {className:"meta",begin:/<![a-z]/,end:/>/,contains:[t,i,l,c]};
 						</script>
 					</body>
 				</html>`.replace(/\s/g, '')

diff --git a/packages/happy-dom/test/nodes/element/Element.test.ts b/packages/happy-dom/test/nodes/element/Element.test.ts
@@ -270,6 +270,21 @@ describe('Element', () => {
 
 			expect(element.innerHTML).toBe('EXPECTED_HTML');
 		});
+
+		it('Returns HTML of a mixture of normal and raw text elements as a concatenated string.', () => {
+			const container = document.createElement('div');
+			const testString = `/* &<>\xA0 */`;
+			const div = document.createElement('div');
+			div.textContent = testString;
+			const script = document.createElement('script');
+			script.textContent = testString;
+			const style = document.createElement('style');
+			style.textContent = testString;
+			container.append(div, script, style);
+			expect(container.innerHTML).toBe(
+				'<div>/* &amp;&lt;&gt;&nbsp; */</div><script>/* &<>\xA0 */</script><style>/* &<>\xA0 */</style>'
+			);
+		});
 	});
 
 	describe('set innerHTML()', () => {

diff --git a/packages/happy-dom/test/xml-parser/XMLParser.test.ts b/packages/happy-dom/test/xml-parser/XMLParser.test.ts
@@ -246,9 +246,9 @@ describe('XMLParser', () => {
 
 			expect(new XMLSerializer().serializeToString(root)).toBe(
 				`<div>
-					<script>if(1&lt;Math['random']()){}else if(Math['random']()&gt;1){console.log("1")}</script>
-					<script>&lt;b&gt;&lt;/b&gt;</script>
-					<style>&lt;b&gt;&lt;/b&gt;</style>
+					<script>if(1<Math['random']()){}else if(Math['random']()>1){console.log("1")}</script>
+					<script><b></b></script>
+					<style><b></b></style>
 				</div>`
 			);