Implement #[bind(...)] for Routable macro

examples/router/src/main.rs

@@ -15,14 +15,17 @@ pub enum Route {
     #[at("/posts/:id")]
     Post { id: u64 },
     #[at("/posts")]
-    Posts,
+    Posts {
+        #[bind(query)]
+        page: u64,
+    },
     #[at("/authors/:id")]
     Author { id: u64 },
     #[at("/authors")]
     Authors,
     #[at("/")]
     Home,
-    #[not_found]
+    #[bind(not_found)]
     #[at("/404")]
     NotFound,
 }
@@ -111,7 +114,7 @@ impl Model {
                         <Link<Route> classes=classes!("navbar-item") route=Route::Home>
                             { "Home" }
                         </Link<Route>>
-                        <Link<Route> classes=classes!("navbar-item") route=Route::Posts>
+                        <Link<Route> classes=classes!("navbar-item") route=Route::Posts { page: 1 }>
                             { "Posts" }
                         </Link<Route>>
 
@@ -139,8 +142,8 @@ fn switch(routes: &Route) -> Html {
         Route::Post { id } => {
             html! { <Post seed=*id /> }
         }
-        Route::Posts => {
-            html! { <PostList /> }
+        Route::Posts { page } => {
+            html! { <PostList page=page /> }
         }
         Route::Author { id } => {
             html! { <Author seed=*id /> }

examples/router/src/pages/post_list.rs

@@ -1,6 +1,5 @@
 use crate::components::{pagination::Pagination, post_card::PostCard};
 use crate::Route;
-use serde::{Deserialize, Serialize};
 use yew::prelude::*;
 
 const ITEMS_PER_PAGE: u64 = 10;
@@ -10,37 +9,39 @@ pub enum Msg {
     ShowPage(u64),
 }
 
-#[derive(Serialize, Deserialize)]
-struct PageQuery {
-    page: u64,
+#[derive(Properties, Clone, PartialEq)]
+pub struct Props {
+    pub page: u64,
 }
 
 pub struct PostList {
     link: ComponentLink<Self>,
+    props: Props,
 }
 impl Component for PostList {
     type Message = Msg;
-    type Properties = ();
+    type Properties = Props;
 
-    fn create(_props: Self::Properties, link: ComponentLink<Self>) -> Self {
-        Self { link }
+    fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
+        Self { link, props }
     }
 
     fn update(&mut self, msg: Self::Message) -> ShouldRender {
         match msg {
             Msg::ShowPage(page) => {
-                yew_router::push_route_with_query(Route::Posts, PageQuery { page }).unwrap();
+                yew_router::push_route(Route::Posts { page });
                 true
             }
         }
     }
 
-    fn change(&mut self, _props: Self::Properties) -> ShouldRender {
-        false
+    fn change(&mut self, mut props: Self::Properties) -> ShouldRender {
+        std::mem::swap(&mut self.props, &mut props);
+        props != self.props
     }
 
     fn view(&self) -> Html {
-        let page = self.current_page();
+        let page = self.props.page;
 
         html! {
             <div class="section container">
@@ -58,7 +59,7 @@ impl Component for PostList {
 }
 impl PostList {
     fn view_posts(&self) -> Html {
-        let start_seed = (self.current_page() - 1) * ITEMS_PER_PAGE;
+        let start_seed = (self.props.page - 1) * ITEMS_PER_PAGE;
         let mut cards = (0..ITEMS_PER_PAGE).map(|seed_offset| {
             html! {
                 <li class="list-item mb-5">
@@ -81,10 +82,4 @@ impl PostList {
             </div>
         }
     }
-
-    fn current_page(&self) -> u64 {
-        yew_router::parse_query::<PageQuery>()
-            .map(|it| it.page)
-            .unwrap_or(1)
-    }
 }

packages/yew-router-macro/Cargo.toml

@@ -14,7 +14,7 @@ proc-macro = true
 heck = "0.3.2"
 proc-macro2 = "1.0.24"
 quote = "1.0.9"
-syn = { version = "1.0.64", features = ["full","extra-traits"] }
+syn = { version = "1.0", features = ["full","extra-traits"] }
 
 [dev-dependencies]
 rustversion = "1.0"

packages/yew-router-macro/src/lib.rs

@@ -1,6 +1,6 @@
 mod routable_derive;
-use routable_derive::{routable_derive_impl, Routable};
-use syn::parse_macro_input;
+use routable_derive::routable_derive_impl;
+use syn::{parse_macro_input, DeriveInput};
 
 /// Derive macro used to mark an enum as Routable.
 ///
@@ -23,8 +23,10 @@ use syn::parse_macro_input;
 ///     NotFound,
 /// }
 /// ```
-#[proc_macro_derive(Routable, attributes(at, not_found))]
+#[proc_macro_derive(Routable, attributes(at, bind))]
 pub fn routable_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input = parse_macro_input!(input as Routable);
-    routable_derive_impl(input).into()
+    let input = parse_macro_input!(input as DeriveInput);
+    routable_derive_impl(input)
+        .unwrap_or_else(|it| it.to_compile_error())
+        .into()
 }