happy-dom 12.10.2 → 13.0.0

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

@@ -1,7 +1,7 @@
 import IAttr from '../attr/IAttr.js';
+import Element from '../element/Element.js';
 import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
-import HTMLIFrameElement from './HTMLIFrameElement.js';
-import HTMLIFrameUtility from './HTMLIFrameUtility.js';
+import HTMLIFrameElementPageLoader from './HTMLIFrameElementPageLoader.js';
 
 /**
  * Named Node Map.
@@ -9,7 +9,18 @@ import HTMLIFrameUtility from './HTMLIFrameUtility.js';
  * @see https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
  */
 export default class HTMLIFrameElementNamedNodeMap extends HTMLElementNamedNodeMap {
-	protected _ownerElement: HTMLIFrameElement;
+	#pageLoader: HTMLIFrameElementPageLoader;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ownerElement Owner element.
+	 * @param pageLoader
+	 */
+	constructor(ownerElement: Element, pageLoader: HTMLIFrameElementPageLoader) {
+		super(ownerElement);
+		this.#pageLoader = pageLoader;
+	}
 
 	/**
 	 * @override
@@ -18,7 +29,7 @@ export default class HTMLIFrameElementNamedNodeMap extends HTMLElementNamedNodeM
 		const replacedAttribute = super.setNamedItem(item);
 
 		if (item.name === 'src' && item.value && item.value !== replacedAttribute?.value) {
-			HTMLIFrameUtility.loadPage(this._ownerElement);
+			this.#pageLoader.loadPage();
 		}
 
 		return replacedAttribute || null;

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

@@ -0,0 +1,106 @@
+import Event from '../../event/Event.js';
+import * as PropertySymbol from '../../PropertySymbol.js';
+import IBrowserWindow from '../../window/IBrowserWindow.js';
+import CrossOriginBrowserWindow from '../../window/CrossOriginBrowserWindow.js';
+import WindowErrorUtility from '../../window/WindowErrorUtility.js';
+import IBrowserFrame from '../../browser/types/IBrowserFrame.js';
+import ICrossOriginBrowserWindow from '../../window/ICrossOriginBrowserWindow.js';
+import IHTMLIFrameElement from './IHTMLIFrameElement.js';
+import DOMException from '../../exception/DOMException.js';
+import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
+import BrowserFrameURL from '../../browser/utilities/BrowserFrameURL.js';
+import BrowserFrameFactory from '../../browser/utilities/BrowserFrameFactory.js';
+
+/**
+ * HTML Iframe page loader.
+ */
+export default class HTMLIFrameElementPageLoader {
+	#element: IHTMLIFrameElement;
+	#contentWindowContainer: { window: IBrowserWindow | ICrossOriginBrowserWindow | null };
+	#browserParentFrame: IBrowserFrame;
+	#browserIFrame: IBrowserFrame;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param options Options.
+	 * @param options.element Iframe element.
+	 * @param options.browserParentFrame Main browser frame.
+	 * @param options.contentWindowContainer Content window container.
+	 * @param options.contentWindowContainer.window Content window.
+	 */
+	constructor(options: {
+		element: IHTMLIFrameElement;
+		browserParentFrame: IBrowserFrame;
+		contentWindowContainer: { window: IBrowserWindow | ICrossOriginBrowserWindow | null };
+	}) {
+		this.#element = options.element;
+		this.#contentWindowContainer = options.contentWindowContainer;
+		this.#browserParentFrame = options.browserParentFrame;
+	}
+
+	/**
+	 * Loads an iframe page.
+	 */
+	public loadPage(): void {
+		if (!this.#element.isConnected) {
+			if (this.#browserIFrame) {
+				BrowserFrameFactory.destroyFrame(this.#browserIFrame);
+				this.#browserIFrame = null;
+			}
+			this.#contentWindowContainer.window = null;
+			return;
+		}
+
+		const window = this.#element.ownerDocument[PropertySymbol.defaultView];
+		const originURL = this.#browserParentFrame.window.location;
+		const targetURL = BrowserFrameURL.getRelativeURL(this.#browserParentFrame, this.#element.src);
+
+		if (this.#browserIFrame && this.#browserIFrame.window.location.href === targetURL.href) {
+			return;
+		}
+
+		if (this.#browserParentFrame.page.context.browser.settings.disableIframePageLoading) {
+			WindowErrorUtility.dispatchError(
+				this.#element,
+				new DOMException(
+					`Failed to load iframe page "${targetURL.href}". Iframe page loading is disabled.`,
+					DOMExceptionNameEnum.notSupportedError
+				)
+			);
+			return;
+		}
+
+		// Iframes has a special rule for CORS and doesn't allow access between frames when the origin is different.
+		const isSameOrigin = originURL.origin === targetURL.origin || targetURL.origin === 'null';
+		const parentWindow = isSameOrigin ? window : new CrossOriginBrowserWindow(window);
+
+		this.#browserIFrame =
+			this.#browserIFrame ?? BrowserFrameFactory.newChildFrame(this.#browserParentFrame);
+
+		(<IBrowserWindow | ICrossOriginBrowserWindow>(<unknown>this.#browserIFrame.window.top)) =
+			parentWindow;
+		(<IBrowserWindow | ICrossOriginBrowserWindow>(<unknown>this.#browserIFrame.window.parent)) =
+			parentWindow;
+
+		this.#browserIFrame
+			.goto(targetURL.href)
+			.then(() => this.#element.dispatchEvent(new Event('load')))
+			.catch((error) => WindowErrorUtility.dispatchError(this.#element, error));
+
+		this.#contentWindowContainer.window = isSameOrigin
+			? this.#browserIFrame.window
+			: new CrossOriginBrowserWindow(this.#browserIFrame.window, window);
+	}
+
+	/**
+	 * Unloads an iframe page.
+	 */
+	public unloadPage(): void {
+		if (this.#browserIFrame) {
+			BrowserFrameFactory.destroyFrame(this.#browserIFrame);
+			this.#browserIFrame = null;
+		}
+		this.#contentWindowContainer.window = null;
+	}
+}

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

@@ -1,8 +1,8 @@
 import Event from '../../event/Event.js';
-import IWindow from '../../window/IWindow.js';
+import IBrowserWindow from '../../window/IBrowserWindow.js';
 import IDocument from '../document/IDocument.js';
 import IHTMLElement from '../html-element/IHTMLElement.js';
-import IFrameCrossOriginWindow from './IFrameCrossOriginWindow.js';
+import ICrossOriginBrowserWindow from '../../window/ICrossOriginBrowserWindow.js';
 
 /**
  * HTML Iframe Element.
@@ -19,7 +19,7 @@ export default interface IHTMLIFrameElement extends IHTMLElement {
 	sandbox: string | null;
 	srcdoc: string | null;
 	readonly contentDocument: IDocument | null;
-	readonly contentWindow: IWindow | IFrameCrossOriginWindow | null;
+	readonly contentWindow: IBrowserWindow | ICrossOriginBrowserWindow | null;
 
 	// Events
 	onload: (event: Event) => void | null;

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

@@ -1,4 +1,5 @@
 import HTMLElement from '../html-element/HTMLElement.js';
+import * as PropertySymbol from '../../PropertySymbol.js';
 import ValidityState from '../../validity-state/ValidityState.js';
 import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
@@ -40,13 +41,13 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	public formMethod = '';
 
 	// Any type of input
-	public _value = null;
-	public _height = 0;
-	public _width = 0;
+	public [PropertySymbol.value] = null;
+	public [PropertySymbol.height] = 0;
+	public [PropertySymbol.width] = 0;
 
 	// Type specific: checkbox/radio
 	public defaultChecked = false;
-	public _checked: boolean | null = null;
+	public [PropertySymbol.checked]: boolean | null = null;
 
 	// Type specific: file
 	public files: IFileList<File> = new FileList();
@@ -61,9 +62,9 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	public onselectionchange: (event: Event) => void | null = null;
 
 	// Type specific: text/password/search/tel/url/week/month
-	private _selectionStart: number = null;
-	private _selectionEnd: number = null;
-	private _selectionDirection: HTMLInputElementSelectionDirectionEnum =
+	#selectionStart: number = null;
+	#selectionEnd: number = null;
+	#selectionDirection: HTMLInputElementSelectionDirectionEnum =
 		HTMLInputElementSelectionDirectionEnum.none;
 
 	/**
@@ -72,7 +73,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Height.
 	 */
 	public get height(): number {
-		return this._height;
+		return this[PropertySymbol.height];
 	}
 
 	/**
@@ -81,7 +82,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param height Height.
 	 */
 	public set height(height: number) {
-		this._height = height;
+		this[PropertySymbol.height] = height;
 		this.setAttribute('height', String(height));
 	}
 
@@ -91,7 +92,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Width.
 	 */
 	public get width(): number {
-		return this._width;
+		return this[PropertySymbol.width];
 	}
 
 	/**
@@ -100,7 +101,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param width Width.
 	 */
 	public set width(width: number) {
-		this._width = width;
+		this[PropertySymbol.width] = width;
 		this.setAttribute('width', String(width));
 	}
 
@@ -560,8 +561,8 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Checked.
 	 */
 	public get checked(): boolean {
-		if (this._checked !== null) {
-			return this._checked;
+		if (this[PropertySymbol.checked] !== null) {
+			return this[PropertySymbol.checked];
 		}
 		return this.getAttribute('checked') !== null;
 	}
@@ -572,7 +573,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param checked Checked.
 	 */
 	public set checked(checked: boolean) {
-		this._setChecked(checked);
+		this.#setChecked(checked);
 	}
 
 	/**
@@ -596,11 +597,11 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 				return this.files.length > 0 ? '/fake/path/' + this.files[0].name : '';
 		}
 
-		if (this._value === null) {
+		if (this[PropertySymbol.value] === null) {
 			return this.getAttribute('value') || '';
 		}
 
-		return this._value;
+		return this[PropertySymbol.value];
 	}
 
 	/**
@@ -630,13 +631,13 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 				}
 				break;
 			default:
-				const oldValue = this._value;
-				this._value = HTMLInputElementValueSanitizer.sanitize(this, value);
+				const oldValue = this[PropertySymbol.value];
+				this[PropertySymbol.value] = HTMLInputElementValueSanitizer.sanitize(this, value);
 
-				if (oldValue !== this._value) {
-					this._selectionStart = this._value.length;
-					this._selectionEnd = this._value.length;
-					this._selectionDirection = HTMLInputElementSelectionDirectionEnum.none;
+				if (oldValue !== this[PropertySymbol.value]) {
+					this.#selectionStart = this[PropertySymbol.value].length;
+					this.#selectionEnd = this[PropertySymbol.value].length;
+					this.#selectionDirection = HTMLInputElementSelectionDirectionEnum.none;
 				}
 
 				break;
@@ -649,15 +650,15 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Selection start.
 	 */
 	public get selectionStart(): number {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			return null;
 		}
 
-		if (this._selectionStart === null) {
+		if (this.#selectionStart === null) {
 			return this.value.length;
 		}
 
-		return this._selectionStart;
+		return this.#selectionStart;
 	}
 
 	/**
@@ -666,14 +667,14 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param start Start.
 	 */
 	public set selectionStart(start: number) {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			throw new DOMException(
 				`The input element's type (${this.type}) does not support selection.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
-		this.setSelectionRange(start, Math.max(start, this.selectionEnd), this._selectionDirection);
+		this.setSelectionRange(start, Math.max(start, this.selectionEnd), this.#selectionDirection);
 	}
 
 	/**
@@ -682,15 +683,15 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Selection end.
 	 */
 	public get selectionEnd(): number {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			return null;
 		}
 
-		if (this._selectionEnd === null) {
+		if (this.#selectionEnd === null) {
 			return this.value.length;
 		}
 
-		return this._selectionEnd;
+		return this.#selectionEnd;
 	}
 
 	/**
@@ -699,14 +700,14 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param end End.
 	 */
 	public set selectionEnd(end: number) {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			throw new DOMException(
 				`The input element's type (${this.type}) does not support selection.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
-		this.setSelectionRange(this.selectionStart, end, this._selectionDirection);
+		this.setSelectionRange(this.selectionStart, end, this.#selectionDirection);
 	}
 
 	/**
@@ -715,11 +716,11 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Selection direction.
 	 */
 	public get selectionDirection(): string {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			return null;
 		}
 
-		return this._selectionDirection;
+		return this.#selectionDirection;
 	}
 
 	/**
@@ -728,14 +729,14 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param direction Direction.
 	 */
 	public set selectionDirection(direction: string) {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			throw new DOMException(
 				`The input element's type (${this.type}) does not support selection.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
-		this.setSelectionRange(this._selectionStart, this._selectionEnd, direction);
+		this.setSelectionRange(this.#selectionStart, this.#selectionEnd, direction);
 	}
 
 	/**
@@ -766,7 +767,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @returns Form.
 	 */
 	public get form(): IHTMLFormElement {
-		return <IHTMLFormElement>this._formNode;
+		return <IHTMLFormElement>this[PropertySymbol.formNode];
 	}
 
 	/**
@@ -976,13 +977,13 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * Selects the text.
 	 */
 	public select(): void {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			return null;
 		}
 
-		this._selectionStart = 0;
-		this._selectionEnd = this.value.length;
-		this._selectionDirection = HTMLInputElementSelectionDirectionEnum.none;
+		this.#selectionStart = 0;
+		this.#selectionEnd = this.value.length;
+		this.#selectionDirection = HTMLInputElementSelectionDirectionEnum.none;
 
 		this.dispatchEvent(new Event('select', { bubbles: true, cancelable: true }));
 	}
@@ -995,16 +996,16 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 * @param [direction="none"] Direction.
 	 */
 	public setSelectionRange(start: number, end: number, direction = 'none'): void {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			throw new DOMException(
 				`The input element's type (${this.type}) does not support selection.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
-		this._selectionEnd = Math.min(end, this.value.length);
-		this._selectionStart = Math.min(start, this._selectionEnd);
-		this._selectionDirection =
+		this.#selectionEnd = Math.min(end, this.value.length);
+		this.#selectionStart = Math.min(start, this.#selectionEnd);
+		this.#selectionDirection =
 			direction === HTMLInputElementSelectionDirectionEnum.forward ||
 			direction === HTMLInputElementSelectionDirectionEnum.backward
 				? direction
@@ -1027,7 +1028,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 		end: number = null,
 		selectionMode = HTMLInputElementSelectionModeEnum.preserve
 	): void {
-		if (!this._isSelectionSupported()) {
+		if (!this.#isSelectionSupported()) {
 			throw new DOMException(
 				`The input element's type (${this.type}) does not support selection.`,
 				DOMExceptionNameEnum.invalidStateError
@@ -1035,10 +1036,10 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 		}
 
 		if (start === null) {
-			start = this._selectionStart;
+			start = this.#selectionStart;
 		}
 		if (end === null) {
-			end = this._selectionEnd;
+			end = this.#selectionEnd;
 		}
 
 		if (start > end) {
@@ -1052,8 +1053,8 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 		end = Math.min(end, this.value.length);
 
 		const val = this.value;
-		let selectionStart = this._selectionStart;
-		let selectionEnd = this._selectionEnd;
+		let selectionStart = this.#selectionStart;
+		let selectionEnd = this.#selectionEnd;
 
 		this.value = val.slice(0, start) + replacement + val.slice(end);
 
@@ -1152,14 +1153,14 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 		const clone = <HTMLInputElement>super.cloneNode(deep);
 		clone.formAction = this.formAction;
 		clone.formMethod = this.formMethod;
-		clone._value = this._value;
-		clone._height = this._height;
-		clone._width = this._width;
+		clone[PropertySymbol.value] = this[PropertySymbol.value];
+		clone[PropertySymbol.height] = this[PropertySymbol.height];
+		clone[PropertySymbol.width] = this[PropertySymbol.width];
 		clone.defaultChecked = this.defaultChecked;
 		clone.files = <FileList>this.files.slice();
-		clone._selectionStart = this._selectionStart;
-		clone._selectionEnd = this._selectionEnd;
-		clone._selectionDirection = this._selectionDirection;
+		clone.#selectionStart = this.#selectionStart;
+		clone.#selectionEnd = this.#selectionEnd;
+		clone.#selectionDirection = this.#selectionDirection;
 		return clone;
 	}
 
@@ -1184,7 +1185,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 			const inputType = this.type;
 			if (inputType === 'checkbox' || inputType === 'radio') {
 				previousCheckedValue = this.checked;
-				this._setChecked(inputType === 'checkbox' ? !previousCheckedValue : true);
+				this.#setChecked(inputType === 'checkbox' ? !previousCheckedValue : true);
 			}
 		}
 
@@ -1203,12 +1204,12 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 					this.dispatchEvent(new Event('input', { bubbles: true, cancelable: true }));
 					this.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
 				} else if (inputType === 'submit') {
-					const form = <IHTMLFormElement>this._formNode;
+					const form = <IHTMLFormElement>this[PropertySymbol.formNode];
 					if (form) {
 						form.requestSubmit();
 					}
 				} else if (inputType === 'reset' && this.isConnected) {
-					const form = <IHTMLFormElement>this._formNode;
+					const form = <IHTMLFormElement>this[PropertySymbol.formNode];
 					if (form) {
 						form.reset();
 					}
@@ -1226,7 +1227,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 		) {
 			const inputType = this.type;
 			if (inputType === 'checkbox' || inputType === 'radio') {
-				this._setChecked(previousCheckedValue);
+				this.#setChecked(previousCheckedValue);
 			}
 		}
 
@@ -1236,19 +1237,25 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	/**
 	 * @override
 	 */
-	public override _connectToNode(parentNode: INode = null): void {
-		const oldFormNode = <HTMLFormElement>this._formNode;
+	public override [PropertySymbol.connectToNode](parentNode: INode = null): void {
+		const oldFormNode = <HTMLFormElement>this[PropertySymbol.formNode];
 
-		super._connectToNode(parentNode);
+		super[PropertySymbol.connectToNode](parentNode);
 
-		if (oldFormNode !== this._formNode) {
+		if (oldFormNode !== this[PropertySymbol.formNode]) {
 			if (oldFormNode) {
-				oldFormNode._removeFormControlItem(this, this.name);
-				oldFormNode._removeFormControlItem(this, this.id);
+				oldFormNode[PropertySymbol.removeFormControlItem](this, this.name);
+				oldFormNode[PropertySymbol.removeFormControlItem](this, this.id);
 			}
-			if (this._formNode) {
-				(<HTMLFormElement>this._formNode)._appendFormControlItem(this, this.name);
-				(<HTMLFormElement>this._formNode)._appendFormControlItem(this, this.id);
+			if (this[PropertySymbol.formNode]) {
+				(<HTMLFormElement>this[PropertySymbol.formNode])[PropertySymbol.appendFormControlItem](
+					this,
+					this.name
+				);
+				(<HTMLFormElement>this[PropertySymbol.formNode])[PropertySymbol.appendFormControlItem](
+					this,
+					this.id
+				);
 			}
 		}
 	}
@@ -1258,7 +1265,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 *
 	 * @returns "true" if selection is supported.
 	 */
-	private _isSelectionSupported(): boolean {
+	#isSelectionSupported(): boolean {
 		const inputType = this.type;
 		return (
 			inputType === 'text' ||
@@ -1274,16 +1281,18 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	 *
 	 * @param checked Checked.
 	 */
-	private _setChecked(checked: boolean): void {
-		this._checked = checked;
+	#setChecked(checked: boolean): void {
+		this[PropertySymbol.checked] = checked;
 
 		if (checked && this.type === 'radio' && this.name) {
-			const root = <IHTMLElement>(<IHTMLFormElement>this._formNode || this.getRootNode());
+			const root = <IHTMLElement>(
+				(<IHTMLFormElement>this[PropertySymbol.formNode] || this.getRootNode())
+			);
 			const radioButtons = root.querySelectorAll(`input[type="radio"][name="${this.name}"]`);
 
 			for (const radioButton of radioButtons) {
 				if (radioButton !== this) {
-					radioButton['_checked'] = false;
+					radioButton[PropertySymbol.checked] = false;
 				}
 			}
 		}

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

@@ -5,24 +5,26 @@ export default class HTMLInputElementDateUtility {
 	/**
 	 * Returns iso week number from given date
 	 *
+	 * @see https://stackoverflow.com/a/6117889
 	 * @param date Date or number.
 	 * @returns Iso-week string.
 	 */
 	public static dateIsoWeek(date: Date | number): string {
-		date = new Date(date);
-		const day = (date.getUTCDay() + 6) % 7;
-		date.setUTCDate(date.getUTCDate() - day + 3);
-		const firstThursday = date.getTime();
-		date.setUTCMonth(0, 1);
-		if (date.getDay() !== 4) {
-			date.setUTCMonth(0, 1 + ((4 - date.getDay() + 7) % 7));
-		}
-		return (
-			date.getUTCFullYear() +
-			'-W' +
-			String(1 + Math.ceil((firstThursday - date.getTime()) / 604800000)).padStart(2, '0')
+		date = typeof date === 'number' ? new Date(date) : date;
+		// Copy date so don't modify original
+		date = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+		// Set to nearest Thursday: current date + 4 - current day number
+		// Make Sunday's day number 7
+		date.setUTCDate(date.getUTCDate() + 4 - (date.getUTCDay() || 7));
+		// Get first day of year
+		const yearStart = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
+		// Calculate full weeks to nearest Thursday
+		const weekNo = Math.ceil(
+			((<number>(<unknown>date) - <number>(<unknown>yearStart)) / 86400000 + 1) / 7
 		);
+		return `${date.getUTCFullYear()}-W${weekNo < 10 ? '0' : ''}${weekNo}`;
 	}
+
 	/**
 	 * Returns a date object for monday of given iso week string (\d\d\d\d-W\d\d)
 	 *
@@ -37,7 +39,7 @@ export default class HTMLInputElementDateUtility {
 		}
 		const date = new Date(`${Y}-01-01T00:00Z`);
 		const jan4th = new Date(`${Y}-01-04T00:00Z`);
-		const jan4thDay = (jan4th.getDay() + 6) % 7;
+		const jan4thDay = (jan4th.getUTCDay() + 6) % 7;
 		const ordinalDate = 1 + (Number(W) - 1) * 7 - jan4thDay + 3;
 		date.setUTCDate(ordinalDate);
 		if (date.getUTCFullYear() > Number(Y)) {