@tmlmt/cooklang-parser 3.0.0-alpha.15 → 3.0.0-alpha.16

package/dist/index.cjs

@@ -330,7 +330,6 @@ var nestedMetaVarRegex = (varName) => new RegExp(
   "m"
 );
 var metadataRegex = d().literal("---").newline().startCaptureGroup().anyCharacter().zeroOrMore().optional().endGroup().newline().literal("---").dotAll().toRegExp();
-var scalingMetaValueRegex = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("\\t ").zeroOrMore().startCaptureGroup().startCaptureGroup().notAnyOf(",\\n").oneOrMore().endGroup().startGroup().literal(",").whitespace().zeroOrMore().startCaptureGroup().anyCharacter().oneOrMore().endGroup().endGroup().optional().endGroup().endAnchor().multiline().toRegExp();
 var nonWordChar = "\\s@#~\\[\\]{(,;:!?";
 var nonWordCharStrict = "\\s@#~\\[\\]{(,;:!?|";
 var ingredientWithAlternativeRegex = d().literal("@").startNamedGroup("ingredientModifiers").anyOf("@\\-&?").zeroOrMore().endGroup().optional().startNamedGroup("ingredientRecipeAnchor").literal("./").endGroup().optional().startGroup().startGroup().startNamedGroup("mIngredientName").notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startNamedGroup("sIngredientName").notAnyOf(nonWordChar).zeroOrMore().notAnyOf("\\." + nonWordChar).endGroup().endGroup().startGroup().literal("{").startNamedGroup("ingredientQuantityModifier").literal("=").exactly(1).endGroup().optional().startNamedGroup("ingredientQuantity").startGroup().notAnyOf("}|%").oneOrMore().endGroup().optional().startGroup().literal("%").notAnyOf("|}").oneOrMore().lazy().endGroup().optional().startGroup().literal("|").notAnyOf("}").oneOrMore().lazy().endGroup().zeroOrMore().endGroup().literal("}").endGroup().optional().startGroup().literal("(").startNamedGroup("ingredientPreparation").notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().startGroup().literal("[").startNamedGroup("ingredientNote").notAnyOf("\\]").oneOrMore().lazy().endGroup().literal("]").endGroup().optional().startNamedGroup("ingredientAlternative").startGroup().literal("|").startGroup().anyOf("@\\-&?").zeroOrMore().endGroup().optional().startGroup().literal("./").endGroup().optional().startGroup().startGroup().startGroup().notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startGroup().notAnyOf(nonWordChar).oneOrMore().endGroup().endGroup().startGroup().literal("{").startGroup().literal("=").exactly(1).endGroup().optional().startGroup().notAnyOf("}%").oneOrMore().endGroup().optional().startGroup().literal("%").startGroup().notAnyOf("}").oneOrMore().lazy().endGroup().endGroup().optional().literal("}").endGroup().optional().startGroup().literal("(").startGroup().notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().startGroup().literal("[").startGroup().notAnyOf("\\]").oneOrMore().lazy().endGroup().literal("]").endGroup().optional().endGroup().zeroOrMore().endGroup().toRegExp();
@@ -351,6 +350,13 @@ var tokensRegex = new RegExp(
   ].map((r2) => r2.source).join("|"),
   "gu"
 );
