Merge branch 'master' into fix-form-submitter

capricorn86 · Jan 15, 2024 · fb026d9 · fb026d9
2 parents 43e73a7 + 35a0b3c
commit fb026d9
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 6 deletions.
diff --git a/packages/happy-dom/src/query-selector/QuerySelector.ts b/packages/happy-dom/src/query-selector/QuerySelector.ts
@@ -16,6 +16,11 @@ type IDocumentPositionAndElement = {
 	element: IElement;
 };
 
+/**
+ * Invalid Selector RegExp.
+ */
+const INVALID_SELECTOR_REGEXP = /^[.#\[]?\d/;
+
 /**
  * Utility for query selection in an HTML element.
  *
@@ -35,14 +40,20 @@ export default class QuerySelector {
 	): INodeList<IElement> {
 		if (selector === '') {
 			throw new Error(
-				"Failed to execute 'querySelectorAll' on 'Element': The provided selector is empty."
+				`Failed to execute 'querySelectorAll' on '${node.constructor.name}': The provided selector is empty.`
 			);
 		}
 
 		if (selector === null || selector === undefined) {
 			return new NodeList<IElement>();
 		}
 
+		if (INVALID_SELECTOR_REGEXP.test(selector)) {
+			throw new Error(
+				`Failed to execute 'querySelectorAll' on '${node.constructor.name}': '${selector}' is not a valid selector.`
+			);
+		}
+
 		const groups = SelectorParser.getSelectorGroups(selector);
 		let matches: IDocumentPositionAndElement[] = [];
 
@@ -79,17 +90,23 @@ export default class QuerySelector {
 	public static querySelector(
 		node: IElement | IDocument | IDocumentFragment,
 		selector: string
-	): IElement {
+	): IElement | null {
 		if (selector === '') {
 			throw new Error(
-				"Failed to execute 'querySelector' on 'Element': The provided selector is empty."
+				`Failed to execute 'querySelector' on '${node.constructor.name}': The provided selector is empty.`
 			);
 		}
 
 		if (selector === null || selector === undefined) {
 			return null;
 		}
 
+		if (INVALID_SELECTOR_REGEXP.test(selector)) {
+			throw new Error(
+				`Failed to execute 'querySelector' on '${node.constructor.name}': '${selector}' is not a valid selector.`
+			);
+		}
+
 		for (const items of SelectorParser.getSelectorGroups(selector)) {
 			const match =
 				node[PropertySymbol.nodeType] === NodeTypeEnum.elementNode
@@ -112,12 +129,22 @@ export default class QuerySelector {
 	 * @returns Result.
 	 */
 	public static match(element: IElement, selector: string): ISelectorMatch | null {
+		if (!selector) {
+			return null;
+		}
+
 		if (selector === '*') {
 			return {
 				priorityWeight: 1
 			};
 		}
 
+		if (INVALID_SELECTOR_REGEXP.test(selector)) {
+			throw new Error(
+				`Failed to execute 'match' on '${element.constructor.name}': '${selector}' is not a valid selector.`
+			);
+		}
+
 		for (const items of SelectorParser.getSelectorGroups(selector)) {
 			const result = this.matchSelector(element, element, items.reverse());
 

diff --git a/packages/happy-dom/src/selection/Selection.ts b/packages/happy-dom/src/selection/Selection.ts
@@ -92,7 +92,7 @@ export default class Selection {
 	 */
 	public get anchorOffset(): number {
 		if (!this.#range) {
-			return null;
+			return 0;
 		}
 		return this.#direction === SelectionDirectionEnum.forwards
 			? this.#range.startOffset

diff --git a/packages/happy-dom/test/query-selector/QuerySelector.test.ts b/packages/happy-dom/test/query-selector/QuerySelector.test.ts
@@ -975,6 +975,22 @@ describe('QuerySelector', () => {
 
 			expect(elements.length).toBe(0);
 		});
+
+		it('Throws an error when providing an invalid selector', () => {
+			const div = document.createElement('div');
+			expect(() => div.querySelectorAll('1')).toThrowError(
+				"Failed to execute 'querySelectorAll' on 'HTMLElement': '1' is not a valid selector."
+			);
+			expect(() => div.querySelectorAll('[1')).toThrowError(
+				"Failed to execute 'querySelectorAll' on 'HTMLElement': '[1' is not a valid selector."
+			);
+			expect(() => div.querySelectorAll('.1')).toThrowError(
+				"Failed to execute 'querySelectorAll' on 'HTMLElement': '.1' is not a valid selector."
+			);
+			expect(() => div.querySelectorAll('#1')).toThrowError(
+				"Failed to execute 'querySelectorAll' on 'HTMLElement': '#1' is not a valid selector."
+			);
+		});
 	});
 
 	describe('querySelector', () => {
@@ -1126,5 +1142,21 @@ describe('QuerySelector', () => {
 			expect(element === div.children[0]).toBe(true);
 			expect(element2 === div.children[0]).toBe(true);
 		});
+
+		it('Throws an error when providing an invalid selector', () => {
+			const div = document.createElement('div');
+			expect(() => div.querySelector('1')).toThrowError(
+				"Failed to execute 'querySelector' on 'HTMLElement': '1' is not a valid selector."
+			);
+			expect(() => div.querySelector('[1')).toThrowError(
+				"Failed to execute 'querySelector' on 'HTMLElement': '[1' is not a valid selector."
+			);
+			expect(() => div.querySelector('.1')).toThrowError(
+				"Failed to execute 'querySelector' on 'HTMLElement': '.1' is not a valid selector."
+			);
+			expect(() => div.querySelector('#1')).toThrowError(
+				"Failed to execute 'querySelector' on 'HTMLElement': '#1' is not a valid selector."
+			);
+		});
 	});
 });
diff --git a/packages/happy-dom/test/selection/Selection.test.ts b/packages/happy-dom/test/selection/Selection.test.ts
@@ -117,8 +117,8 @@ describe('Selection', () => {
 
 	for (const property of ['anchorOffset', 'baseOffset', 'focusOffset', 'extentOffset']) {
 		describe(`get ${property}()`, () => {
-			it('Returns null if no Range has been added.', () => {
-				expect(selection[property]).toBe(null);
+			it('Returns 0 if no Range has been added.', () => {
+				expect(selection[property]).toBe(0);
 			});
 
 			it(`Returns start offset of Range if direction is "${SelectionDirectionEnum.forwards}".`, () => {