Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
thiserror = "1.0"
uniffi = "0.27.3"
url = "2.5"
3 changes: 2 additions & 1 deletion wp_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ async-trait = "0.1"
base64 = { workspace = true }
http = { workspace = true }
indoc = "2.0"
url = "2.5"
url = { workspace = true }
parse_link_header = "0.3"
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
uniffi = { workspace = true }
wp_contextual = { path = "../wp_contextual" }
wp_derive_request_builder = { path = "../wp_derive_request_builder", features = [ "generate_request_builder" ] }

[dev-dependencies]
chrono = { version = "0.4" }
Expand Down
16 changes: 16 additions & 0 deletions wp_api/src/request/endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,22 @@ impl ApiBaseUrl {
.expect("ApiBaseUrl is already parsed, so this can't result in an error")
}

pub fn by_extending_and_splitting_by_forward_slash<I>(&self, segments: I) -> Url
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method would probably benefit from some of its own testing

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's address that at a later time. I am not sure if this function will remain or not.

where
I: IntoIterator,
I::Item: AsRef<str>,
{
self.url
.clone()
.extend(segments.into_iter().flat_map(|s| {
s.as_ref()
.split('/')
.map(str::to_string)
.collect::<Vec<String>>()
}))
.expect("ApiBaseUrl is already parsed, so this can't result in an error")
}

fn as_str(&self) -> &str {
self.url.as_str()
}
Expand Down
30 changes: 30 additions & 0 deletions wp_api/src/request/endpoint/users_endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,36 @@ use crate::{SparseUserField, UserDeleteParams, UserId, UserListParams, WpContext

use super::{ApiBaseUrl, ApiEndpointUrl, UrlExtension};

// Temporary mod to showcase `wp_derive_request_builder`
// The generated code can be inspected by running:
// ```
// cargo expand request::endpoint::users_endpoint::generated -p wp_api
// ```
mod generated {
use super::*;

#[derive(wp_derive_request_builder::WpDerivedRequest)]
#[SparseField(SparseUserField)]
enum UsersRequest {
#[contextual_get(url = "/users", params = &UserListParams, output = Vec<crate::SparseUser>)]
List,
#[post(url = "/users", params = &crate::UserCreateParams, output = UserWithEditContext)]
Create,
#[delete(url = "/users/<user_id>", params = &UserDeleteParams, output = crate::UserDeleteResponse)]
Delete,
#[delete(url = "/users/me", params = &UserDeleteParams, output = crate::UserDeleteResponse)]
DeleteMe,
#[contextual_get(url = "/users/<user_id>", output = crate::SparseUser)]
Retrieve,
#[contextual_get(url = "/users/me", output = crate::SparseUser)]
RetrieveMe,
#[post(url = "/users/<user_id>", params = &crate::UserUpdateParams, output = UserWithEditContext)]
Update,
#[post(url = "/users/me", params = &crate::UserUpdateParams, output = UserWithEditContext)]
UpdateMe,
}
}

#[derive(Debug)]
pub(crate) struct UsersEndpoint {
api_base_url: Arc<ApiBaseUrl>,
Expand Down
2 changes: 2 additions & 0 deletions wp_derive_request_builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ name = "tests"
path = "tests/parser_tests.rs"

[dev-dependencies]
rstest = { workspace = true }
trybuild = { version = "1.0", features = ["diff"] }
url = { workspace = true }

[dependencies]
convert_case = "0.6"
Expand Down
175 changes: 175 additions & 0 deletions wp_derive_request_builder/src/generate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
use std::fmt::Display;

use helpers_to_generate_tokens::*;
use proc_macro2::{Span, TokenStream};
use proc_macro_crate::{crate_name, FoundCrate};
use quote::{format_ident, quote};
use strum::IntoEnumIterator;
use strum_macros::EnumIter;
use syn::Ident;

use crate::{
parse::{ParsedEnum, ParsedVariant, RequestType},
sparse_field_attr::SparseFieldAttr,
};

mod helpers_to_generate_tokens;

pub(crate) fn generate_types(parsed_enum: &ParsedEnum) -> syn::Result<TokenStream> {
let config = Config::new(parsed_enum);

Ok(generate_endpoint_type(&config, parsed_enum))
}

fn generate_endpoint_type(config: &Config, parsed_enum: &ParsedEnum) -> TokenStream {
let api_base_url_type = &config.api_base_url_type;
let endpoint_ident = format_ident!("{}Endpoint", parsed_enum.enum_ident);

let functions = parsed_enum.variants.iter().map(|variant| {
let url_parts = variant.attr.url_parts.as_slice();
let params_type = &variant.attr.params;
let request_type = variant.attr.request_type;
let url_from_endpoint = fn_body_get_url_from_api_base_url(url_parts);
let query_pairs = fn_body_query_pairs(params_type, request_type);

ContextAndFilterHandler::from_request_type(request_type)
.into_iter()
.map(|context_and_filter_handler| {
let fn_signature = fn_signature(
PartOf::Endpoint,
&variant.variant_ident,
url_parts,
params_type,
request_type,
context_and_filter_handler,
&config.sparse_field_type,
);
let context_query_pair =
fn_body_context_query_pairs(&config.crate_ident, context_and_filter_handler);
let api_endpoint_url_type = &config.api_endpoint_url_type;
let fields_query_pairs =
fn_body_fields_query_pairs(&config.crate_ident, context_and_filter_handler);
quote! {
pub #fn_signature -> #api_endpoint_url_type {
#url_from_endpoint
#context_query_pair
#query_pairs
#fields_query_pairs
url.into()
}
}
})
.collect::<TokenStream>()
});

quote! {
#[derive(Debug)]
pub struct #endpoint_ident {
api_base_url: #api_base_url_type,
}

impl #endpoint_ident {
pub fn new(api_base_url: #api_base_url_type) -> Self {
Self { api_base_url }
}

#(#functions)*
}
}
}

