#1099@trivial: Adds support for Document.currentScript when loading a…

… script file.
capricorn86 · Sep 30, 2023 · d959f1b · d959f1b
1 parent 2df6512
commit d959f1b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/packages/happy-dom/src/nodes/element/Element.ts b/packages/happy-dom/src/nodes/element/Element.ts
@@ -31,6 +31,7 @@ import EventPhaseEnum from '../../event/EventPhaseEnum.js';
 import CSSStyleDeclaration from '../../css/declaration/CSSStyleDeclaration.js';
 import DocumentFragment from '../document-fragment/DocumentFragment.js';
 import ElementNamedNodeMap from './ElementNamedNodeMap.js';
+import WindowErrorUtility from '../../window/WindowErrorUtility.js';
 
 /**
  * Element.
@@ -931,7 +932,13 @@ export default class Element extends Node implements IElement {
 			const attribute = this.getAttribute('on' + event.type);
 
 			if (attribute && !event._immediatePropagationStopped) {
-				this.ownerDocument.defaultView.eval(attribute);
+				if (this.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
+					this.ownerDocument.defaultView.eval(attribute);
+				} else {
+					WindowErrorUtility.captureError(this.ownerDocument.defaultView, () =>
+						this.ownerDocument.defaultView.eval(attribute)
+					);
+				}
 			}
 		}
 

diff --git a/packages/happy-dom/src/nodes/html-script-element/HTMLScriptElement.ts b/packages/happy-dom/src/nodes/html-script-element/HTMLScriptElement.ts
@@ -189,19 +189,17 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 						type === 'application/x-javascript' ||
 						type.startsWith('text/javascript'))
 				) {
-					try {
-						this.ownerDocument['_currentScript'] = this;
-
-						if (this.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
-							this.ownerDocument.defaultView.eval(textContent);
-						} else {
-							WindowErrorUtility.captureError(this.ownerDocument.defaultView, () =>
-								this.ownerDocument.defaultView.eval(textContent)
-							);
-						}
-					} finally {
-						this.ownerDocument['_currentScript'] = null;
+					this.ownerDocument['_currentScript'] = this;
+
+					if (this.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
+						this.ownerDocument.defaultView.eval(textContent);
+					} else {
+						WindowErrorUtility.captureError(this.ownerDocument.defaultView, () =>
+							this.ownerDocument.defaultView.eval(textContent)
+						);
 					}
+
+					this.ownerDocument['_currentScript'] = null;
 				}
 			}
 		}

diff --git a/packages/happy-dom/src/nodes/html-script-element/HTMLScriptElementUtility.ts b/packages/happy-dom/src/nodes/html-script-element/HTMLScriptElementUtility.ts
@@ -56,13 +56,15 @@ export default class HTMLScriptElementUtility {
 					throw error;
 				}
 			} else {
+				element.ownerDocument['_currentScript'] = element;
 				if (element.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
 					element.ownerDocument.defaultView.eval(code);
 				} else {
 					WindowErrorUtility.captureError(element.ownerDocument.defaultView, () =>
 						element.ownerDocument.defaultView.eval(code)
 					);
 				}
+				element.ownerDocument['_currentScript'] = null;
 				element.dispatchEvent(new Event('load'));
 			}
 		} else {
@@ -81,13 +83,15 @@ export default class HTMLScriptElementUtility {
 					throw error;
 				}
 			} else {
+				element.ownerDocument['_currentScript'] = element;
 				if (element.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
 					element.ownerDocument.defaultView.eval(code);
 				} else {
 					WindowErrorUtility.captureError(element.ownerDocument.defaultView, () =>
 						element.ownerDocument.defaultView.eval(code)
 					);
 				}
+				element.ownerDocument['_currentScript'] = null;
 				element.dispatchEvent(new Event('load'));
 			}
 		}

diff --git a/packages/happy-dom/test/nodes/document/Document.test.ts b/packages/happy-dom/test/nodes/document/Document.test.ts
@@ -36,6 +36,7 @@ import ProcessingInstruction from '../../../src/nodes/processing-instruction/Pro
 import DOMException from '../../../src/exception/DOMException.js';
 import { beforeEach, afterEach, describe, it, expect, vi } from 'vitest';
 import IRequestInit from '../../../src/fetch/types/IRequestInit.js';
+import IShadowRoot from '../../../src/nodes/shadow-root/IShadowRoot.js';
 
 /* eslint-disable jsdoc/require-jsdoc */
 
