fix: metadata servings scale

Author: dubadub

bindings/src/lib.rs

@@ -24,9 +24,7 @@ pub fn parse_metadata(input: String, scaling_factor: f64) -> CooklangMetadata {
     let mut metadata = CooklangMetadata::new();
     let parser = cooklang::CooklangParser::canonical();
 
-    let (parsed, _warnings) = parser.parse(&input)
-        .into_result()
-        .unwrap();
+    let (parsed, _warnings) = parser.parse(&input).into_result().unwrap();
 
     let scaled = parsed.scale(scaling_factor, parser.converter());
 
@@ -132,7 +130,7 @@ mod tests {
 a test @step @salt{1%mg} more text
 "#
             .to_string(),
-            1.0
+            1.0,
         );
 
         assert_eq!(
@@ -209,7 +207,7 @@ source: https://google.com
 a test @step @salt{1%mg} more text
 "#
             .to_string(),
-            1.0
+            1.0,
         );
 
         assert_eq!(
@@ -357,7 +355,7 @@ dried oregano
 Cook @onions{3%large} until brown
 "#
             .to_string(),
-            1.0
+            1.0,
         );
 
         let first_section = recipe
@@ -416,7 +414,7 @@ add @tomatoes{400%g}
 simmer for 10 minutes
 "#
             .to_string(),
-            1.0
+            1.0,
         );
         let first_section = recipe
             .sections
@@ -481,7 +479,7 @@ Mix @flour{200%g} and @water{50%ml} together until smooth.
 Combine @cheese{100%g} and @spinach{50%g}, then season to taste.
 "#
             .to_string(),
-            1.0
+            1.0,
         );
 
         let mut sections = recipe.sections.into_iter();

bindings/src/model.rs

@@ -1,9 +1,7 @@
 use std::collections::HashMap;
 
 use cooklang::model::Item as OriginalItem;
-use cooklang::quantity::{
-    Quantity as OriginalQuantity, Value as OriginalValue
-};
+use cooklang::quantity::{Quantity as OriginalQuantity, Value as OriginalValue};
 use cooklang::ScaledRecipe as OriginalRecipe;
 
 #[derive(uniffi::Record, Debug)]

fuzz/fuzz_targets/fuzz_parser.rs

@@ -2,7 +2,7 @@
 
 use libfuzzer_sys::fuzz_target;
 
