happy-dom 16.5.2 → 16.6.0

package/src/console/VirtualConsole.ts

@@ -33,14 +33,15 @@ export default class VirtualConsole implements Console {
 	 * Writes an error message to the console if the assertion is false. If the assertion is true, nothing happens.
 	 *
 	 * @param assertion Assertion.
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public assert(assertion: boolean, ...args: Array<object | string>): void {
+	public assert(assertion: boolean, message?: any, ...args: Array<object | string>): void {
 		if (!assertion) {
 			this.#printer.print({
 				type: VirtualConsoleLogTypeEnum.assert,
 				level: VirtualConsoleLogLevelEnum.error,
-				message: ['Assertion failed:', ...args],
+				message: ['Assertion failed:', ...(message ? [message, ...args] : args)],
 				group: this.#groups[this.#groups.length - 1] || null
 			});
 		}
@@ -92,13 +93,14 @@ export default class VirtualConsole implements Console {
 	/**
 	 * Outputs a message to the web console at the "debug" log level.
 	 *
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public debug(...args: Array<object | string>): void {
+	public debug(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.debug,
 			level: VirtualConsoleLogLevelEnum.log,
-			message: args,
+			message: message ? [message, ...args] : args,
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}
@@ -108,7 +110,7 @@ export default class VirtualConsole implements Console {
 	 *
 	 * @param data Data.
 	 */
-	public dir(data: object): void {
+	public dir(data: any): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.dir,
 			level: VirtualConsoleLogLevelEnum.log,
@@ -122,7 +124,7 @@ export default class VirtualConsole implements Console {
 	 *
 	 * @param data Data.
 	 */
-	public dirxml(data: object): void {
+	public dirxml(data: any[]): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.dirxml,
 			level: VirtualConsoleLogLevelEnum.log,
@@ -134,13 +136,14 @@ export default class VirtualConsole implements Console {
 	/**
 	 * Outputs an error message to the console.
 	 *
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public error(...args: Array<object | string>): void {
+	public error(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.error,
 			level: VirtualConsoleLogLevelEnum.error,
-			message: args,
+			message: message ? [message, ...args] : args,
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}
@@ -211,14 +214,16 @@ export default class VirtualConsole implements Console {
 	}
 
 	/**
+	 * Outputs an informational message to the console.
 	 *
-	 * @param args
+	 * @param message Message.
+	 * @param args Arguments.
 	 */
-	public info(...args: Array<object | string>): void {
+	public info(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.info,
 			level: VirtualConsoleLogLevelEnum.info,
-			message: args,
+			message: message ? [message, ...args] : args,
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}
@@ -226,13 +231,14 @@ export default class VirtualConsole implements Console {
 	/**
 	 * Outputs a message to the console.
 	 *
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public log(...args: Array<object | string>): void {
+	public log(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.log,
 			level: VirtualConsoleLogLevelEnum.log,
-			message: args,
+			message: message ? [message, ...args] : args,
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}
@@ -329,13 +335,17 @@ export default class VirtualConsole implements Console {
 	/**
 	 * Outputs a stack trace to the console.
 	 *
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public trace(...args: Array<object | string>): void {
+	public trace(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.trace,
 			level: VirtualConsoleLogLevelEnum.log,
-			message: [...args, new Error('stack').stack.replace('Error: stack', '')],
+			message: [
+				...(message ? [message, ...args] : args),
+				new Error('stack').stack!.replace('Error: stack', '')
+			],
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}
@@ -343,13 +353,14 @@ export default class VirtualConsole implements Console {
 	/**
 	 * Outputs a warning message to the console.
 	 *
+	 * @param message Message.
 	 * @param args Arguments.
 	 */
-	public warn(...args: Array<object | string>): void {
+	public warn(message?: any, ...args: Array<object | string>): void {
 		this.#printer.print({
 			type: VirtualConsoleLogTypeEnum.warn,
 			level: VirtualConsoleLogLevelEnum.warn,
-			message: args,
+			message: message ? [message, ...args] : args,
 			group: this.#groups[this.#groups.length - 1] || null
 		});
 	}

package/src/cookie/urilities/CookieExpireUtility.ts

@@ -10,7 +10,7 @@ export default class CookieExpireUtility {
 	 * @param cookie Cookie.
 	 * @returns "true" if cookie has expired.
 	 */
-	public static hasExpired(cookie: ICookie): boolean {
+	public static hasExpired(cookie: ICookie): boolean | null {
 		return cookie.expires && cookie.expires.getTime() < Date.now();
 	}
 }

package/src/css/declaration/computed-style/CSSStyleDeclarationComputedStyle.ts

@@ -287,8 +287,8 @@ export default class CSSStyleDeclarationComputedStyle {
 	private parseCSSRules(options: {
 		cssRules: CSSRule[];
 		elements: IStyleAndElement[];
-		rootElement?: IStyleAndElement;
-		hostElement?: IStyleAndElement;
+		rootElement?: IStyleAndElement | null;
+		hostElement?: IStyleAndElement | null;
 	}): void {
 		if (!options.elements.length) {
 			return;

package/src/css/declaration/property-manager/CSSStyleDeclarationPropertyGetParser.ts

@@ -13,7 +13,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getMargin(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			['margin-top', 'margin-right', 'margin-bottom', 'margin-left'],
 			properties
@@ -28,7 +28,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getPadding(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			['padding-top', 'padding-right', 'padding-bottom', 'padding-left'],
 			properties
@@ -43,7 +43,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getOutline(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['outline-color']?.value ||
 			!properties['outline-style']?.value ||
@@ -94,7 +94,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorder(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['border-top-width']?.value ||
 			properties['border-top-width']?.value !== properties['border-right-width']?.value ||
@@ -200,7 +200,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderTop(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getBorderTopRightBottomLeft('top', properties);
 	}
 
@@ -212,7 +212,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderRight(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getBorderTopRightBottomLeft('right', properties);
 	}
 
@@ -224,7 +224,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderBottom(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getBorderTopRightBottomLeft('bottom', properties);
 	}
 
@@ -236,7 +236,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderLeft(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getBorderTopRightBottomLeft('left', properties);
 	}
 
@@ -248,7 +248,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderColor(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			['border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color'],
 			properties
@@ -263,7 +263,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderWidth(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			['border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'],
 			properties
@@ -278,7 +278,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderStyle(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			['border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style'],
 			properties
@@ -293,7 +293,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderRadius(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		return this.getPaddingLikeProperty(
 			[
 				'border-top-left-radius',
@@ -313,7 +313,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBorderImage(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['border-image-source']?.value ||
 			!properties['border-image-slice']?.value ||
@@ -366,7 +366,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBackground(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['background-image']?.value ||
 			!properties['background-repeat']?.value ||
@@ -489,7 +489,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getBackgroundPosition(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['background-position-x']?.value ||
 			!properties['background-position-y']?.value
@@ -536,7 +536,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getFlex(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['flex-grow']?.value ||
 			!properties['flex-shrink']?.value ||
@@ -582,7 +582,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 	 */
 	public static getFont(properties: {
 		[k: string]: ICSSStyleDeclarationPropertyValue;
-	}): ICSSStyleDeclarationPropertyValue {
+	}): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties['font-size']?.value ||
 			!properties['font-family']?.value ||
@@ -671,7 +671,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 		properties: {
 			[k: string]: ICSSStyleDeclarationPropertyValue;
 		}
-	): ICSSStyleDeclarationPropertyValue {
+	): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties[`border-${position}-width`]?.value ||
 			!properties[`border-${position}-style`]?.value ||
@@ -730,7 +730,7 @@ export default class CSSStyleDeclarationPropertyGetParser {
 		properties: {
 			[k: string]: ICSSStyleDeclarationPropertyValue;
 		}
-	): ICSSStyleDeclarationPropertyValue {
+	): ICSSStyleDeclarationPropertyValue | null {
 		if (
 			!properties[propertyNames[0]]?.value ||
 			!properties[propertyNames[1]]?.value ||

package/src/fetch/Fetch.ts

@@ -39,8 +39,8 @@ const LAST_CHUNK = Buffer.from('0\r\n\r\n');
  * @see https://fetch.spec.whatwg.org/#http-network-fetch
  */
 export default class Fetch {
-	private reject: (reason: Error) => void | null = null;
-	private resolve: (value: Response | Promise<Response>) => Promise<void> = null;
+	private reject: ((reason: Error) => void) | null = null;
+	private resolve: ((value: Response | Promise<Response>) => Promise<void>) | null = null;
 	private listeners = {
 		onSignalAbort: this.onSignalAbort.bind(this)
 	};

package/src/html-parser/HTMLParser.ts

@@ -402,7 +402,7 @@ export default class HTMLParser {
 					const name =
 						attributeMatch[1] || attributeMatch[3] || attributeMatch[6] || attributeMatch[9] || '';
 					const rawValue = attributeMatch[2] || attributeMatch[4] || attributeMatch[7] || '';
-					const value = rawValue ? XMLEncodeUtility.decodeAttributeValue(rawValue) : '';
+					const value = rawValue ? XMLEncodeUtility.decodeHTMLAttributeValue(rawValue) : '';
 					const attributes = this.nextElement[PropertySymbol.attributes];
 
 					if (this.nextElement[PropertySymbol.namespaceURI] === NamespaceURI.svg) {

package/src/html-serializer/HTMLSerializer.ts

@@ -147,11 +147,11 @@ export default class HTMLSerializer {
 
 		if (!namedItems.has('is') && element[PropertySymbol.isValue]) {
 			attributeString +=
-				' is="' + XMLEncodeUtility.encodeAttributeValue(element[PropertySymbol.isValue]) + '"';
+				' is="' + XMLEncodeUtility.encodeHTMLAttributeValue(element[PropertySymbol.isValue]) + '"';
 		}
 
 		for (const attributes of namedItems.values()) {
-			const escapedValue = XMLEncodeUtility.encodeAttributeValue(
+			const escapedValue = XMLEncodeUtility.encodeHTMLAttributeValue(
 				attributes[0][PropertySymbol.value]
 			);
 			attributeString += ' ' + attributes[0][PropertySymbol.name] + '="' + escapedValue + '"';

package/src/nodes/element/Element.ts

@@ -49,40 +49,40 @@ export default class Element
 	public declare cloneNode: (deep?: boolean) => Element;
 
 	// Events
-	public oncancel: (event: Event) => void | null = null;
-	public onerror: (event: Event) => void | null = null;
-	public onscroll: (event: Event) => void | null = null;
-	public onselect: (event: Event) => void | null = null;
-	public onwheel: (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;
-	public oncompositionend: (event: Event) => void | null = null;
-	public oncompositionstart: (event: Event) => void | null = null;
-	public oncompositionupdate: (event: Event) => void | null = null;
-	public onblur: (event: Event) => void | null = null;
-	public onfocus: (event: Event) => void | null = null;
-	public onfocusin: (event: Event) => void | null = null;
-	public onfocusout: (event: Event) => void | null = null;
-	public onfullscreenchange: (event: Event) => void | null = null;
-	public onfullscreenerror: (event: Event) => void | null = null;
-	public onkeydown: (event: Event) => void | null = null;
-	public onkeyup: (event: Event) => void | null = null;
-	public onauxclick: (event: Event) => void | null = null;
-	public onclick: (event: Event) => void | null = null;
-	public oncontextmenu: (event: Event) => void | null = null;
-	public ondblclick: (event: Event) => void | null = null;
-	public onmousedown: (event: Event) => void | null = null;
-	public onmouseenter: (event: Event) => void | null = null;
-	public onmouseleave: (event: Event) => void | null = null;
-	public onmousemove: (event: Event) => void | null = null;
-	public onmouseout: (event: Event) => void | null = null;
-	public onmouseover: (event: Event) => void | null = null;
-	public onmouseup: (event: Event) => void | null = null;
-	public ontouchcancel: (event: Event) => void | null = null;
-	public ontouchend: (event: Event) => void | null = null;
-	public ontouchmove: (event: Event) => void | null = null;
-	public ontouchstart: (event: Event) => void | null = null;
+	public oncancel: ((event: Event) => void) | null = null;
+	public onerror: ((event: Event) => void) | null = null;
+	public onscroll: ((event: Event) => void) | null = null;
+	public onselect: ((event: Event) => void) | null = null;
+	public onwheel: ((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;
+	public oncompositionend: ((event: Event) => void) | null = null;
+	public oncompositionstart: ((event: Event) => void) | null = null;
+	public oncompositionupdate: ((event: Event) => void) | null = null;
+	public onblur: ((event: Event) => void) | null = null;
+	public onfocus: ((event: Event) => void) | null = null;
+	public onfocusin: ((event: Event) => void) | null = null;
+	public onfocusout: ((event: Event) => void) | null = null;
+	public onfullscreenchange: ((event: Event) => void) | null = null;
+	public onfullscreenerror: ((event: Event) => void) | null = null;
+	public onkeydown: ((event: Event) => void) | null = null;
+	public onkeyup: ((event: Event) => void) | null = null;
+	public onauxclick: ((event: Event) => void) | null = null;
+	public onclick: ((event: Event) => void) | null = null;
+	public oncontextmenu: ((event: Event) => void) | null = null;
+	public ondblclick: ((event: Event) => void) | null = null;
+	public onmousedown: ((event: Event) => void) | null = null;
+	public onmouseenter: ((event: Event) => void) | null = null;
+	public onmouseleave: ((event: Event) => void) | null = null;
+	public onmousemove: ((event: Event) => void) | null = null;
+	public onmouseout: ((event: Event) => void) | null = null;
+	public onmouseover: ((event: Event) => void) | null = null;
+	public onmouseup: ((event: Event) => void) | null = null;
+	public ontouchcancel: ((event: Event) => void) | null = null;
+	public ontouchend: ((event: Event) => void) | null = null;
+	public ontouchmove: ((event: Event) => void) | null = null;
+	public ontouchstart: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.classList]: DOMTokenList | null = null;

package/src/nodes/html-body-element/HTMLBodyElement.ts

@@ -7,22 +7,22 @@ import HTMLElement from '../html-element/HTMLElement.js';
  */
 export default class HTMLBodyElement extends HTMLElement {
 	// 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;
 }

package/src/nodes/html-canvas-element/HTMLCanvasElement.ts

@@ -14,11 +14,11 @@ const DEVICE_ID = 'S3F/aBCdEfGHIjKlMnOpQRStUvWxYz1234567890+1AbC2DEf2GHi3jK34le+
  */
 export default class HTMLCanvasElement extends HTMLElement {
 	// Events
-	public oncontextlost: (event: Event) => void | null = null;
-	public oncontextrestored: (event: Event) => void | null = null;
-	public onwebglcontextcreationerror: (event: Event) => void | null = null;
-	public onwebglcontextlost: (event: Event) => void | null = null;
-	public onwebglcontextrestored: (event: Event) => void | null = null;
+	public oncontextlost: ((event: Event) => void) | null = null;
+	public oncontextrestored: ((event: Event) => void) | null = null;
+	public onwebglcontextcreationerror: ((event: Event) => void) | null = null;
+	public onwebglcontextlost: ((event: Event) => void) | null = null;
+	public onwebglcontextrestored: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns width.

package/src/nodes/html-details-element/HTMLDetailsElement.ts

@@ -12,7 +12,7 @@ import MouseEvent from '../../event/events/MouseEvent.js';
  */
 export default class HTMLDetailsElement extends HTMLElement {
 	// Events
-	public ontoggle: (event: Event) => void | null = null;
+	public ontoggle: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns the open attribute.

package/src/nodes/html-dialog-element/HTMLDialogElement.ts

@@ -12,8 +12,8 @@ export default class HTMLDialogElement extends HTMLElement {
 	public [PropertySymbol.returnValue] = '';
 
 	// Events
-	public oncancel: (event: Event) => void | null = null;
-	public onclose: (event: Event) => void | null = null;
+	public oncancel: ((event: Event) => void) | null = null;
+	public onclose: ((event: Event) => void) | null = null;
 
 	/**
 	 * Returns return value.

package/src/nodes/html-element/HTMLElement.ts

@@ -20,31 +20,31 @@ export default class HTMLElement extends Element {
 	public static observedAttributes?: string[];
 
 	// Events
-	public oncopy: (event: Event) => void | null = null;
-	public oncut: (event: Event) => void | null = null;
-	public onpaste: (event: Event) => void | null = null;
-	public oninvalid: (event: Event) => void | null = null;
-	public onanimationcancel: (event: Event) => void | null = null;
-	public onanimationend: (event: Event) => void | null = null;
-	public onanimationiteration: (event: Event) => void | null = null;
-	public onanimationstart: (event: Event) => void | null = null;
-	public onbeforeinput: (event: Event) => void | null = null;
-	public oninput: (event: Event) => void | null = null;
-	public onchange: (event: Event) => void | null = null;
-	public ongotpointercapture: (event: Event) => void | null = null;
-	public onlostpointercapture: (event: Event) => void | null = null;
-	public onpointercancel: (event: Event) => void | null = null;
-	public onpointerdown: (event: Event) => void | null = null;
-	public onpointerenter: (event: Event) => void | null = null;
-	public onpointerleave: (event: Event) => void | null = null;
-	public onpointermove: (event: Event) => void | null = null;
-	public onpointerout: (event: Event) => void | null = null;
-	public onpointerover: (event: Event) => void | null = null;
-	public onpointerup: (event: Event) => void | null = null;
-	public ontransitioncancel: (event: Event) => void | null = null;
-	public ontransitionend: (event: Event) => void | null = null;
-	public ontransitionrun: (event: Event) => void | null = null;
-	public ontransitionstart: (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;
+	public oninvalid: ((event: Event) => void) | null = null;
+	public onanimationcancel: ((event: Event) => void) | null = null;
+	public onanimationend: ((event: Event) => void) | null = null;
+	public onanimationiteration: ((event: Event) => void) | null = null;
+	public onanimationstart: ((event: Event) => void) | null = null;
+	public onbeforeinput: ((event: Event) => void) | null = null;
+	public oninput: ((event: Event) => void) | null = null;
+	public onchange: ((event: Event) => void) | null = null;
+	public ongotpointercapture: ((event: Event) => void) | null = null;
+	public onlostpointercapture: ((event: Event) => void) | null = null;
+	public onpointercancel: ((event: Event) => void) | null = null;
+	public onpointerdown: ((event: Event) => void) | null = null;
+	public onpointerenter: ((event: Event) => void) | null = null;
+	public onpointerleave: ((event: Event) => void) | null = null;
+	public onpointermove: ((event: Event) => void) | null = null;
+	public onpointerout: ((event: Event) => void) | null = null;
+	public onpointerover: ((event: Event) => void) | null = null;
+	public onpointerup: ((event: Event) => void) | null = null;
+	public ontransitioncancel: ((event: Event) => void) | null = null;
+	public ontransitionend: ((event: Event) => void) | null = null;
+	public ontransitionrun: ((event: Event) => void) | null = null;
+	public ontransitionstart: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.accessKey] = '';

package/src/nodes/html-form-element/HTMLFormElement.ts

@@ -33,9 +33,9 @@ export default class HTMLFormElement extends HTMLElement {
 	public [PropertySymbol.proxy]: HTMLFormElement;
 
 	// Events
-	public onformdata: (event: Event) => void | null = null;
-	public onreset: (event: Event) => void | null = null;
-	public onsubmit: (event: Event) => void | null = null;
+	public onformdata: ((event: Event) => void) | null = null;
+	public onreset: ((event: Event) => void) | null = null;
+	public onsubmit: ((event: Event) => void) | null = null;
 
 	/**
 	 * Constructor.

package/src/nodes/html-iframe-element/HTMLIFrameElement.ts

@@ -41,8 +41,8 @@ export default class HTMLIFrameElement extends HTMLElement {
 	public declare cloneNode: (deep?: boolean) => HTMLIFrameElement;
 
 	// Events
-	public onload: (event: Event) => void | null = null;
-	public onerror: (event: Event) => void | null = null;
+	public onload: ((event: Event) => void) | null = null;
+	public onerror: ((event: Event) => void) | null = null;
 
 	// Internal properties
 	public [PropertySymbol.sandbox]: DOMTokenList | null = null;

package/src/nodes/html-input-element/HTMLInputElement.ts

@@ -34,9 +34,9 @@ export default class HTMLInputElement extends HTMLElement {
 	public declare cloneNode: (deep?: boolean) => HTMLInputElement;
 
 	// Events
-	public oninput: (event: Event) => void | null = null;
-	public oninvalid: (event: Event) => void | null = null;
-	public onselectionchange: (event: Event) => void | null = null;
+	public oninput: ((event: Event) => void) | null = null;
+	public oninvalid: ((event: Event) => void) | null = null;
+	public onselectionchange: ((event: Event) => void) | null = null;
 
 	public [PropertySymbol.value] = null;
 	public [PropertySymbol.height] = 0;