happy-dom 2.40.1 → 2.41.0

package/src/css/CSSStyleDeclaration.ts

@@ -10,7 +10,36 @@ export default class CSSStyleDeclaration {
 	private _attributes: { [k: string]: Attr } = null;
 	private _computedStyleElement: { isConnected: boolean } = null;
 
-	/* eslint-disable require-jsdoc */
+	/**
+	 * Constructor.
+	 *
+	 * @param [attributes] Attributes.
+	 * @param [computedStyleElement] Computed style element.
+	 * @param computedStyleElement.isConnected
+	 */
+	constructor(
+		attributes: { [k: string]: Attr } = {},
+		computedStyleElement: { isConnected: boolean } = null
+	) {
+		const style = attributes['style'];
+		let index = 0;
+
+		this._attributes = attributes;
+		this._computedStyleElement = computedStyleElement;
+
+		if (style && style.value) {
+			const parts = style.value.split(';');
+			for (const part of parts) {
+				if (part) {
+					const [name] = part.trim().split(':');
+					this[index] = name;
+					index++;
+				}
+			}
+		}
+
+		(<number>this.length) = index;
+	}
 
 	/**
 	 *
@@ -4809,8 +4838,6 @@ export default class CSSStyleDeclaration {
 		this.setProperty('zoom', zoom);
 	}
 
-	/* eslint-enable require-jsdoc */
-
 	/**
 	 * Returns the style decleration as a CSS text.
 	 *
@@ -4844,7 +4871,11 @@ export default class CSSStyleDeclaration {
 			for (const part of parts) {
 				if (part) {
 					const [name, value] = part.trim().split(':');
-					newStyle.push(`${name}: ${value.trim()};`);
+					if (value) {
+						newStyle.push(`${name}: ${value.trim()};`);
+					} else {
+						newStyle.push(name);
+					}
 					this[index] = name;
 					index++;
 				}
@@ -4860,37 +4891,6 @@ export default class CSSStyleDeclaration {
 		}
 	}
 
-	/**
-	 * Constructor.
-	 *
-	 * @param [attributes] Attributes.
-	 * @param [computedStyleElement] Computed style element.
-	 * @param computedStyleElement.isConnected
-	 */
-	constructor(
-		attributes: { [k: string]: Attr } = {},
-		computedStyleElement: { isConnected: boolean } = null
-	) {
-		const style = attributes['style'];
-		let index = 0;
-
-		this._attributes = attributes;
-		this._computedStyleElement = computedStyleElement;
-
-		if (style && style.value) {
-			const parts = style.value.split(';');
-			for (const part of parts) {
-				if (part) {
-					const [name] = part.trim().split(':');
-					this[index] = name;
-					index++;
-				}
-			}
-		}
-
-		(<number>this.length) = index;
-	}
-
 	/**
 	 * Returns item.
 	 *
@@ -4932,8 +4932,10 @@ export default class CSSStyleDeclaration {
 					if (name === propertyName) {
 						newStyle.push(`${name}: ${value};`);
 						isExisting = true;
-					} else {
+					} else if (existingValue) {
 						newStyle.push(`${name}: ${existingValue.trim()};`);
+					} else {
+						newStyle.push(`${name};`);
 					}
 
 					this[index] = name;
@@ -5011,6 +5013,9 @@ export default class CSSStyleDeclaration {
 				if (part) {
 					const [name, value] = part.trim().split(':');
 					if (name === propertyName) {
+						if (!value) {
+							return '';
+						}
 						return value.trim();
 					}
 				}

package/src/index.ts

@@ -106,6 +106,7 @@ import ChildLessElements from './config/ChildLessElements';
 import CSSStyleSheet from './css/CSSStyleSheet';
 import Storage from './storage/Storage';
 import URLSearchParams from './url-search-params/URLSearchParams';
+import Selection from './selection/Selection';
 
 export {
 	AsyncWindow,
@@ -215,5 +216,6 @@ export {
 	ChildLessElements,
 	CSSStyleSheet,
 	Storage,
-	URLSearchParams
+	URLSearchParams,
+	Selection
 };

package/src/nodes/document/Document.ts

@@ -35,6 +35,7 @@ import IHTMLStyleElement from '../html-style-element/IHTMLStyleElement';
 import DocumentReadyStateEnum from './DocumentReadyStateEnum';
 import DocumentReadyStateManager from './DocumentReadyStateManager';
 import Location from '../../location/Location';
+import Selection from '../../selection/Selection';
 
 /**
  * Document.
@@ -699,6 +700,15 @@ export default class Document extends Node implements IDocument {
 		return adopted;
 	}
 
+	/**
+	 * Returns selection.
+	 *
+	 * @returns Selection.
+	 */
+	public getSelection(): Selection {
+		return new Selection();
+	}
+
 	/**
 	 * @override
 	 */

package/src/nodes/document/IDocument.ts

@@ -11,6 +11,7 @@ import IParentNode from '../parent-node/IParentNode';
 import INode from '../node/INode';
 import ICharacterData from '../character-data/ICharacterData';
 import IDocumentFragment from '../document-fragment/IDocumentFragment';
+import Selection from '../../selection/Selection';
 
 /**
  * Document.
@@ -152,4 +153,11 @@ export default interface IDocument extends IParentNode {
 	 * @returns Adopted node.
 	 */
 	adoptNode(node: INode): INode;
+
+	/**
+	 * Returns selection.
+	 *
+	 * @returns Selection.
+	 */
+	getSelection(): Selection;
 }

