happy-dom 10.5.2 → 10.6.0

package/src/named-node-map/NamedNodeMap.ts

@@ -1,145 +1,207 @@
-import type Element from '../nodes/element/Element.js';
-import IAttr from '../nodes/attr/IAttr.js';
 import INamedNodeMap from './INamedNodeMap.js';
+import IAttr from '../nodes/attr/IAttr.js';
 
 /**
- * NamedNodeMap.
+ * Named Node Map.
  *
- * Reference:
- * https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap.
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
  */
 export default class NamedNodeMap implements INamedNodeMap {
 	[index: number]: IAttr;
+	public length = 0;
+	protected _namedItems: { [k: string]: IAttr } = {};
 
 	/**
-	 * Reference to the element.
+	 * Returns string.
+	 *
+	 * @returns string.
 	 */
-	#ownerElement: Element;
+	public get [Symbol.toStringTag](): string {
+		return 'NamedNodeMap';
+	}
 
 	/**
-	 * Constructor.
+	 * Iterator.
 	 *
-	 * @param element Associated element.
+	 * @returns Iterator.
 	 */
-	constructor(element: Element) {
-		this.#ownerElement = element;
+	public *[Symbol.iterator](): IterableIterator<IAttr> {
+		for (let i = 0, max = this.length; i < max; i++) {
+			yield this[i];
+		}
 	}
 
 	/**
-	 * Returns string.
+	 * Returns item by index.
 	 *
-	 * @returns string.
+	 * @param index Index.
 	 */
-	public get [Symbol.toStringTag](): string {
-		return this.constructor.name;
+	public item(index: number): IAttr | null {
+		return index >= 0 && this[index] ? this[index] : null;
 	}
 
 	/**
-	 * Length.
+	 * Returns named item.
 	 *
-	 * @returns Length.
+	 * @param name Name.
+	 * @returns Itme.
 	 */
-	public get length(): number {
-		return Object.keys(this.#ownerElement._attributes).length;
+	public getNamedItem(name: string): IAttr | null {
+		return this._namedItems[name] || null;
 	}
 
 	/**
-	 * Returns attribute by index.
+	 * Returns item by name and namespace.
 	 *
-	 * @param index Index.
+	 * @param namespace Namespace.
+	 * @param localName Local name of the attribute.
+	 * @returns Item.
 	 */
-	public item(index: number): IAttr | null {
-		if (index < 0) {
-			return null;
+	public getNamedItemNS(namespace: string, localName: string): IAttr | null {
+		const attribute = this.getNamedItem(localName);
+
+		if (attribute && attribute.namespaceURI === namespace && attribute.localName === localName) {
+			return attribute;
+		}
+
+		for (let i = 0, max = this.length; i < max; i++) {
+			if (this[i].namespaceURI === namespace && this[i].localName === localName) {
+				return this[i];
+			}
 		}
-		const attr = Object.values(this.#ownerElement._attributes)[index];
-		return attr ? attr : null;
+
+		return null;
 	}
 
 	/**
-	 * Returns attribute by name.
+	 * Sets named item.
 	 *
-	 * @param qualifiedName Name.
-	 * @returns Attribute.
+	 * @param item Item.
+	 * @returns Replaced item.
 	 */
-	public getNamedItem(qualifiedName: string): IAttr | null {
-		return this.#ownerElement.getAttributeNode(qualifiedName);
+	public setNamedItem(item: IAttr): IAttr | null {
+		return this._setNamedItemWithoutConsequences(item);
 	}
 
 	/**
-	 * Returns attribute by name and namespace.
+	 * Adds a new namespaced item.
 	 *
-	 * @param namespace Namespace.
-	 * @param localName Local name of the attribute.
-	 * @returns Attribute.
+	 * @alias setNamedItem()
+	 * @param item Item.
+	 * @returns Replaced item.
 	 */
-	public getNamedItemNS(namespace: string, localName: string): IAttr | null {
-		return this.#ownerElement.getAttributeNodeNS(namespace, localName);
+	public setNamedItemNS(item: IAttr): IAttr | null {
+		return this.setNamedItem(item);
 	}
 
 	/**
-	 * Adds a new attribute node.
+	 * Removes an item.
 	 *
-	 * @param attr Attribute.
-	 * @returns Replaced attribute.
+	 * @param name Name of item.
+	 * @returns Removed item.
 	 */
-	public setNamedItem(attr: IAttr): IAttr {
-		return this.#ownerElement.setAttributeNode(attr);
+	public removeNamedItem(name: string): IAttr | null {
+		return this._removeNamedItemWithoutConsequences(name);
 	}
 
 	/**
-	 * Adds a new namespaced attribute node.
+	 * Removes a namespaced item.
 	 *
-	 * @param attr Attribute.
-	 * @returns Replaced attribute.
+	 * @param namespace Namespace.
+	 * @param localName Local name of the item.
+	 * @returns Removed item.
 	 */
-	public setNamedItemNS(attr: IAttr): IAttr {
-		return this.#ownerElement.setAttributeNodeNS(attr);
+	public removeNamedItemNS(namespace: string, localName: string): IAttr | null {
+		const attribute = this.getNamedItemNS(namespace, localName);
+		if (attribute) {
+			return this.removeNamedItem(attribute.name);
+		}
+		return null;
 	}
 
 	/**
-	 * Removes an attribute.
+	 * Sets named item without calling listeners for certain attributes.
 	 *
-	 * @param qualifiedName Name of the attribute.
-	 * @returns Removed attribute.
+	 * @param item Item.
+	 * @returns Replaced item.
 	 */
-	public removeNamedItem(qualifiedName: string): IAttr | null {
-		const attr = this.getNamedItem(qualifiedName);
+	public _setNamedItemWithoutConsequences(item: IAttr): IAttr | null {
+		if (item.name) {
+			const replacedItem = this._namedItems[item.name] || null;
+
+			this._namedItems[item.name] = item;
+
+			if (replacedItem) {
+				this._removeNamedItemIndex(replacedItem);
+			}
 
-		if (attr) {
-			this.#ownerElement.removeAttributeNode(attr);
+			this[this.length] = item;
+			this.length++;
+
+			if (this._isValidPropertyName(item.name)) {
+				this[item.name] = item;
+			}
+
+			return replacedItem;
 		}
-		return attr;
+		return null;
 	}
 
 	/**
-	 * Removes a namespaced attribute.
+	 * Removes an item without calling listeners for certain attributes.
 	 *
-	 * @param namespace Namespace.
-	 * @param localName Local name of the attribute.
-	 * @returns Removed attribute.
+	 * @param name Name of item.
+	 * @returns Removed item.
 	 */
-	public removeNamedItemNS(namespace: string, localName: string): IAttr | null {
-		const attr = this.getNamedItemNS(namespace, localName);
+	public _removeNamedItemWithoutConsequences(name: string): IAttr | null {
+		const removedItem = this._namedItems[name] || null;
 
-		if (attr) {
-			this.#ownerElement.removeAttributeNode(attr);
+		if (!removedItem) {
+			return null;
 		}
-		return attr;
+
+		this._removeNamedItemIndex(removedItem);
+
+		if (this[name] === removedItem) {
+			delete this[name];
+		}
+
+		delete this._namedItems[name];
+
+		return removedItem;
 	}
 
 	/**
-	 * Iterator.
+	 * Removes an item from index.
 	 *
-	 * @returns Iterator.
+	 * @param item Item.
 	 */
-	public [Symbol.iterator](): Iterator<IAttr> {
-		let index = -1;
-		return {
-			next: () => {
-				index++;
-				return { value: this.item(index), done: index >= this.length };
+	protected _removeNamedItemIndex(item: IAttr): void {
+		for (let i = 0; i < this.length; i++) {
+			if (this[i] === item) {
+				for (let b = i; b < this.length; b++) {
+					if (b < this.length - 1) {
+						this[b] = this[b + 1];
+					} else {
+						delete this[b];
+					}
+				}
+				this.length--;
+				break;
 			}
-		};
+		}
+	}
+
+	/**
+	 * Returns "true" if the property name is valid.
+	 *
+	 * @param name Name.
+	 * @returns True if the property name is valid.
+	 */
+	protected _isValidPropertyName(name: string): boolean {
+		return (
+			!this.constructor.prototype.hasOwnProperty(name) &&
+			(isNaN(Number(name)) || name.includes('.'))
+		);
 	}
 }

package/src/nodes/element/Dataset.ts

@@ -20,11 +20,12 @@ export default class Dataset {
 	constructor(element: Element) {
 		// Build the initial dataset record from all data attributes.
 		const dataset: DatasetRecord = {};
-		const attributes = element._attributes;
-		for (const name of Object.keys(attributes)) {
-			if (name.startsWith('data-')) {
-				const key = Dataset.kebabToCamelCase(name.replace('data-', ''));
-				dataset[key] = attributes[name].value;
+
+		for (let i = 0, max = element.attributes.length; i < max; i++) {
+			const attribute = element.attributes[i];
+			if (attribute.name.startsWith('data-')) {
+				const key = Dataset.kebabToCamelCase(attribute.name.replace('data-', ''));
+				dataset[key] = attribute.value;
 			}
 		}
 
@@ -32,9 +33,9 @@ export default class Dataset {
 		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
 		this.proxy = new Proxy(dataset, {
 			get(dataset: DatasetRecord, key: string): string {
-				const name = 'data-' + Dataset.camelCaseToKebab(key);
-				if (name in attributes) {
-					return (dataset[key] = attributes[name].value);
+				const attribute = element.attributes.getNamedItem('data-' + Dataset.camelCaseToKebab(key));
+				if (attribute) {
+					return (dataset[key] = attribute.value);
 				}
 				delete dataset[key];
 				return undefined;
@@ -45,10 +46,10 @@ export default class Dataset {
 				return true;
 			},
 			deleteProperty(dataset: DatasetRecord, key: string): boolean {
-				const name = 'data-' + Dataset.camelCaseToKebab(key);
-				const result1 = delete attributes[name];
-				const result2 = delete dataset[key];
-				return result1 && result2;
+				return (
+					!!element.attributes.removeNamedItem('data-' + Dataset.camelCaseToKebab(key)) &&
+					delete dataset[key]
+				);
 			},
 			ownKeys(dataset: DatasetRecord): string[] {
 				// According to Mozilla we have to update the dataset object (target) to contain the same keys as what we return:
@@ -56,11 +57,12 @@ export default class Dataset {
 				// "The result List must contain the keys of all non-configurable own properties of the target object."
 				const keys = [];
 				const deleteKeys = [];
-				for (const name of Object.keys(attributes)) {
-					if (name.startsWith('data-')) {
-						const key = Dataset.kebabToCamelCase(name.replace('data-', ''));
+				for (let i = 0, max = element.attributes.length; i < max; i++) {
+					const attribute = element.attributes[i];
+					if (attribute.name.startsWith('data-')) {
+						const key = Dataset.kebabToCamelCase(attribute.name.replace('data-', ''));
 						keys.push(key);
-						dataset[key] = attributes[name].value;
+						dataset[key] = attribute.value;
 						if (!dataset[key]) {
 							deleteKeys.push(key);
 						}
@@ -72,7 +74,7 @@ export default class Dataset {
 				return keys;
 			},
 			has(_dataset: DatasetRecord, key: string): boolean {
-				return !!attributes['data-' + Dataset.camelCaseToKebab(key)];
+				return !!element.attributes.getNamedItem('data-' + Dataset.camelCaseToKebab(key));
 			}
 		});
 	}

package/src/nodes/element/Element.ts

@@ -1,13 +1,10 @@
 import Node from '../node/Node.js';
 import ShadowRoot from '../shadow-root/ShadowRoot.js';
 import Attr from '../attr/Attr.js';
-import NamedNodeMap from '../../named-node-map/NamedNodeMap.js';
 import DOMRect from './DOMRect.js';
 import DOMTokenList from '../../dom-token-list/DOMTokenList.js';
 import IDOMTokenList from '../../dom-token-list/IDOMTokenList.js';
 import QuerySelector from '../../query-selector/QuerySelector.js';
-import MutationRecord from '../../mutation-observer/MutationRecord.js';
-import MutationTypeEnum from '../../mutation-observer/MutationTypeEnum.js';
 import NamespaceURI from '../../config/NamespaceURI.js';
 import XMLParser from '../../xml-parser/XMLParser.js';
 import XMLSerializer from '../../xml-serializer/XMLSerializer.js';
@@ -32,6 +29,7 @@ import ElementUtility from './ElementUtility.js';
 import HTMLCollection from './HTMLCollection.js';
 import EventPhaseEnum from '../../event/EventPhaseEnum.js';
 import CSSStyleDeclaration from '../../css/declaration/CSSStyleDeclaration.js';
+import ElementNamedNodeMap from './ElementNamedNodeMap.js';
 
 /**
  * Element.
@@ -89,9 +87,9 @@ export default class Element extends Node implements IElement {
 
 	// Used for being able to access closed shadow roots
 	public _shadowRoot: IShadowRoot = null;
-	public _attributes: { [k: string]: IAttr } = {};
+	public readonly attributes: INamedNodeMap = new ElementNamedNodeMap(this);
 
-	private _classList: DOMTokenList = null;
+	public _classList: DOMTokenList = null;
 	public _isValue?: string | null = null;
 	public _computedStyle: CSSStyleDeclaration | null = null;
 
@@ -266,15 +264,6 @@ export default class Element extends Node implements IElement {
 		this.replaceWith(html);
 	}
 
-	/**
-	 * Returns attributes.
-	 *
-	 * @returns Attributes.
-	 */
-	public get attributes(): INamedNodeMap {
-		return Object.assign(new NamedNodeMap(this), Object.values(this._attributes), this._attributes);
-	}
-
 	/**
 	 * First element child.
 	 *
@@ -364,10 +353,9 @@ export default class Element extends Node implements IElement {
 
 		Attr._ownerDocument = this.ownerDocument;
 
-		for (const key of Object.keys(this._attributes)) {
-			const attr = Object.assign(new Attr(), this._attributes[key]);
-			(<IElement>attr.ownerElement) = clone;
-			(<Element>clone)._attributes[key] = attr;
+		for (let i = 0, max = this.attributes.length; i < max; i++) {
+			const attribute = this.attributes[i];
+			clone.attributes.setNamedItem(Object.assign(new Attr(), attribute));
 		}
 
 		if (deep) {
@@ -563,7 +551,11 @@ export default class Element extends Node implements IElement {
 	 * @returns Attribute names.
 	 */
 	public getAttributeNames(): string[] {
-		return Object.keys(this._attributes);
+		const attributeNames = [];
+		for (let i = 0, max = this.attributes.length; i < max; i++) {
+			attributeNames.push(this.attributes[i].name);
+		}
+		return attributeNames;
 	}
 
 	/**
@@ -635,13 +627,7 @@ export default class Element extends Node implements IElement {
 	 * @returns True if attribute exists, false otherwise.
 	 */
 	public hasAttributeNS(namespace: string | null, localName: string): boolean {
-		for (const name of Object.keys(this._attributes)) {
-			const attribute = this._attributes[name];
-			if (attribute.namespaceURI === namespace && attribute.localName === localName) {
-				return true;
-			}
-		}
-		return false;
+		return this.attributes.getNamedItemNS(namespace, localName) !== null;
 	}
 
 	/**
@@ -650,7 +636,7 @@ export default class Element extends Node implements IElement {
 	 * @returns "true" if the element has attributes.
 	 */
 	public hasAttributes(): boolean {
-		return Object.keys(this._attributes).length > 0;
+		return this.attributes.length > 0;
 	}
 
 	/**
@@ -659,10 +645,7 @@ export default class Element extends Node implements IElement {
 	 * @param name Name.
 	 */
 	public removeAttribute(name: string): void {
-		const attribute = this._attributes[this._getAttributeName(name)];
-		if (attribute) {
-			this.removeAttributeNode(attribute);
-		}
+		this.attributes.removeNamedItem(name);
 	}
 
 	/**
@@ -672,12 +655,7 @@ export default class Element extends Node implements IElement {
 	 * @param localName Local name.
 	 */
 	public removeAttributeNS(namespace: string | null, localName: string): void {
-		for (const name of Object.keys(this._attributes)) {
-			const attribute = this._attributes[name];
-			if (attribute.namespaceURI === namespace && attribute.localName === localName) {
-				this.removeAttribute(attribute.name);
-			}
-		}
+		this.attributes.removeNamedItemNS(namespace, localName);
 	}
 
 	/**
@@ -824,67 +802,7 @@ export default class Element extends Node implements IElement {
 	 * @returns Replaced attribute.
 	 */
 	public setAttributeNode(attribute: IAttr): IAttr | null {
-		const name = this._getAttributeName(attribute.name);
-		const replacedAttribute = this._attributes[name];
-		const oldValue = replacedAttribute ? replacedAttribute.value : null;
-
-		attribute.name = name;
-		(<IElement>attribute.ownerElement) = <IElement>this;
-		(<IDocument>attribute.ownerDocument) = this.ownerDocument;
-
-		if (this.isConnected) {
-			this.ownerDocument['_cacheID']++;
-		}
-
-		this._attributes[name] = attribute;
-
-		if (attribute.name === 'class' && this._classList) {
-			this._classList._updateIndices();
-		}
-
-		if (attribute.name === 'id' || attribute.name === 'name') {
-			if (this.parentNode && (<IElement>this.parentNode).children && attribute.value !== oldValue) {
-				if (oldValue) {
-					(<HTMLCollection<IElement>>(<IElement>this.parentNode).children)._removeNamedItem(
-						this,
-						oldValue
-					);
-				}
-				if (attribute.value) {
-					(<HTMLCollection<IElement>>(<IElement>this.parentNode).children)._appendNamedItem(
-						this,
-						attribute.value
-					);
-				}
-			}
-		}
-
-		if (
-			this.attributeChangedCallback &&
-			(<typeof Element>this.constructor)._observedAttributes &&
-			(<typeof Element>this.constructor)._observedAttributes.includes(name)
-		) {
-			this.attributeChangedCallback(name, oldValue, attribute.value);
-		}
-
-		// MutationObserver
-		if (this._observers.length > 0) {
-			for (const observer of this._observers) {
-				if (
-					observer.options.attributes &&
-					(!observer.options.attributeFilter || observer.options.attributeFilter.includes(name))
-				) {
-					const record = new MutationRecord();
-					record.target = this;
-					record.type = MutationTypeEnum.attributes;
-					record.attributeName = name;
-					record.oldValue = observer.options.attributeOldValue ? oldValue : null;
-					observer.callback([record]);
-				}
-			}
-		}
-
-		return replacedAttribute || null;
+		return this.attributes.setNamedItem(attribute);
 	}
 
 	/**
@@ -893,8 +811,8 @@ export default class Element extends Node implements IElement {
 	 * @param attribute Attribute.
 	 * @returns Replaced attribute.
 	 */
-	public setAttributeNodeNS(attribute: IAttr): IAttr {
-		return this.setAttributeNode(attribute);
+	public setAttributeNodeNS(attribute: IAttr): IAttr | null {
+		return this.attributes.setNamedItemNS(attribute);
 	}
 
 	/**
@@ -903,33 +821,19 @@ export default class Element extends Node implements IElement {
 	 * @param name Name.
 	 * @returns Replaced attribute.
 	 */
-	public getAttributeNode(name: string): IAttr {
-		return this._attributes[this._getAttributeName(name)] || null;
+	public getAttributeNode(name: string): IAttr | null {
+		return this.attributes.getNamedItem(name);
 	}
 
 	/**
 	 * Returns a namespaced Attr node.
 	 *
 	 * @param namespace Namespace.
-	 * @param name Name.
+	 * @param localName Name.
 	 * @returns Replaced attribute.
 	 */
-	public getAttributeNodeNS(namespace: string | null, name: string): IAttr {
-		const attributeName = this._getAttributeName(name);
-		if (
-			this._attributes[attributeName] &&
-			this._attributes[attributeName].namespaceURI === namespace &&
-			this._attributes[attributeName].localName === attributeName
-		) {
-			return this._attributes[attributeName];
-		}
-		for (const name of Object.keys(this._attributes)) {
-			const attribute = this._attributes[name];
-			if (attribute.namespaceURI === namespace && attribute.localName === attributeName) {
-				return attribute;
-			}
-		}
-		return null;
+	public getAttributeNodeNS(namespace: string | null, localName: string): IAttr | null {
+		return this.attributes.getNamedItemNS(namespace, localName);
 	}
 
 	/**
@@ -938,61 +842,8 @@ export default class Element extends Node implements IElement {
 	 * @param attribute Attribute.
 	 * @returns Removed attribute.
 	 */
-	public removeAttributeNode(attribute: IAttr): IAttr {
-		const removedAttribute = this._attributes[attribute.name];
-
-		if (removedAttribute !== attribute) {
-			throw new DOMException(
-				`Failed to execute 'removeAttributeNode' on 'Element': The node provided is owned by another element.`
-			);
-		}
-
-		delete this._attributes[attribute.name];
-
-		if (this.isConnected) {
-			this.ownerDocument['_cacheID']++;
-		}
-
-		if (attribute.name === 'class' && this._classList) {
-			this._classList._updateIndices();
-		}
-
-		if (attribute.name === 'id' || attribute.name === 'name') {
-			if (this.parentNode && (<IElement>this.parentNode).children && attribute.value) {
-				(<HTMLCollection<IElement>>(<IElement>this.parentNode).children)._removeNamedItem(
-					this,
-					attribute.value
-				);
-			}
-		}
-
-		if (
-			this.attributeChangedCallback &&
-			(<typeof Element>this.constructor)._observedAttributes &&
-			(<typeof Element>this.constructor)._observedAttributes.includes(attribute.name)
-		) {
-			this.attributeChangedCallback(attribute.name, attribute.value, null);
-		}
-
-		// MutationObserver
-		if (this._observers.length > 0) {
-			for (const observer of this._observers) {
-				if (
-					observer.options.attributes &&
-					(!observer.options.attributeFilter ||
-						observer.options.attributeFilter.includes(attribute.name))
-				) {
-					const record = new MutationRecord();
-					record.target = this;
-					record.type = MutationTypeEnum.attributes;
-					record.attributeName = attribute.name;
-					record.oldValue = observer.options.attributeOldValue ? attribute.value : null;
-					observer.callback([record]);
-				}
-			}
-		}
-
-		return attribute;
+	public removeAttributeNode(attribute: IAttr): IAttr | null {
+		return this.attributes.removeNamedItem(attribute.name);
 	}
 
 	/**
@@ -1001,8 +852,8 @@ export default class Element extends Node implements IElement {
 	 * @param attribute Attribute.
 	 * @returns Removed attribute.
 	 */
-	public removeAttributeNodeNS(attribute: IAttr): IAttr {
-		return this.removeAttributeNode(attribute);
+	public removeAttributeNodeNS(attribute: IAttr): IAttr | null {
+		return this.attributes.removeNamedItemNS(attribute.namespaceURI, attribute.localName);
 	}
 
 	/**