Chore remove explicit schemars deps (#179)

Author: rlebran

Cargo.toml

@@ -43,7 +43,7 @@ proc-macro2 = "1.0"
 proc-macro-error2 = "2.0"
 quote = "1.0"
 regex = ">=1.5.5"
-schemars = { version = "=1.0.0-alpha.21", features = ["chrono04", "uuid1", "url2", "rust_decimal1"] }
+schemars = { version = "=1.0.0-alpha.21", features = ["chrono04", "uuid1", "url2", "rust_decimal1", "preserve_order"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 syn = "2.0"

README.md

@@ -18,16 +18,21 @@
 
 [OASv3.md]: https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md
 
-An OpenAPI documentation tool exposing [OAS 3.0][OASv3.md] models as well as an actix-web wrapper similar
+[OASv3.1.md]: https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.1.md
+
+An OpenAPI documentation tool exposing [OAS 3.0][OASv3.md] and [OpenAPI v3.1.1][OASv3.1.md] models as well as an
+actix-web wrapper similar
 to [paperclip](https://github.com/paperclip-rs/paperclip).
 
 **Apistos** is composed of these crates:
 
 - [`apistos`](./apistos): [actix-web](https://github.com/actix/actix-web) wrapper to generate an OpenAPI v3.0.3
   documentation file
 - [`apistos-core`](./apistos-core): A set of traits and common models around [OpenAPI v3.0.3][OASv3.md]
-- [`apistos-gen`](./apistos-gen): macro utilities to generate [OpenAPI v3.0.3][OASv3.md] documentation from Rust models
-- [`apistos-models`](./apistos-models): [OpenAPI v3.0.3][OASv3.md] models
+  and [OpenAPI v3.1.1][OASv3.1.md]
+- [`apistos-gen`](./apistos-gen): macro utilities to generate [OpenAPI v3.0.3][OASv3.md]
+  and [OpenAPI v3.1.1][OASv3.1.md] documentation from Rust models
+- [`apistos-models`](./apistos-models): [OpenAPI v3.0.3][OASv3.md] and [OpenAPI v3.1.1][OASv3.1.md] models
   with [`Schema`](https://docs.rs/schemars/latest/schemars/schema/enum.Schema.html) based
   on [schemars](https://github.com/GREsau/schemars) definition
 - [`apistos-plugins`](./apistos-plugins): traits and utilities to extend apistos
@@ -59,7 +64,6 @@ carpenters, craftsmen, metallurgy ... which can also be considered by some as th
 
 ```toml
 [dependencies]
-schemars = "=1.0.0-alpha.15"
 apistos = "=1.0.0-pre-release.12"
 ```
 
@@ -80,20 +84,28 @@ use apistos::api_operation;
 use apistos::ApiComponent;
 use apistos::ApiErrorComponent;
 use apistos::app::OpenApiWrapper;
+use apistos::info::Info;
+use apistos::schemars::JsonSchema;
 use apistos::spec::Spec;
 use apistos::web::{post, resource, scope};
-use apistos_models::info::Info;
 use core::fmt::Formatter;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::error::Error;
 use std::net::Ipv4Addr;
 
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, ApiComponent)]
+#[schemars(crate = "apistos")]
 pub struct Test {
   pub test: String
 }
 
+// or
+// #[derive(Serialize, Deserialize, Debug, Clone)]
+// #[apistos::api_component]
+// pub struct Test {
+//   pub test: String
+// }
+
 #[derive(Serialize, Deserialize, Debug, Clone, ApiErrorComponent)]
 #[openapi_error(
   status(code = 403),

apistos-core/Cargo.toml

@@ -17,7 +17,6 @@ license.workspace = true
 log = { workspace = true }
 pin-project = { workspace = true }
 serde_json = { workspace = true }
-schemars = { workspace = true }
 
 actix-web = { workspace = true, optional = true }
 actix-web-grants = { workspace = true, optional = true }
@@ -58,14 +57,14 @@ lab_query = ["actix", "dep:actix-web-lab", "garde-actix-web?/lab_query"]
 garde = ["actix", "dep:garde-actix-web"]
 
 # extra types related features
-chrono = ["dep:chrono", "schemars/chrono04"]
+chrono = ["dep:chrono"]
 ipnetwork_0_20 = ["dep:serde", "dep:ipnetwork_0_20"]
 ipnetwork = ["dep:serde", "dep:ipnetwork"]
 multipart = ["actix", "dep:serde", "dep:actix-multipart", "dep:futures-core"]
-rust_decimal = ["dep:rust_decimal", "schemars/rust_decimal1"]
+rust_decimal = ["dep:rust_decimal"]
 actix-session = ["actix", "dep:serde", "dep:actix-session"]
-uuid = ["dep:uuid", "schemars/uuid1"]
-url = ["dep:url", "schemars/url2"]
+uuid = ["dep:uuid"]
+url = ["dep:url"]
 extras = ["chrono", "ipnetwork", "multipart", "rust_decimal", "uuid", "url"]
 
 default = ["actix", "query"]

apistos-core/src/__internal/mod.rs

@@ -1,7 +1,7 @@
 use apistos_models::paths::{MediaType, Response, Responses};
 use apistos_models::reference_or::ReferenceOr;
+use apistos_models::schemars::json_schema;
 use apistos_models::{ApistosSchema, OpenApiVersion, VersionSpecificSchema};
-use schemars::json_schema;
 use serde_json::Value;
 use std::collections::BTreeMap;
 

apistos-core/src/api_component.rs

@@ -504,9 +504,9 @@ where
 
 #[cfg(test)]
 mod test {
+  use apistos_models::schemars::JsonSchema;
+  use apistos_models::schemars::generate::SchemaGenerator;
   use apistos_models::{ApistosSchema, OpenApiVersion};
-  use schemars::JsonSchema;
-  use schemars::generate::SchemaGenerator;
   use serde_json::json;
 
   use apistos_models::reference_or::ReferenceOr;
@@ -518,6 +518,7 @@ mod test {
   #[expect(dead_code)]
   fn api_component_schema_vec_oas_3_0() {
     #[derive(JsonSchema)]
+    #[schemars(crate = "apistos_models::schemars")]
     struct TestChild {
       surname: String,
     }
@@ -538,6 +539,7 @@ mod test {
     }
 
     #[derive(JsonSchema)]
+    #[schemars(crate = "apistos_models::schemars")]
     struct Test {
       name: String,
       surname: TestChild,
@@ -623,6 +625,7 @@ mod test {
   #[expect(dead_code)]
   fn api_component_schema_vec_oas_3_1() {
     #[derive(JsonSchema)]
+    #[schemars(crate = "apistos_models::schemars")]
     struct TestChild {
       surname: String,
     }
@@ -643,6 +646,7 @@ mod test {
     }
 
     #[derive(JsonSchema)]
+    #[schemars(crate = "apistos_models::schemars")]
     struct Test {
       name: String,
       surname: TestChild,

apistos-core/src/components/custom.rs

@@ -2,7 +2,7 @@
 #[cfg(feature = "ipnetwork")]
 pub mod ipnetwork {
   use crate::simple::simple_modifier;
-  use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
+  use apistos_models::schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
   use serde::{Deserialize, Serialize};
   use std::borrow::Cow;
 
@@ -134,15 +134,16 @@ pub mod ipnetwork {
     use crate::ApiComponent;
     use crate::custom::ipnetwork::IpNetwork;
     use apistos_models::reference_or::ReferenceOr;
+    use apistos_models::schemars::{JsonSchema, SchemaGenerator};
     use apistos_models::{ApistosSchema, OpenApiVersion};
     use assert_json_diff::assert_json_eq;
-    use schemars::{JsonSchema, SchemaGenerator};
     use serde_json::json;
 
     #[test]
     #[expect(dead_code)]
     fn ip_network_schema() {
       #[derive(JsonSchema)]
+      #[schemars(crate = "apistos_models::schemars")]
       struct Test {
         ip: IpNetwork,
         label: String,
@@ -234,7 +235,7 @@ pub mod ipnetwork {
 #[cfg(feature = "ipnetwork_0_20")]
 pub mod ipnetwork_20 {
   use crate::simple::simple_modifier;
-  use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
+  use apistos_models::schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
   use serde::{Deserialize, Serialize};
   use std::borrow::Cow;
 
@@ -366,15 +367,16 @@ pub mod ipnetwork_20 {
     use crate::ApiComponent;
     use crate::custom::ipnetwork_20::IpNetwork;
     use apistos_models::reference_or::ReferenceOr;
+    use apistos_models::schemars::{JsonSchema, SchemaGenerator};
     use apistos_models::{ApistosSchema, OpenApiVersion};
     use assert_json_diff::assert_json_eq;
-    use schemars::{JsonSchema, SchemaGenerator};
     use serde_json::json;
 
     #[test]
     #[expect(dead_code)]
     fn ip_network_schema() {
       #[derive(JsonSchema)]
+      #[schemars(crate = "apistos_models::schemars")]
       struct Test {
         ip: IpNetwork,
         label: String,

apistos-core/src/components/multipart.rs

@@ -93,9 +93,9 @@ pub mod tempfile {
   use actix_multipart::{Field, MultipartError};
   use actix_web::HttpRequest;
   use apistos_models::reference_or::ReferenceOr;
+  use apistos_models::schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
   use apistos_models::{ApistosSchema, OpenApiVersion};
   use futures_core::future::LocalBoxFuture;
-  use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
   use std::borrow::Cow;
 
   #[derive(Debug)]
@@ -170,15 +170,16 @@ pub mod tempfile {
     use crate::ApiComponent;
     use crate::multipart::tempfile::Tempfile;
     use apistos_models::reference_or::ReferenceOr;
+    use apistos_models::schemars::{JsonSchema, SchemaGenerator};
     use apistos_models::{ApistosSchema, OpenApiVersion};
     use assert_json_diff::assert_json_eq;
-    use schemars::{JsonSchema, SchemaGenerator};
     use serde_json::json;
 
     #[test]
     #[expect(dead_code)]
     fn multipart_tempfile_schema() {
       #[derive(JsonSchema)]
+      #[schemars(crate = "apistos_models::schemars")]
       struct Test {
         file: Tempfile,
         label: String,

apistos-core/src/components/parameters/path.rs

@@ -2,8 +2,8 @@ use crate::ApiComponent;
 use actix_web::web::Path;
 use apistos_models::paths::{Parameter, ParameterDefinition, ParameterIn, RequestBody};
 use apistos_models::reference_or::ReferenceOr;
+use apistos_models::schemars::Schema;
 use apistos_models::{ApistosSchema, OpenApiVersion};
-use schemars::Schema;
 use serde_json::{Map, Value};
 
 impl<T> ApiComponent for Path<T>

apistos-core/src/components/parameters/query.rs

@@ -2,13 +2,13 @@ use std::collections::HashMap;
 
 #[cfg(feature = "query")]
 use actix_web::web::Query;
+use apistos_models::schemars::Schema;
 #[cfg(all(feature = "lab_query", feature = "garde"))]
 use garde_actix_web::web::LabQuery as GardeLabQuery;
 #[cfg(all(feature = "qs_query", feature = "garde"))]
 use garde_actix_web::web::QsQuery as GardeQsQuery;
 #[cfg(all(feature = "query", feature = "garde"))]
 use garde_actix_web::web::Query as GardeQuery;
-use schemars::Schema;
 use serde_json::{Map, Value, json};
 #[cfg(feature = "qs_query")]
 use serde_qs::actix::QsQuery;
@@ -319,7 +319,7 @@ fn extract_required_from_schema(sch_props: &Map<String, Value>, property_name: &
 #[cfg(test)]
 mod test {
   use actix_web::web::Query;
-  use schemars::{JsonSchema, json_schema};
+  use apistos_models::schemars::{JsonSchema, json_schema};
   use serde::{Deserialize, Serialize};
   #[cfg(feature = "qs_query")]
   use serde_qs::actix::QsQuery;
@@ -335,6 +335,7 @@ mod test {
   use crate::ApiComponent;
 
   #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+  #[schemars(crate = "apistos_models::schemars")]
   struct Test {
     id_number: u32,
     id_string: String,

apistos-core/src/components/session.rs

@@ -2,7 +2,7 @@ use crate::ApiComponent;
 use apistos_models::ApistosSchema;
 use apistos_models::paths::{Parameter, ParameterDefinition, ParameterIn, RequestBody};
 use apistos_models::reference_or::ReferenceOr;
-use schemars::json_schema;
+use apistos_models::schemars::json_schema;
 
 impl ApiComponent for actix_session::Session {
   fn required() -> bool {