Implement #[wasm_bindgen(extends = ...)]

This commit implements the `extends` attribute for `#[wasm_bindgen]` to
statically draw the inheritance hierarchy in the generated bindings, generating
appropriate `AsRef`, `AsMut`, and `From` implementations.

Author: alexcrichton

crates/backend/src/ast.rs

@@ -125,6 +125,7 @@ pub struct ImportType {
     pub attrs: Vec<syn::Attribute>,
     pub doc_comment: Option<String>,
     pub instanceof_shim: String,
+    pub extends: Vec<Ident>,
 }
 
 #[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))]

crates/backend/src/codegen.rs

@@ -656,6 +656,31 @@ impl ToTokens for ast::ImportType {
                 ()
             };
         }).to_tokens(tokens);
+
+        for superclass in self.extends.iter() {
+            (quote! {
+                impl From<#name> for #superclass {
+                    fn from(obj: #name) -> #superclass {
+                        use wasm_bindgen::JsCast;
+                        #superclass::unchecked_from_js(obj.into())
+                    }
+                }
+
+                impl AsRef<#superclass> for #name {
+                    fn as_ref(&self) -> &#superclass {
+                        use wasm_bindgen::JsCast;
+                        #superclass::unchecked_from_js_ref(self.as_ref())
+                    }
+                }
+
+                impl AsMut<#superclass> for #name {
+                    fn as_mut(&mut self) -> &mut #superclass {
+                        use wasm_bindgen::JsCast;
+                        #superclass::unchecked_from_js_mut(self.as_mut())
+                    }
+                }
+            }).to_tokens(tokens);
+        }
     }
 }
 

crates/macro-support/src/parser.rs

@@ -158,6 +158,16 @@ impl BindgenAttrs {
             })
             .next()
     }
+
+    /// Return the list of classes that a type extends
+    fn extends(&self) -> impl Iterator<Item = &Ident> {
+        self.attrs
+            .iter()
+            .filter_map(|a| match a {
+                BindgenAttr::Extends(s) => Some(s),
+                _ => None,
+            })
+    }
 }
 
 impl syn::synom::Synom for BindgenAttrs {
@@ -190,6 +200,7 @@ pub enum BindgenAttr {
     Readonly,
     JsName(String),
     JsClass(String),
+    Extends(Ident),
 }
 
 impl syn::synom::Synom for BindgenAttr {
@@ -262,6 +273,13 @@ impl syn::synom::Synom for BindgenAttr {
             s: syn!(syn::LitStr) >>
             (s.value())
         )=> { BindgenAttr::JsClass }
+        |
+        do_parse!(
+            call!(term, "extends") >>
+            punct!(=) >>
+            ns: call!(term2ident) >>
+            (ns)
+        )=> { BindgenAttr::Extends }
     ));
 }
 
@@ -478,17 +496,18 @@ impl<'a> ConvertToAst<(BindgenAttrs, &'a Option<String>)> for syn::ForeignItemFn
     }
 }
 
-impl ConvertToAst<()> for syn::ForeignItemType {
+impl ConvertToAst<BindgenAttrs> for syn::ForeignItemType {
     type Target = ast::ImportKind;
 
-    fn convert(self, (): ()) -> Result<Self::Target, Diagnostic> {
+    fn convert(self, attrs: BindgenAttrs) -> Result<Self::Target, Diagnostic> {
         let shim = format!("__wbg_instanceof_{}_{}", self.ident, ShortHash(&self.ident));
         Ok(ast::ImportKind::Type(ast::ImportType {
             vis: self.vis,
             attrs: self.attrs,
             doc_comment: None,
             instanceof_shim: shim,
             name: self.ident,
+            extends: attrs.extends().cloned().collect(),
         }))
     }
 }
@@ -895,7 +914,7 @@ impl<'a> MacroParse<&'a BindgenAttrs> for syn::ForeignItem {
         let js_namespace = item_opts.js_namespace().or(opts.js_namespace()).cloned();
         let kind = match self {
             syn::ForeignItem::Fn(f) => f.convert((item_opts, &module))?,
-            syn::ForeignItem::Type(t) => t.convert(())?,
+            syn::ForeignItem::Type(t) => t.convert(item_opts)?,
             syn::ForeignItem::Static(s) => s.convert(item_opts)?,
             _ => panic!("only foreign functions/types allowed for now"),
         };

crates/webidl/src/first_pass.rs

@@ -17,6 +17,7 @@ use weedle;
 
 use super::Result;
 use util;
+use util::camel_case_ident;
 
 /// Collection of constructs that may use partial.
 #[derive(Default)]
@@ -36,6 +37,7 @@ pub(crate) struct InterfaceData<'src> {
     pub(crate) partial: bool,
     pub(crate) global: bool,
     pub(crate) operations: BTreeMap<OperationId<'src>, OperationData<'src>>,
+    pub(crate) superclass: Option<&'src str>,
 }
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -143,6 +145,7 @@ impl<'src> FirstPass<'src, ()> for weedle::InterfaceDefinition<'src> {
                 .entry(self.identifier.0)
                 .or_insert_with(Default::default);
             interface.partial = false;
+            interface.superclass = self.inheritance.map(|s| s.identifier.0);
         }
 
         if util::is_chrome_only(&self.attributes) {
@@ -173,6 +176,7 @@ impl<'src> FirstPass<'src, ()> for weedle::PartialInterfaceDefinition<'src> {
                     partial: true,
                     operations: Default::default(),
                     global: false,
+                    superclass: None,
                 },
             );
 
