happy-dom 10.5.2 → 10.5.3

package/src/nodes/html-option-element/HTMLOptionElementNamedNodeMap.ts

@@ -0,0 +1,55 @@
+import IAttr from '../attr/IAttr.js';
+import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
+import HTMLSelectElement from '../html-select-element/HTMLSelectElement.js';
+import HTMLOptionElement from './HTMLOptionElement.js';
+
+/**
+ * Named Node Map.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+ */
+export default class HTMLOptionElementNamedNodeMap extends HTMLElementNamedNodeMap {
+	protected _ownerElement: HTMLOptionElement;
+
+	/**
+	 * @override
+	 */
+	public override setNamedItem(item: IAttr): IAttr | null {
+		const replacedItem = super.setNamedItem(item);
+
+		if (
+			!this._ownerElement._dirtyness &&
+			item.name === 'selected' &&
+			replacedItem?.value !== item.value
+		) {
+			const selectNode = <HTMLSelectElement>this._ownerElement._selectNode;
+
+			this._ownerElement._selectedness = true;
+
+			if (selectNode) {
+				selectNode._updateOptionItems(this._ownerElement);
+			}
+		}
+
+		return replacedItem || null;
+	}
+
+	/**
+	 * @override
+	 */
+	public override removeNamedItem(name: string): IAttr | null {
+		const removedItem = super.removeNamedItem(name);
+
+		if (removedItem && !this._ownerElement._dirtyness && removedItem.name === 'selected') {
+			const selectNode = <HTMLSelectElement>this._ownerElement._selectNode;
+
+			this._ownerElement._selectedness = false;
+
+			if (selectNode) {
+				selectNode._updateOptionItems();
+			}
+		}
+
+		return removedItem;
+	}
+}

package/src/nodes/html-script-element/HTMLScriptElement.ts

@@ -1,10 +1,11 @@
-import IAttr from '../attr/IAttr.js';
 import HTMLElement from '../html-element/HTMLElement.js';
 import IHTMLScriptElement from './IHTMLScriptElement.js';
 import HTMLScriptElementUtility from './HTMLScriptElementUtility.js';
 import Event from '../../event/Event.js';
 import ErrorEvent from '../../event/events/ErrorEvent.js';
 import INode from '../../nodes/node/INode.js';
+import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
+import HTMLScriptElementNamedNodeMap from './HTMLScriptElementNamedNodeMap.js';
 
 /**
  * HTML Script Element.
@@ -13,6 +14,7 @@ import INode from '../../nodes/node/INode.js';
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLScriptElement.
  */
 export default class HTMLScriptElement extends HTMLElement implements IHTMLScriptElement {
+	public override readonly attributes: INamedNodeMap = new HTMLScriptElementNamedNodeMap(this);
 	public onerror: (event: ErrorEvent) => void = null;
 	public onload: (event: Event) => void = null;
 	public _evaluateScript = true;
@@ -151,23 +153,6 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 		this.textContent = text;
 	}
 
-	/**
-	 * The setAttributeNode() method adds a new Attr node to the specified element.
-	 *
-	 * @override
-	 * @param attribute Attribute.
-	 * @returns Replaced attribute.
-	 */
-	public setAttributeNode(attribute: IAttr): IAttr | null {
-		const replacedAttribute = super.setAttributeNode(attribute);
-
-		if (attribute.name === 'src' && attribute.value !== null && this.isConnected) {
-			HTMLScriptElementUtility.loadExternalScript(this);
-		}
-
-		return replacedAttribute;
-	}
-
 	/**
 	 * Clones a node.
 	 *

package/src/nodes/html-script-element/HTMLScriptElementNamedNodeMap.ts

@@ -0,0 +1,26 @@
+import IAttr from '../attr/IAttr.js';
+import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
+import HTMLScriptElement from './HTMLScriptElement.js';
+import HTMLScriptElementUtility from './HTMLScriptElementUtility.js';
+
+/**
+ * Named Node Map.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+ */
+export default class HTMLScriptElementNamedNodeMap extends HTMLElementNamedNodeMap {
+	protected _ownerElement: HTMLScriptElement;
+
+	/**
+	 * @override
+	 */
+	public override setNamedItem(item: IAttr): IAttr | null {
+		const replacedItem = super.setNamedItem(item);
+
+		if (item.name === 'src' && item.value !== null && this._ownerElement.isConnected) {
+			HTMLScriptElementUtility.loadExternalScript(this._ownerElement);
+		}
+
+		return replacedItem || null;
+	}
+}

