happy-dom 9.16.0 → 9.18.0

package/src/query-selector/SelectorParser.ts

@@ -14,16 +14,17 @@ import ISelectorPseudo from './ISelectorPseudo';
  * Group 6: Attribute name when there is a value using apostrophe (e.g. "attr1")
  * Group 7: Attribute operator when using apostrophe (e.g. "~")
  * Group 8: Attribute value when using apostrophe (e.g. "value1")
- * Group 9: Attribute name when threre is a value not using apostrophe (e.g. "attr1")
- * Group 10: Attribute operator when not using apostrophe (e.g. "~")
- * Group 11: Attribute value when notusing apostrophe (e.g. "value1")
- * Group 12: Pseudo name when arguments (e.g. "nth-child")
- * Group 13: Arguments of pseudo (e.g. "2n + 1")
- * Group 14: Pseudo name when no arguments (e.g. "empty")
- * Group 15: Combinator.
+ * Group 9: Attribute modifier when using apostrophe (e.g. "i" or "s")
+ * Group 10: Attribute name when threre is a value not using apostrophe (e.g. "attr1")
+ * Group 11: Attribute operator when not using apostrophe (e.g. "~")
+ * Group 12: Attribute value when notusing apostrophe (e.g. "value1")
+ * Group 13: Pseudo name when arguments (e.g. "nth-child")
+ * Group 14: Arguments of pseudo (e.g. "2n + 1")
+ * Group 15: Pseudo name when no arguments (e.g. "empty")
+ * Group 16: 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}) *= *["']{1}([^"']*)["']{1}\]|\[([a-zA-Z0-9-_]+)([~|^$*]{0,1}) *= *([^\]]*)\]|:([a-zA-Z-]+) *\(([^)]+)\)|:([a-zA-Z-]+)|([ ,+>]*)/g;
+	/(\*)|([a-zA-Z0-9-]+)|#((?:[a-zA-Z0-9-_]|\\.)+)|\.((?:[a-zA-Z0-9-_]|\\.)+)|\[([a-zA-Z0-9-_]+)\]|\[([a-zA-Z0-9-_]+) *([~|^$*]{0,1}) *= *["']{1}([^"']*)["']{1} *(s|i){0,1}\]|\[([a-zA-Z0-9-_]+) *([~|^$*]{0,1}) *= *([^\]]*)\]|:([a-zA-Z-]+) *\(([^)]+)\)|:([a-zA-Z-]+)|([ ,+>]*)/g;
 
 /**
  * Escaped Character RegExp.
@@ -117,30 +118,40 @@ export default class SelectorParser {
 					currentSelectorItem.attributes.push({
 						name: match[5].toLowerCase(),
 						operator: null,
-						value: null
+						value: null,
+						modifier: null,
+						regExp: null
 					});
 				} else if (match[6] && match[8] !== undefined) {
 					currentSelectorItem.attributes = currentSelectorItem.attributes || [];
 					currentSelectorItem.attributes.push({
 						name: match[6].toLowerCase(),
 						operator: match[7] || null,
-						value: match[8]
+						value: match[8],
+						modifier: match[9] || null,
+						regExp: this.getAttributeRegExp({
+							operator: match[7],
+							value: match[8],
+							modifier: match[9]
+						})
 					});
-				} else if (match[9] && match[11] !== undefined) {
+				} else if (match[10] && match[12] !== undefined) {
 					currentSelectorItem.attributes = currentSelectorItem.attributes || [];
 					currentSelectorItem.attributes.push({
-						name: match[9].toLowerCase(),
-						operator: match[10] || null,
-						value: match[11]
+						name: match[10].toLowerCase(),
+						operator: match[11] || null,
+						value: match[12],
+						modifier: null,
+						regExp: this.getAttributeRegExp({ operator: match[7], value: match[8] })
 					});
-				} else if (match[12] && match[13]) {
+				} else if (match[13] && match[14]) {
 					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push(this.getPseudo(match[12], match[13]));
-				} else if (match[14]) {
-					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push(this.getPseudo(match[14]));
+					currentSelectorItem.pseudos.push(this.getPseudo(match[13], match[14]));
 				} else if (match[15]) {
-					switch (match[15].trim()) {
+					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
+					currentSelectorItem.pseudos.push(this.getPseudo(match[15]));
+				} else if (match[16]) {
+					switch (match[16].trim()) {
 						case ',':
 							currentSelectorItem = new SelectorItem({
 								combinator: SelectorCombinatorEnum.descendant
@@ -178,6 +189,47 @@ export default class SelectorParser {
 		return groups;
 	}
 
+	/**
+	 * Returns attribute RegExp.
+	 *
+	 * @param attribute Attribute.
+	 * @param attribute.value Attribute value.
+	 * @param attribute.operator Attribute operator.
+	 * @param attribute.modifier Attribute modifier.
+	 * @returns Attribute RegExp.
+	 */
+	private static getAttributeRegExp(attribute: {
+		value?: string;
+		operator?: string;
+		modifier?: string;
+	}): RegExp | null {
+		const modifier = attribute.modifier === 'i' ? 'i' : '';
+
+		if (!attribute.operator || !attribute.value) {
+			return null;
+		}
+
+		switch (attribute.operator) {
+			// [attribute~="value"] - Contains a specified word.
+			case '~':
+				return new RegExp(`[- ]${attribute.value}|${attribute.value}[- ]`, modifier);
+			// [attribute|="value"] - Starts with the specified word.
+			case '|':
+				return new RegExp(`^${attribute.value}[- ]`, modifier);
+			// [attribute^="value"] - Begins with a specified value.
+			case '^':
+				return new RegExp(`^${attribute.value}`, modifier);
+			// [attribute$="value"] - Ends with a specified value.
+			case '$':
+				return new RegExp(`${attribute.value}$`, modifier);
+			// [attribute*="value"] - Contains a specified value.
+			case '*':
+				return new RegExp(`${attribute.value}`, modifier);
+			default:
+				return null;
+		}
+	}
+
 	/**
 	 * Returns pseudo.
 	 *

package/lib/nodes/html-script-element/ScriptUtility.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScriptUtility.d.ts","sourceRoot":"","sources":["../../../src/nodes/html-script-element/ScriptUtility.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IACjC;;;;;;OAMG;WACiB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAuEjF"}

package/lib/nodes/html-script-element/ScriptUtility.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScriptUtility.js","sourceRoot":"","sources":["../../../src/nodes/html-script-element/ScriptUtility.ts"],"names":[],"mappings":"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"}

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

@@ -1,89 +0,0 @@
-import { Document } from '../..';
-import Event from '../../event/Event';
-import ErrorEvent from '../../event/events/ErrorEvent';
-import ResourceFetch from '../../fetch/ResourceFetch';
-import HTMLScriptElement from './HTMLScriptElement';
-
-/**
- * Helper class for getting the URL relative to a Location object.
- */
-export default class ScriptUtility {
-	/**
-	 * Returns a URL relative to the given Location object.
-	 *
-	 * @param options Options.
-	 * @param options.element Element.
-	 * @param element
-	 */
-	public static async loadExternalScript(element: HTMLScriptElement): Promise<void> {
-		const src = element.getAttribute('src');
-		const async = element.getAttribute('async') !== null;
-
-		if (
-			element.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptFileLoading ||
-			element.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptEvaluation
-		) {
-			return;
-		}
-
-		if (async) {
-			let code = null;
-			(<Document>element.ownerDocument)._readyStateManager.startTask();
-			try {
-				code = await ResourceFetch.fetch(element.ownerDocument, src);
-			} catch (error) {
-				element.dispatchEvent(
-					new ErrorEvent('error', {
-						message: error.message,
-						error
-					})
-				);
-				element.ownerDocument.defaultView.dispatchEvent(
-					new ErrorEvent('error', {
-						message: error.message,
-						error
-					})
-				);
-				if (
-					!element['_listeners']['error'] &&
-					!element.ownerDocument.defaultView['_listeners']['error']
-				) {
-					element.ownerDocument.defaultView.console.error(error);
-				}
-			}
-			if (code) {
-				element.ownerDocument.defaultView.eval(code);
-				element.dispatchEvent(new Event('load'));
-			}
-			(<Document>element.ownerDocument)._readyStateManager.endTask();
-		} else {
-			let code = null;
-			try {
-				code = ResourceFetch.fetchSync(element.ownerDocument, src);
-			} catch (error) {
-				element.dispatchEvent(
-					new ErrorEvent('error', {
-						message: error.message,
-						error
-					})
-				);
-				element.ownerDocument.defaultView.dispatchEvent(
-					new ErrorEvent('error', {
-						message: error.message,
-						error
-					})
-				);
-				if (
-					!element['_listeners']['error'] &&
-					!element.ownerDocument.defaultView['_listeners']['error']
-				) {
-					element.ownerDocument.defaultView.console.error(error);
-				}
-			}
-			if (code) {
-				element.ownerDocument.defaultView.eval(code);
-				element.dispatchEvent(new Event('load'));
-			}
-		}
-	}
-}