improve WebContext parsing. (#1184)

Author: fakeshadow

codegen/CHANGES.md

@@ -1,4 +1,8 @@
 # unreleased 0.4.0
+## Fix
+- fix `xitca_web::WebContext` parsing when generic body type is presented.
+
+## Change
 - macro is refactored to target xitca-web `0.7.0`
 
 # 0.3.1

codegen/src/route.rs

@@ -80,6 +80,7 @@ pub(crate) fn route(attr: Args, input: ItemFn) -> Result<TokenStream, Error> {
     enum State<'a> {
         Partial(&'a Type),
         Full(&'a Type),
+        Default,
     }
 
     let mut state = Vec::new();
@@ -114,13 +115,24 @@ pub(crate) fn route(attr: Args, input: ItemFn) -> Result<TokenStream, Error> {
                         let PathArguments::AngleBracketed(ref arg) = path.arguments else {
                             return Err(Error::new(path.span(), format!("expect &{ident}<'_, _>")));
                         };
-                        match arg.args.last() {
+                        let mut args = arg.args.iter();
+
+                        match args.next() {
+                            Some(GenericArgument::Lifetime(..)) => {}
+                            _ => return Err(Error::new(ty.span(), "expect lifetime param '_")),
+                        }
+
+                        match args.next() {
                             Some(GenericArgument::Type(ref ty)) => {
                                 state.push(State::Full(ty));
-                                break;
+                            }
+                            None => {
+                                state.push(State::Default);
                             }
                             _ => return Err(Error::new(ty.span(), "expect state type.")),
-                        }
+                        };
+
+                        break;
                     }
                     _ => {}
                 }
@@ -152,6 +164,11 @@ pub(crate) fn route(attr: Args, input: ItemFn) -> Result<TokenStream, Error> {
                     state_ident = quote! { #ty };
                     break;
                 }
+                State::Default => {
+                    generic_arg = quote! {};
+                    where_clause = quote! {};
+                    state_ident = quote! {};
+                }
             }
         }
     }

test/Cargo.toml

@@ -17,7 +17,7 @@ xitca-io = "0.4.1"
 xitca-server = { version = "0.5", features = ["quic"] }
 xitca-service = "0.3.0"
 xitca-unsafe-collection = "0.2"
-xitca-web = "0.7"
+xitca-web = { version = "0.7", features = ["codegen"] }
 
 http-ws = { version = "0.4", features = ["stream"] }
 

test/tests/macro.rs

@@ -135,3 +135,27 @@ impl MyError {
         WebResponse::builder().status(*status).body(Default::default()).unwrap()
     }
 }
+
+#[tokio::test]
+async fn web_handler() {
+    #[xitca_web::codegen::route("/", method = get)]
+    async fn test(_: &WebContext<'_>) -> &'static str {
+        ""
+    }
+
+    #[xitca_web::codegen::route("/2", method = get)]
+    async fn test2(_: &WebContext<'_, ()>) -> &'static str {
+        ""
+    }
+
+    #[xitca_web::codegen::route("/3", method = get)]
+    async fn test3(_: &WebContext<'_, (), xitca_web::body::RequestBody>) -> &'static str {
+        ""
+    }
+
+    let _ = xitca_web::App::new()
+        .at_typed(test)
+        .at_typed(test2)
+        .at_typed(test3)
+        .finish();
+}