package/src/nodes/html-select-element/HTMLSelectElement.ts

@@ -13,11 +13,12 @@ import IHTMLOptionsCollection from './IHTMLOptionsCollection.js';
 import INode from '../node/INode.js';
 import NodeTypeEnum from '../node/NodeTypeEnum.js';
 import HTMLFormElement from '../html-form-element/HTMLFormElement.js';
-import IAttr from '../attr/IAttr.js';
 import IHTMLCollection from '../element/IHTMLCollection.js';
 import NodeList from '../node/NodeList.js';
 import IDocument from '../document/IDocument.js';
 import IShadowRoot from '../shadow-root/IShadowRoot.js';
+import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
+import HTMLSelectElementNamedNodeMap from './HTMLSelectElementNamedNodeMap.js';
 
 /**
  * HTML Select Element.
@@ -26,6 +27,8 @@ import IShadowRoot from '../shadow-root/IShadowRoot.js';
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLSelectElement.
  */
 export default class HTMLSelectElement extends HTMLElement implements IHTMLSelectElement {
+	public override readonly attributes: INamedNodeMap = new HTMLSelectElementNamedNodeMap(this);
+
 	// Public properties.
 	public readonly length = 0;
 	public readonly options: IHTMLOptionsCollection = new HTMLOptionsCollection(this);
@@ -402,38 +405,6 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 		}
 	}
 
-	/**
-	 * @override
-	 */
-	public override setAttributeNode(attribute: IAttr): IAttr | null {
-		const replacedAttribute = super.setAttributeNode(attribute);
-		const oldValue = replacedAttribute ? replacedAttribute.value : null;
-
-		if ((attribute.name === 'id' || attribute.name === 'name') && this._formNode) {
-			if (oldValue) {
-				(<HTMLFormElement>this._formNode)._removeFormControlItem(this, oldValue);
-			}
-			if (attribute.value) {
-				(<HTMLFormElement>this._formNode)._appendFormControlItem(this, attribute.value);
-			}
-		}
-
-		return replacedAttribute;
-	}
-
-	/**
-	 * @override
-	 */
-	public override removeAttributeNode(attribute: IAttr): IAttr {
-		super.removeAttributeNode(attribute);
-
-		if ((attribute.name === 'id' || attribute.name === 'name') && this._formNode) {
-			(<HTMLFormElement>this._formNode)._removeFormControlItem(this, attribute.value);
-		}
-
-		return attribute;
-	}
-
 	/**
 	 * @override
 	 */

package/src/nodes/html-select-element/HTMLSelectElementNamedNodeMap.ts

@@ -0,0 +1,57 @@
+import IAttr from '../attr/IAttr.js';
+import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
+import HTMLFormElement from '../html-form-element/HTMLFormElement.js';
+import HTMLSelectElement from './HTMLSelectElement.js';
+
+/**
+ * Named Node Map.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+ */
+export default class HTMLSelectElementNamedNodeMap extends HTMLElementNamedNodeMap {
+	protected _ownerElement: HTMLSelectElement;
+
+	/**
+	 * @override
+	 */
+	public override setNamedItem(item: IAttr): IAttr | null {
+		const replacedItem = super.setNamedItem(item);
+
+		if ((item.name === 'id' || item.name === 'name') && this._ownerElement._formNode) {
+			if (replacedItem && replacedItem.value) {
+				(<HTMLFormElement>this._ownerElement._formNode)._removeFormControlItem(
+					this._ownerElement,
+					replacedItem.value
+				);
+			}
+			if (item.value) {
+				(<HTMLFormElement>this._ownerElement._formNode)._appendFormControlItem(
+					this._ownerElement,
+					item.value
+				);
+			}
+		}
+
+		return replacedItem || null;
+	}
+
+	/**
+	 * @override
+	 */
+	public override removeNamedItem(name: string): IAttr | null {
+		const removedItem = super.removeNamedItem(name);
+
+		if (
+			removedItem &&
+			(removedItem.name === 'id' || removedItem.name === 'name') &&
+			this._ownerElement._formNode
+		) {
+			(<HTMLFormElement>this._ownerElement._formNode)._removeFormControlItem(
+				this._ownerElement,
+				removedItem.value
+			);
+		}
+
+		return removedItem;
+	}
+}

