feat(ext/web): Implement AbortSignal.prototype.throwIfAborted()

See whatwg/dom#1034.
andreubotella · Dec 10, 2021 · f518bfa · f518bfa
1 parent 542b71e
commit f518bfa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js
@@ -85,6 +85,13 @@
       webidl.assertBranded(this, AbortSignal);
       return this[abortReason];
     }
+
+    throwIfAborted() {
+      webidl.assertBranded(this, AbortSignal);
+      if (this[abortReason] !== undefined) {
+        throw this[abortReason];
+      }
+    }
   }
   defineEventHandler(AbortSignal.prototype, "abort");
 

diff --git a/ext/web/lib.deno_web.d.ts b/ext/web/lib.deno_web.d.ts
@@ -293,6 +293,10 @@ interface AbortSignal extends EventTarget {
     listener: EventListenerOrEventListenerObject,
     options?: boolean | EventListenerOptions,
   ): void;
+
+  /** Throws this AbortSignal's abort reason, if its AbortController has
+   * signaled to abort; otherwise, does nothing. */
+  throwIfAborted(): void;
 }
 
 declare var AbortSignal: {

diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
@@ -4799,16 +4799,8 @@
     "abort": {
       "AbortSignal.any.html": true,
       "AbortSignal.any.worker.html": true,
-      "event.any.html": [
-        "throwIfAborted() should throw abort.reason if signal aborted",
-        "throwIfAborted() should throw primitive abort.reason if signal aborted",
-        "throwIfAborted() should not throw if signal not aborted"
-      ],
-      "event.any.worker.html": [
-        "throwIfAborted() should throw abort.reason if signal aborted",
-        "throwIfAborted() should throw primitive abort.reason if signal aborted",
-        "throwIfAborted() should not throw if signal not aborted"
-      ]
+      "event.any.html": true,
+      "event.any.worker.html": true
     },
     "events": {
       "AddEventListenerOptions-once.any.html": [