mirror of
https://github.com/robertwayne/axum-htmx
synced 2024-12-27 02:39:32 +01:00
Small refactoring
This commit is contained in:
parent
8a461b1135
commit
7279dee47f
2 changed files with 13 additions and 10 deletions
|
@ -98,9 +98,7 @@ In addition to the HxBoosted extractor, the library provides macroses `hx_booste
|
||||||
|
|
||||||
The macro input should have a `layout_fn`, and can have arguments passed from annotated function into `layout_fn`. The macro will call the `layout_fn` if the `HX-Boosted` header is not present, otherwise it will return the response directly.
|
The macro input should have a `layout_fn`, and can have arguments passed from annotated function into `layout_fn`. The macro will call the `layout_fn` if the `HX-Boosted` header is not present, otherwise it will return the response directly.
|
||||||
|
|
||||||
```rust
|
`#[hx_boosted_by(layout_fn [, arg1, agr2, ...])]`
|
||||||
#[hx_boosted_by(layout_fn, [arg1, agr2, ...])]
|
|
||||||
```
|
|
||||||
|
|
||||||
If `layout_fn` is an async function, use `hx_boosted_by_async` instead.
|
If `layout_fn` is an async function, use `hx_boosted_by_async` instead.
|
||||||
|
|
||||||
|
@ -203,6 +201,8 @@ fn router_two() -> Router {
|
||||||
### Example: Macros
|
### Example: Macros
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
|
use axum::extract::Path;
|
||||||
|
use axum::response::Html;
|
||||||
use axum_htmx::hx_boosted_by;
|
use axum_htmx::hx_boosted_by;
|
||||||
|
|
||||||
#[hx_boosted_by(with_layout, page_title)]
|
#[hx_boosted_by(with_layout, page_title)]
|
||||||
|
|
|
@ -76,21 +76,24 @@ pub fn transform_using_template(input: MacroInput, template_fn: ItemFn) -> ItemF
|
||||||
source_fn.sig.inputs.push(hx_boosted_input);
|
source_fn.sig.inputs.push(hx_boosted_input);
|
||||||
|
|
||||||
// pop the last statement and wrap it with if-else
|
// pop the last statement and wrap it with if-else
|
||||||
let modify_stmt = source_fn.block.stmts.pop().unwrap();
|
let source_stmt = source_fn.block.stmts.pop().unwrap();
|
||||||
let modify_stmt = quote!(#modify_stmt).to_string();
|
let source_stmt = quote!(#source_stmt).to_string();
|
||||||
let modify_args = input.fn_args.join("");
|
|
||||||
|
|
||||||
let new_fn_str = quote!(#template_fn)
|
let new_fn_str = quote!(#template_fn)
|
||||||
.to_string()
|
.to_string()
|
||||||
.replace("layout_fn", input.layout_fn.as_str())
|
.replace("layout_fn", input.layout_fn.as_str())
|
||||||
.replace("result_boosted", modify_stmt.as_str())
|
.replace("result_boosted", source_stmt.as_str())
|
||||||
.replace("result_with_layout", modify_stmt.as_str())
|
.replace("result_with_layout", source_stmt.as_str());
|
||||||
.replace(", fn_args", modify_args.as_str());
|
|
||||||
|
|
||||||
|
// add layout_args
|
||||||
|
let layout_args = input.fn_args.join("");
|
||||||
|
let new_fn_str = new_fn_str.replace(", fn_args", layout_args.as_str());
|
||||||
|
|
||||||
|
// parse new_fn_str as ItemFn
|
||||||
let new_fn: ItemFn = parse_str(new_fn_str.as_str()).unwrap();
|
let new_fn: ItemFn = parse_str(new_fn_str.as_str()).unwrap();
|
||||||
let new_fn_stmt = new_fn.block.stmts.first().unwrap().clone();
|
|
||||||
|
|
||||||
// push the new statement to source_fn
|
// push the new statement to source_fn
|
||||||
|
let new_fn_stmt = new_fn.block.stmts.first().unwrap().clone();
|
||||||
source_fn.block.stmts.push(new_fn_stmt);
|
source_fn.block.stmts.push(new_fn_stmt);
|
||||||
|
|
||||||
source_fn.to_owned()
|
source_fn.to_owned()
|
||||||
|
|
Loading…
Reference in a new issue