@tmlmt/cooklang-parser 2.0.2 → 2.1.1

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
@@ -16,6 +18,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
@@ -342,6 +352,7 @@ var numberLikeRegex = d().startAnchor().digit().oneOrMore().startGroup().anyOf("
 var floatRegex = d().startAnchor().digit().oneOrMore().startGroup().anyOf(".").exactly(1).digit().oneOrMore().endGroup().optional().endAnchor().toRegExp();
 
 // src/units.ts
+var import_big = __toESM(require("big.js"), 1);
 var units = [
   // Mass (Metric)
   {
@@ -493,9 +504,9 @@ function simplifyFraction(num, den) {
 }
 function multiplyNumericValue(v, factor) {
   if (v.type === "decimal") {
-    return { type: "decimal", value: v.value * factor };
+    return { type: "decimal", value: (0, import_big.default)(v.value).times(factor).toNumber() };
   }
-  return simplifyFraction(v.num * factor, v.den);
+  return simplifyFraction((0, import_big.default)(v.num).times(factor).toNumber(), v.den);
 }
 function addNumericValues(val1, val2) {
   let num1;
@@ -524,7 +535,10 @@ function addNumericValues(val1, val2) {
     const sumNum = num1 * den2 + num2 * den1;
     return simplifyFraction(sumNum, commonDen);
   } else {
-    return { type: "decimal", value: num1 / den1 + num2 / den2 };
+    return {
+      type: "decimal",
+      value: (0, import_big.default)(num1).div(den1).add((0, import_big.default)(num2).div(den2)).toNumber()
+    };
   }
 }
 var toRoundedDecimal = (v) => {
@@ -551,8 +565,8 @@ function multiplyQuantityValue(value, factor) {
   }
   return {
     type: "range",
-    min: toRoundedDecimal(multiplyNumericValue(value.min, factor)),
-    max: toRoundedDecimal(multiplyNumericValue(value.max, factor))
+    min: multiplyNumericValue(value.min, factor),
+    max: multiplyNumericValue(value.max, factor)
   };
 }
 var convertQuantityValue = (value, def, targetDef) => {
@@ -1243,8 +1257,14 @@ var ShoppingList = class {
   }
   calculate_ingredients() {
     this.ingredients = [];
-    for (const { recipe, factor } of this.recipes) {
-      const scaledRecipe = factor === 1 ? recipe : recipe.scaleBy(factor);
+    for (const addedRecipe of this.recipes) {
+      let scaledRecipe;
+      if ("factor" in addedRecipe) {
+        const { recipe, factor } = addedRecipe;
+        scaledRecipe = factor === 1 ? recipe : recipe.scaleBy(factor);
+      } else {
+        scaledRecipe = addedRecipe.recipe.scaleTo(addedRecipe.servings);
+      }
       for (const ingredient of scaledRecipe.ingredients) {
         if (ingredient.flags && ingredient.flags.includes("hidden")) {
           continue;
@@ -1293,14 +1313,16 @@ var ShoppingList = class {
       }
     }
   }
-  /**
-   * Adds a recipe to the shopping list, then automatically
-   * recalculates the quantities and recategorize the ingredients.
-   * @param recipe - The recipe to add.
-   * @param factor - The factor to scale the recipe by.
-   */
-  add_recipe(recipe, factor = 1) {
-    this.recipes.push({ recipe, factor });
+  add_recipe(recipe, scaling) {
+    if (typeof scaling === "number" || scaling === void 0) {
+      this.recipes.push({ recipe, factor: scaling ?? 1 });
+    } else {
+      if ("factor" in scaling) {
+        this.recipes.push({ recipe, factor: scaling.factor });
+      } else {
+        this.recipes.push({ recipe, servings: scaling.servings });
+      }
+    }
     this.calculate_ingredients();
     this.categorize();
   }