Skip to content

feat: add (De)Serialize and JsonSchema to Html #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m4tx merged 4 commits into from
Feb 23, 2026
Merged

feat: add (De)Serialize and JsonSchema to Html #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e06b22
feat: add (De)Serialize to `Html`
m4tx Feb 22, 2026
ec7ca12
fixes, add JsonSchema
m4tx Feb 22, 2026
a822aaf
fix
m4tx Feb 22, 2026
4c46cb7
fix deps
m4tx Feb 22, 2026
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion cot-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ http-body-util.workspace = true
http-body.workspace = true
http.workspace = true
indexmap.workspace = true
serde.workspace = true
schemars = { workspace = true, optional = true, features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
serde_html_form = { workspace = true, features = ["de", "std"] }
serde_json.workspace = true
serde_path_to_error.workspace = true
Expand All @@ -47,3 +48,4 @@ tokio.workspace = true
[features]
default = []
json = []
schemars = ["dep:schemars"]
21 changes: 20 additions & 1 deletion cot-core/src/html.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ use std::fmt::Write;

use askama::filters::Escaper;
use derive_more::{Deref, Display, From};
#[cfg(feature = "schemars")]
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

/// A type that represents HTML content as a string.
///
Expand All @@ -65,7 +68,23 @@ use derive_more::{Deref, Display, From};
/// let html = Html::new("<div>Hello</div>");
/// assert_eq!(html.as_str(), "<div>Hello</div>");
/// ```
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Deref, From, Display)]
#[derive(
Debug,
Clone,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Default,
Deref,
From,
Display,
Serialize,
Deserialize,
)]
#[cfg_attr(feature = "schemars", derive(JsonSchema))]
#[serde(transparent)]
pub struct Html(pub String);

impl Html {
Expand Down
4 changes: 2 additions & 2 deletions cot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ multer.workspace = true
password-auth = { workspace = true, features = ["std", "argon2"] }
pin-project-lite.workspace = true
redis = { workspace = true, features = ["aio", "tokio-comp"], optional = true }
schemars = { workspace = true, optional = true }
schemars = { workspace = true, optional = true, features = ["derive"] }
sea-query = { workspace = true, optional = true }
sea-query-binder = { workspace = true, features = ["with-chrono", "runtime-tokio"], optional = true }
serde = { workspace = true, features = ["derive"] }
Expand Down Expand Up @@ -113,7 +113,7 @@ postgres = ["db", "sea-query/backend-postgres", "sea-query-binder/sqlx-postgres"
mysql = ["db", "sea-query/backend-mysql", "sea-query-binder/sqlx-mysql", "sqlx/mysql"]
redis = ["cache", "dep:deadpool-redis", "dep:redis", "json"]
json = ["dep:serde_json", "cot_core/json"]
openapi = ["json", "dep:aide", "dep:schemars"]
openapi = ["json", "cot_core/schemars", "dep:aide", "dep:schemars"]
swagger-ui = ["openapi", "dep:swagger-ui-redist"]
live-reload = ["dep:tower-livereload"]
cache = ["json"]
Expand Down
Loading