tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-08-19 00:00:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

checkpoint

Browse Source
This commit is contained in:
David Pedersen
2022-02-13 13:29:01 +01:00
parent c84d6d66d4
commit 47f5954903
5 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axum-extra/Cargo.toml
+3 -2
View File
@@ -11,7 +11,7 @@ repository = "https://github.com/tokio-rs/axum"
version = "0.1.2"
[features]
erased-json = ["serde", "serde_json"]
erased-json = ["serde_json"]
[dependencies]
axum = { path = "../axum", version = "0.4" }
@@ -19,16 +19,17 @@ bytes = "1.1.0"
http = "0.2"
mime = "0.3"
pin-project-lite = "0.2"
serde = "1.0"
tower = { version = "0.4", default_features = false, features = ["util"] }
tower-http = { version = "0.2", features = ["map-response-body"] }
tower-layer = "0.3"
tower-service = "0.3"
# optional dependencies
serde = { version = "1.0.130", optional = true }
serde_json = { version = "1.0.71", optional = true }
[dev-dependencies]
axum-macros = { path = "../axum-macros", version = "0.1" }
hyper = "0.14"
tokio = { version = "1.14", features = ["full"] }
tower = { version = "0.4", features = ["util"] }
axum-extra/src/routing/mod.rs
+1 -1
View File
@@ -3,7 +3,7 @@
use axum::{body::Body, Router};
mod resource;
mod typed_path;
pub mod typed_path;
pub use self::{resource::Resource, typed_path::TypedPath};
axum-extra/src/routing/typed_path.rs
+19 -4
View File
@@ -1,10 +1,25 @@
#![allow(missing_docs)]
use axum::extract::{FromRequest, Path};
use serde::de::DeserializeOwned;
use std::borrow::Cow;
/// TODO
pub trait TypedPath {
/// TODO
/// ```rust
/// use axum_macros::TypedPath;
///
/// #[derive(TypedPath)]
/// #[typed_path("/users/:id")]
/// struct UsersShow {
/// id: u32,
/// }
/// ```
pub trait TypedPath<B>: FromRequest<B> + DeserializeOwned {
const PATH: &'static str;
/// TODO
fn path(&self) -> Cow<'static, str>;
}
// pub trait FirstElementIsPath {}
// impl<P> FirstElementIsPath for (Path<P>,) {}
// impl<P, T1> FirstElementIsPath for (Path<P>, T1) {}
// impl<P, T1, T2> FirstElementIsPath for (Path<P>, T1, T2) {}
axum-macros/src/typed_path.rs
+48 -36
View File
@@ -1,51 +1,42 @@
use proc_macro2::{Span, TokenStream};
use quote::{format_ident, quote};
use quote::{format_ident, quote_spanned};
use syn::{ItemStruct, LitStr};
pub(crate) fn expand(item_struct: ItemStruct) -> syn::Result<TokenStream> {
let ItemStruct {
attrs,
vis: _,
struct_token: _,
ident,
generics,
fields,
semi_token: _,
..
} = &item_struct;
if !generics.params.is_empty() || generics.where_clause.is_some() {
return Err(syn::Error::new_spanned(
generics,
"`#[derive(TypePath)]` doesn't support generics",
));
}
let Attrs { path } = parse_attrs(attrs)?;
match fields {
syn::Fields::Named(_) => {
let segments = parse_path(&path);
Ok(expand_named_fields(ident, path, &segments))
Ok(expand_named_fields(ident, generics, path, &segments))
}
syn::Fields::Unnamed(fields) => {
let segments = parse_path(&path);
expand_unnamed_fields(fields, ident, path, &segments)
expand_unnamed_fields(fields, ident, generics, path, &segments)
}
syn::Fields::Unit => Ok(expand_unit_fields(ident, path)),
syn::Fields::Unit => Ok(expand_unit_fields(ident, generics, path)),
}
}
#[derive(Debug)]
struct Attrs {
path: String,
path: LitStr,
}
fn parse_attrs(attrs: &[syn::Attribute]) -> syn::Result<Attrs> {
let mut path = None::<String>;
let mut path = None;
for attr in attrs {
if attr.path.is_ident("typed_path") {
path = Some(attr.parse_args::<LitStr>()?.value());
path = Some(attr.parse_args()?);
}
}
@@ -59,13 +50,22 @@ fn parse_attrs(attrs: &[syn::Attribute]) -> syn::Result<Attrs> {
})
}
fn expand_named_fields(ident: &syn::Ident, path: String, segments: &[Segment]) -> TokenStream {
fn expand_named_fields(
ident: &syn::Ident,
generics: &syn::Generics,
path: LitStr,
segments: &[Segment],
) -> TokenStream {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
let format_str = format_str_from_path(segments);
let captures = captures_from_path(segments);
quote! {
quote_spanned! {path.span()=>
#[automatically_derived]
impl ::axum_extra::routing::TypedPath for #ident {
impl #impl_generics ::axum_extra::routing::TypedPath for #ident
#ty_generics #where_clause
{
const PATH: &'static str = #path;
fn path(&self) -> ::std::borrow::Cow<'static, str> {
@@ -79,13 +79,16 @@ fn expand_named_fields(ident: &syn::Ident, path: String, segments: &[Segment]) -
fn expand_unnamed_fields(
fields: &syn::FieldsUnnamed,
ident: &syn::Ident,
path: String,
generics: &syn::Generics,
path: LitStr,
segments: &[Segment],
) -> syn::Result<TokenStream> {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
let num_captures = segments
.iter()
.filter(|segment| match segment {
Segment::Capture(_) => true,
Segment::Capture(_, _) => true,
Segment::Static(_) => false,
})
.count();
@@ -104,7 +107,7 @@ fn expand_unnamed_fields(
let destructure_self = segments
.iter()
.filter_map(|segment| match segment {
Segment::Capture(capture) => Some(capture),
Segment::Capture(capture, _) => Some(capture),
Segment::Static(_) => None,
})
.enumerate()
@@ -113,8 +116,8 @@ fn expand_unnamed_fields(
index: idx as _,
span: Span::call_site(),
};
let capture = format_ident!("{}", capture);
quote! {
let capture = format_ident!("{}", capture, span = path.span());
quote_spanned! {path.span()=>
#idx: #capture,
}
});
@@ -122,9 +125,11 @@ fn expand_unnamed_fields(
let format_str = format_str_from_path(segments);
let captures = captures_from_path(segments);
Ok(quote! {
Ok(quote_spanned! {path.span()=>
#[automatically_derived]
impl ::axum_extra::routing::TypedPath for #ident {
impl #impl_generics ::axum_extra::routing::TypedPath for #ident
#ty_generics #where_clause
{
const PATH: &'static str = #path;
fn path(&self) -> ::std::borrow::Cow<'static, str> {
@@ -143,10 +148,14 @@ fn simple_pluralize(count: usize, word: &str) -> String {
}
}
fn expand_unit_fields(ident: &syn::Ident, path: String) -> TokenStream {
quote! {
fn expand_unit_fields(ident: &syn::Ident, generics: &syn::Generics, path: LitStr) -> TokenStream {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
quote_spanned! {path.span()=>
#[automatically_derived]
impl ::axum_extra::routing::TypedPath for #ident {
impl #impl_generics ::axum_extra::routing::TypedPath for #ident
#ty_generics #where_clause
{
const PATH: &'static str = #path;
fn path(&self) -> ::std::borrow::Cow<'static, str> {
@@ -160,7 +169,7 @@ fn format_str_from_path(segments: &[Segment]) -> String {
segments
.iter()
.map(|segment| match segment {
Segment::Capture(capture) => format!("{{{}}}", capture),
Segment::Capture(capture, _) => format!("{{{}}}", capture),
Segment::Static(segment) => segment.to_owned(),
})
.collect::<Vec<_>>()
@@ -171,17 +180,20 @@ fn captures_from_path(segments: &[Segment]) -> Vec<syn::Ident> {
segments
.iter()
.filter_map(|segment| match segment {
Segment::Capture(capture) => Some(format_ident!("{}", capture)),
Segment::Capture(capture, span) => {
Some(format_ident!("{}", capture, span = span.clone()))
}
Segment::Static(_) => None,
})
.collect::<Vec<_>>()
}
fn parse_path(path: &str) -> Vec<Segment> {
path.split('/')
fn parse_path(path: &LitStr) -> Vec<Segment> {
path.value()
.split('/')
.map(|segment| {
if let Some(capture) = segment.strip_prefix(':') {
Segment::Capture(capture.to_owned())
Segment::Capture(capture.to_owned(), path.span())
} else {
Segment::Static(segment.to_owned())
}
@@ -190,6 +202,6 @@ fn parse_path(path: &str) -> Vec<Segment> {
}
enum Segment {
Capture(String),
Capture(String, Span),
Static(String),
}
examples/hello-world/src/main.rs
+9 -9
View File
@@ -31,13 +31,13 @@ async fn main() {
#[typed_path("/users")]
struct UsersIndex;
#[derive(Deserialize, TypedPath)]
#[typed_path("/users/:id/teams/:team_id")]
struct UsersShow {
id: u32,
team_id: u32,
}
// #[derive(Deserialize, TypedPath)]
// #[typed_path("/users/:id/teams/:team_id")]
// struct UsersShow {
// id: u32,
// team_id: u32,
// }
#[derive(Deserialize, TypedPath)]
#[typed_path("/users/:id/edit")]
struct UsersEdit(u32);
// #[derive(Deserialize, TypedPath)]
// #[typed_path("/users/:id/edit")]
// struct UsersEdit(u32);