+var servingsPrefixPart = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("	 ").zeroOrMore().startNamedGroup("servingsPrefix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().lazy().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().toRegExp();
+var servingsSuffixPart = d().anyOf("	 ").zeroOrMore().startNamedGroup("servingsSuffix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().endAnchor().toRegExp();
+var scalingSimpleMetaValueRegex = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("\\t ").zeroOrMore().startCaptureGroup().startCaptureGroup().notAnyOf(",\\n").oneOrMore().endGroup().startGroup().literal(",").anyOf("\\t ").zeroOrMore().startCaptureGroup().anyCharacter().oneOrMore().endGroup().optional().endGroup().optional().endGroup().endAnchor().multiline().toRegExp();
+var scalingMetaValueWithUnitRegex = (varName) => new RegExp(
+  servingsPrefixPart(varName).source + arbitraryScalableRegex.source + servingsSuffixPart.source,
+  "m"
+);
 var commentRegex = d().literal("--").anyCharacter().zeroOrMore().global().toRegExp();
 var blockCommentRegex = d().literal("[-").anyCharacter().zeroOrMore().lazy().literal("-]").whitespace().zeroOrMore().global().toRegExp();
 var shoppingListRegex = d().literal("[").startNamedGroup("name").anyCharacter().oneOrMore().endGroup().literal("]").newline().startNamedGroup("items").anyCharacter().zeroOrMore().lazy().endGroup().startGroup().newline().newline().or().endAnchor().endGroup().global().toRegExp();
@@ -1334,17 +1340,21 @@ var flattenPlainUnitGroup = (summed) => {
   }
 };
 function applyBestUnit(q, system) {
-  if (!q.unit?.name) {
+  const extended = { quantity: q.quantity };
+  if (q.unit) {
+    extended.unit = typeof q.unit === "string" ? { name: q.unit } : q.unit;
+  }
+  if (!extended.unit?.name) {
     return q;
   }
-  const unitDef = resolveUnit(q.unit.name);
+  const unitDef = resolveUnit(extended.unit.name);
   if (unitDef.type === "other") {
     return q;
   }
-  if (q.quantity.type === "fixed" && q.quantity.value.type === "text") {
+  if (extended.quantity.type === "fixed" && extended.quantity.value.type === "text") {
     return q;
   }
-  const avgValue = getAverageValue(q.quantity);
+  const avgValue = getAverageValue(extended.quantity);
   const effectiveSystem = system ?? (["metric", "JP"].includes(unitDef.system) ? unitDef.system : "US");
   const toBase = getToBase(unitDef, effectiveSystem);
   const valueInBase = avgValue * toBase;
@@ -1354,22 +1364,22 @@ function applyBestUnit(q, system) {
     effectiveSystem,
     [unitDef]
   );
-  const originalCanonicalName = normalizeUnit(q.unit.name)?.name;
+  const originalCanonicalName = normalizeUnit(extended.unit.name)?.name;
   if (bestUnit.name === originalCanonicalName) {
     return q;
   }
   const formattedValue = formatOutputValue(bestValue, bestUnit);
-  if (q.quantity.type === "range") {
+  if (extended.quantity.type === "range") {
     const bestToBase = getToBase(bestUnit, effectiveSystem);
-    const minValue = getNumericValue(q.quantity.min) * toBase / bestToBase;
-    const maxValue = getNumericValue(q.quantity.max) * toBase / bestToBase;
+    const minValue = getNumericValue(extended.quantity.min) * toBase / bestToBase;
+    const maxValue = getNumericValue(extended.quantity.max) * toBase / bestToBase;
     return {
       quantity: {
         type: "range",
         min: formatOutputValue(minValue, bestUnit),
         max: formatOutputValue(maxValue, bestUnit)
       },
-      unit: { name: bestUnit.name }
+      unit: typeof q.unit === "string" ? bestUnit.name : { name: bestUnit.name }
     };
   }
   return {
@@ -1377,7 +1387,7 @@ function applyBestUnit(q, system) {
       type: "fixed",
       value: formattedValue
     },
-    unit: { name: bestUnit.name }
+    unit: typeof q.unit === "string" ? bestUnit.name : { name: bestUnit.name }
   };
 }
 function subtractQuantities(q1, q2, options = {}) {
@@ -1729,13 +1739,62 @@ function parseBlockScalarMetaVar(content, varName) {
   }
   return stripped.replace(/\n\n/g, "\0").replace(/\n/g, " ").replace(/\0/g, "\n");
 }
+function parseArbitraryQuantity(raw) {
+  const quantityMatch = raw.trim().match(quantityAlternativeRegex);
+  if (!quantityMatch?.groups) {
+    throw new InvalidQuantityFormat(
+      raw,
+      "Arbitrary quantities must have a numerical value"
+    );
+  }
+  const value = parseQuantityInput(quantityMatch.groups.quantity);
+  const unit = quantityMatch.groups.unit;
+  if (!value || value.type === "fixed" && value.value.type === "text") {
+    throw new InvalidQuantityFormat(
+      raw,
+      "Arbitrary quantities must have a numerical value"
+    );
+  }
+  const arbitrary = {
+    quantity: value
+  };
+  if (unit) arbitrary.unit = unit;
+  return arbitrary;
+}
 function parseScalingMetaVar(content, varName) {
-  const varMatch = content.match(scalingMetaValueRegex(varName));
+  const complexMatch = content.match(scalingMetaValueWithUnitRegex(varName));
+  if (complexMatch?.groups?.arbitraryQuantity) {
+    const parsed = parseArbitraryQuantity(
+      complexMatch.groups.arbitraryQuantity
+    );
+    const result2 = {
+      quantity: parsed.quantity
+    };
+    if (parsed.unit) result2.unit = parsed.unit;
+    if (complexMatch.groups.servingsPrefix) {
+      result2.textBefore = complexMatch.groups.servingsPrefix;
+    }
+    if (complexMatch.groups.servingsSuffix) {
+      result2.textAfter = complexMatch.groups.servingsSuffix;
+    }
+    return result2;
+  }
+  const varMatch = content.match(scalingSimpleMetaValueRegex(varName));
   if (!varMatch) return void 0;
   if (isNaN(Number(varMatch[2]?.trim()))) {
     throw new Error("Scaling variables should be numbers");
   }
-  return [Number(varMatch[2]?.trim()), varMatch[1].trim()];
+  const numericValue = Number(varMatch[2]?.trim());
+  const result = {
+    quantity: {
+      type: "fixed",
+      value: { type: "decimal", decimal: numericValue }
+    }
+  };
+  if (varMatch[3]) {
+    result.text = `${varMatch[3].trim()}`;
+  }
+  return result;
 }
 function parseListMetaVar(content, varName) {
   const listMatch = content.match(
@@ -1853,6 +1912,13 @@ function parseAnyMetaVar(content, varName) {
   if (simple) return parseMetadataValue(simple);
   return void 0;
 }
+function getNumericValueFromMetaVar(v) {
+  if (v.quantity.type === "fixed" && v.quantity.value.type !== "text") {
+    return getNumericValue(v.quantity.value);
+  }
+  if (v.quantity.type === "range") return getNumericValue(v.quantity.min);
+  return 0;
+}
 function extractMetadata(content) {
   const metadata = {};
   let servings = void 0;
@@ -1977,9 +2043,9 @@ function extractMetadata(content) {
   }
   for (const metaVar of ["servings", "yield", "serves"]) {
     const scalingMetaValue = parseScalingMetaVar(metadataContent, metaVar);
-    if (scalingMetaValue && scalingMetaValue[1]) {
-      metadata[metaVar] = scalingMetaValue[1];
-      servings = scalingMetaValue[0];
+    if (scalingMetaValue) {
+      metadata[metaVar] = scalingMetaValue;
+      servings = getNumericValueFromMetaVar(scalingMetaValue);
     }
   }
   const tags = parseListMetaVar(metadataContent, "tags");
@@ -2806,27 +2872,17 @@ var _Recipe = class _Recipe {
    */
   _parseArbitraryScalable(regexMatchGroups, intoArray) {
     if (!regexMatchGroups || !regexMatchGroups.arbitraryQuantity) return;
-    const quantityMatch = regexMatchGroups.arbitraryQuantity?.trim().match(quantityAlternativeRegex);
-    if (quantityMatch?.groups) {
-      const value = parseQuantityInput(quantityMatch.groups.quantity);
-      const unit = quantityMatch.groups.unit;
-      const name = regexMatchGroups.arbitraryName || void 0;
-      if (!value || value.type === "fixed" && value.value.type === "text") {
-        throw new InvalidQuantityFormat(
-          regexMatchGroups.arbitraryQuantity?.trim(),
-          "Arbitrary quantities must have a numerical value"
-        );
-      }
-      const arbitrary = {
-        quantity: value
-      };
-      if (name) arbitrary.name = name;
-      if (unit) arbitrary.unit = unit;
-      intoArray.push({
-        type: "arbitrary",
-        index: this.arbitraries.push(arbitrary) - 1
-      });
-    }
+    const parsed = parseArbitraryQuantity(regexMatchGroups.arbitraryQuantity);
+    const name = regexMatchGroups.arbitraryName || void 0;
+    const arbitrary = {
+      quantity: parsed.quantity
+    };
+    if (name) arbitrary.name = name;
+    if (parsed.unit) arbitrary.unit = parsed.unit;
+    intoArray.push({
+      type: "arbitrary",
+      index: this.arbitraries.push(arbitrary) - 1
+    });
   }
   /**
    * Parses text for arbitrary scalables and returns NoteItem array.
@@ -3155,8 +3211,8 @@ var _Recipe = class _Recipe {
           const isGrouped = "group" in item && item.group !== void 0;
           const groupAlternatives = isGrouped ? this.choices.ingredientGroups.get(item.group) : void 0;
           let selectedAltIndex = 0;
-          let isSelected = false;
-          let hasExplicitChoice = false;
+          let isSelected;
+          let hasExplicitChoice;
           if (isGrouped) {
             const groupChoice = choices?.ingredientGroups?.get(item.group);
             hasExplicitChoice = groupChoice !== void 0;
@@ -3616,37 +3672,34 @@ var _Recipe = class _Recipe {
         arbitrary.quantity,
         factor
       );
+      const optimized = applyBestUnit(
+        { quantity: arbitrary.quantity, unit: arbitrary.unit },
+        unitSystem
+      );
+      arbitrary.quantity = optimized.quantity;
+      arbitrary.unit = optimized.unit;
     }
     newRecipe._populateIngredientQuantities();
     newRecipe.servings = (0, import_big4.default)(originalServings).times(factor).toNumber();
-    if (newRecipe.metadata.servings && this.metadata.servings) {
-      if (floatRegex.test(String(this.metadata.servings).replace(",", ".").trim())) {
-        const servingsValue = parseFloat(
-          String(this.metadata.servings).replace(",", ".")
-        );
-        newRecipe.metadata.servings = String(
-          (0, import_big4.default)(servingsValue).times(factor).toNumber()
-        );
-      }
-    }
-    if (newRecipe.metadata.yield && this.metadata.yield) {
-      if (floatRegex.test(String(this.metadata.yield).replace(",", ".").trim())) {
-        const yieldValue = parseFloat(
-          String(this.metadata.yield).replace(",", ".")
+    for (const metaVar of ["servings", "yield", "serves"]) {
+      if (newRecipe.metadata[metaVar] && this.metadata[metaVar]) {
+        const original = this.metadata[metaVar];
+        const scaledQuantity = multiplyQuantityValue(
+          original.quantity,
+          factor
         );
-        newRecipe.metadata.yield = String(
-          (0, import_big4.default)(yieldValue).times(factor).toNumber()
-        );
-      }
-    }
-    if (newRecipe.metadata.serves && this.metadata.serves) {
-      if (floatRegex.test(String(this.metadata.serves).replace(",", ".").trim())) {
-        const servesValue = parseFloat(
-          String(this.metadata.serves).replace(",", ".")
-        );
-        newRecipe.metadata.serves = String(
-          (0, import_big4.default)(servesValue).times(factor).toNumber()
+        const optimized = applyBestUnit(
+          { quantity: scaledQuantity, unit: original.unit },
+          unitSystem
         );
+        const scaled = {
+          quantity: optimized.quantity
+        };
+        if (optimized.unit) scaled.unit = optimized.unit;
+        if (original.textBefore) scaled.textBefore = original.textBefore;
+        if (original.textAfter) scaled.textAfter = original.textAfter;
+        if (original.text) scaled.text = original.text;
+        newRecipe.metadata[metaVar] = scaled;
       }
     }
     return newRecipe;
@@ -4730,6 +4783,7 @@ function isAlternativeSelected(recipe, choices, item, alternativeIndex) {
 // v8 ignore else -- @preserve
 // v8 ignore if -- @preserve
 /* v8 ignore else -- expliciting error type -- @preserve */
+/* v8 ignore next 4 -- @preserve: defensive guard; regex always matches */
 // v8 ignore if -- @preserve: defensive type guard
 /* v8 ignore if -- @preserve */
 // v8 ignore next -- @preserve