Add support for two argument has and delete in URLSearchParams (#236)

Author: andreiltd

builtins/web/url.cpp

@@ -216,7 +216,14 @@ bool URLSearchParams::delete_(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (!name.data)
     return false;
 
-  jsurl::params_delete(params, &name);
+  if (args.hasDefined(1)) {
+    auto value = core::encode_spec_string(cx, args.get(1));
+    if (!value.data) return false;
+    jsurl::params_delete_kv(params, &name, &value);
+  } else {
+    jsurl::params_delete(params, &name);
+  }
+
   args.rval().setUndefined();
   return true;
 }
@@ -230,7 +237,14 @@ bool URLSearchParams::has(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (!name.data)
     return false;
 
-  args.rval().setBoolean(jsurl::params_has(params, &name));
+  if (args.hasDefined(1)) {
+    auto value = core::encode_spec_string(cx, args.get(1));
+    if (!value.data) return false;
+    args.rval().setBoolean(jsurl::params_has_kv(params, &name, &value));
+  } else {
+    args.rval().setBoolean(jsurl::params_has(params, &name));
+  }
+
   return true;
 }
 

crates/rust-url/rust-url.h

@@ -171,8 +171,12 @@ void params_append(JSUrlSearchParams *params, SpecString name, SpecString value)
 
 void params_delete(JSUrlSearchParams *params, const SpecString *name);
 
+void params_delete_kv(JSUrlSearchParams *params, const SpecString *name, const SpecString *value);
+
 bool params_has(const JSUrlSearchParams *params, const SpecString *name);
 
+bool params_has_kv(JSUrlSearchParams *params, const SpecString *name, const SpecString *value);
+
 SpecSlice params_get(const JSUrlSearchParams *params, const SpecString *name);
 
 void params_at(const JSUrlSearchParams *params, size_t index, JSSearchParam *param_out);

crates/rust-url/src/lib.rs

@@ -278,12 +278,35 @@ pub extern "C" fn params_delete(params: &mut JSUrlSearchParams, name: &SpecStrin
     params.update_url_or_str();
 }
 
+#[no_mangle]
+pub extern "C" fn params_delete_kv(
+    params: &mut JSUrlSearchParams,
+    name: &SpecString,
+    value: &SpecString,
+) {
+    let name: &str = name.into();
+    let value: &str = value.into();
+    params.list.retain(|(k, v)| !(k == name && v == value));
+    params.update_url_or_str();
+}
+
 #[no_mangle]
 pub extern "C" fn params_has(params: &JSUrlSearchParams, name: &SpecString) -> bool {
     let name: &str = name.into();
     params.list.iter().any(|kv| kv.0 == name)
 }
 
+#[no_mangle]
+pub extern "C" fn params_has_kv(
+    params: &JSUrlSearchParams,
+    name: &SpecString,
+    value: &SpecString,
+) -> bool {
+    let name: &str = name.into();
+    let value: &str = value.into();
+    params.list.iter().any(|(k, v)| k == name && v == value)
+}
+
 #[no_mangle]
 pub extern "C" fn params_get<'a>(
     params: &'a JSUrlSearchParams,

tests/wpt-harness/expectations/url/urlsearchparams-delete.any.js.json

@@ -18,9 +18,9 @@
     "status": "PASS"
   },
   "Two-argument delete()": {
-    "status": "FAIL"
+    "status": "PASS"
   },
   "Two-argument delete() respects undefined as second arg": {
-    "status": "FAIL"
+    "status": "PASS"
   }
 }

tests/wpt-harness/expectations/url/urlsearchparams-has.any.js.json

@@ -6,9 +6,9 @@
     "status": "PASS"
   },
   "Two-argument has()": {
-    "status": "FAIL"
+    "status": "PASS"
   },
   "Two-argument has() respects undefined as second arg": {
-    "status": "FAIL"
+    "status": "PASS"
   }
 }