chore: refactor

frender-rs · Apr 25, 2024 · 77aef42 · 77aef42
1 parent 3a213bb
commit 77aef42
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/crates/frender-macro-core/src/rsx/data.rs b/crates/frender-macro-core/src/rsx/data.rs
@@ -166,4 +166,4 @@ pub enum RsxChild {
     Element(RsxElement),
 }
 
-pub type OptionalCratePathAndRsxChild = crate::utils::prefix_path::PrefixPath<RsxChild>;
+pub struct OptionalCratePathAndRsxChild(pub(super) crate::utils::prefix_path::PrefixPath<RsxChild>);
diff --git a/crates/frender-macro-core/src/rsx/parse.rs b/crates/frender-macro-core/src/rsx/parse.rs
@@ -269,3 +269,9 @@ impl Parse for RsxChild {
         }
     }
 }
+
+impl Parse for OptionalCratePathAndRsxChild {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        Parse::parse(input).map(Self)
+    }
+}
diff --git a/crates/frender-macro-core/src/rsx/to_tokens.rs b/crates/frender-macro-core/src/rsx/to_tokens.rs
@@ -269,3 +269,9 @@ impl RsxChild {
         }
     }
 }
+
+impl OptionalCratePathAndRsxChild {
+    pub fn into_ts(self) -> proc_macro2::TokenStream {
+        self.0.map(RsxChild::into_ts)
+    }
+}
diff --git a/crates/frender-macros/src/lib.rs b/crates/frender-macros/src/lib.rs
@@ -36,5 +36,5 @@ pub fn rsx(input: TokenStream) -> TokenStream {
         }
     };
 
-    value.map(rsx::RsxChild::into_ts).into()
+    value.into_ts().into()
 }