fixup! lib,src: replace toUSVString with toWellFormed()

nodejs · Nov 24, 2023 · f69ddee · f69ddee
1 parent db1c688
commit f69ddee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/lib/internal/file.js b/lib/internal/file.js
@@ -55,7 +55,7 @@ class File extends Blob {
       lastModified = DateNow();
     }
 
-    this.#name = StringPrototypeToWellFormed(fileName);
+    this.#name = StringPrototypeToWellFormed(`${fileName}`);
     this.#lastModified = lastModified;
   }
 

diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -368,8 +368,8 @@ class URLSearchParams {
             // Append (innerSequence[0], innerSequence[1]) to querys list.
             ArrayPrototypePush(
               this.#searchParams,
-              StringPrototypeToWellFormed(pair[0]),
-              StringPrototypeToWellFormed(pair[1]),
+              StringPrototypeToWellFormed(`${pair[0]}`),
+              StringPrototypeToWellFormed(`${pair[1]}`),
             );
           } else {
             if (((typeof pair !== 'object' && typeof pair !== 'function') ||
@@ -381,7 +381,7 @@ class URLSearchParams {
 
             for (const element of pair) {
               length++;
-              ArrayPrototypePush(this.#searchParams, StringPrototypeToWellFormed(element));
+              ArrayPrototypePush(this.#searchParams, StringPrototypeToWellFormed(`${element}`));
             }
 
             // If innerSequence's size is not 2, then throw a TypeError.
@@ -400,7 +400,7 @@ class URLSearchParams {
           const desc = ReflectGetOwnPropertyDescriptor(init, key);
           if (desc !== undefined && desc.enumerable) {
             const typedKey = StringPrototypeToWellFormed(key);
-            const typedValue = StringPrototypeToWellFormed(init[key]);
+            const typedValue = StringPrototypeToWellFormed(`${init[key]}`);
 
             // Two different keys may become the same USVString after normalization.
             // In that case, we retain the later one. Refer to WPT.
@@ -417,7 +417,7 @@ class URLSearchParams {
       }
     } else {
       // https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams
-      init = StringPrototypeToWellFormed(init);
+      init = StringPrototypeToWellFormed(`${init}`);
       this.#searchParams = init ? parseParams(init) : [];
     }
   }
@@ -472,8 +472,8 @@ class URLSearchParams {
       throw new ERR_MISSING_ARGS('name', 'value');
     }
 
-    name = StringPrototypeToWellFormed(name);
-    value = StringPrototypeToWellFormed(value);
+    name = StringPrototypeToWellFormed(`${name}`);
+    value = StringPrototypeToWellFormed(`${value}`);
     ArrayPrototypePush(this.#searchParams, name, value);
     if (this.#context) {
       this.#context.search = this.toString();
@@ -489,10 +489,10 @@ class URLSearchParams {
     }
 
     const list = this.#searchParams;
-    name = StringPrototypeToWellFormed(name);
+    name = StringPrototypeToWellFormed(`${name}`);
 
     if (value !== undefined) {
-      value = StringPrototypeToWellFormed(value);
+      value = StringPrototypeToWellFormed(`${value}`);
       for (let i = 0; i < list.length;) {
         if (list[i] === name && list[i + 1] === value) {
           list.splice(i, 2);
@@ -523,7 +523,7 @@ class URLSearchParams {
     }
 
     const list = this.#searchParams;
-    name = StringPrototypeToWellFormed(name);
+    name = StringPrototypeToWellFormed(`${name}`);
     for (let i = 0; i < list.length; i += 2) {
       if (list[i] === name) {
         return list[i + 1];
@@ -542,7 +542,7 @@ class URLSearchParams {
 
     const list = this.#searchParams;
     const values = [];
-    name = StringPrototypeToWellFormed(name);
+    name = StringPrototypeToWellFormed(`${name}`);
     for (let i = 0; i < list.length; i += 2) {
       if (list[i] === name) {
         values.push(list[i + 1]);
@@ -560,10 +560,10 @@ class URLSearchParams {
     }
 
     const list = this.#searchParams;
-    name = StringPrototypeToWellFormed(name);
+    name = StringPrototypeToWellFormed(`${name}`);
 
     if (value !== undefined) {
-      value = StringPrototypeToWellFormed(value);
+      value = StringPrototypeToWellFormed(`${value}`);
     }
 
     for (let i = 0; i < list.length; i += 2) {
@@ -586,8 +586,8 @@ class URLSearchParams {
     }
 
     const list = this.#searchParams;
-    name = StringPrototypeToWellFormed(name);
-    value = StringPrototypeToWellFormed(value);
+    name = StringPrototypeToWellFormed(`${name}`);
+    value = StringPrototypeToWellFormed(`${value}`);
 
     // If there are any name-value pairs whose name is `name`, in `list`, set
     // the value of the first such name-value pair to `value` and remove the
@@ -1010,7 +1010,7 @@ class URL {
   }
 
   set search(value) {
-    const href = bindingUrl.update(this.#context.href, updateActions.kSearch, StringPrototypeToWellFormed(value));
+    const href = bindingUrl.update(this.#context.href, updateActions.kSearch, StringPrototypeToWellFormed(`${value}`));
     if (href) {
       this.#updateContext(href);
     }

diff --git a/lib/util.js b/lib/util.js
@@ -412,7 +412,7 @@ module.exports = {
   promisify,
   stripVTControlCharacters,
   toUSVString(input) {
-    return StringPrototypeToWellFormed(input);
+    return StringPrototypeToWellFormed(`${input}`);
   },
   get transferableAbortSignal() {
     return lazyAbortController().transferableAbortSignal;