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

1 files changed, 38 insertions, 87 deletions

diff --git a/ext/url/00_url.js b/ext/url/00_url.js
index 7f674e9aa..169cbe3a5 100644
--- a/ext/url/00_url.js
+++ b/ext/url/00_url.js
@@ -104,7 +104,8 @@ class URLSearchParams {
     init = webidl.converters
       ["sequence<sequence<USVString>> or record<USVString, USVString> or USVString"](
         init,
-        { prefix, context: "Argument 1" },
+        prefix,
+        "Argument 1",
       );
     this[webidl.brand] = webidl.brand;
     if (!init) {
@@ -158,14 +159,8 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'append' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 2, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
-    value = webidl.converters.USVString(value, {
-      prefix,
-      context: "Argument 2",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
+    value = webidl.converters.USVString(value, prefix, "Argument 2");
     ArrayPrototypePush(this[_list], [name, value]);
     this.#updateUrlSearch();
   }
@@ -177,10 +172,7 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'append' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
     const list = this[_list];
     let i = 0;
     while (i < list.length) {
@@ -201,10 +193,7 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'getAll' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
     const values = [];
     const entries = this[_list];
     for (let i = 0; i < entries.length; ++i) {
@@ -224,10 +213,7 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'get' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
     const entries = this[_list];
     for (let i = 0; i < entries.length; ++i) {
       const entry = entries[i];
@@ -246,10 +232,7 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'has' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
     return ArrayPrototypeSome(this[_list], (entry) => entry[0] === name);
   }
 
@@ -261,14 +244,8 @@ class URLSearchParams {
     webidl.assertBranded(this, URLSearchParamsPrototype);
     const prefix = "Failed to execute 'set' on 'URLSearchParams'";
     webidl.requiredArguments(arguments.length, 2, prefix);
-    name = webidl.converters.USVString(name, {
-      prefix,
-      context: "Argument 1",
-    });
-    value = webidl.converters.USVString(value, {
-      prefix,
-      context: "Argument 2",
-    });
+    name = webidl.converters.USVString(name, prefix, "Argument 1");
+    value = webidl.converters.USVString(value, prefix, "Argument 2");
 
     const list = this[_list];
 
@@ -372,12 +349,9 @@ class URL {
   constructor(url, base = undefined) {
     const prefix = "Failed to construct 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    url = webidl.converters.DOMString(url, { prefix, context: "Argument 1" });
+    url = webidl.converters.DOMString(url, prefix, "Argument 1");
     if (base !== undefined) {
-      base = webidl.converters.DOMString(base, {
-        prefix,
-        context: "Argument 2",
-      });
+      base = webidl.converters.DOMString(base, prefix, "Argument 2");
     }
     this[webidl.brand] = webidl.brand;
     const status = opUrlParse(url, base);
@@ -392,12 +366,9 @@ class URL {
   static canParse(url, base = undefined) {
     const prefix = "Failed to call 'URL.canParse'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    url = webidl.converters.DOMString(url, { prefix, context: "Argument 1" });
+    url = webidl.converters.DOMString(url, prefix, "Argument 1");
     if (base !== undefined) {
-      base = webidl.converters.DOMString(base, {
-        prefix,
-        context: "Argument 2",
-      });
+      base = webidl.converters.DOMString(base, prefix, "Argument 2");
     }
     const status = opUrlParse(url, base);
     return status === 0 || status === 1;
@@ -467,10 +438,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'hash' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -495,10 +463,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'host' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -523,10 +488,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'hostname' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -550,10 +512,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'href' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     const status = opUrlParse(value);
     this.#serialization = getSerialization(status, value);
     this.#updateComponents();
@@ -606,10 +565,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'password' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -639,10 +595,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'pathname' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -674,10 +627,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'port' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -702,10 +652,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'protocol' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -733,10 +680,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'search' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -773,10 +717,7 @@ class URL {
     webidl.assertBranded(this, URLPrototype);
     const prefix = "Failed to set 'username' on 'URL'";
     webidl.requiredArguments(arguments.length, 1, prefix);
-    value = webidl.converters.DOMString(value, {
-      prefix,
-      context: "Argument 1",
-    });
+    value = webidl.converters.DOMString(value, prefix, "Argument 1");
     try {
       this.#serialization = opUrlReparse(
         this.#serialization,
@@ -827,15 +768,25 @@ function parseUrlEncoded(bytes) {
 webidl
   .converters[
     "sequence<sequence<USVString>> or record<USVString, USVString> or USVString"
-  ] = (V, opts) => {
+  ] = (V, prefix, context, opts) => {
     // Union for (sequence<sequence<USVString>> or record<USVString, USVString> or USVString)
     if (webidl.type(V) === "Object" && V !== null) {
       if (V[SymbolIterator] !== undefined) {
-        return webidl.converters["sequence<sequence<USVString>>"](V, opts);
+        return webidl.converters["sequence<sequence<USVString>>"](
+          V,
+          prefix,
+          context,
+          opts,
+        );
       }
-      return webidl.converters["record<USVString, USVString>"](V, opts);
+      return webidl.converters["record<USVString, USVString>"](
+        V,
+        prefix,
+        context,
+        opts,
+      );
     }
-    return webidl.converters.USVString(V, opts);
+    return webidl.converters.USVString(V, prefix, context, opts);
   };
 
 export {