Merge pull request #7 from reciperium/fix/serde

fix: use serde content for token enum
reciperium · Apr 24, 2024 · dc9c4cc · dc9c4cc
2 parents 4407b36 + 719c207
commit dc9c4cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/recipe-parser/src/parser.rs b/crates/recipe-parser/src/parser.rs
@@ -196,7 +196,7 @@ fn parse_backstory<'a>(input: &mut Input<'a>) -> PResult<&'a str> {
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 // if you use `zod` for example, using a tag makes it easy to use an undiscriminated union
-#[cfg_attr(feature = "serde", serde(tag = "token"))]
+#[cfg_attr(feature = "serde", serde(tag = "token", content = "content"))]
 pub enum Token<'a> {
     Metadata {
         key: &'a str,
@@ -582,10 +582,19 @@ mod test {
         let serialized = serde_json::to_string(&token).expect("failed to serialize");
         assert_eq!(
             serialized,
-            r#"{"token":"Ingredient","name":"quinoa","quantity":"200","unit":"gr"}"#
+            r#"{"token":"Ingredient","content":{"name":"quinoa","quantity":"200","unit":"gr"}}"#
         );
     }
 
+    #[test]
+    #[cfg(feature = "serde")]
+    fn test_token_serialization_creates_right_payload_single_string() {
+        let token = Token::Word("holis");
+
+        let serialized = serde_json::to_string(&token).expect("failed to serialize");
+        assert_eq!(serialized, r#"{"token":"Word","content":"holis"}"#);
+    }
+
     #[test]
     #[cfg(feature = "schemars")]
     fn test_token_json_schema_generation() {