package/src/nodes/html-text-area-element/HTMLTextAreaElement.ts

@@ -1,7 +1,6 @@
 import Event from '../../event/Event.js';
 import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
-import IAttr from '../attr/IAttr.js';
 import HTMLElement from '../html-element/HTMLElement.js';
 import HTMLFormElement from '../html-form-element/HTMLFormElement.js';
 import IHTMLFormElement from '../html-form-element/IHTMLFormElement.js';
@@ -15,6 +14,8 @@ import IHTMLLabelElement from '../html-label-element/IHTMLLabelElement.js';
 import IDocument from '../document/IDocument.js';
 import IShadowRoot from '../shadow-root/IShadowRoot.js';
 import NodeList from '../node/NodeList.js';
+import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
+import HTMLTextAreaElementNamedNodeMap from './HTMLTextAreaElementNamedNodeMap.js';
 
 /**
  * HTML Text Area Element.
@@ -23,6 +24,7 @@ import NodeList from '../node/NodeList.js';
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLTextAreaElement.
  */
 export default class HTMLTextAreaElement extends HTMLElement implements IHTMLTextAreaElement {
+	public override readonly attributes: INamedNodeMap = new HTMLTextAreaElementNamedNodeMap(this);
 	public readonly type = 'textarea';
 	public readonly validationMessage = '';
 	public readonly validity = new ValidityState(this);
@@ -588,38 +590,6 @@ export default class HTMLTextAreaElement extends HTMLElement implements IHTMLTex
 		}
 	}
 
-	/**
-	 * @override
-	 */
-	public override setAttributeNode(attribute: IAttr): IAttr | null {
-		const replacedAttribute = super.setAttributeNode(attribute);
-		const oldValue = replacedAttribute ? replacedAttribute.value : null;
-
-		if ((attribute.name === 'id' || attribute.name === 'name') && this._formNode) {
-			if (oldValue) {
-				(<HTMLFormElement>this._formNode)._removeFormControlItem(this, oldValue);
-			}
-			if (attribute.value) {
-				(<HTMLFormElement>this._formNode)._appendFormControlItem(this, attribute.value);
-			}
-		}
-
-		return replacedAttribute;
-	}
-
-	/**
-	 * @override
-	 */
-	public override removeAttributeNode(attribute: IAttr): IAttr {
-		super.removeAttributeNode(attribute);
-
-		if ((attribute.name === 'id' || attribute.name === 'name') && this._formNode) {
-			(<HTMLFormElement>this._formNode)._removeFormControlItem(this, attribute.value);
-		}
-
-		return attribute;
-	}
-
 	/**
 	 * @override
 	 */

package/src/nodes/html-text-area-element/HTMLTextAreaElementNamedNodeMap.ts

@@ -0,0 +1,57 @@
+import IAttr from '../attr/IAttr.js';
+import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
+import HTMLFormElement from '../html-form-element/HTMLFormElement.js';
+import HTMLTextAreaElement from './HTMLTextAreaElement.js';
+
+/**
+ * Named Node Map.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+ */
+export default class HTMLTextAreaElementNamedNodeMap extends HTMLElementNamedNodeMap {
+	protected _ownerElement: HTMLTextAreaElement;
+
+	/**
+	 * @override
+	 */
+	public override setNamedItem(item: IAttr): IAttr | null {
+		const replacedItem = super.setNamedItem(item);
+
+		if ((item.name === 'id' || item.name === 'name') && this._ownerElement._formNode) {
+			if (replacedItem && replacedItem.value) {
+				(<HTMLFormElement>this._ownerElement._formNode)._removeFormControlItem(
+					this._ownerElement,
+					replacedItem.value
+				);
+			}
+			if (item.value) {
+				(<HTMLFormElement>this._ownerElement._formNode)._appendFormControlItem(
+					this._ownerElement,
+					item.value
+				);
+			}
+		}
+
+		return replacedItem || null;
+	}
+
+	/**
+	 * @override
+	 */
+	public override removeNamedItem(name: string): IAttr | null {
+		const removedItem = super.removeNamedItem(name);
+
+		if (
+			removedItem &&
+			(removedItem.name === 'id' || removedItem.name === 'name') &&
+			this._ownerElement._formNode
+		) {
+			(<HTMLFormElement>this._ownerElement._formNode)._removeFormControlItem(
+				this._ownerElement,
+				removedItem.value
+			);
+		}
+
+		return removedItem;
+	}
+}

