Merge pull request #18 from Portrucci/fix/router-not-working

removed unnecessary calls to multiple leptos functions

Author: blorbb

Cargo.toml

@@ -17,6 +17,7 @@ leptos-mview-macro = { path = "leptos-mview-macro", version = "0.4.0" }
 trybuild = "1"
 # needs to use ssr for some view-to-HTML features to work.
 leptos = { version = "0.7.0", features = ["ssr", "nightly"] }
+leptos_router = { version = "0.7.0", features = ["ssr", "nightly"] }
 leptos-mview = { path = ".", features = ["nightly"] }
 
 [features]

leptos-mview-core/src/ast/children.rs

@@ -30,7 +30,7 @@ impl ToTokens for NodeChild {
             Self::Element(e) => e.into_token_stream(),
         };
         tokens.extend(quote! {
-            ::leptos::prelude::IntoRender::into_render(#child_tokens)
+            #child_tokens
         });
     }
 }

leptos-mview-core/src/expand.rs

@@ -24,7 +24,7 @@ mod utils;
 #[allow(clippy::wildcard_imports)]
 use utils::*;
 
-/// Converts the children into a `leptos::Fragment::lazy()` token stream.
+/// Converts the children into a `View::new()` token stream.
 ///
 /// Example:
 /// ```ignore
@@ -41,9 +41,7 @@ use utils::*;
 ///     {"b"},
 /// ))
 /// ```
-
-// used in the root or for component children
-pub fn children_fragment_tokens<'a>(
+pub fn root_children_tokens<'a>(
     children: impl Iterator<Item = &'a NodeChild>,
     span: Span,
 ) -> TokenStream {
@@ -54,6 +52,25 @@ pub fn children_fragment_tokens<'a>(
     }
 }
 
+// used for component children
+pub fn children_fragment_tokens<'a>(
+    children: impl Iterator<Item = &'a NodeChild>,
+    span: Span,
+) -> TokenStream {
+    let children = children.collect::<Vec<_>>();
+    let has_multiple_children = children.len() > 1;
+
+    if has_multiple_children {
+        quote_spanned! { span=>
+            ( #( #children, )* )
+        }
+    } else {
+        quote_spanned! { span=>
+            #( #children )*
+        }
+    }
+}
+
 /// Converts an xml (like html, svg or math) element to tokens.
 ///
 /// Returns `None` if the element is not an xml element (custom component).
@@ -291,23 +308,22 @@ pub fn component_to_tokens<const IS_SLOT: bool>(element: &Element) -> Option<Tok
             path.span()=> ::leptos::component::component_props_builder(&#path)
         };
 
+        let directive_paths = (!directive_paths.is_empty()).then(|| {
+            quote! {
+                .add_any_attr((#(#directive_paths,)*))
+            }
+        });
+
         Some(quote! {
-            // the .build() returns `!` if not all props are present.
-            // this causes unreachable code warning in ::leptos::component_view
-            #[allow(unreachable_code)]
-            ::leptos::prelude::View::new(
-                ::leptos::component::component_view(
-                    &#path,
-                    #component_props_builder
-                        #attrs
-                        #children
-                        #slot_children
-                        #build
-                )
-                .add_any_attr((
-                    #(#directive_paths,)*
-                ))
+            ::leptos::component::component_view(
+                &#path,
+                #component_props_builder
+                    #attrs
+                    #children
+                    #slot_children
+                    #build
             )
+            #directive_paths
         })
     }
 }

leptos-mview-core/src/lib.rs

@@ -12,14 +12,13 @@ mod kw;
 mod parse;
 mod span;
 
-use ast::Child;
+use ast::{Child, Children};
+use expand::root_children_tokens;
 use proc_macro2::{Span, TokenStream};
 use proc_macro_error2::abort;
 use quote::quote;
 use syn::spanned::Spanned;
 
-use crate::{ast::Children, expand::children_fragment_tokens};
-
 #[must_use]
 pub fn mview_impl(input: TokenStream) -> TokenStream {
     // return () in case of any errors, to avoid "unexpected end of macro
@@ -54,7 +53,7 @@ pub fn mview_impl(input: TokenStream) -> TokenStream {
             );
         };
 
-        let fragment = children_fragment_tokens(children.element_children(), Span::call_site());
+        let fragment = root_children_tokens(children.element_children(), Span::call_site());
         quote! {
             {
                 #[allow(unused_braces)]

tests/router.rs

@@ -0,0 +1,67 @@
+use leptos::prelude::*;
+use leptos_router::{components::{Route, Router, Routes}, location::RequestUrl, StaticSegment};
+use leptos_mview::mview;
+
+mod utils;
+use utils::check_str;
+
+#[test]
+fn router() {
+    #[component]
+    fn RouterContext(children: ChildrenFn, path: &'static str) -> impl IntoView {
+        // `Router` panicks if it is not provided with a `RequestUrl` context
+        Owner::new().set();
+        provide_context(RequestUrl::new(path));
+
+        mview! {
+            {children()}
+        }
+    }
+
+
+    let router = || mview! {
+        Router {
+            main {
+                Routes
+                    fallback=[mview! { p { "not found" }}]
+                {
+                    Route
+                        path={StaticSegment("")}
+                        view=[mview! { p { "root route" } }];
+
+                    Route
+                        path={StaticSegment("route2")}
+                        view=[mview! { p { "you are on /route2" } }];
+                }
+            }
+        }
+    };
+
+    let router_context1 = mview! {
+        RouterContext
+            path="/"
+        {{
+            router()
+        }}
+    };
+
+    let router_context2 = mview! {
+        RouterContext
+            path="/route2"
+        {{
+            router()
+        }}
+    };
+
+    let router_context3 = mview! {
+        RouterContext
+            path="/does-not-exist"
+        {{
+            router()
+        }}
+    };
+
+    check_str(router_context1, "<p>root route");
+    check_str(router_context2, "<p>you are on /route2");
+    check_str(router_context3, "<p>not found");
+}