url,lib: pass urlsearchparams-constructor.any.js

According to WPT: 1. `URLSearchParams` constructor should throw exactly `TypeError` if any Error occurrs. 2. When a record passed to `URLSearchParams` constructor, two different key may result same after `toUVString()`. We should leave only the later one.
nodejs · Sep 1, 2021 · 7b72a8c · 7b72a8c
1 parent b63e449
commit 7b72a8c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 15 deletions.
diff --git a/lib/internal/per_context/domexception.js b/lib/internal/per_context/domexception.js
@@ -10,18 +10,33 @@ const {
   TypeError,
 } = primordials;
 
-class ERR_INVALID_THIS extends TypeError {
-  constructor(type) {
-    super('Value of "this" must be of ' + type);
-  }
-
-  get code() { return 'ERR_INVALID_THIS'; }
-}
-
 let internalsMap;
 let nameToCodeMap;
 let isInitialized = false;
 
+function throwInvalidThisError(Base, type) {
+  const err = new Base();
+  const key = 'ERR_INVALID_THIS';
+  ObjectDefineProperties(err, {
+    message: {
+      value: `Value of "this" must be of ${type}`,
+      enumerable: false,
+      writable: true,
+      configurable: true,
+    },
+    toString: {
+      value() {
+        return `${this.name} [${key}]: ${this.message}`;
+      },
+      enumerable: false,
+      writable: true,
+      configurable: true,
+    },
+  });
+  err.code = key;
+  throw err;
+}
+
 // We need to instantiate the maps lazily because they render
 // the snapshot non-rehashable.
 // https://bugs.chromium.org/p/v8/issues/detail?id=6593
@@ -51,7 +66,7 @@ class DOMException extends Error {
     ensureInitialized();
     const internals = internalsMap.get(this);
     if (internals === undefined) {
-      throw new ERR_INVALID_THIS('DOMException');
+      throwInvalidThisError(TypeError, 'DOMException');
     }
     return internals.name;
   }
@@ -60,7 +75,7 @@ class DOMException extends Error {
     ensureInitialized();
     const internals = internalsMap.get(this);
     if (internals === undefined) {
-      throw new ERR_INVALID_THIS('DOMException');
+      throwInvalidThisError(TypeError, 'DOMException');
     }
     return internals.message;
   }
@@ -69,7 +84,7 @@ class DOMException extends Error {
     ensureInitialized();
     const internals = internalsMap.get(this);
     if (internals === undefined) {
-      throw new ERR_INVALID_THIS('DOMException');
+      throwInvalidThisError(TypeError, 'DOMException');
     }
     const code = nameToCodeMap.get(internals.name);
     return code === undefined ? 0 : code;

diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -219,6 +219,7 @@ class URLSearchParams {
       } else {
         // Record<USVString, USVString>
         // Need to use reflection APIs for full spec compliance.
+        const visited = {};
         this[searchParams] = [];
         const keys = ReflectOwnKeys(init);
         for (let i = 0; i < keys.length; i++) {
@@ -227,7 +228,15 @@ class URLSearchParams {
           if (desc !== undefined && desc.enumerable) {
             const typedKey = toUSVString(key);
             const typedValue = toUSVString(init[key]);
-            this[searchParams].push(typedKey, typedValue);
+
+            // Two different key may result same after `toUSVString()`, we only
+            // leave the later one. Refers to WPT.
+            if (visited[typedKey] !== undefined) {
+              this[searchParams][visited[typedKey]] = typedValue;
+            } else {
+              this[searchParams].push(typedKey, typedValue);
+              visited[typedKey] = this[searchParams].length - 1;
+            }
           }
         }
       }

diff --git a/test/wpt/status/url.json b/test/wpt/status/url.json
@@ -12,9 +12,6 @@
   "urlencoded-parser.any.js": {
     "fail": "missing Request and Response"
   },
-  "urlsearchparams-constructor.any.js": {
-    "fail": "FormData is not defined"
-  },
   "url-constructor.any.js": {
     "requires": ["small-icu"]
   },

diff --git a/test/wpt/test-url.js b/test/wpt/test-url.js
@@ -11,6 +11,12 @@ runner.setScriptModifier((obj) => {
     // created via `document.createElement`. So we need to ignore them and just
     // test `URL`.
     obj.code = obj.code.replace(/\["url", "a", "area"\]/, '[ "url" ]');
+  } else if (obj.filename.includes('urlsearchparams-constructor.any.js')) {
+    // Ignore test named `URLSearchParams constructor, FormData.` because we do
+    // not have `FormData`.
+    obj.code = obj.code.replace(
+      /('URLSearchParams constructor, object\.'\);[\w\W]+)test\(function\(\) {[\w\W]*?}, 'URLSearchParams constructor, FormData\.'\);/,
+      '$1');
   }
 });
 runner.pretendGlobalThisAs('Window');