Merge pull request #5 from cwfitzgerald/ref-wasm-abi

Support RefFromWasmAbi
siefkenj · Jan 13, 2024 · d66f68a · d66f68a
2 parents 8cf9ae3 + 96c302f
commit d66f68a
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 5 deletions.
diff --git a/tests/expand/borrow.expanded.rs b/tests/expand/borrow.expanded.rs
@@ -10,7 +10,10 @@ const _: () = {
     extern crate serde as _serde;
     use tsify::Tsify;
     use wasm_bindgen::{
-        convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi},
+        convert::{
+            FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi,
+            RefFromWasmAbi,
+        },
         describe::WasmDescribe, prelude::*,
     };
     #[wasm_bindgen]
@@ -72,4 +75,21 @@ const _: () = {
             <JsType as OptionFromWasmAbi>::is_none(js)
         }
     }
+    pub struct SelfOwner<T>(T);
+    impl<T> ::core::ops::Deref for SelfOwner<T> {
+        type Target = T;
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+    impl<'a> RefFromWasmAbi for Borrow<'a>
+    where
+        Self: _serde::de::DeserializeOwned,
+    {
+        type Abi = <JsType as RefFromWasmAbi>::Abi;
+        type Anchor = SelfOwner<Self>;
+        unsafe fn ref_from_abi(js: Self::Abi) -> Self::Anchor {
+            SelfOwner(Self::from_abi(js))
+        }
+    }
 };
diff --git a/tests/expand/generic_enum.expanded.rs b/tests/expand/generic_enum.expanded.rs
@@ -11,7 +11,10 @@ const _: () = {
     extern crate serde as _serde;
     use tsify::Tsify;
     use wasm_bindgen::{
-        convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi},
+        convert::{
+            FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi,
+            RefFromWasmAbi,
+        },
         describe::WasmDescribe, prelude::*,
     };
     #[wasm_bindgen]
@@ -73,4 +76,21 @@ const _: () = {
             <JsType as OptionFromWasmAbi>::is_none(js)
         }
     }
+    pub struct SelfOwner<T>(T);
+    impl<T> ::core::ops::Deref for SelfOwner<T> {
+        type Target = T;
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+    impl<T, U> RefFromWasmAbi for GenericEnum<T, U>
+    where
+        Self: _serde::de::DeserializeOwned,
+    {
+        type Abi = <JsType as RefFromWasmAbi>::Abi;
+        type Anchor = SelfOwner<Self>;
+        unsafe fn ref_from_abi(js: Self::Abi) -> Self::Anchor {
+            SelfOwner(Self::from_abi(js))
+        }
+    }
 };
diff --git a/tests/expand/generic_struct.expanded.rs b/tests/expand/generic_struct.expanded.rs
@@ -8,7 +8,10 @@ const _: () = {
     extern crate serde as _serde;
     use tsify::Tsify;
     use wasm_bindgen::{
-        convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi},
+        convert::{
+            FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi,
+            RefFromWasmAbi,
+        },
         describe::WasmDescribe, prelude::*,
     };
     #[wasm_bindgen]
@@ -70,6 +73,23 @@ const _: () = {
             <JsType as OptionFromWasmAbi>::is_none(js)
         }
     }
+    pub struct SelfOwner<T>(T);
+    impl<T> ::core::ops::Deref for SelfOwner<T> {
+        type Target = T;
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+    impl<T> RefFromWasmAbi for GenericStruct<T>
+    where
+        Self: _serde::de::DeserializeOwned,
+    {
+        type Abi = <JsType as RefFromWasmAbi>::Abi;
+        type Anchor = SelfOwner<Self>;
+        unsafe fn ref_from_abi(js: Self::Abi) -> Self::Anchor {
+            SelfOwner(Self::from_abi(js))
+        }
+    }
 };
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct GenericNewtype<T>(T);
@@ -78,7 +98,10 @@ const _: () = {
     extern crate serde as _serde;
     use tsify::Tsify;
     use wasm_bindgen::{
-        convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi},
+        convert::{
+            FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi,
+            RefFromWasmAbi,
+        },
         describe::WasmDescribe, prelude::*,
     };
     #[wasm_bindgen]
@@ -140,4 +163,21 @@ const _: () = {
             <JsType as OptionFromWasmAbi>::is_none(js)
         }
     }
+    pub struct SelfOwner<T>(T);
+    impl<T> ::core::ops::Deref for SelfOwner<T> {
+        type Target = T;
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+    impl<T> RefFromWasmAbi for GenericNewtype<T>
+    where
+        Self: _serde::de::DeserializeOwned,
+    {
+        type Abi = <JsType as RefFromWasmAbi>::Abi;
+        type Anchor = SelfOwner<Self>;
+        unsafe fn ref_from_abi(js: Self::Abi) -> Self::Anchor {
+            SelfOwner(Self::from_abi(js))
+        }
+    }
 };
diff --git a/tsify-macros/src/wasm_bindgen.rs b/tsify-macros/src/wasm_bindgen.rs
@@ -48,7 +48,7 @@ pub fn expand(cont: &Container, decl: Decl) -> TokenStream {
             #use_serde
             use tsify::Tsify;
             use wasm_bindgen::{
-                convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi},
+                convert::{FromWasmAbi, IntoWasmAbi, OptionFromWasmAbi, OptionIntoWasmAbi, RefFromWasmAbi},
                 describe::WasmDescribe,
                 prelude::*,
             };
@@ -137,5 +137,25 @@ fn expand_from_wasm_abi(cont: &Container) -> TokenStream {
                 <JsType as OptionFromWasmAbi>::is_none(js)
             }
         }
+
+        pub struct SelfOwner<T>(T);
+
+        impl<T> ::core::ops::Deref for SelfOwner<T> {
+            type Target = T;
+
+            fn deref(&self) -> &Self::Target {
+                &self.0
+            }
+        }
+
+        impl #impl_generics RefFromWasmAbi for #ident #ty_generics #where_clause {
+            type Abi = <JsType as RefFromWasmAbi>::Abi;
+
+            type Anchor = SelfOwner<Self>;
+
+            unsafe fn ref_from_abi(js: Self::Abi) -> Self::Anchor {
+                SelfOwner(Self::from_abi(js))
+            }
+        }
     }
 }