Merge pull request #38 from yassun7010/fix_custom_message

Fix custom message
yassun7010 · Jan 13, 2024 · fbcba49 · fbcba49
2 parents ee6b7ce + 5c6c882
commit fbcba49
Show file tree

Hide file tree

Showing 60 changed files with 1,172 additions and 811 deletions.
diff --git a/serde_valid/Cargo.toml b/serde_valid/Cargo.toml
@@ -21,7 +21,7 @@ once_cell = "^1.7"
 paste = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde_json = { workspace = true, optional = true }
 serde_toml = { package = "toml", version = "^0.8", optional = true }
 serde_valid_derive = { version = "0.16.3", path = "../serde_valid_derive" }
 serde_valid_literal = { version = "0.16.3", path = "../serde_valid_literal" }
@@ -33,7 +33,8 @@ unicode-segmentation = "^1.7"
 unic-langid = "0.9.1"
 
 [features]
-default = ["i128"]
+default = ["i128", "json"]
+json = ["serde_json"]
 toml = ["serde_toml"]
 yaml = ["serde_yaml"]
 i128 = ["num-traits/i128", "indexmap/std", "serde_valid_literal/i128"]

diff --git a/serde_valid/expands/.gitignore b/serde_valid/expands/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/serde_valid/src/error.rs b/serde_valid/src/error.rs
@@ -1,8 +1,8 @@
 use itertools::Itertools;
 use serde_valid_literal::Literal;
 
+use crate::validation::error::FormatDefault;
 use crate::validation::Number;
-use crate::validation::ToDefaultMessage;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error<E>
@@ -62,12 +62,23 @@ macro_rules! struct_error_params {
             pub $limit: Vec<$type>,
         }
 
