happy-dom 8.9.0 → 9.0.0

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

@@ -23,7 +23,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Type.
 	 */
 	public get type(): string {
-		return this.getAttributeNS(null, 'type') || '';
+		return this.getAttribute('type') || '';
 	}
 
 	/**
@@ -32,7 +32,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @param type Type.
 	 */
 	public set type(type: string) {
-		this.setAttributeNS(null, 'type', type);
+		this.setAttribute('type', type);
 	}
 
 	/**
@@ -41,7 +41,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Source.
 	 */
 	public get src(): string {
-		return this.getAttributeNS(null, 'src') || '';
+		return this.getAttribute('src') || '';
 	}
 
 	/**
@@ -50,7 +50,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @param source Source.
 	 */
 	public set src(src: string) {
-		this.setAttributeNS(null, 'src', src);
+		this.setAttribute('src', src);
 	}
 
 	/**
@@ -59,7 +59,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Charset.
 	 */
 	public get charset(): string {
-		return this.getAttributeNS(null, 'charset') || '';
+		return this.getAttribute('charset') || '';
 	}
 
 	/**
@@ -68,7 +68,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @param charset Charset.
 	 */
 	public set charset(charset: string) {
-		this.setAttributeNS(null, 'charset', charset);
+		this.setAttribute('charset', charset);
 	}
 
 	/**
@@ -77,7 +77,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Lang.
 	 */
 	public get lang(): string {
-		return this.getAttributeNS(null, 'lang') || '';
+		return this.getAttribute('lang') || '';
 	}
 
 	/**
@@ -86,7 +86,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @param lang Lang.
 	 */
 	public set lang(lang: string) {
-		this.setAttributeNS(null, 'lang', lang);
+		this.setAttribute('lang', lang);
 	}
 
 	/**
@@ -95,7 +95,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Async.
 	 */
 	public get async(): boolean {
-		return this.getAttributeNS(null, 'async') !== null;
+		return this.getAttribute('async') !== null;
 	}
 
 	/**
@@ -105,9 +105,9 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 */
 	public set async(async: boolean) {
 		if (!async) {
-			this.removeAttributeNS(null, 'async');
+			this.removeAttribute('async');
 		} else {
-			this.setAttributeNS(null, 'async', '');
+			this.setAttribute('async', '');
 		}
 	}
 
@@ -117,7 +117,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @returns Defer.
 	 */
 	public get defer(): boolean {
-		return this.getAttributeNS(null, 'defer') !== null;
+		return this.getAttribute('defer') !== null;
 	}
 
 	/**
@@ -127,9 +127,9 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 */
 	public set defer(defer: boolean) {
 		if (!defer) {
-			this.removeAttributeNS(null, 'defer');
+			this.removeAttribute('defer');
 		} else {
-			this.setAttributeNS(null, 'defer', '');
+			this.setAttribute('defer', '');
 		}
 	}
 
@@ -189,13 +189,13 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 		super._connectToNode(parentNode);
 
 		if (isParentConnected && isConnected !== isParentConnected && this._evaluateScript) {
-			const src = this.getAttributeNS(null, 'src');
+			const src = this.getAttribute('src');
 
 			if (src !== null) {
 				ScriptUtility.loadExternalScript(this);
 			} else if (!this.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptEvaluation) {
 				const textContent = this.textContent;
-				const type = this.getAttributeNS(null, 'type');
+				const type = this.getAttribute('type');
 				if (
 					textContent &&
 					(type === null ||

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

@@ -1,7 +1,7 @@
 import { Document } from '../..';
 import Event from '../../event/Event';
 import ErrorEvent from '../../event/events/ErrorEvent';
-import ResourceFetchHandler from '../../fetch/ResourceFetchHandler';
+import ResourceFetch from '../../fetch/ResourceFetch';
 import HTMLScriptElement from './HTMLScriptElement';
 
 /**
@@ -16,8 +16,8 @@ export default class ScriptUtility {
 	 * @param element
 	 */
 	public static async loadExternalScript(element: HTMLScriptElement): Promise<void> {
-		const src = element.getAttributeNS(null, 'src');
-		const async = element.getAttributeNS(null, 'async') !== null;
+		const src = element.getAttribute('src');
+		const async = element.getAttribute('async') !== null;
 
 		if (
 			element.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptFileLoading ||
@@ -30,7 +30,7 @@ export default class ScriptUtility {
 			let code = null;
 			(<Document>element.ownerDocument)._readyStateManager.startTask();
 			try {
-				code = await ResourceFetchHandler.fetch(element.ownerDocument, src);
+				code = await ResourceFetch.fetch(element.ownerDocument, src);
 			} catch (error) {
 				element.dispatchEvent(
 					new ErrorEvent('error', {
@@ -59,7 +59,7 @@ export default class ScriptUtility {
 		} else {
 			let code = null;
 			try {
-				code = ResourceFetchHandler.fetchSync(element.ownerDocument, src);
+				code = ResourceFetch.fetchSync(element.ownerDocument, src);
 			} catch (error) {
 				element.dispatchEvent(
 					new ErrorEvent('error', {

package/src/nodes/{html-option-element → html-select-element}/HTMLOptionsCollection.ts

@@ -1,8 +1,7 @@
 import DOMException from '../../exception/DOMException';
 import HTMLCollection from '../element/HTMLCollection';
-import IHTMLOptGroupElement from '../html-opt-group-element/IHTMLOptGroupElement';
-import IHTMLSelectElement from '../html-select-element/IHTMLSelectElement';
-import IHTMLOptionElement from './IHTMLOptionElement';
+import IHTMLSelectElement from './IHTMLSelectElement';
+import IHTMLOptionElement from '../html-option-element/IHTMLOptionElement';
 import IHTMLOptionsCollection from './IHTMLOptionsCollection';
 
 /**
@@ -12,7 +11,7 @@ import IHTMLOptionsCollection from './IHTMLOptionsCollection';
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLOptionsCollection.
  */
 export default class HTMLOptionsCollection
-	extends HTMLCollection
+	extends HTMLCollection<IHTMLOptionElement, IHTMLOptionElement>
 	implements IHTMLOptionsCollection
 {
 	private _selectElement: IHTMLSelectElement;
@@ -50,7 +49,7 @@ export default class HTMLOptionsCollection
 	 *
 	 * @param index Index.
 	 */
-	public item(index: number): IHTMLOptionElement | IHTMLOptGroupElement {
+	public item(index: number): IHTMLOptionElement {
 		return this[index];
 	}
 
@@ -59,10 +58,7 @@ export default class HTMLOptionsCollection
 	 * @param element
 	 * @param before
 	 */
-	public add(
-		element: IHTMLOptionElement | IHTMLOptGroupElement,
-		before?: number | IHTMLOptionElement | IHTMLOptGroupElement
-	): void {
+	public add(element: IHTMLOptionElement, before?: number | IHTMLOptionElement): void {
 		if (!before && before !== 0) {
 			this._selectElement.appendChild(element);
 			return;