package/src/nodes/html-unknown-element/HTMLUnknownElement.ts

@@ -6,6 +6,7 @@ import IHTMLCollection from '../element/IHTMLCollection.js';
 import IElement from '../element/IElement.js';
 import NodeList from '../node/NodeList.js';
 import HTMLCollection from '../element/HTMLCollection.js';
+import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
 
 /**
  * HTML Unknown Element.
@@ -43,7 +44,10 @@ export default class HTMLUnknownElement extends HTMLElement implements IHTMLElem
 						newElement._textAreaNode = this._textAreaNode;
 						newElement._observers = this._observers;
 						newElement._isValue = this._isValue;
-						newElement._attributes = this._attributes;
+
+						for (let i = 0, max = this.attributes.length; i < max; i++) {
+							newElement.attributes.setNamedItem(this.attributes[i]);
+						}
 
 						(<INodeList<INode>>this.childNodes) = new NodeList();
 						(<IHTMLCollection<IElement>>this.children) = new HTMLCollection();
@@ -53,7 +57,7 @@ export default class HTMLUnknownElement extends HTMLElement implements IHTMLElem
 						this._textAreaNode = null;
 						this._observers = [];
 						this._isValue = null;
-						this._attributes = {};
+						(<HTMLElementNamedNodeMap>this.attributes) = new HTMLElementNamedNodeMap(this);
 
 						for (let i = 0, max = this.parentNode.childNodes.length; i < max; i++) {
 							if (this.parentNode.childNodes[i] === this) {

package/src/nodes/node/NodeUtility.ts

@@ -395,33 +395,16 @@ export default class NodeUtility {
 	 * @param elementB
 	 */
 	public static attributeListsEqual(elementA: IElement, elementB: IElement): boolean {
-		const listA = <Array<IAttr>>Object.values(elementA['_attributes']);
-		const listB = <Array<IAttr>>Object.values(elementB['_attributes']);
-
-		const lengthA = listA.length;
-		const lengthB = listB.length;
-
-		if (lengthA !== lengthB) {
-			return false;
-		}
-
-		for (let i = 0; i < lengthA; ++i) {
-			const attrA = listA[i];
-
-			if (
-				!listB.some((attrB) => {
-					return (
-						(typeof attrA === 'number' && typeof attrB === 'number' && attrA === attrB) ||
-						(typeof attrA === 'object' &&
-							typeof attrB === 'object' &&
-							NodeUtility.isEqualNode(attrA, attrB))
-					);
-				})
-			) {
+		for (let i = 0, max = elementA.attributes.length; i < max; i++) {
+			const attributeA = elementA.attributes[i];
+			const attributeB = elementB.attributes.getNamedItemNS(
+				attributeA.namespaceURI,
+				attributeA.localName
+			);
+			if (!attributeB || attributeB.value !== attributeA.value) {
 				return false;
 			}
 		}
-
 		return true;
 	}
 

package/src/nodes/svg-element/SVGElement.ts

@@ -2,10 +2,11 @@ import CSSStyleDeclaration from '../../css/declaration/CSSStyleDeclaration.js';
 import Element from '../element/Element.js';
 import ISVGElement from './ISVGElement.js';
 import ISVGSVGElement from './ISVGSVGElement.js';
-import IAttr from '../attr/IAttr.js';
 import Event from '../../event/Event.js';
 import Dataset from '../element/Dataset.js';
 import HTMLElementUtility from '../html-element/HTMLElementUtility.js';
+import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
+import SVGElementNamedNodeMap from './SVGElementNamedNodeMap.js';
 
 /**
  * SVG Element.
@@ -14,6 +15,8 @@ import HTMLElementUtility from '../html-element/HTMLElementUtility.js';
  * https://developer.mozilla.org/en-US/docs/Web/API/SVGElement.
  */
 export default class SVGElement extends Element implements ISVGElement {
+	public override readonly attributes: INamedNodeMap = new SVGElementNamedNodeMap(this);
+
 	// Events
 	public onabort: (event: Event) => void | null = null;
 	public onerror: (event: Event) => void | null = null;
@@ -23,7 +26,7 @@ export default class SVGElement extends Element implements ISVGElement {
 	public onunload: (event: Event) => void | null = null;
 
 	// Private properties
-	private _style: CSSStyleDeclaration = null;
+	public _style: CSSStyleDeclaration = null;
 	private _dataset: Dataset = null;
 
 	/**
@@ -109,30 +112,4 @@ export default class SVGElement extends Element implements ISVGElement {
 	public focus(): void {
 		HTMLElementUtility.focus(this);
 	}
-
-	/**
-	 * @override
-	 */
-	public setAttributeNode(attribute: IAttr): IAttr | null {
-		const replacedAttribute = super.setAttributeNode(attribute);
-
-		if (attribute.name === 'style' && this._style) {
-			this._style.cssText = attribute.value;
-		}
-
-		return replacedAttribute;
-	}
-
-	/**
-	 * @override
-	 */
-	public removeAttributeNode(attribute: IAttr): IAttr {
-		super.removeAttributeNode(attribute);
-
-		if (attribute.name === 'style' && this._style) {
-			this._style.cssText = '';
-		}
-
-		return attribute;
-	}
 }

package/src/nodes/svg-element/SVGElementNamedNodeMap.ts

@@ -0,0 +1,38 @@
+import IAttr from '../attr/IAttr.js';
+import ElementNamedNodeMap from '../element/ElementNamedNodeMap.js';
+import SVGElement from './SVGElement.js';
+
+/**
+ * Named Node Map.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+ */
+export default class SVGElementNamedNodeMap extends ElementNamedNodeMap {
+	protected _ownerElement: SVGElement;
+
+	/**
+	 * @override
+	 */
+	public override setNamedItem(item: IAttr): IAttr | null {
+		const replacedItem = super.setNamedItem(item);
+
+		if (item.name === 'style' && this._ownerElement._style) {
+			this._ownerElement._style.cssText = item.value;
+		}
+
+		return replacedItem || null;
+	}
+
+	/**
+	 * @override
+	 */
+	public override removeNamedItem(name: string): IAttr | null {
+		const removedItem = super.removeNamedItem(name);
+
+		if (removedItem && removedItem.name === 'style' && this._ownerElement._style) {
+			this._ownerElement._style.cssText = '';
+		}
+
+		return removedItem;
+	}
+}

package/src/query-selector/SelectorItem.ts

@@ -236,7 +236,7 @@ export default class SelectorItem {
 		let priorityWeight = 0;
 
 		for (const attribute of this.attributes) {
-			const elementAttribute = (<Element>element)._attributes[attribute.name];
+			const elementAttribute = (<Element>element).attributes.getNamedItem(attribute.name);
 
 			if (!elementAttribute) {
 				return null;

package/src/xml-serializer/XMLSerializer.ts

@@ -110,11 +110,12 @@ export default class XMLSerializer {
 	private _getAttributes(element: IElement): string {
 		let attributeString = '';
 
-		if (!(<Element>element)._attributes.is && (<Element>element)._isValue) {
+		if (!(<Element>element).attributes.getNamedItem('is') && (<Element>element)._isValue) {
 			attributeString += ' is="' + (<Element>element)._isValue + '"';
 		}
 
-		for (const attribute of Object.values((<Element>element)._attributes)) {
+		for (let i = 0, max = (<Element>element).attributes.length; i < max; i++) {
+			const attribute = (<Element>element).attributes[i];
 			if (attribute.value !== null) {
 				const escapedValue = this._options.escapeEntities
 					? Entities.escapeText(attribute.value)
@@ -122,6 +123,7 @@ export default class XMLSerializer {
 				attributeString += ' ' + attribute.name + '="' + escapedValue + '"';
 			}
 		}
+
 		return attributeString;
 	}
 }