#[derive(Debug, Clone, Copy)]
pub enum PartOf {
Endpoint,
RequestBuilder,
}

#[derive(Debug, Clone, Copy)]
pub enum ContextAndFilterHandler {
None,
NoFilterTakeContextAsArgument,
NoFilterTakeContextAsFunctionName(WpContext),
FilterTakeContextAsArgument,
FilterNoContext,
}

impl ContextAndFilterHandler {
fn from_request_type(request_type: RequestType) -> Vec<Self> {
match request_type {
crate::parse::RequestType::ContextualGet => {
let mut v: Vec<Self> = WpContext::iter()
.map(Self::NoFilterTakeContextAsFunctionName)
.collect();
v.push(ContextAndFilterHandler::FilterTakeContextAsArgument);
v
}
crate::parse::RequestType::Get => {
vec![
ContextAndFilterHandler::NoFilterTakeContextAsArgument,
ContextAndFilterHandler::FilterTakeContextAsArgument,
]
}
crate::parse::RequestType::Delete | crate::parse::RequestType::Post => {
vec![
ContextAndFilterHandler::None,
ContextAndFilterHandler::FilterNoContext,
]
}
}
}
}

#[derive(Debug, Clone, Copy, EnumIter)]
pub enum WpContext {
Edit,
Embed,
View,
}

impl Display for WpContext {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let s = match self {
WpContext::Edit => "Edit",
WpContext::Embed => "Embed",
WpContext::View => "View",
};
write!(f, "{}", s)
}
}

#[derive(Debug)]
pub struct Config {
pub crate_ident: Ident,
pub api_base_url_type: TokenStream,
pub api_endpoint_url_type: TokenStream,
pub request_builder_type: TokenStream,
pub endpoint_ident: Ident,
pub request_builder_ident: Ident,
pub sparse_field_type: SparseFieldAttr,
}

impl Config {
fn new(parsed_enum: &ParsedEnum) -> Self {
let crate_name = "wp_api";
let found_crate = proc_macro_crate::crate_name(crate_name)
.unwrap_or_else(|_| panic!("{} is not present in `Cargo.toml`", crate_name));

let crate_ident = match found_crate {
FoundCrate::Itself => format_ident!("crate"),
FoundCrate::Name(name) => Ident::new(&name, Span::call_site()),
};
let api_base_url_type =
quote! { std::sync::Arc<#crate_ident::request::endpoint::ApiBaseUrl> };
let api_endpoint_url_type = quote! { #crate_ident::request::endpoint::ApiEndpointUrl };
let request_builder_type = quote! { std::sync::Arc<#crate_ident::request::RequestBuilder> };
Self {
crate_ident,
api_base_url_type,
api_endpoint_url_type,
request_builder_type,
endpoint_ident: format_ident!("{}Endpoint", parsed_enum.enum_ident),
request_builder_ident: format_ident!("{}Builder", parsed_enum.enum_ident),
sparse_field_type: parsed_enum.sparse_field_attr.clone(),
}
}
}
Loading