happy-dom 16.5.2 → 16.6.0

package/src/nodes/html-media-element/HTMLMediaElement.ts

@@ -28,29 +28,29 @@ export default class HTMLMediaElement extends HTMLElement {
 	public declare cloneNode: (deep?: boolean) => HTMLMediaElement;
 
 	// Events
-	public onabort: (event: Event) => void | null = null;
-	public oncanplay: (event: Event) => void | null = null;
-	public oncanplaythrough: (event: Event) => void | null = null;
-	public ondurationchange: (event: Event) => void | null = null;
-	public onemptied: (event: Event) => void | null = null;
-	public onended: (event: Event) => void | null = null;
-	public onerror: (event: ErrorEvent) => void | null = null;
-	public onloadeddata: (event: Event) => void | null = null;
-	public onloadedmetadata: (event: Event) => void | null = null;
-	public onloadstart: (event: Event) => void | null = null;
-	public onpause: (event: Event) => void | null = null;
-	public onplay: (event: Event) => void | null = null;
-	public onplaying: (event: Event) => void | null = null;
-	public onprogress: (event: Event) => void | null = null;
-	public onratechange: (event: Event) => void | null = null;
-	public onresize: (event: Event) => void | null = null;
-	public onseeked: (event: Event) => void | null = null;
-	public onseeking: (event: Event) => void | null = null;
-	public onstalled: (event: Event) => void | null = null;
-	public onsuspend: (event: Event) => void | null = null;
-	public ontimeupdate: (event: Event) => void | null = null;
-	public onvolumechange: (event: Event) => void | null = null;
-	public onwaiting: (event: Event) => void | null = null;
+	public onabort: ((event: Event) => void) | null = null;
+	public oncanplay: ((event: Event) => void) | null = null;
+	public oncanplaythrough: ((event: Event) => void) | null = null;
+	public ondurationchange: ((event: Event) => void) | null = null;
+	public onemptied: ((event: Event) => void) | null = null;
+	public onended: ((event: Event) => void) | null = null;
+	public onerror: ((event: ErrorEvent) => void) | null = null;
+	public onloadeddata: ((event: Event) => void) | null = null;
+	public onloadedmetadata: ((event: Event) => void) | null = null;
+	public onloadstart: ((event: Event) => void) | null = null;
+	public onpause: ((event: Event) => void) | null = null;
+	public onplay: ((event: Event) => void) | null = null;
+	public onplaying: ((event: Event) => void) | null = null;
+	public onprogress: ((event: Event) => void) | null = null;
+	public onratechange: ((event: Event) => void) | null = null;
+	public onresize: ((event: Event) => void) | null = null;
+	public onseeked: ((event: Event) => void) | null = null;
+	public onseeking: ((event: Event) => void) | null = null;
+	public onstalled: ((event: Event) => void) | null = null;
+	public onsuspend: ((event: Event) => void) | null = null;
+	public ontimeupdate: ((event: Event) => void) | null = null;
+	public onvolumechange: ((event: Event) => void) | null = null;
+	public onwaiting: ((event: Event) => void) | null = null;
 
 	// Internal Properties
 	public [PropertySymbol.volume] = 1;

package/src/nodes/html-media-element/MediaStream.ts

@@ -15,8 +15,8 @@ export default class MediaStream extends EventTarget {
 	public id: string = Crypto.randomUUID();
 
 	// Events
-	public onaddtrack: (event: MediaStreamTrackEvent) => void | null = null;
-	public onremovetrack: (event: MediaStreamTrackEvent) => void | null = null;
+	public onaddtrack: ((event: MediaStreamTrackEvent) => void) | null = null;
+	public onremovetrack: ((event: MediaStreamTrackEvent) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.tracks]: MediaStreamTrack[] = [];

package/src/nodes/html-media-element/MediaStreamTrack.ts

@@ -59,9 +59,9 @@ export default class MediaStreamTrack extends EventTarget {
 	public [PropertySymbol.settings]: IMediaTrackSettings = JSON.parse(JSON.stringify(SETTINGS));
 
 	// Events
-	public onended: (event: Event) => void | null = null;
-	public onmute: (event: Event) => void | null = null;
-	public onunmute: (event: Event) => void | null = null;
+	public onended: ((event: Event) => void) | null = null;
+	public onmute: ((event: Event) => void) | null = null;
+	public onunmute: ((event: Event) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/nodes/html-select-element/HTMLSelectElement.ts

@@ -32,8 +32,8 @@ export default class HTMLSelectElement extends HTMLElement {
 	public [PropertySymbol.proxy]: HTMLSelectElement;
 
 	// Events
-	public onchange: (event: Event) => void | null = null;
-	public oninput: (event: Event) => void | null = null;
+	public onchange: ((event: Event) => void) | null = null;
+	public oninput: ((event: Event) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/nodes/html-slot-element/HTMLSlotElement.ts

@@ -22,7 +22,7 @@ export default class HTMLSlotElement extends HTMLElement {
 	public [PropertySymbol.assignedNodes]: Node[] = [];
 
 	// Events
-	public onslotchange: (event: Event) => void | null = null;
+	public onslotchange: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns name.

package/src/nodes/html-text-area-element/HTMLTextAreaElement.ts

@@ -22,8 +22,8 @@ export default class HTMLTextAreaElement extends HTMLElement {
 	public readonly type = 'textarea';
 
 	// Events
-	public oninput: (event: Event) => void | null = null;
-	public onselectionchange: (event: Event) => void | null = null;
+	public oninput: ((event: Event) => void) | null = null;
+	public onselectionchange: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.validationMessage] = '';

package/src/nodes/shadow-root/ShadowRoot.ts

@@ -17,7 +17,7 @@ export default class ShadowRoot extends DocumentFragment {
 	public declare cloneNode: (deep?: boolean) => ShadowRoot;
 
 	// Events
-	public onslotchange: (event: Event) => void | null = null;
+	public onslotchange: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.adoptedStyleSheets]: CSSStyleSheet[] = [];

package/src/nodes/svg-animation-element/SVGAnimationElement.ts

@@ -14,9 +14,9 @@ export default class SVGAnimationElement extends SVGElement {
 	public [PropertySymbol.systemLanguage]: SVGStringList | null = null;
 
 	// Events
-	public onbegin: (event: Event) => void | null = null;
-	public onend: (event: Event) => void | null = null;
-	public onrepeat: (event: Event) => void | null = null;
+	public onbegin: ((event: Event) => void) | null = null;
+	public onend: ((event: Event) => void) | null = null;
+	public onrepeat: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns required extensions.

package/src/nodes/svg-element/SVGElement.ts

@@ -14,12 +14,12 @@ import DOMStringMap from '../../dom/DOMStringMap.js';
  */
 export default class SVGElement extends Element {
 	// Events
-	public onabort: (event: Event) => void | null = null;
-	public onerror: (event: Event) => void | null = null;
-	public onload: (event: Event) => void | null = null;
-	public onresize: (event: Event) => void | null = null;
-	public onscroll: (event: Event) => void | null = null;
-	public onunload: (event: Event) => void | null = null;
+	public onabort: ((event: Event) => void) | null = null;
+	public onerror: ((event: Event) => void) | null = null;
+	public onload: ((event: Event) => void) | null = null;
+	public onresize: ((event: Event) => void) | null = null;
+	public onscroll: ((event: Event) => void) | null = null;
+	public onunload: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.style]: CSSStyleDeclaration | null = null;

package/src/nodes/svg-graphics-element/SVGGraphicsElement.ts

@@ -18,9 +18,9 @@ export default class SVGGraphicsElement extends SVGElement {
 	public [PropertySymbol.transform]: SVGAnimatedTransformList | null = null;
 
 	// Events
-	public oncopy: (event: Event) => void | null = null;
-	public oncut: (event: Event) => void | null = null;
-	public onpaste: (event: Event) => void | null = null;
+	public oncopy: ((event: Event) => void) | null = null;
+	public oncut: ((event: Event) => void) | null = null;
+	public onpaste: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns required extensions.

package/src/nodes/svg-svg-element/SVGSVGElement.ts

@@ -38,24 +38,24 @@ export default class SVGSVGElement extends SVGGraphicsElement {
 	public declare cloneNode: (deep?: boolean) => SVGSVGElement;
 
 	// Events
-	public onafterprint: (event: Event) => void | null = null;
-	public onbeforeprint: (event: Event) => void | null = null;
-	public onbeforeunload: (event: Event) => void | null = null;
-	public ongamepadconnected: (event: Event) => void | null = null;
-	public ongamepaddisconnected: (event: Event) => void | null = null;
-	public onhashchange: (event: Event) => void | null = null;
-	public onlanguagechange: (event: Event) => void | null = null;
-	public onmessage: (event: Event) => void | null = null;
-	public onmessageerror: (event: Event) => void | null = null;
-	public onoffline: (event: Event) => void | null = null;
-	public ononline: (event: Event) => void | null = null;
-	public onpagehide: (event: Event) => void | null = null;
-	public onpageshow: (event: Event) => void | null = null;
-	public onpopstate: (event: Event) => void | null = null;
-	public onrejectionhandled: (event: Event) => void | null = null;
-	public onstorage: (event: Event) => void | null = null;
-	public onunhandledrejection: (event: Event) => void | null = null;
-	public onunload: (event: Event) => void | null = null;
+	public onafterprint: ((event: Event) => void) | null = null;
+	public onbeforeprint: ((event: Event) => void) | null = null;
+	public onbeforeunload: ((event: Event) => void) | null = null;
+	public ongamepadconnected: ((event: Event) => void) | null = null;
+	public ongamepaddisconnected: ((event: Event) => void) | null = null;
+	public onhashchange: ((event: Event) => void) | null = null;
+	public onlanguagechange: ((event: Event) => void) | null = null;
+	public onmessage: ((event: Event) => void) | null = null;
+	public onmessageerror: ((event: Event) => void) | null = null;
+	public onoffline: ((event: Event) => void) | null = null;
+	public ononline: ((event: Event) => void) | null = null;
+	public onpagehide: ((event: Event) => void) | null = null;
+	public onpageshow: ((event: Event) => void) | null = null;
+	public onpopstate: ((event: Event) => void) | null = null;
+	public onrejectionhandled: ((event: Event) => void) | null = null;
+	public onstorage: ((event: Event) => void) | null = null;
+	public onunhandledrejection: ((event: Event) => void) | null = null;
+	public onunload: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns preserve aspect ratio.

package/src/query-selector/QuerySelector.ts

@@ -387,6 +387,7 @@ export default class QuerySelector {
 					const previousElementSibling = element.previousElementSibling;
 					if (previousElementSibling) {
 						previousElementSibling[PropertySymbol.affectsCache].push(cachedItem);
+
 						const match = this.matchSelector(
 							previousElementSibling,
 							selectorItems.slice(1),
@@ -419,6 +420,33 @@ export default class QuerySelector {
 						}
 					}
 					break;
+				case SelectorCombinatorEnum.subsequentSibling:
+					const siblingParentElement = element.parentElement;
+					if (siblingParentElement) {
+						const siblings = siblingParentElement[PropertySymbol.elementArray];
+						const index = siblings.indexOf(element);
+
+						siblingParentElement[PropertySymbol.affectsCache].push(cachedItem);
+
+						for (let i = index - 1; i >= 0; i--) {
+							const sibling = siblings[i];
+
+							sibling[PropertySymbol.affectsCache].push(cachedItem);
+
+							const match = this.matchSelector(
+								sibling,
+								selectorItems.slice(1),
+								cachedItem,
+								selectorItem,
+								priorityWeight + result.priorityWeight
+							);
+
+							if (match) {
+								return match;
+							}
+						}
+					}
+					break;
 			}
 		}
 
@@ -477,11 +505,12 @@ export default class QuerySelector {
 				} else {
 					switch (nextSelectorItem.combinator) {
 						case SelectorCombinatorEnum.adjacentSibling:
-							if (child.nextElementSibling) {
+							const nextElementSibling = child.nextElementSibling;
+							if (nextElementSibling) {
 								matched = matched.concat(
 									this.findAll(
 										rootElement,
-										[child.nextElementSibling],
+										[nextElementSibling],
 										selectorItems.slice(1),
 										cachedItem,
 										position
@@ -501,6 +530,15 @@ export default class QuerySelector {
 								)
 							);
 							break;
+						case SelectorCombinatorEnum.subsequentSibling:
+							const index = children.indexOf(child);
+							for (let j = index + 1; j < children.length; j++) {
+								const sibling = children[j];
+								matched = matched.concat(
+									this.findAll(rootElement, [sibling], selectorItems.slice(1), cachedItem, position)
+								);
+							}
+							break;
 					}
 				}
 			}
@@ -546,10 +584,11 @@ export default class QuerySelector {
 				} else {
 					switch (nextSelectorItem.combinator) {
 						case SelectorCombinatorEnum.adjacentSibling:
-							if (child.nextElementSibling) {
+							const nextElementSibling = child.nextElementSibling;
+							if (nextElementSibling) {
 								const match = this.findFirst(
 									rootElement,
-									[child.nextElementSibling],
+									[nextElementSibling],
 									selectorItems.slice(1),
 									cachedItem
 								);
@@ -570,6 +609,21 @@ export default class QuerySelector {
 								return match;
 							}
 							break;
+						case SelectorCombinatorEnum.subsequentSibling:
+							const index = children.indexOf(child);
+							for (let i = index + 1; i < children.length; i++) {
+								const sibling = children[i];
+								const match = this.findFirst(
+									rootElement,
+									[sibling],
+									selectorItems.slice(1),
+									cachedItem
+								);
+								if (match) {
+									return match;
+								}
+							}
+							break;
 					}
 				}
 			}

package/src/query-selector/SelectorCombinatorEnum.ts

@@ -1,7 +1,8 @@
 enum SelectorCombinatorEnum {
 	descendant = 'descendant',
 	child = 'child',
-	adjacentSibling = 'adjacentSibling'
+	adjacentSibling = 'adjacentSibling',
+	subsequentSibling = 'subsequentSibling'
 }
 
 export default SelectorCombinatorEnum;

package/src/query-selector/SelectorItem.ts

@@ -7,6 +7,8 @@ import ISelectorAttribute from './ISelectorAttribute.js';
 import ISelectorMatch from './ISelectorMatch.js';
 import ISelectorPseudo from './ISelectorPseudo.js';
 
+const SPACE_REGEXP = /\s+/;
+
 /**
  * Selector item.
  */
@@ -417,7 +419,7 @@ export default class SelectorItem {
 			return null;
 		}
 
-		const classList = element.className.split(' ');
+		const classList = element.className.split(SPACE_REGEXP);
 		let priorityWeight = 0;
 
 		for (const className of this.classNames) {

package/src/query-selector/SelectorParser.ts

@@ -25,7 +25,7 @@ import ISelectorPseudo from './ISelectorPseudo.js';
  * Group 17: Combinator.
  */
 const SELECTOR_REGEXP =
-	/(\*)|([a-zA-Z0-9-]+)|#((?:[a-zA-Z0-9-_]|\\.)+)|\.((?:[a-zA-Z0-9-_]|\\.)+)|\[([a-zA-Z0-9-_\\:]+)\]|\[([a-zA-Z0-9-_\\:]+)\s*([~|^$*]{0,1})\s*=\s*["']{1}([^"']*)["']{1}\s*(s|i){0,1}\]|\[([a-zA-Z0-9-_]+)\s*([~|^$*]{0,1})\s*=\s*([^\]]*)\]|:([a-zA-Z-]+)\s*\(([^)]+)\){0,1}|:([a-zA-Z-]+)|::([a-zA-Z-]+)|([\s,+>]*)/gm;
+	/(\*)|([a-zA-Z0-9-]+)|#((?:[a-zA-Z0-9-_]|\\.)+)|\.((?:[a-zA-Z0-9-_]|\\.)+)|\[([a-zA-Z0-9-_\\:]+)\]|\[([a-zA-Z0-9-_\\:]+)\s*([~|^$*]{0,1})\s*=\s*["']{1}([^"']*)["']{1}\s*(s|i){0,1}\]|\[([a-zA-Z0-9-_]+)\s*([~|^$*]{0,1})\s*=\s*([^\]]*)\]|:([a-zA-Z-]+)\s*\(([^)]+)\){0,1}|:([a-zA-Z-]+)|::([a-zA-Z-]+)|([\s,+>~]*)/gm;
 
 /**
  * Escaped Character RegExp.
@@ -193,6 +193,13 @@ export default class SelectorParser {
 							});
 							currentGroup.push(currentSelectorItem);
 							break;
+						case '~':
+							currentSelectorItem = new SelectorItem({
+								combinator: SelectorCombinatorEnum.subsequentSibling,
+								ignoreErrors
+							});
+							currentGroup.push(currentSelectorItem);
+							break;
 						case '':
 							currentSelectorItem = new SelectorItem({
 								combinator: SelectorCombinatorEnum.descendant,

package/src/svg/SVGAngle.ts

@@ -19,8 +19,8 @@ export default class SVGAngle {
 
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string = '';
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGAnimatedBoolean.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGAnimatedBoolean {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/svg/SVGAnimatedInteger.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGAnimatedInteger {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/svg/SVGAnimatedNumber.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGAnimatedNumber {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.defaultValue]: number = 0;
 
 	/**

package/src/svg/SVGAnimatedString.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGAnimatedString {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/svg/SVGLength.ts

@@ -25,8 +25,8 @@ export default class SVGLength {
 
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGLengthList.ts

@@ -15,8 +15,8 @@ export default class SVGLengthList {
 	[index: number]: SVGLength;
 
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 	private [PropertySymbol.cache]: { items: SVGLength[]; attributeValue: string } = {
 		items: [],

package/src/svg/SVGMatrix.ts

@@ -13,8 +13,8 @@ const TRANSFORM_PARAMETER_SPLIT_REGEXP = /[\s,]+/;
 export default class SVGMatrix {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGNumber.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGNumber {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGNumberList.ts

@@ -15,8 +15,8 @@ export default class SVGNumberList {
 	[index: number]: SVGNumber;
 
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 	private [PropertySymbol.cache]: { items: SVGNumber[]; attributeValue: string } = {
 		items: [],

package/src/svg/SVGPoint.ts

@@ -11,8 +11,8 @@ const ATTRIBUTE_SEPARATOR_REGEXP = /[\t\f\n\r, ]+/;
 export default class SVGPoint {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGPointList.ts

@@ -15,8 +15,8 @@ export default class SVGPointList {
 	[index: number]: SVGPoint;
 
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 	private [PropertySymbol.cache]: { items: SVGPoint[]; attributeValue: string } = {
 		items: [],

package/src/svg/SVGPreserveAspectRatio.ts

@@ -33,8 +33,8 @@ export default class SVGPreserveAspectRatio {
 
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGRect.ts

@@ -9,8 +9,8 @@ import BrowserWindow from '../window/BrowserWindow.js';
 export default class SVGRect {
 	// Internal properties
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.attributeValue]: string | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 

package/src/svg/SVGStringList.ts

@@ -14,8 +14,8 @@ export default class SVGStringList {
 	[index: number]: string;
 
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 	private [PropertySymbol.cache]: { items: string[]; attributeValue: string } = {
 		items: [],

package/src/svg/SVGTransformList.ts

@@ -16,8 +16,8 @@ export default class SVGTransformList {
 	[index: number]: SVGTransform;
 
 	public [PropertySymbol.window]: BrowserWindow;
-	public [PropertySymbol.getAttribute]: () => string | null = null;
-	public [PropertySymbol.setAttribute]: (value: string) => void | null = null;
+	public [PropertySymbol.getAttribute]: (() => string | null) | null = null;
+	public [PropertySymbol.setAttribute]: ((value: string) => void) | null = null;
 	public [PropertySymbol.readOnly]: boolean = false;
 	private [PropertySymbol.cache]: { items: SVGTransform[]; attributeValue: string } = {
 		items: [],

package/src/utilities/XMLEncodeUtility.ts

@@ -8,7 +8,7 @@ export default class XMLEncodeUtility {
 	 * @param value Value.
 	 * @returns Escaped value.
 	 */
-	public static encodeAttributeValue(value: string | null): string {
+	public static encodeXMLAttributeValue(value: string | null): string {
 		if (value === null) {
 			return '';
 		}
@@ -28,7 +28,7 @@ export default class XMLEncodeUtility {
 	 * @param value Value.
 	 * @returns Decoded value.
 	 */
-	public static decodeAttributeValue(value: string | null): string {
+	public static decodeXMLAttributeValue(value: string | null): string {
 		if (value === null) {
 			return '';
 		}
@@ -43,6 +43,33 @@ export default class XMLEncodeUtility {
 			.replace(/&/gu, '&');
 	}
 
+	/**
+	 * Encodes attribute value.
+	 *
+	 * @param value Value.
+	 * @returns Escaped value.
+	 */
+	public static encodeHTMLAttributeValue(value: string | null): string {
+		if (value === null) {
+			return '';
+		}
+		return value.replace(/&/gu, '&').replace(/"/gu, '"');
+	}
+
+	/**
+	 * Decodes attribute value.
+	 *
+	 * @param value Value.
+	 * @returns Decoded value.
+	 */
+	public static decodeHTMLAttributeValue(value: string | null): string {
+		if (value === null) {
+			return '';
+		}
+
+		return value.replace(/"/gu, '"').replace(/&/gu, '&');
+	}
+
 	/**
 	 * Encodes text content.
 	 *

package/src/xml-http-request/XMLHttpRequestEventTarget.ts

@@ -9,7 +9,7 @@ export type ProgressEventListener = (event: ProgressEvent) => void;
 export default class XMLHttpRequestEventTarget extends EventTarget {
 	public onloadstart: ProgressEventListener | null = null;
 	public onprogress: ProgressEventListener | null = null;
-	public onabort: (event: ProgressEvent) => void | null = null;
+	public onabort: ((event: ProgressEvent) => void) | null = null;
 	public onerror: ProgressEventListener | null = null;
 	public onload: ProgressEventListener | null = null;
 	public ontimeout: ProgressEventListener | null = null;