Make URLSearchParams iterable #13022

components/script/dom/urlsearchparams.rs

@@ -5,9 +5,11 @@
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::URLSearchParamsBinding;
 use dom::bindings::codegen::Bindings::URLSearchParamsBinding::URLSearchParamsMethods;
+use dom::bindings::codegen::Bindings::URLSearchParamsBinding::URLSearchParamsWrap;
 use dom::bindings::codegen::UnionTypes::USVStringOrURLSearchParams;
 use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
+use dom::bindings::iterable::Iterable;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::{DOMString, USVString};
@@ -37,7 +39,7 @@ impl URLSearchParams {
 
     pub fn new(global: GlobalRef, url: Option<&URL>) -> Root<URLSearchParams> {
         reflect_dom_object(box URLSearchParams::new_inherited(url), global,
-                           URLSearchParamsBinding::Wrap)
+                           URLSearchParamsWrap)
     }
 
     // https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams
@@ -163,3 +165,40 @@ impl URLSearchParams {
         }
     }
 }
+
+impl URLSearchParams {
+    pub fn sort_list(&self) -> Vec<(String, String)> {
+        let borrowed_list = self.list.borrow();
+        let URLSearchParams_iter = borrowed_list.iter();
+        let mut URLSearchParam_vec = vec![];
+        for URLSearchParam in URLSearchParams_iter {
+            let name = URLSearchParam.0.to_string();
+            let value = URLSearchParam.1.to_string();
+            let name_value = (name, value);
+            URLSearchParam_vec.push(name_value);
+        }
+        URLSearchParam_vec.sort();
+        URLSearchParam_vec
+    }
+}
+
+impl Iterable for URLSearchParams {
+    type Key = USVString;
+    type Value = USVString;
+
+    fn get_iterable_length(&self) -> u32 {
+        self.list.borrow().iter().count() as u32
+    }
+
+    fn get_value_at_index(&self, n: u32) -> USVString {
+        let sorted_URLSearchParam_vec = self.sort_list();
+        let value = sorted_URLSearchParam_vec[n as usize].1.clone();
+        USVString(value)
+    }
+
+    fn get_key_at_index(&self, n: u32) -> USVString {
+        let sorted_URLSearchParam_vec = self.sort_list();
+        let key = sorted_URLSearchParam_vec[n as usize].0.clone();
+        USVString(key)
+    }
+}

components/script/dom/webidls/URLSearchParams.webidl

@@ -16,7 +16,6 @@ interface URLSearchParams {
   void set(USVString name, USVString value);
   // Be careful with implementing iterable interface.
   // Search params might be mutated by URL::SetSearch while iterating (discussed in PR #10351).
-  // iterable<USVString, USVString>;
+  iterable<USVString, USVString>;
   stringifier;
 };
-