release: 0.18.1

- Expose categories() method on AisleConf
- Rename package from cooklang-rs to CooklangParser

Author: dubadub

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cooklang"
-version = "0.18.0"
+version = "0.18.1"
 edition = "2021"
 authors = ["Zheoni <zheoni@outlook.es>"]
 description = "Cooklang parser with opt-in extensions"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cooklang-bindings"
-version = "0.18.0"
+version = "0.18.1"
 edition = "2021"
 authors = ["dubadub <dubovskoy.a@gmail.com>"]
 description = "Cooklang Uniffi bindings"

bindings/Cargo.toml

@@ -102,7 +102,8 @@ pub fn deref_timer(recipe: &Arc<CooklangRecipe>, index: u32) -> Timer {
 pub fn parse_aisle_config(input: String) -> Arc<AisleConf> {
     let mut categories: Vec<AisleCategory> = Vec::new();
     let mut cache: AisleReverseCategory = AisleReverseCategory::default();
-    let mut common_names: std::collections::HashMap<String, String> = std::collections::HashMap::new();
+    let mut common_names: std::collections::HashMap<String, String> =
+        std::collections::HashMap::new();
 
     // Use the lenient parser that handles duplicates as warnings
     let result = parse_lenient(&input);
@@ -143,7 +144,11 @@ pub fn parse_aisle_config(input: String) -> Arc<AisleConf> {
         categories.push(category);
     });
 
-    let config = AisleConf { categories, cache, common_names };
+    let config = AisleConf {
+        categories,
+        cache,
+        common_names,
+    };
 
     Arc::new(config)
 }
@@ -1321,10 +1326,7 @@ Serve the @./pasta/spaghetti{1%portion} with sauce
             1.0,
         );
 
-        let ingredient = recipe
-            .ingredients
-            .get(0)
-            .expect("No ingredients found");
+        let ingredient = recipe.ingredients.get(0).expect("No ingredients found");
 
         assert_eq!(ingredient.name, "spaghetti");
         assert_eq!(

bindings/src/lib.rs

@@ -552,10 +552,7 @@ beef
         let parser = CooklangParser::new(Extensions::all(), converter.clone());
 
         // Recipe with "Chili flakes" (capital C)
-        let recipe = parser
-            .parse("@Chili flakes{1%tsp}")
-            .into_output()
-            .unwrap();
+        let recipe = parser.parse("@Chili flakes{1%tsp}").into_output().unwrap();
 
         // Aisle config has "chili flakes" (lowercase)
         let aisle_conf = r#"

src/ingredient_list.rs

@@ -70,8 +70,6 @@ pub mod _features {
 
 #[cfg(feature = "aisle")]
 pub mod aisle;
-#[cfg(feature = "shopping_list")]
-pub mod shopping_list;
 pub mod analysis;
 pub mod ast;
 pub mod convert;
@@ -85,6 +83,8 @@ pub mod pantry;
 pub mod parser;
 pub mod quantity;
 pub mod scale;
+#[cfg(feature = "shopping_list")]
+pub mod shopping_list;
 pub mod span;
 pub mod text;
 

src/lib.rs

@@ -198,15 +198,16 @@ fn parse_recipe_line(line: &ParsedLine<'_>) -> Result<(String, Option<f64>), Sho
         if content.ends_with('}') {
             let path = content[..brace_start].trim().to_string();
             let multiplier_str = &content[brace_start + 1..content.len() - 1];
-            let multiplier: f64 = multiplier_str.parse().map_err(|_| {
-                ShoppingListError::InvalidMultiplier {
-                    span: Span::new(
-                        line.offset + 2 + brace_start + 1,
-                        line.offset + 2 + content.len() - 1,
-                    ),
-                    message: format!("'{multiplier_str}' is not a valid number"),
-                }
-            })?;
+            let multiplier: f64 =
+                multiplier_str
+                    .parse()
+                    .map_err(|_| ShoppingListError::InvalidMultiplier {
+                        span: Span::new(
+                            line.offset + 2 + brace_start + 1,
+                            line.offset + 2 + content.len() - 1,
+                        ),
+                        message: format!("'{multiplier_str}' is not a valid number"),
+                    })?;
             Ok((path, Some(multiplier)))
         } else {
             Ok((content.trim().to_string(), None))