package/src/nodes/html-element/HTMLElement.ts

@@ -4,6 +4,7 @@ import CSSStyleDeclaration from '../../css/CSSStyleDeclaration';
 import Attr from '../../attribute/Attr';
 import FocusEvent from '../../event/events/FocusEvent';
 import PointerEvent from '../../event/events/PointerEvent';
+import Node from '../node/Node';
 
 /**
  * HTML Element.
@@ -49,21 +50,34 @@ export default class HTMLElement extends Element implements IHTMLElement {
 	}
 
 	/**
-	 * Returns inner text.
+	 * Returns inner text, which is the rendered appearance of text.
 	 *
-	 * @returns Text.
+	 * @returns Inner text.
 	 */
 	public get innerText(): string {
-		return this.textContent;
+		let result = '';
+		for (const childNode of this.childNodes) {
+			if (childNode instanceof HTMLElement) {
+				if (childNode.tagName !== 'SCRIPT' && childNode.tagName !== 'STYLE') {
+					result += childNode.innerText;
+				}
+			} else if (
+				childNode.nodeType === Node.ELEMENT_NODE ||
+				childNode.nodeType === Node.TEXT_NODE
+			) {
+				result += childNode.textContent;
+			}
+		}
+		return result;
 	}
 
 	/**
-	 * Sets inner text.
+	 * Sets the inner text, which is the rendered appearance of text.
 	 *
-	 * @param text Text.
+	 * @param innerText Inner text.
 	 */
