refactor(webidl): move prefix & context out of converters options bag (#18931)

1 files changed, 23 insertions, 30 deletions

diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js
index 7d46fdf2a..dab34a023 100644
--- a/ext/websocket/01_websocket.js
+++ b/ext/websocket/01_websocket.js
@@ -52,20 +52,25 @@ const {
   TypedArrayPrototypeGetSymbolToStringTag,
 } = primordials;
 
-webidl.converters["sequence<DOMString> or DOMString"] = (V, opts) => {
+webidl.converters["sequence<DOMString> or DOMString"] = (
+  V,
+  prefix,
+  context,
+  opts,
+) => {
   // Union for (sequence<DOMString> or DOMString)
   if (webidl.type(V) === "Object" && V !== null) {
     if (V[SymbolIterator] !== undefined) {
-      return webidl.converters["sequence<DOMString>"](V, opts);
+      return webidl.converters["sequence<DOMString>"](V, prefix, context, opts);
     }
   }
-  return webidl.converters.DOMString(V, opts);
+  return webidl.converters.DOMString(V, prefix, context, opts);
 };
 
-webidl.converters["WebSocketSend"] = (V, opts) => {
+webidl.converters["WebSocketSend"] = (V, prefix, context, opts) => {
   // Union for (Blob or ArrayBufferView or ArrayBuffer or USVString)
   if (ObjectPrototypeIsPrototypeOf(BlobPrototype, V)) {
-    return webidl.converters["Blob"](V, opts);
+    return webidl.converters["Blob"](V, prefix, context, opts);
   }
   if (typeof V === "object") {
     if (
@@ -73,13 +78,13 @@ webidl.converters["WebSocketSend"] = (V, opts) => {
       // deno-lint-ignore prefer-primordials
       ObjectPrototypeIsPrototypeOf(SharedArrayBuffer.prototype, V)
     ) {
-      return webidl.converters["ArrayBuffer"](V, opts);
+      return webidl.converters["ArrayBuffer"](V, prefix, context, opts);
     }
     if (ArrayBufferIsView(V)) {
-      return webidl.converters["ArrayBufferView"](V, opts);
+      return webidl.converters["ArrayBufferView"](V, prefix, context, opts);
     }
   }
-  return webidl.converters["USVString"](V, opts);
+  return webidl.converters["USVString"](V, prefix, context, opts);
 };
 
 /** role */
@@ -158,9 +163,10 @@ class WebSocket extends EventTarget {
   }
   set binaryType(value) {
     webidl.assertBranded(this, WebSocketPrototype);
-    value = webidl.converters.DOMString(value, {
-      prefix: "Failed to set 'binaryType' on 'WebSocket'",
-    });
+    value = webidl.converters.DOMString(
+      value,
+      "Failed to set 'binaryType' on 'WebSocket'",
+    );
     if (value === "blob" || value === "arraybuffer") {
       this[_binaryType] = value;
     }
@@ -177,16 +183,11 @@ class WebSocket extends EventTarget {
     this[webidl.brand] = webidl.brand;
     const prefix = "Failed to construct 'WebSocket'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    url = webidl.converters.USVString(url, {
-      prefix,
-      context: "Argument 1",
-    });
+    url = webidl.converters.USVString(url, prefix, "Argument 1");
     protocols = webidl.converters["sequence<DOMString> or DOMString"](
       protocols,
-      {
-        prefix,
-        context: "Argument 2",
-      },
+      prefix,
+      "Argument 2",
     );
 
     let wsURL;
@@ -304,10 +305,7 @@ class WebSocket extends EventTarget {
     const prefix = "Failed to execute 'send' on 'WebSocket'";
 
     webidl.requiredArguments(arguments.length, 1, prefix);
-    data = webidl.converters.WebSocketSend(data, {
-      prefix,
-      context: "Argument 1",
-    });
+    data = webidl.converters.WebSocketSend(data, prefix, "Argument 1");
 
     if (this[_readyState] !== OPEN) {
       throw new DOMException("readyState not OPEN", "InvalidStateError");
@@ -372,18 +370,13 @@ class WebSocket extends EventTarget {
     const prefix = "Failed to execute 'close' on 'WebSocket'";
 
     if (code !== undefined) {
-      code = webidl.converters["unsigned short"](code, {
-        prefix,
+      code = webidl.converters["unsigned short"](code, prefix, "Argument 1", {
         clamp: true,
-        context: "Argument 1",
       });
     }
 
     if (reason !== undefined) {
-      reason = webidl.converters.USVString(reason, {
-        prefix,
-        context: "Argument 2",
-      });
+      reason = webidl.converters.USVString(reason, prefix, "Argument 2");
     }
 
     if (!this[_server]) {