Use re-export of serde_json in macros

Fixes #540
paperclip-rs · Sep 18, 2024 · a5f0d8d · a5f0d8d
1 parent 9637746
commit a5f0d8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/core/src/v2/mod.rs b/core/src/v2/mod.rs
@@ -22,6 +22,7 @@ pub use self::{
     schema::Schema,
 };
 pub use paperclip_macros::*;
+pub use serde_json;
 
 #[cfg(feature = "codegen")]
 use self::resolver::Resolver;

diff --git a/macros/src/actix.rs b/macros/src/actix.rs
@@ -819,7 +819,7 @@ pub fn emit_v2_definition(input: TokenStream) -> TokenStream {
     let example = if let Some(example) = extract_example(&item_ast.attrs) {
         // allow to parse escaped json string or single str value
         quote!(
-            serde_json::from_str::<serde_json::Value>(#example).ok().or_else(|| Some(#example.into()))
+            paperclip::v2::serde_json::from_str::<paperclip::v2::serde_json::Value>(#example).ok().or_else(|| Some(#example.into()))
         )
     } else {
         quote!(None)
@@ -1642,7 +1642,7 @@ fn handle_field_struct(
         let example = if let Some(example) = extract_example(&field.attrs) {
             // allow to parse escaped json string or single str value
             quote!({
-                s.example = serde_json::from_str::<serde_json::Value>(#example).ok().or_else(|| Some(#example.into()));
+                s.example = paperclip::v2::serde_json::from_str::<paperclip::v2::serde_json::Value>(#example).ok().or_else(|| Some(#example.into()));
             })
         } else {
             quote!({})
@@ -1727,7 +1727,7 @@ fn handle_enum(e: &DataEnum, serde: &SerdeProps, props_gen: &mut proc_macro2::To
         }
 
         props_gen.extend(quote!(
-            schema.enum_.push(serde_json::json!(#name));
+            schema.enum_.push(paperclip::v2::serde_json::json!(#name));
         ));
     }
 }

diff --git a/macros/src/core.rs b/macros/src/core.rs
@@ -175,7 +175,7 @@ pub fn emit_v2_schema_struct(input: TokenStream) -> TokenStream {
             }
 
             #[inline]
-            fn enum_variants(&self) -> Option<&[serde_json::Value]> {
+            fn enum_variants(&self) -> Option<&[paperclip::v2::serde_json::Value]> {
                 if self.enum_.is_empty() {
                     return None
                 } else {
@@ -294,7 +294,7 @@ fn schema_fields(name: &Ident, is_ref: bool) -> proc_macro2::TokenStream {
     ));
     gen.extend(quote!(
         #[serde(skip_serializing_if = "Option::is_none")]
-        pub example: Option<serde_json::Value>,
+        pub example: Option<paperclip::v2::serde_json::Value>,
     ));
 
     gen.extend(quote!(
@@ -313,7 +313,7 @@ fn schema_fields(name: &Ident, is_ref: bool) -> proc_macro2::TokenStream {
 
     gen.extend(quote!(
         #[serde(default, rename = "enum", skip_serializing_if = "Vec::is_empty")]
-        pub enum_: Vec<serde_json::Value>,
+        pub enum_: Vec<paperclip::v2::serde_json::Value>,
     ));
 
     gen.extend(quote!(

diff --git a/src/v2/mod.rs b/src/v2/mod.rs
@@ -102,6 +102,7 @@ pub use paperclip_core::{
     v2::{
         models::{self, DefaultSchema, ResolvableApi},
         schema::{self, Schema},
+        serde_json
     },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,7 @@ pub use paperclip_core::{ @@
         v2::{
             models::{self, DefaultSchema, ResolvableApi},
             schema::{self, Schema},
+            serde_json
         },
     };
@@ Expand Down @@