@@ -295,3 +299,27 @@ impl<'src> FirstPass<'src, ()> for weedle::TypedefDefinition<'src> {
         Ok(())
     }
 }
+
+impl<'a> FirstPassRecord<'a> {
+    pub fn all_superclasses<'me>(&'me self, interface: &str)
+        -> impl Iterator<Item = String> + 'me
+    {
+        let mut set = BTreeSet::new();
+        self.fill_superclasses(interface, &mut set);
+        set.into_iter()
+    }
+
+    fn fill_superclasses(&self, interface: &str, set: &mut BTreeSet<String>) {
+        let data = match self.interfaces.get(interface) {
+            Some(data) => data,
+            None => return,
+        };
+        let superclass = match &data.superclass {
+            Some(class) => class,
+            None => return,
+        };
+        if set.insert(camel_case_ident(superclass)) {
+            self.fill_superclasses(superclass, set);
+        }
+    }
+}

crates/webidl/src/lib.rs

@@ -39,6 +39,7 @@ use backend::defined::{ImportedTypeDefinitions, RemoveUndefinedImports};
 use backend::util::{ident_ty, rust_ident, wrap_import_function};
 use failure::ResultExt;
 use heck::{ShoutySnakeCase};
+use proc_macro2::{Ident, Span};
 use weedle::argument::Argument;
 use weedle::attribute::{ExtendedAttribute, ExtendedAttributeList};
 
@@ -246,7 +247,10 @@ impl<'src> WebidlParse<'src, ()> for weedle::InterfaceDefinition<'src> {
                 name: rust_ident(camel_case_ident(self.identifier.0).as_str()),
                 attrs: Vec::new(),
                 doc_comment,
-                instanceof_shim: format!("__widl_instanceof_{}", self.name),
+                instanceof_shim: format!("__widl_instanceof_{}", self.identifier.0),
+                extends: first_pass.all_superclasses(self.identifier.0)
+                    .map(|name| Ident::new(&name, Span::call_site()))
+                    .collect(),
             }),
         });
 

guide/src/design/import-customization.md

@@ -168,3 +168,25 @@ possibilities!
 
   All of these functions will call `console.log` in JS, but each identifier
   will have only one signature in Rust.
+
+* `extends = Bar` - this can be used to say that an imported type extends
+  another type. This will generate `AsRef`, `AsMut`, and `From` impls for
+  converting a type into another given that we statically know the inheritance
+  hierarchy:
+
+  ```rust
+  #[wasm_bindgen]
+  extern {
+      type Foo;
+
+      #[wasm_bindgen(extends = Foo)]
+      type Bar;
+  }
+
+  let x: &Bar = ...;
+  let y: &Foo = x.as_ref(); // zero cost cast
+  ```
+
+  The `extends = ...` attribute can be specified multiple times for longer
+  inheritance chains, and `AsRef` and such impls will be generated for each of
+  the types.

tests/wasm/jscast.js

@@ -4,15 +4,25 @@ class JsCast1 {
   }
   myval() { return this.val; }
 }
+
 class JsCast2 {
 }
+
 class JsCast3 extends JsCast1 {
   constructor() {
     super();
     this.val = 3;
   }
 }
 
+class JsCast4 extends JsCast3 {
+  constructor() {
+    super();
+    this.val = 4;
+  }
+}
+
 exports.JsCast1 = JsCast1;
 exports.JsCast2 = JsCast2;
 exports.JsCast3 = JsCast3;
+exports.JsCast4 = JsCast4;

tests/wasm/jscast.rs

@@ -14,9 +14,15 @@ extern {
     #[wasm_bindgen(constructor)]
     fn new() -> JsCast2;
 
+    #[wasm_bindgen(extends = JsCast1)]
     type JsCast3;
     #[wasm_bindgen(constructor)]
     fn new() -> JsCast3;
+
+    #[wasm_bindgen(extends = JsCast1, extends = JsCast3)]
+    type JsCast4;
+    #[wasm_bindgen(constructor)]
+    fn new() -> JsCast4;
 }
 
 #[wasm_bindgen_test]
@@ -65,4 +71,18 @@ fn method_calling() {
     assert_eq!(a.myval(), 1);
     assert_eq!(b.dyn_ref::<JsCast1>().unwrap().myval(), 3);
     assert_eq!(b.unchecked_ref::<JsCast1>().myval(), 3);
+    let c: &JsCast1 = b.as_ref();
+    assert_eq!(c.myval(), 3);
+}
+
+#[wasm_bindgen_test]
+fn multiple_layers_of_inheritance() {
+    let a = JsCast4::new();
+    assert!(a.is_instance_of::<JsCast4>());
+    assert!(a.is_instance_of::<JsCast3>());
+    assert!(a.is_instance_of::<JsCast1>());
+
+    let _: &JsCast3 = a.as_ref();
+    let b: &JsCast1 = a.as_ref();
+    assert_eq!(b.myval(), 4);
 }