-use cooklang::{CooklangParser, Extensions, Converter};
+use cooklang::{Converter, CooklangParser, Extensions};
 
 fuzz_target!(|contents: &str| {
     let parser = CooklangParser::new(Extensions::all(), Converter::default());

src/analysis/event_consumer.rs

@@ -364,9 +364,7 @@ impl<'i> RecipeCollector<'i, '_> {
                             format!("Unknown config metadata key: {key_t}"),
                             label!(key.span())
                         )
-                        .hint(
-                            "Possible config keys are '[mode]' and '[duplicate]''",
-                        ),
+                        .hint("Possible config keys are '[mode]' and '[duplicate]''"),
                     );
                     if self.old_style_metadata {
                         self.content.metadata.map.insert(
@@ -1029,7 +1027,10 @@ impl<'i> RecipeCollector<'i, '_> {
     }
 
     fn value(&mut self, value: parser::QuantityValue, is_ingredient: bool) -> ScalableValue {
-        let parser::QuantityValue { value, scaling_lock } = value;
+        let parser::QuantityValue {
+            value,
+            scaling_lock,
+        } = value;
         let has_scaling_lock = scaling_lock.is_some();
         let is_text = value.is_text();
 
@@ -1496,13 +1497,17 @@ fn yaml_find_key_position(text: &str, key: &str) -> Option<usize> {
 }
 
 fn parse_reference(name: &str) -> Option<RecipeReference> {
-    if name.starts_with("./") || name.starts_with("../") || name.starts_with(".\\") || name.starts_with("..\\") {
+    if name.starts_with("./")
+        || name.starts_with("../")
+        || name.starts_with(".\\")
+        || name.starts_with("..\\")
+    {
         let path = name.replace('\\', "/");
         let mut components: Vec<String> = path.split('/').map(String::from).skip(1).collect();
         let file_stem = components.pop().unwrap();
         Some(RecipeReference {
             components,
-            name: file_stem.into()
+            name: file_stem,
         })
     } else {
         None
@@ -1553,7 +1558,11 @@ mod tests {
         assert_eq!(
             parse_reference("./recipes/italian/pasta/spaghetti"),
             Some(RecipeReference {
-                components: vec!["recipes".to_string(), "italian".to_string(), "pasta".to_string()],
+                components: vec![
+                    "recipes".to_string(),
+                    "italian".to_string(),
+                    "pasta".to_string()
+                ],
                 name: "spaghetti".into()
             })
         );

src/ingredient_list.rs

@@ -144,7 +144,11 @@ impl IngredientList {
     }
 
     /// Ingredient list of a recipe
-    pub fn from_recipe(recipe: &ScaledRecipe, converter: &Converter, list_references: bool) -> Self {
+    pub fn from_recipe(
+        recipe: &ScaledRecipe,
+        converter: &Converter,
+        list_references: bool,
+    ) -> Self {
         let mut list = Self::new();
         list.add_recipe(recipe, converter, list_references);
         list
@@ -162,7 +166,12 @@ impl IngredientList {
     /// error.
     ///
     /// Ingredients are listed based on their [`display_name`](crate::model::Ingredient::display_name).
-    pub fn add_recipe(&mut self, recipe: &ScaledRecipe, converter: &Converter, list_references: bool) -> Vec<usize> {
+    pub fn add_recipe(
+        &mut self,
+        recipe: &ScaledRecipe,
+        converter: &Converter,
+        list_references: bool,
+    ) -> Vec<usize> {
         let mut references = Vec::new();
 
         for entry in recipe.group_ingredients(converter) {

src/parser/model.rs

@@ -109,7 +109,7 @@ pub struct Quantity<'a> {
 #[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct QuantityValue {
     pub value: Located<Value>,
-    pub scaling_lock: Option<Span>
+    pub scaling_lock: Option<Span>,
 }
 
 impl QuantityValue {

src/parser/quantity.rs

@@ -87,11 +87,7 @@ fn parse_regular_quantity<'i>(bp: &mut BlockParser<'_, 'i>) -> ParsedQuantity<'i
 }
 
 fn parse_advanced_quantity<'i>(bp: &mut BlockParser<'_, 'i>) -> Option<ParsedQuantity<'i>> {
-    if bp
-        .tokens()
-        .iter()
-        .any(|t| matches!(t.kind, T![%]))
-    {
+    if bp.tokens().iter().any(|t| matches!(t.kind, T![%])) {
         return None;
     }
 
@@ -138,7 +134,10 @@ fn parse_advanced_quantity<'i>(bp: &mut BlockParser<'_, 'i>) -> Option<ParsedQua
     Some(ParsedQuantity {
         quantity: Located::new(
             Quantity {
-                value: QuantityValue {value, scaling_lock},
+                value: QuantityValue {
+                    value,
+                    scaling_lock,
+                },
                 unit: Some(unit),
             },
             tokens_span(bp.tokens()),
@@ -152,7 +151,10 @@ fn value(bp: &mut BlockParser) -> QuantityValue {
     let value_tokens = bp.consume_while(|t| !matches!(t, T![%]));
     let value = parse_value(value_tokens, bp);
 
-    QuantityValue { value, scaling_lock }
+    QuantityValue {
+        value,
+        scaling_lock,
+    }
 }
 
 fn scaling_lock(bp: &mut BlockParser) -> Option<Span> {
@@ -162,8 +164,8 @@ fn scaling_lock(bp: &mut BlockParser) -> Option<Span> {
         T![=] => {
             let tok = bp.bump_any();
             Some(tok.span)
-        },
-        _ => None
+        }
+        _ => None,
     }
 }
 
@@ -329,7 +331,7 @@ fn float(tokens: &[Token], bp: &BlockParser) -> Result<f64, SourceDiag> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{parser::TokenStream};
+    use crate::parser::TokenStream;
     use test_case::test_case;
 
     macro_rules! t {

src/scale.rs

@@ -23,8 +23,8 @@ impl ScaleTarget {
     /// Creates a new [`ScaleTarget`].
     ///
     /// - `factor` is the multiplier to scale the recipe by.
-    /// Invalid parameters don't error here, but may do so in the
-    /// scaling process.
+    ///   Invalid parameters don't error here, but may do so in the
+    ///   scaling process.
     fn new(factor: f64) -> Self {
         ScaleTarget { factor }
     }
@@ -150,8 +150,25 @@ impl ScalableRecipe {
             timers: timer_outcomes,
         };
 
+        // Update metadata with new servings
+        let mut metadata = self.metadata;
+        if let Servings(Some(servings)) = &self.data {
+            if let Some(base_servings) = servings.first() {
+                let new_servings = (*base_servings as f64 * factor).round() as u32;
+                if metadata.get(crate::metadata::StdKey::Servings).is_some() {
+                    // Update existing servings value
+                    if let Some(servings_value) =
+                        metadata.get_mut(crate::metadata::StdKey::Servings)
+                    {
+                        *servings_value =
+                            serde_yaml::Value::Number(serde_yaml::Number::from(new_servings));
+                    }
+                }
+            }
+        }
+
         ScaledRecipe {
-            metadata: self.metadata,
+            metadata,
             sections: self.sections,
             ingredients,
             cookware,

tests/canonical.rs

@@ -172,7 +172,7 @@ impl TestValue {
                 Value::Number(num) => TestValue::Number(num.value()),
                 Value::Range { .. } => panic!("unexpected range value"),
                 Value::Text(value) => TestValue::Text(value),
-            }
+            },
         }
     }
 }

tests/canonical_cases/mod.rs

@@ -1,6 +1,6 @@
 //! AUTO GENERATED WITH `gen_canonical_tests.py`
-use test_case::test_case;
 use super::{runner, TestCase};
+use test_case::test_case;
 #[test_case(r#"
 result:
   metadata: {}