@@ -277,7 +278,7 @@ describe('Document', () => {
 		it('Returns and sets title.', () => {
 			document.title = 'test title';
 			expect(document.title).toBe('test title');
-			const title = document.head.querySelector('title');
+			const title = <Element>document.head.querySelector('title');
 			expect(title.textContent).toBe('test title');
 			document.title = 'new title';
 			expect(document.title).toBe('new title');
@@ -405,7 +406,7 @@ describe('Document', () => {
 				}
 
 				public connectedCallback(): void {
-					this.shadowRoot.innerHTML = `
+					(<IShadowRoot>this.shadowRoot).innerHTML = `
 						<div>
 							<custom-element-b></custom-element-b>
 						</div>
@@ -419,7 +420,7 @@ describe('Document', () => {
 				}
 
 				public connectedCallback(): void {
-					this.shadowRoot.innerHTML = `
+					(<IShadowRoot>this.shadowRoot).innerHTML = `
 						<div>
 							<button tabindex="0"></button>
 						</div>

diff --git a/packages/happy-dom/test/nodes/html-script-element/HTMLScriptElement.test.ts b/packages/happy-dom/test/nodes/html-script-element/HTMLScriptElement.test.ts
@@ -141,17 +141,18 @@ describe('HTMLScriptElement', () => {
 	describe('set isConnected()', () => {
 		it('Evaluates the text content as code when appended to an element that is connected to the document.', () => {
 			const element = <IHTMLScriptElement>document.createElement('script');
-			element.text = 'globalThis.test = "test";';
+			element.text = 'globalThis.test = "test";globalThis.currentScript = document.currentScript;';
 			document.body.appendChild(element);
 			expect(window['test']).toBe('test');
+			expect(window['currentScript']).toBe(element);
 		});
 
 		it('Evaluates the text content as code when inserted before an element that is connected to the document.', () => {
 			const element = <IHTMLScriptElement>document.createElement('script');
 			const div1 = document.createElement('div');
 			const div2 = document.createElement('div');
 
-			element.text = 'globalThis.test = "test";';
+			element.text = 'globalThis.test = "test";globalThis.currentScript = document.currentScript;';
 
 			div1.appendChild(element);
 
@@ -160,6 +161,7 @@ describe('HTMLScriptElement', () => {
 			document.body.appendChild(element);
 
 			expect(window['test']).toBe('test');
+			expect(window['currentScript']).toBe(element);
 		});
 
 		it('Loads external script asynchronously.', async () => {
@@ -169,7 +171,8 @@ describe('HTMLScriptElement', () => {
 			vi.spyOn(window, 'fetch').mockImplementation((url: IRequestInfo) => {
 				fetchedURL = <string>url;
 				return Promise.resolve(<IResponse>{
-					text: async () => 'globalThis.test = "test";',
+					text: async () =>
+						'globalThis.test = "test";globalThis.currentScript = document.currentScript;',
 					ok: true
 				});
 			});
@@ -188,6 +191,7 @@ describe('HTMLScriptElement', () => {
 			expect((<Event>(<unknown>loadEvent)).target).toBe(script);
 			expect(fetchedURL).toBe('path/to/script/');
 			expect(window['test']).toBe('test');
+			expect(window['currentScript']).toBe(script);
 		});
 
 		it('Triggers error event when loading external script asynchronously.', async () => {
@@ -228,7 +232,7 @@ describe('HTMLScriptElement', () => {
 				(document: IDocument, url: string) => {
 					fetchedDocument = document;
 					fetchedURL = url;
-					return 'globalThis.test = "test";';
+					return 'globalThis.test = "test";globalThis.currentScript = document.currentScript;';
 				}
 			);
 
@@ -244,6 +248,7 @@ describe('HTMLScriptElement', () => {
 			expect(fetchedDocument).toBe(document);
 			expect(fetchedURL).toBe('path/to/script/');
 			expect(window['test']).toBe('test');
+			expect(window['currentScript']).toBe(script);
 		});
 
 		it('Triggers error event when loading external script synchronously with relative URL.', () => {