summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/broadcast_channel/01_broadcast_channel.js4
-rw-r--r--ext/flash/01_http.js1
-rw-r--r--ext/http/01_http.js1
-rw-r--r--ext/web/02_event.js21
-rw-r--r--ext/web/03_abort_signal.js8
-rw-r--r--ext/web/04_global_interfaces.js2
-rw-r--r--ext/web/10_filereader.js2
-rw-r--r--ext/web/13_message_port.js4
-rw-r--r--ext/web/15_performance.js1
-rw-r--r--ext/web/internal.d.ts11
-rw-r--r--ext/websocket/01_websocket.js4
-rw-r--r--runtime/js/10_permissions.js10
-rw-r--r--runtime/js/11_workers.js4
-rw-r--r--runtime/js/30_os.js4
-rw-r--r--runtime/js/99_main.js44
-rw-r--r--tools/wpt/expectation.json2
16 files changed, 74 insertions, 49 deletions
diff --git a/ext/broadcast_channel/01_broadcast_channel.js b/ext/broadcast_channel/01_broadcast_channel.js
index e14b59779..0682a2d5a 100644
--- a/ext/broadcast_channel/01_broadcast_channel.js
+++ b/ext/broadcast_channel/01_broadcast_channel.js
@@ -8,7 +8,9 @@
const core = window.Deno.core;
const ops = core.ops;
const webidl = window.__bootstrap.webidl;
- const { defineEventHandler, setTarget } = window.__bootstrap.event;
+ const { MessageEvent, defineEventHandler, setTarget } =
+ window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const { DOMException } = window.__bootstrap.domException;
const {
ArrayPrototypeIndexOf,
diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js
index 547b6d42e..5e6cb69aa 100644
--- a/ext/flash/01_http.js
+++ b/ext/flash/01_http.js
@@ -7,6 +7,7 @@
const { fromFlashRequest, toInnerResponse, _flash } =
window.__bootstrap.fetch;
const core = window.Deno.core;
+ const { Event } = window.__bootstrap.event;
const {
ReadableStream,
ReadableStreamPrototype,
diff --git a/ext/http/01_http.js b/ext/http/01_http.js
index 588a7da57..ab23cbec0 100644
--- a/ext/http/01_http.js
+++ b/ext/http/01_http.js
@@ -4,6 +4,7 @@
((window) => {
const webidl = window.__bootstrap.webidl;
const { InnerBody } = window.__bootstrap.fetchBody;
+ const { Event } = window.__bootstrap.event;
const { setEventTargetData } = window.__bootstrap.eventTarget;
const { BlobPrototype } = window.__bootstrap.file;
const {
diff --git a/ext/web/02_event.js b/ext/web/02_event.js
index ee64b3719..d915b5f20 100644
--- a/ext/web/02_event.js
+++ b/ext/web/02_event.js
@@ -1471,19 +1471,6 @@
reportException(error);
}
- window[webidl.brand] = webidl.brand;
- window.Event = Event;
- window.EventTarget = EventTarget;
- window.ErrorEvent = ErrorEvent;
- window.CloseEvent = CloseEvent;
- window.MessageEvent = MessageEvent;
- window.CustomEvent = CustomEvent;
- window.ProgressEvent = ProgressEvent;
- window.PromiseRejectionEvent = PromiseRejectionEvent;
- window.dispatchEvent = EventTarget.prototype.dispatchEvent;
- window.addEventListener = EventTarget.prototype.addEventListener;
- window.removeEventListener = EventTarget.prototype.removeEventListener;
- window.reportError = reportError;
window.__bootstrap.eventTarget = {
EventTarget,
setEventTargetData,
@@ -1494,5 +1481,13 @@
setIsTrusted,
setTarget,
defineEventHandler,
+ Event,
+ ErrorEvent,
+ CloseEvent,
+ MessageEvent,
+ CustomEvent,
+ ProgressEvent,
+ PromiseRejectionEvent,
+ reportError,
};
})(this);
diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js
index 39de8d0fc..2fa3c4bcf 100644
--- a/ext/web/03_abort_signal.js
+++ b/ext/web/03_abort_signal.js
@@ -6,8 +6,8 @@
((window) => {
const webidl = window.__bootstrap.webidl;
- const { setIsTrusted, defineEventHandler } = window.__bootstrap.event;
- const { listenerCount } = window.__bootstrap.eventTarget;
+ const { Event, setIsTrusted, defineEventHandler } = window.__bootstrap.event;
+ const { EventTarget, listenerCount } = window.__bootstrap.eventTarget;
const {
Set,
SetPrototypeAdd,
@@ -185,9 +185,9 @@
}
}
- window.AbortSignal = AbortSignal;
- window.AbortController = AbortController;
window.__bootstrap.abortSignal = {
+ AbortSignal,
+ AbortController,
AbortSignalPrototype,
add,
signalAbort,
diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js
index fcf8caea5..503b8fd08 100644
--- a/ext/web/04_global_interfaces.js
+++ b/ext/web/04_global_interfaces.js
@@ -5,7 +5,7 @@
/// <reference path="../../core/internal.d.ts" />
((window) => {
- const { EventTarget } = window;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const {
Symbol,
SymbolToStringTag,
diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js
index c50635ea8..8a76b2e0f 100644
--- a/ext/web/10_filereader.js
+++ b/ext/web/10_filereader.js
@@ -15,6 +15,8 @@
((window) => {
const webidl = window.__bootstrap.webidl;
const { forgivingBase64Encode } = window.__bootstrap.infra;
+ const { ProgressEvent } = window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const { decode, TextDecoder } = window.__bootstrap.encoding;
const { parseMimeType } = window.__bootstrap.mimesniff;
const { DOMException } = window.__bootstrap.domException;
diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js
index 1fbeeaff7..253ed7ecd 100644
--- a/ext/web/13_message_port.js
+++ b/ext/web/13_message_port.js
@@ -12,8 +12,8 @@
const core = window.Deno.core;
const { InterruptedPrototype, ops } = core;
const webidl = window.__bootstrap.webidl;
- const { setEventTargetData } = window.__bootstrap.eventTarget;
- const { defineEventHandler } = window.__bootstrap.event;
+ const { EventTarget, setEventTargetData } = window.__bootstrap.eventTarget;
+ const { MessageEvent, defineEventHandler } = window.__bootstrap.event;
const { DOMException } = window.__bootstrap.domException;
const {
ArrayBufferPrototype,
diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js
index e7eafd533..556cfa774 100644
--- a/ext/web/15_performance.js
+++ b/ext/web/15_performance.js
@@ -18,6 +18,7 @@
const { webidl, structuredClone } = window.__bootstrap;
const consoleInternal = window.__bootstrap.console;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const { opNow } = window.__bootstrap.timers;
const { DOMException } = window.__bootstrap.domException;
diff --git a/ext/web/internal.d.ts b/ext/web/internal.d.ts
index 04309a77e..9e836aac0 100644
--- a/ext/web/internal.d.ts
+++ b/ext/web/internal.d.ts
@@ -70,6 +70,17 @@ declare namespace globalThis {
EventTarget: typeof EventTarget;
};
+ declare var event: {
+ Event: typeof event;
+ ErrorEvent: typeof ErrorEvent;
+ CloseEvent: typeof CloseEvent;
+ MessageEvent: typeof MessageEvent;
+ CustomEvent: typeof CustomEvent;
+ ProgressEvent: typeof ProgressEvent;
+ PromiseRejectionEvent: typeof PromiseRejectionEvent;
+ reportError: typeof reportError;
+ };
+
declare var location: {
getLocationHref(): string | undefined;
};
diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js
index 4b0b4e941..5b364f809 100644
--- a/ext/websocket/01_websocket.js
+++ b/ext/websocket/01_websocket.js
@@ -10,7 +10,9 @@
const webidl = window.__bootstrap.webidl;
const { HTTP_TOKEN_CODE_POINT_RE } = window.__bootstrap.infra;
const { DOMException } = window.__bootstrap.domException;
- const { defineEventHandler } = window.__bootstrap.event;
+ const { Event, ErrorEvent, CloseEvent, MessageEvent, defineEventHandler } =
+ window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const { Blob, BlobPrototype } = globalThis.__bootstrap.file;
const {
ArrayBufferPrototype,
diff --git a/runtime/js/10_permissions.js b/runtime/js/10_permissions.js
index 6aad0677d..f048a5d62 100644
--- a/runtime/js/10_permissions.js
+++ b/runtime/js/10_permissions.js
@@ -2,13 +2,11 @@
"use strict";
((window) => {
- const {
- Event,
- EventTarget,
- Deno: { core: { ops } },
- __bootstrap: { webUtil: { illegalConstructorKey } },
- } = window;
+ const { ops } = Deno.core;
+ const { Event } = window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const { pathFromURL } = window.__bootstrap.util;
+ const { illegalConstructorKey } = window.__bootstrap.webUtil;
const {
ArrayIsArray,
ArrayPrototypeIncludes,
diff --git a/runtime/js/11_workers.js b/runtime/js/11_workers.js
index 5e3253dff..0d05ac671 100644
--- a/runtime/js/11_workers.js
+++ b/runtime/js/11_workers.js
@@ -17,7 +17,9 @@
const { getLocationHref } = window.__bootstrap.location;
const { serializePermissions } = window.__bootstrap.permissions;
const { log } = window.__bootstrap.util;
- const { defineEventHandler } = window.__bootstrap.event;
+ const { ErrorEvent, MessageEvent, defineEventHandler } =
+ window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const {
deserializeJsMessageData,
serializeJsMessageData,
diff --git a/runtime/js/30_os.js b/runtime/js/30_os.js
index c3addd043..4fa71fa83 100644
--- a/runtime/js/30_os.js
+++ b/runtime/js/30_os.js
@@ -4,12 +4,14 @@
((window) => {
const core = window.Deno.core;
const ops = core.ops;
+ const { Event } = window.__bootstrap.event;
+ const { EventTarget } = window.__bootstrap.eventTarget;
const {
Error,
SymbolFor,
} = window.__bootstrap.primordials;
- const windowDispatchEvent = window.dispatchEvent.bind(window);
+ const windowDispatchEvent = EventTarget.prototype.dispatchEvent.bind(window);
function loadavg() {
return ops.op_loadavg();
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index 9934ddcd3..afacd9b34 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -39,6 +39,7 @@ delete Intl.v8BreakIterator;
WeakMapPrototypeSet,
} = window.__bootstrap.primordials;
const util = window.__bootstrap.util;
+ const event = window.__bootstrap.event;
const eventTarget = window.__bootstrap.eventTarget;
const globalInterfaces = window.__bootstrap.globalInterfaces;
const location = window.__bootstrap.location;
@@ -78,6 +79,7 @@ delete Intl.v8BreakIterator;
const errors = window.__bootstrap.errors.errors;
const webidl = window.__bootstrap.webidl;
const domException = window.__bootstrap.domException;
+ const abortSignal = window.__bootstrap.abortSignal;
const { defineEventHandler, reportException } = window.__bootstrap.event;
const { deserializeJsMessageData, serializeJsMessageData } =
window.__bootstrap.messagePort;
@@ -156,7 +158,7 @@ delete Intl.v8BreakIterator;
const message = v[0];
const transferables = v[1];
- const msgEvent = new MessageEvent("message", {
+ const msgEvent = new event.MessageEvent("message", {
cancelable: false,
data: message,
ports: transferables.filter((t) =>
@@ -167,7 +169,7 @@ delete Intl.v8BreakIterator;
try {
globalDispatchEvent(msgEvent);
} catch (e) {
- const errorEvent = new ErrorEvent("error", {
+ const errorEvent = new event.ErrorEvent("error", {
cancelable: true,
message: e.message,
lineno: e.lineNumber ? e.lineNumber + 1 : undefined,
@@ -432,33 +434,35 @@ delete Intl.v8BreakIterator;
// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
const windowOrWorkerGlobalScope = {
+ AbortController: util.nonEnumerable(abortSignal.AbortController),
+ AbortSignal: util.nonEnumerable(abortSignal.AbortSignal),
Blob: util.nonEnumerable(file.Blob),
ByteLengthQueuingStrategy: util.nonEnumerable(
streams.ByteLengthQueuingStrategy,
),
- CloseEvent: util.nonEnumerable(CloseEvent),
+ CloseEvent: util.nonEnumerable(event.CloseEvent),
CompressionStream: util.nonEnumerable(compression.CompressionStream),
CountQueuingStrategy: util.nonEnumerable(
streams.CountQueuingStrategy,
),
CryptoKey: util.nonEnumerable(crypto.CryptoKey),
- CustomEvent: util.nonEnumerable(CustomEvent),
+ CustomEvent: util.nonEnumerable(event.CustomEvent),
DecompressionStream: util.nonEnumerable(compression.DecompressionStream),
DOMException: util.nonEnumerable(domException.DOMException),
- ErrorEvent: util.nonEnumerable(ErrorEvent),
- Event: util.nonEnumerable(Event),
- EventTarget: util.nonEnumerable(EventTarget),
+ ErrorEvent: util.nonEnumerable(event.ErrorEvent),
+ Event: util.nonEnumerable(event.Event),
+ EventTarget: util.nonEnumerable(eventTarget.EventTarget),
File: util.nonEnumerable(file.File),
FileReader: util.nonEnumerable(fileReader.FileReader),
FormData: util.nonEnumerable(formData.FormData),
Headers: util.nonEnumerable(headers.Headers),
- MessageEvent: util.nonEnumerable(MessageEvent),
+ MessageEvent: util.nonEnumerable(event.MessageEvent),
Performance: util.nonEnumerable(performance.Performance),
PerformanceEntry: util.nonEnumerable(performance.PerformanceEntry),
PerformanceMark: util.nonEnumerable(performance.PerformanceMark),
PerformanceMeasure: util.nonEnumerable(performance.PerformanceMeasure),
- PromiseRejectionEvent: util.nonEnumerable(PromiseRejectionEvent),
- ProgressEvent: util.nonEnumerable(ProgressEvent),
+ PromiseRejectionEvent: util.nonEnumerable(event.PromiseRejectionEvent),
+ ProgressEvent: util.nonEnumerable(event.ProgressEvent),
ReadableStream: util.nonEnumerable(streams.ReadableStream),
ReadableStreamDefaultReader: util.nonEnumerable(
streams.ReadableStreamDefaultReader,
@@ -518,9 +522,12 @@ delete Intl.v8BreakIterator;
SubtleCrypto: util.nonEnumerable(crypto.SubtleCrypto),
fetch: util.writable(fetch.fetch),
performance: util.writable(performance.performance),
+ reportError: util.writable(event.reportError),
setInterval: util.writable(timers.setInterval),
setTimeout: util.writable(timers.setTimeout),
structuredClone: util.writable(messagePort.structuredClone),
+ // Branding as a WebIDL object
+ [webidl.brand]: util.nonEnumerable(webidl.brand),
};
const unstableWindowOrWorkerGlobalScope = {
@@ -648,11 +655,14 @@ delete Intl.v8BreakIterator;
continue;
}
- const event = new PromiseRejectionEvent("unhandledrejection", {
- cancelable: true,
- promise,
- reason,
- });
+ const rejectionEvent = new event.PromiseRejectionEvent(
+ "unhandledrejection",
+ {
+ cancelable: true,
+ promise,
+ reason,
+ },
+ );
const errorEventCb = (event) => {
if (event.error === reason) {
@@ -663,12 +673,12 @@ delete Intl.v8BreakIterator;
// if error is thrown during dispatch of "unhandledrejection"
// event.
globalThis.addEventListener("error", errorEventCb);
- globalThis.dispatchEvent(event);
+ globalThis.dispatchEvent(rejectionEvent);
globalThis.removeEventListener("error", errorEventCb);
// If event was not prevented (or "unhandledrejection" listeners didn't
// throw) we will let Rust side handle it.
- if (event.defaultPrevented) {
+ if (rejectionEvent.defaultPrevented) {
ops.op_remove_pending_promise_exception(promise);
}
}
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 8e390a4a3..7b878d7d4 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -1132,9 +1132,7 @@
"Event interface: calling initEvent(DOMString, optional boolean, optional boolean) on new CustomEvent(\"foo\") with too few arguments must throw TypeError",
"EventTarget interface: operation addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean))",
"EventTarget interface: operation removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean))",
- "AbortController interface: existence and properties of interface object",
"AbortController interface: operation abort(optional any)",
- "AbortSignal interface: existence and properties of interface object",
"AbortSignal interface: operation abort(optional any)",
"AbortSignal interface: operation timeout(unsigned long long)",
"AbortSignal interface: attribute onabort"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 04:31:21 +0000