happy-dom 9.9.2 → 9.10.1

package/lib/query-selector/SelectorParser.js

@@ -0,0 +1,154 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const SelectorItem_1 = __importDefault(require("./SelectorItem"));
+const SelectorCombinatorEnum_1 = __importDefault(require("./SelectorCombinatorEnum"));
+const DOMException_1 = __importDefault(require("../exception/DOMException"));
+/**
+ * Selector RegExp.
+ *
+ * Group 1: All (e.g. "*")
+ * Group 2: Tag name (e.g. "div")
+ * Group 3: ID (e.g. "#id")
+ * Group 4: Class (e.g. ".class")
+ * Group 5: Attribute name when no value (e.g. "attr1")
+ * Group 6: Attribute name when there is a value (e.g. "attr1")
+ * Group 7: Attribute operator (e.g. "~")
+ * Group 8: Attribute value (e.g. "value1")
+ * Group 9: Pseudo (e.g. "nth-child")
+ * Group 10: Arguments of pseudo (e.g. "2n + 1")
+ * Group 11: Combinator.
+ */
+const SELECTOR_REGEXP = /(\*)|([a-zA-Z0-9-]+)|#((?:[a-zA-Z0-9-_]|\\.)+)|\.((?:[a-zA-Z0-9-_]|\\.)+)|\[([a-zA-Z0-9-_]+)\]|\[([a-zA-Z0-9-_]+)([~|^$*]{0,1}) *= *["']{0,1}([^"']+)["']{0,1}\]|:([a-zA-Z-:]+)|\(([^)]+)\)|([ ,+>]*)/g;
+/**
+ * Escaped Character RegExp.
+ */
+const CLASS_ESCAPED_CHARACTER_REGEXP = /\\/g;
+/**
+ * Simple Selector RegExp.
+ *
+ * Group 1: Tag name (e.g. "div")
+ * Group 2: Class (e.g. ".classA.classB")
+ * Group 3: ID (e.g. "#id")
+ */
+const SIMPLE_SELECTOR_REGEXP = /(^[a-zA-Z0-9-]+$)|(^\.[a-zA-Z0-9-_.]+$)|(^#[a-zA-Z0-9-_]+$)/;
+/**
+ * Utility for parsing a selection string.
+ */
+class SelectorParser {
+    /**
+     * Parses a selector string and returns an instance of SelectorItem.
+     *
+     * @param selector Selector.
+     * @returns Selector itme.
+     */
+    static getSelectorItem(selector) {
+        return this.getSelectorGroups(selector)[0][0];
+    }
+    /**
+     * Parses a selector string and returns groups with SelectorItem instances.
+     *
+     * @param selector Selector.
+     * @returns Selector groups.
+     */
+    static getSelectorGroups(selector) {
+        const simpleMatch = selector.match(SIMPLE_SELECTOR_REGEXP);
+        if (simpleMatch) {
+            if (simpleMatch[1]) {
+                return [[new SelectorItem_1.default({ tagName: selector.toUpperCase() })]];
+            }
+            else if (simpleMatch[2]) {
+                return [[new SelectorItem_1.default({ classNames: selector.replace('.', '').split('.') })]];
+            }
+            else if (simpleMatch[3]) {
+                return [[new SelectorItem_1.default({ id: selector.replace('#', '') })]];
+            }
+        }
+        const regexp = new RegExp(SELECTOR_REGEXP);
+        let currentSelectorItem = new SelectorItem_1.default({
+            combinator: SelectorCombinatorEnum_1.default.descendant
+        });
+        let currentGroup = [currentSelectorItem];
+        const groups = [currentGroup];
+        let isValid = false;
+        let match;
+        while ((match = regexp.exec(selector))) {
+            if (match[0]) {
+                isValid = true;
+                if (match[1]) {
+                    currentSelectorItem.all = '*';
+                }
+                else if (match[2]) {
+                    currentSelectorItem.tagName = match[2].toUpperCase();
+                }
+                else if (match[3]) {
+                    currentSelectorItem.id = match[3].replace(CLASS_ESCAPED_CHARACTER_REGEXP, '');
+                }
+                else if (match[4]) {
+                    currentSelectorItem.classNames = currentSelectorItem.classNames || [];
+                    currentSelectorItem.classNames.push(match[4].replace(CLASS_ESCAPED_CHARACTER_REGEXP, ''));
+                }
+                else if (match[5]) {
+                    currentSelectorItem.attributes = currentSelectorItem.attributes || [];
+                    currentSelectorItem.attributes.push({
+                        name: match[5].toLowerCase(),
+                        operator: null,
+                        value: null
+                    });
+                }
+                else if (match[6] && match[8]) {
+                    currentSelectorItem.attributes = currentSelectorItem.attributes || [];
+                    currentSelectorItem.attributes.push({
+                        name: match[6].toLowerCase(),
+                        operator: match[7] || null,
+                        value: match[8]
+                    });
+                }
+                else if (match[9]) {
+                    currentSelectorItem.pseudoClass = match[9].toLowerCase();
+                }
+                else if (match[10]) {
+                    currentSelectorItem.pseudoArguments = match[10];
+                }
+                else if (match[11]) {
+                    switch (match[11].trim()) {
+                        case ',':
+                            currentSelectorItem = new SelectorItem_1.default({
+                                combinator: SelectorCombinatorEnum_1.default.descendant
+                            });
+                            currentGroup = [currentSelectorItem];
+                            groups.push(currentGroup);
+                            break;
+                        case '>':
+                            currentSelectorItem = new SelectorItem_1.default({ combinator: SelectorCombinatorEnum_1.default.child });
+                            currentGroup.push(currentSelectorItem);
+                            break;
+                        case '+':
+                            currentSelectorItem = new SelectorItem_1.default({
+                                combinator: SelectorCombinatorEnum_1.default.adjacentSibling
+                            });
+                            currentGroup.push(currentSelectorItem);
+                            break;
+                        case '':
+                            currentSelectorItem = new SelectorItem_1.default({
+                                combinator: SelectorCombinatorEnum_1.default.descendant
+                            });
+                            currentGroup.push(currentSelectorItem);
+                            break;
+                    }
+                }
+            }
+            else {
+                break;
+            }
+        }
+        if (!isValid) {
+            throw new DOMException_1.default(`Invalid selector: "${selector}"`);
+        }
+        return groups;
+    }
+}
+exports.default = SelectorParser;
+//# sourceMappingURL=SelectorParser.js.map

package/lib/query-selector/SelectorParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SelectorParser.js","sourceRoot":"","sources":["../../src/query-selector/SelectorParser.ts"],"names":[],"mappings":";;;;;AAAA,kEAA0C;AAC1C,sFAA8D;AAC9D,6EAAqD;AAErD;;;;;;;;;;;;;;GAcG;AACH,MAAM,eAAe,GACpB,wMAAwM,CAAC;AAE1M;;GAEG;AACH,MAAM,8BAA8B,GAAG,KAAK,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,sBAAsB,GAAG,6DAA6D,CAAC;AAE7F;;GAEG;AACH,MAAqB,cAAc;IAClC;;;;;OAKG;IACI,MAAM,CAAC,eAAe,CAAC,QAAgB;QAC7C,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,iBAAiB,CAAC,QAAgB;QAC/C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAE3D,IAAI,WAAW,EAAE;YAChB,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE;gBACnB,OAAO,CAAC,CAAC,IAAI,sBAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;aACjE;iBAAM,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,IAAI,sBAAY,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aAClF;iBAAM,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,IAAI,sBAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aAC/D;SACD;QAED,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,mBAAmB,GAAiB,IAAI,sBAAY,CAAC;YACxD,UAAU,EAAE,gCAAsB,CAAC,UAAU;SAC7C,CAAC,CAAC;QACH,IAAI,YAAY,GAAmB,CAAC,mBAAmB,CAAC,CAAC;QACzD,MAAM,MAAM,GAA+B,CAAC,YAAY,CAAC,CAAC;QAC1D,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,KAAK,CAAC;QAEV,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE;YACvC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;gBACb,OAAO,GAAG,IAAI,CAAC;gBAEf,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACb,mBAAmB,CAAC,GAAG,GAAG,GAAG,CAAC;iBAC9B;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,mBAAmB,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBACrD;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,mBAAmB,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;iBAC9E;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,mBAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,UAAU,IAAI,EAAE,CAAC;oBACtE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC,CAAC;iBAC1F;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,mBAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,UAAU,IAAI,EAAE,CAAC;oBACtE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC;wBACnC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;wBAC5B,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE,IAAI;qBACX,CAAC,CAAC;iBACH;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBAChC,mBAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,UAAU,IAAI,EAAE,CAAC;oBACtE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC;wBACnC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;wBAC5B,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI;wBAC1B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;qBACf,CAAC,CAAC;iBACH;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,mBAAmB,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBACzD;qBAAM,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE;oBACrB,mBAAmB,CAAC,eAAe,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;iBAChD;qBAAM,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE;oBACrB,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;wBACzB,KAAK,GAAG;4BACP,mBAAmB,GAAG,IAAI,sBAAY,CAAC;gCACtC,UAAU,EAAE,gCAAsB,CAAC,UAAU;6BAC7C,CAAC,CAAC;4BACH,YAAY,GAAG,CAAC,mBAAmB,CAAC,CAAC;4BACrC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;4BAC1B,MAAM;wBACP,KAAK,GAAG;4BACP,mBAAmB,GAAG,IAAI,sBAAY,CAAC,EAAE,UAAU,EAAE,gCAAsB,CAAC,KAAK,EAAE,CAAC,CAAC;4BACrF,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;4BACvC,MAAM;wBACP,KAAK,GAAG;4BACP,mBAAmB,GAAG,IAAI,sBAAY,CAAC;gCACtC,UAAU,EAAE,gCAAsB,CAAC,eAAe;6BAClD,CAAC,CAAC;4BACH,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;4BACvC,MAAM;wBACP,KAAK,EAAE;4BACN,mBAAmB,GAAG,IAAI,sBAAY,CAAC;gCACtC,UAAU,EAAE,gCAAsB,CAAC,UAAU;6BAC7C,CAAC,CAAC;4BACH,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;4BACvC,MAAM;qBACP;iBACD;aACD;iBAAM;gBACN,MAAM;aACN;SACD;QAED,IAAI,CAAC,OAAO,EAAE;YACb,MAAM,IAAI,sBAAY,CAAC,sBAAsB,QAAQ,GAAG,CAAC,CAAC;SAC1D;QAED,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AA5GD,iCA4GC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "happy-dom",
-    "version": "9.9.2",
+    "version": "9.10.1",
     "license": "MIT",
     "homepage": "https://github.com/capricorn86/happy-dom",
     "repository": "https://github.com/capricorn86/happy-dom",

package/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts

@@ -289,8 +289,8 @@ export default class CSSStyleDeclarationElementStyle {
 						}
 					} else {
 						for (const element of options.elements) {
-							const matchResult = QuerySelector.match(element.element, selectorText);
-							if (matchResult.matches) {
+							const matchResult = QuerySelector.match(<IElement>element.element, selectorText);
+							if (matchResult) {
 								element.cssTexts.push({
 									cssText: (<CSSStyleRule>rule)._cssText,
 									priorityWeight: matchResult.priorityWeight

package/src/nodes/element/Element.ts

@@ -723,7 +723,7 @@ export default class Element extends Node implements IElement {
 	 * @returns "true" if matching.
 	 */
 	public matches(selector: string): boolean {
-		return QuerySelector.match(this, selector).matches;
+		return !!QuerySelector.match(this, selector);
 	}
 
 	/**
@@ -733,30 +733,16 @@ export default class Element extends Node implements IElement {
 	 * @returns Closest matching element.
 	 */
 	public closest(selector: string): IElement {
-		let rootElement: IElement = this.ownerDocument.documentElement;
-		if (!this.isConnected) {
-			rootElement = this;
-			while (rootElement.parentNode) {
-				rootElement = <IElement>rootElement.parentNode;
-			}
-		}
-		const elements = rootElement.querySelectorAll(selector);
-
 		// eslint-disable-next-line
 		let parent: IElement = this;
+
 		while (parent) {
-			if (elements.includes(parent)) {
+			if (QuerySelector.match(parent, selector)) {
 				return parent;
 			}
 			parent = parent.parentElement;
 		}
 
-		// QuerySelectorAll() will not match the element it is looking in when searched for
-		// Therefore we need to check if it matches the root
-		if (rootElement.matches(selector)) {
-			return rootElement;
-		}
-
 		return null;
 	}
 

package/src/nodes/node/Node.ts

@@ -11,17 +11,6 @@ import IAttr from '../attr/IAttr';
 import NodeList from './NodeList';
 import INodeList from './INodeList';
 
-const JSON_CIRCULAR_PROPERTIES = [
-	'ownerDocument',
-	'parentNode',
-	'ownerElement',
-	'defaultView',
-	'_rootNode',
-	'_formNode',
-	'_selectNode',
-	'_textAreaNode'
-];
-
 /**
  * Node.
  */
@@ -198,7 +187,7 @@ export default class Node extends EventTarget implements INode {
 	 */
 	public get parentElement(): IElement {
 		let parent = this.parentNode;
-		while (parent && parent.nodeType !== Node.ELEMENT_NODE) {
+		while (parent && parent.nodeType !== NodeTypeEnum.elementNode) {
 			parent = parent.parentNode;
 		}
 		return <IElement>parent;
@@ -648,17 +637,4 @@ export default class Node extends EventTarget implements INode {
 			child = child.nextSibling;
 		}
 	}
-
-	/**
-	 * This will be called by JSON.stringify() when serializing this node.
-	 *
-	 * @returns Object without circular references.
-	 */
-	public toJSON(): { [key: string]: unknown } {
-		const result = {};
-		for (const key of Object.keys(this)) {
-			result[key] = !JSON_CIRCULAR_PROPERTIES.includes(key) ? this[key] : null;
-		}
-		return result;
-	}
 }

package/src/query-selector/ISelectorAttribute.ts

@@ -0,0 +1,5 @@
+export default interface ISelectorAttribute {
+	name: string;
+	operator: string | null;
+	value: string | null;
+}

package/src/query-selector/ISelectorMatch.ts

@@ -0,0 +1,3 @@
+export default interface ISelectorMatch {
+	priorityWeight: number;
+}