fix: ts

Author: dubadub

src/metadata.rs

@@ -532,6 +532,7 @@ pub(crate) fn check_std_entry(
 
 /// Servings information that can be numeric or a string
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[cfg_attr(feature = "ts", derive(tsify::Tsify))]
 #[serde(untagged)]
 pub enum Servings {
     /// Numeric servings count

src/model.rs

@@ -5,7 +5,7 @@ use std::borrow::Cow;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "ts")]
-use tsify::{declare, Tsify};
+use tsify::Tsify;
 
 use crate::{
     convert::Converter, metadata::Metadata, parser::Modifiers, quantity::Quantity, GroupedQuantity,

src/quantity.rs

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[cfg(feature = "ts")]
-use tsify::{declare, Tsify};
+use tsify::Tsify;
 
 use crate::convert::{ConvertError, Converter, PhysicalQuantity, Unit};
 

src/scale.rs

@@ -3,11 +3,10 @@
 use crate::{convert::Converter, quantity::Value, Quantity, Recipe};
 use thiserror::Error;
 
-#[cfg(feature = "ts")]
-use tsify::Tsify;
 
 /// Error type for scaling operations
-#[derive(Debug, Error)]
+#[derive(Debug, Error, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "ts", derive(tsify::Tsify))]
 pub enum ScaleError {
     /// The recipe has no valid numeric servings value
     #[error("Cannot scale recipe: servings metadata is not a valid number")]

typescript/src/lib.rs

@@ -23,7 +23,7 @@ pub struct Parser {
 #[derive(Tsify, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct ScaledRecipeWithReport {
-    recipe: cooklang::ScaledRecipe,
+    recipe: cooklang::Recipe,
     report: String,
 }
 
@@ -85,11 +85,10 @@ impl Parser {
 
     pub fn parse(&self, input: &str) -> ScaledRecipeWithReport {
         let (recipe, _report) = self.parser.parse(input).into_tuple();
-        let scaled = recipe
-            .expect("expected recipe")
-            .scale(1., self.parser.converter());
+        let mut recipe = recipe.expect("expected recipe");
+        recipe.scale(1., self.parser.converter());
         let data = ScaledRecipeWithReport {
-            recipe: scaled,
+            recipe,
             report: "<no output>".to_string(),
         };
         data
@@ -135,7 +134,7 @@ impl Parser {
                     author: Option<NameAndUrl>,
                     source: Option<NameAndUrl>,
                     time: Option<RecipeTime>,
-                    servings: Option<Vec<u32>>,
+                    servings: Option<cooklang::metadata::Servings>,
                     locale: Option<(&'a str, Option<&'a str>)>,
                 }
                 let val = StdMeta {