happy-dom 12.8.0 → 12.9.0

package/src/nodes/character-data/CharacterData.ts

@@ -68,7 +68,7 @@ export default abstract class CharacterData extends Node implements ICharacterDa
 					record.target = this;
 					record.type = MutationTypeEnum.characterData;
 					record.oldValue = observer.options.characterDataOldValue ? oldValue : null;
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}

package/src/nodes/document/DocumentReadyStateManager.ts

@@ -7,7 +7,7 @@ export default class DocumentReadyStateManager {
 	private totalTasks = 0;
 	private readyStateCallbacks: (() => void)[] = [];
 	private window: IWindow = null;
-	private timer: NodeJS.Timeout = null;
+	private immediate: NodeJS.Immediate | null = null;
 	private isComplete = false;
 
 	/**
@@ -30,8 +30,8 @@ export default class DocumentReadyStateManager {
 				resolve();
 			} else {
 				this.readyStateCallbacks.push(resolve);
-				if (this.totalTasks === 0 && !this.timer) {
-					this.timer = this.window.setTimeout(this.endTask.bind(this));
+				if (this.totalTasks === 0 && !this.immediate) {
+					this.immediate = this.window.requestAnimationFrame(this.endTask.bind(this));
 				}
 			}
 		});
@@ -45,9 +45,9 @@ export default class DocumentReadyStateManager {
 			return;
 		}
 
-		if (this.timer) {
-			this.window.clearTimeout(this.timer);
-			this.timer = null;
+		if (this.immediate) {
+			this.window.cancelAnimationFrame(this.immediate);
+			this.immediate = null;
 		}
 
 		this.totalTasks++;
@@ -61,9 +61,9 @@ export default class DocumentReadyStateManager {
 			return;
 		}
 
-		if (this.timer) {
-			this.window.clearTimeout(this.timer);
-			this.timer = null;
+		if (this.immediate) {
+			this.window.cancelAnimationFrame(this.immediate);
+			this.immediate = null;
 		}
 
 		this.totalTasks--;

package/src/nodes/element/ElementNamedNodeMap.ts

@@ -103,7 +103,7 @@ export default class ElementNamedNodeMap extends NamedNodeMap {
 					record.type = MutationTypeEnum.attributes;
 					record.attributeName = item.name;
 					record.oldValue = observer.options.attributeOldValue ? oldValue : null;
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}
@@ -164,7 +164,7 @@ export default class ElementNamedNodeMap extends NamedNodeMap {
 					record.type = MutationTypeEnum.attributes;
 					record.attributeName = removedItem.name;
 					record.oldValue = observer.options.attributeOldValue ? removedItem.value : null;
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}

package/src/nodes/node/NodeUtility.ts

@@ -81,7 +81,7 @@ export default class NodeUtility {
 					(<Node>node)._observe(observer);
 				}
 				if (observer.options.childList) {
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}
@@ -121,7 +121,7 @@ export default class NodeUtility {
 			for (const observer of (<Node>ancestorNode)._observers) {
 				(<Node>node)._unobserve(observer);
 				if (observer.options.childList) {
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}
@@ -208,7 +208,7 @@ export default class NodeUtility {
 					(<Node>newNode)._observe(observer);
 				}
 				if (observer.options.childList) {
-					observer.callback([record]);
+					observer.callback([record], observer.observer);
 				}
 			}
 		}

package/src/window/IWindow.ts

@@ -492,16 +492,16 @@ export default interface IWindow extends IEventTarget, INodeJSGlobal {
 	 * Mock animation frames with timeouts.
 	 *
 	 * @param {Function} callback Callback.
-	 * @returns {NodeJS.Timeout} Timeout ID.
+	 * @returns {NodeJS.Timeout} ID.
 	 */
-	requestAnimationFrame(callback: (timestamp: number) => void): NodeJS.Timeout;
+	requestAnimationFrame(callback: (timestamp: number) => void): NodeJS.Immediate;
 
 	/**
 	 * Mock animation frames with timeouts.
 	 *
-	 * @param {NodeJS.Timeout} id Timeout ID.
+	 * @param {NodeJS.Timeout} id ID.
 	 */
-	cancelAnimationFrame(id: NodeJS.Timeout): void;
+	cancelAnimationFrame(id: NodeJS.Immediate): void;
 
 	/**
 	 * This method provides an easy, logical way to fetch resources asynchronously across the network.

package/src/window/Window.ts

@@ -837,12 +837,12 @@ export default class Window extends EventTarget implements IWindow {
 	 */
 	public setTimeout(callback: Function, delay = 0, ...args: unknown[]): NodeJS.Timeout {
 		const id = this._setTimeout(() => {
-			this.happyDOM.asyncTaskManager.endTimer(id);
 			if (this.happyDOM.settings.disableErrorCapturing) {
 				callback(...args);
 			} else {
 				WindowErrorUtility.captureError(this, () => callback(...args));
 			}
+			this.happyDOM.asyncTaskManager.endTimer(id);
 		}, delay);
 		this.happyDOM.asyncTaskManager.startTimer(id);
 		return id;
@@ -896,19 +896,29 @@ export default class Window extends EventTarget implements IWindow {
 	 * Mock animation frames with timeouts.
 	 *
 	 * @param callback Callback.
-	 * @returns Timeout ID.
+	 * @returns ID.
 	 */
-	public requestAnimationFrame(callback: (timestamp: number) => void): NodeJS.Timeout {
-		return this.setTimeout(() => callback(this.performance.now()));
+	public requestAnimationFrame(callback: (timestamp: number) => void): NodeJS.Immediate {
+		const id = global.setImmediate(() => {
+			if (this.happyDOM.settings.disableErrorCapturing) {
+				callback(this.performance.now());
+			} else {
+				WindowErrorUtility.captureError(this, () => callback(this.performance.now()));
+			}
+			this.happyDOM.asyncTaskManager.endImmediate(id);
+		});
+		this.happyDOM.asyncTaskManager.startImmediate(id);
+		return id;
 	}
 
 	/**
 	 * Mock animation frames with timeouts.
 	 *
-	 * @param id Timeout ID.
+	 * @param id ID.
 	 */
-	public cancelAnimationFrame(id: NodeJS.Timeout): void {
-		this.clearTimeout(id);
+	public cancelAnimationFrame(id: NodeJS.Immediate): void {
+		global.clearImmediate(id);
+		this.happyDOM.asyncTaskManager.endImmediate(id);
 	}
 
 	/**
@@ -921,13 +931,12 @@ export default class Window extends EventTarget implements IWindow {
 		const taskId = this.happyDOM.asyncTaskManager.startTask(() => (isAborted = true));
 		this._queueMicrotask(() => {
 			if (!isAborted) {
-				this.happyDOM.asyncTaskManager.endTask(taskId);
-
 				if (this.happyDOM.settings.disableErrorCapturing) {
 					callback();
 				} else {
 					WindowErrorUtility.captureError(this, <() => unknown>callback);
 				}
+				this.happyDOM.asyncTaskManager.endTask(taskId);
 			}
 		});
 	}