happy-dom 7.6.7 → 7.7.1

package/src/nodes/html-anchor-element/IHTMLHyperlinkElementUtils.ts

@@ -0,0 +1,19 @@
+/**
+ * HTMLHyperlinkElementUtils.
+ *
+ * Reference:
+ * https://html.spec.whatwg.org/multipage/links.html#htmlhyperlinkelementutils.
+ */
+export default interface IHTMLHyperlinkElementUtils {
+	readonly origin: string;
+	href: string;
+	protocol: string;
+	username: string;
+	password: string;
+	host: string;
+	hostname: string;
+	port: string;
+	pathname: string;
+	search: string;
+	hash: string;
+}

package/src/nodes/html-link-element/HTMLLinkElement.ts

@@ -180,17 +180,17 @@ export default class HTMLLinkElement extends HTMLElement implements IHTMLLinkEle
 	}
 
 	/**
-	 * The setAttributeNode() method adds a new Attr node to the specified element.
-	 *
 	 * @override
-	 * @param attribute Attribute.
-	 * @returns Replaced attribute.
 	 */
-	public setAttributeNode(attribute: IAttr): IAttr {
+	public override setAttributeNode(attribute: IAttr): IAttr {
 		const replacedAttribute = super.setAttributeNode(attribute);
 		const rel = this.getAttributeNS(null, 'rel');
 		const href = this.getAttributeNS(null, 'href');
 
+		if (attribute.name === 'rel' && this._relList) {
+			this._relList._updateIndices();
+		}
+
 		if (
 			(attribute.name === 'rel' || attribute.name === 'href') &&
 			href !== null &&
@@ -233,6 +233,19 @@ export default class HTMLLinkElement extends HTMLElement implements IHTMLLinkEle
 		return replacedAttribute;
 	}
 
+	/**
+	 * @override
+	 */
+	public override removeAttributeNode(attribute: IAttr): IAttr {
+		super.removeAttributeNode(attribute);
+
+		if (attribute.name === 'rel' && this._relList) {
+			this._relList._updateIndices();
+		}
+
+		return attribute;
+	}
+
 	/**
 	 * @override
 	 */
@@ -280,15 +293,4 @@ export default class HTMLLinkElement extends HTMLElement implements IHTMLLinkEle
 			}
 		}
 	}
-
-	/**
-	 * Updates DOM list indices.
-	 */
-	protected _updateDomListIndices(): void {
-		super._updateDomListIndices();
-
-		if (this._relList) {
-			this._relList._updateIndices();
-		}
-	}
 }

package/src/query-selector/SelectorItem.ts

@@ -5,10 +5,13 @@ import Element from '../nodes/element/Element';
 const ATTRIBUTE_REGEXP =
 	/\[([a-zA-Z0-9-_]+)\]|\[([a-zA-Z0-9-_]+)([~|^$*]{0,1})[ ]*=[ ]*["']{0,1}([^"']+)["']{0,1}\]/g;
 const ATTRIBUTE_NAME_REGEXP = /[^a-zA-Z0-9-_$]/;
-const PSUEDO_REGEXP = /:([a-zA-Z-]+)\(([0-9n+-]+|odd|even)\)|:not\(([^)]+)\)|:([a-zA-Z-]+)/g;
-const CLASS_REGEXP = /\.([a-zA-Z0-9-_$]+)/g;
+const PSUEDO_REGEXP =
+	/(?<!\\):([a-zA-Z-]+)\(([0-9n+-]+|odd|even)\)|(?<!\\):not\(([^)]+)\)|(?<!\\):([a-zA-Z-]+)/g;
+const CLASS_REGEXP = /\.(([a-zA-Z0-9-_$]|\\.)+)/g;
 const TAG_NAME_REGEXP = /^[a-zA-Z0-9-]+/;
-const ID_REGEXP = /#[A-Za-z][-A-Za-z0-9_]*/g;
+const ID_REGEXP = /(?<!\\)#[A-Za-z][-A-Za-z0-9_]*/g;
+const CSS_ESCAPE_REGEXP = /(?<!\\):/g;
+const CSS_ESCAPE_CHAR_REGEXP = /\\/g;
 
 /**
  * Selector item.
@@ -31,9 +34,10 @@ export default class SelectorItem {
 	 */
 	constructor(selector: string) {
 		const baseSelector = selector.replace(new RegExp(PSUEDO_REGEXP, 'g'), '');
+		const idMatch = !this.isAll && selector.includes('#') ? baseSelector.match(ID_REGEXP) : null;
 
 		this.isAll = baseSelector === '*';
-		this.isID = !this.isAll ? selector.indexOf('#') !== -1 : false;
+		this.isID = !!idMatch;
 		this.isAttribute = !this.isAll && baseSelector.includes('[');
 		// If baseSelector !== selector then some psuedo selector was replaced above
 		this.isPseudo = !this.isAll && baseSelector !== selector;
@@ -42,14 +46,7 @@ export default class SelectorItem {
 		this.tagName = this.tagName ? this.tagName[0].toUpperCase() : null;
 		this.isTagName = this.tagName !== null;
 		this.selector = selector;
-		this.id = null;
-
-		if (!this.isAll && this.isID) {
-			const idMatches = baseSelector.match(ID_REGEXP);
-			if (idMatches) {
-				this.id = idMatches[0].replace('#', '');
-			}
-		}
+		this.id = idMatch ? idMatch[0].replace('#', '') : null;
 	}
 
 	/**
@@ -296,13 +293,13 @@ export default class SelectorItem {
 	): { priorityWeight: number; matches: boolean } {
 		const regexp = new RegExp(CLASS_REGEXP, 'g');
 		const classList = element.className.split(' ');
-		const classSelector = selector.split(':')[0];
+		const classSelector = selector.split(CSS_ESCAPE_REGEXP)[0];
 		let priorityWeight = 0;
 		let match: RegExpMatchArray;
 
 		while ((match = regexp.exec(classSelector))) {
 			priorityWeight += 10;
-			if (!classList.includes(match[1])) {
+			if (!classList.includes(match[1].replace(CSS_ESCAPE_CHAR_REGEXP, ''))) {
 				return { priorityWeight: 0, matches: false };
 			}
 		}