-	public set innerText(text: string) {
-		this.textContent = text;
+	public set innerText(innerText: string) {
+		this.textContent = innerText;
 	}
 
 	/**

package/src/selection/Selection.ts

@@ -0,0 +1,140 @@
+import INode from '../nodes/node/INode';
+
+/**
+ * Selection.
+ *
+ * Reference:
+ * https://developer.mozilla.org/en-US/docs/Web/API/Selection.
+ */
+export default class Selection {
+	public readonly anchorNode: INode = null;
+	public readonly anchorOffset: number = 0;
+	public readonly baseNode: INode = null;
+	public readonly baseOffset: number = 0;
+	public readonly extentNode: INode = null;
+	public readonly extentOffset: number = 0;
+	public readonly focusNode: INode = null;
+	public readonly focusOffset: number = 0;
+	public readonly isCollapsed: boolean = true;
+	public readonly rangeCount: number = 0;
+	public readonly type: string = 'None';
+
+	/**
+	 * Adds a range.
+	 *
+	 * @param _range Range.
+	 */
+	public addRange(_range: object): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Collapses the current selection to a single point.
+	 *
+	 * @param _node Node.
+	 * @param _offset Offset.
+	 */
+	public collapse(_node: INode, _offset?: number): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Collapses the selection to the end.
+	 */
+	public collapseToEnd(): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Collapses the selection to the start.
+	 */
+	public collapseToStart(): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Indicates whether a specified node is part of the selection.
+	 *
+	 * @param _node Node.
+	 * @param _partialContainer Partial container.
+	 * @returns Always returns "true" for now.
+	 */
+	public containsNode(_node: INode, _partialContainer?: INode): boolean {
+		return true;
+	}
+
+	/**
+	 * Deletes the selected text from the document's DOM.
+	 */
+	public deleteFromDocument(): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Moves the focus of the selection to a specified point.
+	 *
+	 * @param _node Node.
+	 * @param _offset Offset.
+	 */
+	public extend(_node: INode, _offset?: number): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Moves the focus of the selection to a specified point.
+	 *
+	 * @param _index Index.
+	 */
+	public getRangeAt(_index: number): object {
+		throw new Error('Not a valid index.');
+	}
+
+	/**
+	 * Removes a range from a selection.
+	 *
+	 * @param _range Range.
+	 */
+	public removeRange(_range: object): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Removes all ranges.
+	 */
+	public removeAllRanges(): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Selects all children.
+	 *
+	 * @param _parentNode Parent node.
+	 */
+	public selectAllChildren(_parentNode: INode): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Sets the selection to be a range including all or parts of two specified DOM nodes, and any content located between them.
+	 *
+	 * @param _anchorNode Anchor node.
+	 * @param _anchorOffset Anchor offset.
+	 * @param _focusNode Focus node.
+	 * @param _focusOffset Focus offset.
+	 */
+	public setBaseAndExtent(
+		_anchorNode: INode,
+		_anchorOffset: number,
+		_focusNode: INode,
+		_focusOffset: number
+	): void {
+		// Do nothing.
+	}
+
+	/**
+	 * Returns string currently being represented by the selection object.
+	 */
+	public toString(): string {
+		return '';
+	}
+}

package/src/window/IWindow.ts

@@ -68,6 +68,7 @@ import Window from './Window';
 import URLSearchParams from '../url-search-params/URLSearchParams';
 import HTMLCollection from '../nodes/element/HTMLCollection';
 import NodeList from '../nodes/node/NodeList';
+import Selection from '../selection/Selection';
 
 /**
  * Window.
@@ -148,6 +149,7 @@ export default interface IWindow {
 	readonly NodeList: typeof NodeList;
 	readonly CSSUnitValue: typeof CSSUnitValue;
 	readonly CSS: CSS;
+	readonly Selection: typeof Selection;
 
 	// Events
 	onload: (event: Event) => void;

package/src/window/Window.ts

@@ -73,6 +73,7 @@ import URLSearchParams from '../url-search-params/URLSearchParams';
 import HTMLCollection from '../nodes/element/HTMLCollection';
 import NodeList from '../nodes/node/NodeList';
 import MediaQueryList from '../match-media/MediaQueryList';
+import Selection from '../selection/Selection';
 import * as PerfHooks from 'perf_hooks';
 
 const FETCH_RESPONSE_TYPE_METHODS = ['blob', 'json', 'text'];
@@ -160,6 +161,7 @@ export default class Window extends EventTarget implements IWindow, NodeJS.Globa
 	public readonly NodeList = NodeList;
 	public readonly MediaQueryList = MediaQueryList;
 	public readonly CSSUnitValue = CSSUnitValue;
+	public readonly Selection = Selection;
 
 	// Events
 	public onload: (event: Event) => void = null;

package/src/xml-parser/XMLParser.ts

@@ -37,7 +37,6 @@ 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();
@@ -88,15 +87,18 @@ 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;
+					let childLessMatch = null;
+					while ((childLessMatch = markupRegexp.exec(data))) {
+						if (childLessMatch[2] === match[2] && childLessMatch[1]) {
+							markupRegexp.lastIndex -= childLessMatch[0].length;
+							break;
+						}
 					}
-					markupRegexp.lastIndex = childLessIndex;
 				}
 			} else {
 				stack.pop();