Add in support for output option type

Author: jonathanKingston

crates/backend/src/codegen.rs

@@ -517,6 +517,10 @@ impl ToTokens for ast::ImportType {
                 fn none() -> Self::Abi { 0 }
             }
 
+            impl<'a> ::wasm_bindgen::convert::OptionIntoWasmAbi for &'a #name {
+                fn none() -> Self::Abi { 0 }
+            }
+
             impl ::wasm_bindgen::convert::FromWasmAbi for #name {
                 type Abi = <::wasm_bindgen::JsValue as
                     ::wasm_bindgen::convert::FromWasmAbi>::Abi;

crates/backend/src/defined.rs

@@ -10,6 +10,20 @@ pub enum ImportedTypeKind {
     Reference,
 }
 
+impl<T> ImportedTypes for Option<T>
+where
+    T: ImportedTypes,
+{
+    fn imported_types<F>(&self, f: &mut F)
+    where
+        F: FnMut(&Ident, ImportedTypeKind),
+    {
+        if let Some(inner) = self {
+            inner.imported_types(f);
+        }
+    }
+}
+
 /// Iterate over definitions of and references to imported types in the AST.
 pub trait ImportedTypes {
     fn imported_types<F>(&self, f: &mut F)
@@ -147,19 +161,74 @@ impl ImportedTypes for syn::TypePath {
     where
         F: FnMut(&Ident, ImportedTypeKind),
     {
-        if self.qself.is_some()
-            || self.path.leading_colon.is_some()
-            || self.path.segments.len() != 1
-        {
-            return;
+        self.qself.imported_types(f);
+        self.path.imported_types(f);
+    }
+}
+
+impl ImportedTypes for syn::QSelf {
+    fn imported_types<F>(&self, _: &mut F)
+    where
+        F: FnMut(&Ident, ImportedTypeKind),
+    {
+        // TODO
+    }
+}
+
+impl ImportedTypes for syn::Path {
+    fn imported_types<F>(&self, f: &mut F)
+    where
+        F: FnMut(&Ident, ImportedTypeKind),
+    {
+        for seg in self.segments.iter() {
+            seg.arguments.imported_types(f);
         }
         f(
-            &self.path.segments.last().unwrap().value().ident,
+            &self.segments.last().unwrap().value().ident,
             ImportedTypeKind::Reference,
         );
     }
 }
 
+impl ImportedTypes for syn::PathArguments {
+    fn imported_types<F>(&self, f: &mut F)
+    where
+        F: FnMut(&Ident, ImportedTypeKind),
+    {
+        match self {
+            syn::PathArguments::AngleBracketed(data) => {
+                for arg in data.args.iter() {
+                    arg.imported_types(f);
+                }
+            }
+//TOCHECK
+            syn::PathArguments::Parenthesized(data) => {
+                for input in data.inputs.iter() {
+                    input.imported_types(f);
+                }
+                // TODO do we need to handle output here? 
+                // https://docs.rs/syn/0.14.0/syn/struct.ParenthesizedGenericArguments.html
+            }
+            syn::PathArguments::None => {}
+        }
+    }
+}
+
+impl ImportedTypes for syn::GenericArgument {
+    fn imported_types<F>(&self, f: &mut F)
+    where
+        F: FnMut(&Ident, ImportedTypeKind),
+    {
+        match self {
+            syn::GenericArgument::Lifetime(_) => {}
+            syn::GenericArgument::Type(ty) => ty.imported_types(f),
+            syn::GenericArgument::Binding(_) => {}, // TODO
+            syn::GenericArgument::Const(_) => {}, // TODO
+        }
+    }
+}
+
+
 impl ImportedTypes for ast::ImportFunction {
     fn imported_types<F>(&self, f: &mut F)
     where

crates/web-sys/tests/all/element.rs

@@ -13,7 +13,11 @@ fn element() {
 
                 #[wasm_bindgen]
                 pub fn test_element(element: &web_sys::Element) {
-                    assert_eq!(element.local_name(), "div", "Shouldn't have a div local name");
+/* Tests needed for:
+  namespace_uri
+*/
+                    assert_eq!(element.prefix(), None, "Shouldn't have a prefix");
+                    assert_eq!(element.local_name(), "div", "Should have a div local name");
                     assert_eq!(element.tag_name(), "div", "Should be a div tag");
                     assert!(!element.has_attribute("id"), "Shouldn't have an id");
                     element.set_id("beep");
@@ -27,7 +31,11 @@ fn element() {
                     assert_eq!(element.class_name(), "", "Shouldn't have a class name");
                     element.set_class_name("test thing");
                     assert_eq!(element.class_name(), "test thing", "Should have a class name");
+                    assert_eq!(element.get_attribute("class").unwrap(), "test thing", "Should have a class name");
                     assert_eq!(element.remove_attribute("class").unwrap(), (), "Should return nothing if removed");
+/* Tests needed for:
+  get_attribute_ns
+*/
 
 /*TODO should we enable toggle_attribute tests? (Firefox Nightly + Chrome canary only)
                     // TODO toggle_attribute should permit a single argument when optional arguments are supported
@@ -44,13 +52,19 @@ fn element() {
                     // TODO check get_attribute here when supported
                     assert_eq!(element.remove_attribute("title").unwrap(), (), "Should return nothing if removed");
                     assert!(!element.has_attribute("title"), "Should not have a title");
+/* Tests needed for:
+  set_attribute_ns
+*/
 
                     assert!(!element.has_attributes(), "Should not have any attributes");
                     assert_eq!(element.set_attribute("title", "boop").unwrap(), (), "Should return nothing if set correctly");
                     assert!(element.has_attributes(), "Should have attributes");
                     assert_eq!(element.remove_attribute("title").unwrap(), (), "Should return nothing if removed");
-
-// closest
+/* Tests needed for:
+  remove_attribute_ns
+  has_attribure_ns
+  closest
+*/
 
                     assert_eq!(element.matches(".this-is-a-thing").unwrap(), false, "Should not match selector");
                     assert_eq!(element.webkit_matches_selector(".this-is-a-thing").unwrap(), false, "Should not match selector");

crates/webidl/src/lib.rs

@@ -82,7 +82,7 @@ fn compile_ast(mut ast: backend::ast::Program) -> String {
     let mut defined = BTreeSet::from_iter(
         vec![
             "str", "char", "bool", "JsValue", "u8", "i8", "u16", "i16", "u32", "i32", "u64", "i64",
-            "usize", "isize", "f32", "f64", "Result", "String", "Vec",
+            "usize", "isize", "f32", "f64", "Result", "String", "Vec", "Option",
         ].into_iter()
             .map(|id| proc_macro2::Ident::new(id, proc_macro2::Span::call_site())),
     );
@@ -533,6 +533,7 @@ impl<'a> WebidlParse<&'a str> for webidl::ast::Iterable {
             return Ok(());
         }
 
+/* TODO
         let throws = util::throws(&self.extended_attributes);
         let return_value = webidl::ast::ReturnType::NonVoid(self.value_type.clone());
         let args = [];
@@ -543,22 +544,23 @@ impl<'a> WebidlParse<&'a str> for webidl::ast::Iterable {
                 &return_value,
                 self_name,
                 false,
-                true, // Should be false
+                false, // Should be false
             )
             .map(wrap_import_function)
             .map(|import| program.imports.push(import));
 
         first_pass
             .create_basic_method(
                 &args,
-                Some(&"item".to_string()),
-                &return_value,
+                Some(&"keys".to_string()),
+                &return_value, // Should be a number
                 self_name,
                 false,
-                true, // Should be false
+                false, // Should be false
             )
             .map(wrap_import_function)
             .map(|import| program.imports.push(import));
+*/
 
         Ok(())
     }