-        impl ToDefaultMessage for $Error {
+        impl $Error {
+            pub fn new<T>($limit: &[T]) -> Self
+            where
+                T: Into<$type> + std::fmt::Debug + Clone,
+            {
+                Self {
+                    $limit: (*$limit).iter().map(|x| x.clone().into()).collect(),
+                }
+            }
+        }
+
+        impl FormatDefault for $Error {
             #[inline]
-            fn to_default_message(&self) -> String {
+            fn format_default(&self) -> String {
                 format!(
                     $default_message,
-                    self.enumerate.iter().map(|v| format!("{}", v)).join(", ")
+                    self.$limit.iter().map(|v| format!("{}", v)).join(", ")
                 )
             }
         }
@@ -93,9 +104,9 @@ macro_rules! struct_error_params {
             }
         }
 
-        impl ToDefaultMessage for $Error {
+        impl FormatDefault for $Error {
             #[inline]
-            fn to_default_message(&self) -> String {
+            fn format_default(&self) -> String {
                 format!($default_message, self.$limit)
             }
         }
@@ -104,15 +115,14 @@ macro_rules! struct_error_params {
     (
         #[derive(Debug, Clone)]
         #[default_message=$default_message:literal]
-        pub struct $Error:ident {
-        }
+        pub struct $Error:ident;
     ) => {
         #[derive(Debug, Clone)]
-        pub struct $Error {}
+        pub struct $Error;
 
-        impl ToDefaultMessage for $Error {
+        impl FormatDefault for $Error {
             #[inline]
-            fn to_default_message(&self) -> String {
+            fn format_default(&self) -> String {
                 format!($default_message)
             }
         }
@@ -205,7 +215,7 @@ struct_error_params!(
 struct_error_params!(
     #[derive(Debug, Clone)]
     #[default_message = "The items must be unique."]
-    pub struct UniqueItemsError {}
+    pub struct UniqueItemsError;
 );
 
 // Object
@@ -233,14 +243,3 @@ struct_error_params!(
         pub enumerate: Vec<Literal>,
     }
 );
-
-impl EnumerateError {
-    pub fn new<T>(enumerate: &[T]) -> Self
-    where
-        T: Into<Literal> + std::fmt::Debug + Clone,
-    {
-        Self {
-            enumerate: (*enumerate).iter().map(|x| x.clone().into()).collect(),
-        }
-    }
-}
diff --git a/serde_valid/src/features.rs b/serde_valid/src/features.rs
@@ -1,8 +1,14 @@
 #[cfg(feature = "flatten")]
 pub mod flatten;
+
 #[cfg(feature = "fluent")]
 pub mod fluent;
+
+#[cfg(feature = "json")]
+pub mod json;
+
 #[cfg(feature = "toml")]
 pub mod toml;
+
 #[cfg(feature = "yaml")]
 pub mod yaml;
diff --git a/serde_valid/src/features/flatten/flat_errors.rs b/serde_valid/src/features/flatten/flat_errors.rs
@@ -51,7 +51,8 @@ mod tests {
 
     use crate::{
         flatten::IntoFlat,
-        validation::{ArrayErrors, Error, Errors, Message, ToDefaultMessage},
+        validation::error::{ArrayErrors, Message},
+        validation::{Error, Errors},
         MinItemsError,
     };
 
@@ -62,7 +63,7 @@ mod tests {
                 Errors::Array(ArrayErrors {
                     errors: vec![Error::MinItems(Message::new(
                         MinItemsError { min_items: 1 },
-                        MinItemsError::to_default_message
+                        crate::validation::error::Format::Default
                     ))],
                     items: indexmap! {},
                 })

diff --git a/serde_valid/src/features/flatten/into_flat.rs b/serde_valid/src/features/flatten/into_flat.rs
@@ -1,7 +1,7 @@
 use jsonschema::paths::{JSONPointer, PathChunk};
 
-use crate::validation::{
-    ArrayErrors, ItemErrorsMap, Message, ObjectErrors, PropertyErrorsMap, ToDefaultMessage,
+use crate::validation::error::{
+    ArrayErrors, FormatDefault, ItemErrorsMap, Message, ObjectErrors, PropertyErrorsMap,
 };
 
 use super::{FlatError, FlatErrors};
@@ -109,10 +109,10 @@ where
 
 impl<T> IntoFlat for Message<T>
 where
-    T: ToDefaultMessage,
+    T: FormatDefault,
 {
     fn into_flat_at(self, path: &JSONPointer) -> FlatErrors {
-        FlatErrors::new(vec![FlatError::new(path.to_owned(), self.error())])
+        FlatErrors::new(vec![FlatError::new(path.to_owned(), self.to_string())])
     }
 }
 
@@ -168,13 +168,13 @@ mod tests {
     fn array_errors_flatten() {
         let min_items = Message::new(
             MinItemsError { min_items: 1 },
-            MinItemsError::to_default_message,
+            crate::validation::error::Format::Default,
         );
         let maximum = Message::new(
             MaximumError {
                 maximum: Number::I32(1),
             },
-            MaximumError::to_default_message,
+            crate::validation::error::Format::Default,
         );
         assert_eq!(
             Errors::Array(ArrayErrors {
@@ -203,29 +203,29 @@ mod tests {
             FlatErrors::new(vec![
                 FlatError::new(
                     JSONPointer::default(),
-                    min_items.error().to_default_message(),
+                    min_items.format_default(),
                 ),
                 FlatError::new(
                     JSONPointer::from([PathChunk::from(0)].as_ref()),
-                    maximum.error().to_default_message(),
+                    maximum.format_default(),
                 ),
                 FlatError::new(
                     JSONPointer::from([PathChunk::from(0), PathChunk::from(2)].as_ref()),
-                    maximum.error().to_default_message(),
+                    maximum.format_default(),
                 ),
                 FlatError::new(
                     JSONPointer::from([PathChunk::from(3)].as_ref()),
-                    maximum.error().to_default_message(),
+                    maximum.format_default(),
                 ),
                 FlatError::new(
                     JSONPointer::from([PathChunk::from(5)].as_ref()),
-                    maximum.error().to_default_message(),
+                    maximum.format_default(),
                 ),
                 FlatError::new(
                     JSONPointer::from(
                         [PathChunk::from(5), PathChunk::from("name".to_owned())].as_ref()
                     ),
-                    maximum.error().to_default_message(),
+                    maximum.format_default(),
                 )
             ])
         );

diff --git a/serde_valid/src/features/fluent.rs b/serde_valid/src/features/fluent.rs
@@ -1,5 +1,9 @@
-mod into_localization;
+mod error;
+mod localize;
 mod message;
+mod try_localize;
 
-pub use into_localization::IntoLocalization;
+pub use error::LocalizedError;
+pub use localize::Localize;
 pub use message::Message;
+pub use try_localize::TryLocalize;
diff --git a/serde_valid/src/features/fluent/error.rs b/serde_valid/src/features/fluent/error.rs
@@ -0,0 +1,9 @@
+use crate::validation::{ArrayErrors, ObjectErrors};
+
+#[derive(Debug, Clone, serde::Serialize)]
+#[serde(untagged)]
+pub enum LocalizedError {
+    String(String),
+    Items(ArrayErrors<LocalizedError>),
+    Properties(ObjectErrors<LocalizedError>),
+}