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

package/dist/index.js

@@ -272,13 +272,12 @@ 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();
 var inlineIngredientAlternativesRegex = new RegExp("\\|" + ingredientWithAlternativeRegex.source.slice(1));
 var quantityAlternativeRegex = d().startNamedGroup("quantity").notAnyOf("}|%").oneOrMore().endGroup().optional().startGroup().literal("%").startNamedGroup("unit").notAnyOf("|}").oneOrMore().endGroup().endGroup().optional().startGroup().literal("|").startNamedGroup("alternative").startGroup().notAnyOf("}").oneOrMore().endGroup().zeroOrMore().endGroup().endGroup().optional().toRegExp();
-var ingredientWithGroupKeyRegex = d().literal("@|").startNamedGroup("gIngredientGroupKey").notAnyOf(nonWordCharStrict).oneOrMore().endGroup().literal("|").startNamedGroup("gIngredientModifiers").anyOf("@\\-&?").zeroOrMore().endGroup().optional().startNamedGroup("gIngredientRecipeAnchor").literal("./").endGroup().optional().startGroup().startGroup().startNamedGroup("gmIngredientName").notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startNamedGroup("gsIngredientName").notAnyOf(nonWordChar).zeroOrMore().notAnyOf("\\." + nonWordChar).endGroup().endGroup().startGroup().literal("{").startNamedGroup("gIngredientQuantityModifier").literal("=").exactly(1).endGroup().optional().startNamedGroup("gIngredientQuantity").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("gIngredientPreparation").notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().toRegExp();
+var ingredientWithGroupKeyRegex = d().literal("@|").startNamedGroup("gIngredientGroupKey").notAnyOf(nonWordCharStrict + "/").oneOrMore().endGroup().startGroup().literal("/").startNamedGroup("gIngredientSubgroupKey").notAnyOf(nonWordCharStrict).oneOrMore().endGroup().endGroup().optional().literal("|").startNamedGroup("gIngredientModifiers").anyOf("@\\-&?").zeroOrMore().endGroup().optional().startNamedGroup("gIngredientRecipeAnchor").literal("./").endGroup().optional().startGroup().startGroup().startNamedGroup("gmIngredientName").notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startNamedGroup("gsIngredientName").notAnyOf(nonWordChar).zeroOrMore().notAnyOf("\\." + nonWordChar).endGroup().endGroup().startGroup().literal("{").startNamedGroup("gIngredientQuantityModifier").literal("=").exactly(1).endGroup().optional().startNamedGroup("gIngredientQuantity").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("gIngredientPreparation").notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().toRegExp();
 var ingredientAliasRegex = d().startAnchor().startNamedGroup("ingredientListName").notAnyOf("|").oneOrMore().endGroup().literal("|").startNamedGroup("ingredientDisplayName").notAnyOf("|").oneOrMore().endGroup().endAnchor().toRegExp();
 var cookwareRegex = d().literal("#").startNamedGroup("cookwareModifiers").anyOf("\\-&?").zeroOrMore().endGroup().startGroup().startGroup().startNamedGroup("mCookwareName").notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\})").endGroup().or().startNamedGroup("sCookwareName").notAnyOf(nonWordChar).zeroOrMore().notAnyOf("\\." + nonWordChar).endGroup().endGroup().startGroup().literal("{").startNamedGroup("cookwareQuantity").anyCharacter().zeroOrMore().lazy().endGroup().literal("}").endGroup().optional().toRegExp();
 var timerRegex = d().literal("~").startNamedGroup("timerName").anyCharacter().zeroOrMore().lazy().endGroup().literal("{").startNamedGroup("timerQuantity").anyCharacter().oneOrMore().lazy().endGroup().startGroup().literal("%").startNamedGroup("timerUnit").anyCharacter().oneOrMore().lazy().endGroup().endGroup().optional().literal("}").toRegExp();
@@ -293,6 +292,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();
@@ -1276,17 +1282,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;
@@ -1296,22 +1306,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 {
@@ -1319,7 +1329,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 = {}) {
@@ -1671,13 +1681,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(
@@ -1795,6 +1854,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;
@@ -1919,9 +1985,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");
@@ -2713,6 +2779,7 @@ var _Recipe = class _Recipe {
      */
     __publicField(this, "servings");
     _Recipe.itemCounts.set(this, 0);
+    _Recipe.subgroupIndices.set(this, /* @__PURE__ */ new Map());
     if (content) {
       this.parse(content);
     }
@@ -2748,27 +2815,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.
@@ -2940,6 +2997,7 @@ var _Recipe = class _Recipe {
     if (!match?.groups) return;
     const groups = match.groups;
     const groupKey = groups.gIngredientGroupKey;
+    const subgroupKey = groups.gIngredientSubgroupKey;
     let name = groups.gmIngredientName || groups.gsIngredientName;
     const preparation = groups.gIngredientPreparation;
     const modifiers = groups.gIngredientModifiers;
@@ -3007,7 +3065,8 @@ var _Recipe = class _Recipe {
     if (itemQuantity) {
       Object.assign(alternative, itemQuantity);
     }
-    const existingAlternatives = this.choices.ingredientGroups.get(groupKey);
+    const existingSubgroups = this.choices.ingredientGroups.get(groupKey);
+    const existingAlternativesFlat = existingSubgroups?.flat();
     function upsertAlternativeToIngredient(ingredients, ingredientIdx, newAlternativeIdx) {
       const ingredient = ingredients[ingredientIdx];
       if (ingredient) {
@@ -3018,8 +3077,8 @@ var _Recipe = class _Recipe {
         }
       }
     }
-    if (existingAlternatives) {
-      for (const alt of existingAlternatives) {
+    if (existingAlternativesFlat) {
+      for (const alt of existingAlternativesFlat) {
         upsertAlternativeToIngredient(this.ingredients, alt.index, idxInList);
         upsertAlternativeToIngredient(this.ingredients, idxInList, alt.index);
       }
@@ -3031,14 +3090,35 @@ var _Recipe = class _Recipe {
       group: groupKey,
       alternatives: [alternative]
     };
+    if (subgroupKey !== void 0) {
+      newItem.subgroup = subgroupKey;
+    }
     items.push(newItem);
     const choiceAlternative = deepClone(alternative);
     choiceAlternative.itemId = id;
     const existingChoice = this.choices.ingredientGroups.get(groupKey);
+    const sgMap = _Recipe.subgroupIndices.get(this);
     if (!existingChoice) {
-      this.choices.ingredientGroups.set(groupKey, [choiceAlternative]);
+      this.choices.ingredientGroups.set(groupKey, [[choiceAlternative]]);
+      if (subgroupKey !== void 0) {
+        sgMap.set(groupKey, /* @__PURE__ */ new Map([[subgroupKey, 0]]));
+      }
+    } else if (subgroupKey !== void 0) {
+      const groupSgMap = sgMap.get(groupKey);
+      const existingIdx = groupSgMap?.get(subgroupKey);
+      if (existingIdx !== void 0) {
+        existingChoice[existingIdx].push(choiceAlternative);
+      } else {
+        const newIdx = existingChoice.length;
+        existingChoice.push([choiceAlternative]);
+        if (!groupSgMap) {
+          sgMap.set(groupKey, /* @__PURE__ */ new Map([[subgroupKey, newIdx]]));
+        } else {
+          groupSgMap.set(subgroupKey, newIdx);
+        }
+      }
     } else {
-      existingChoice.push(choiceAlternative);
+      existingChoice.push([choiceAlternative]);
     }
   }
   /**
@@ -3095,15 +3175,16 @@ var _Recipe = class _Recipe {
           (item2) => item2.type === "ingredient"
         )) {
           const isGrouped = "group" in item && item.group !== void 0;
-          const groupAlternatives = isGrouped ? this.choices.ingredientGroups.get(item.group) : void 0;
+          const groupSubgroups = 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;
-            const targetIndex = groupChoice ?? 0;
-            isSelected = groupAlternatives?.[targetIndex]?.itemId === item.id;
+            const targetSubgroupIndex = groupChoice ?? 0;
+            const selectedSubgroup = groupSubgroups?.[targetSubgroupIndex];
+            isSelected = selectedSubgroup?.some((alt) => alt.itemId === item.id) ?? false;
           } else {
             const itemChoice = choices?.ingredientItems?.get(item.id);
             hasExplicitChoice = itemChoice !== void 0;
@@ -3113,8 +3194,8 @@ var _Recipe = class _Recipe {
           const alternative = item.alternatives[selectedAltIndex];
           if (!alternative || !isSelected) continue;
           selectedIndices.add(alternative.index);
-          const allAlts = isGrouped ? groupAlternatives : item.alternatives;
-          for (const alt of allAlts) {
+          const allAltsFlat = isGrouped ? groupSubgroups.flat() : item.alternatives;
+          for (const alt of allAltsFlat) {
             referencedIndices.add(alt.index);
           }
           if (!alternative.quantity) continue;
@@ -3126,10 +3207,34 @@ var _Recipe = class _Recipe {
           };
           const quantityEntry = alternative.equivalents?.length ? { or: [baseQty, ...alternative.equivalents] } : baseQty;
           let alternativeRefs;
-          if (!hasExplicitChoice && allAlts.length > 1) {
-            alternativeRefs = allAlts.filter(
-              (alt) => isGrouped ? alt.itemId !== item.id : alt.index !== alternative.index
-            ).map((otherAlt) => {
+          if (!hasExplicitChoice && groupSubgroups && groupSubgroups.length > 1) {
+            const currentSubgroupIdx = groupSubgroups.findIndex(
+              (sg) => sg.some((alt) => alt.itemId === item.id)
+            );
+            alternativeRefs = groupSubgroups.filter((_, idx) => idx !== currentSubgroupIdx).flatMap(
+              (subgroup) => subgroup.map((otherAlt) => {
+                const ref = {
+                  index: otherAlt.index
+                };
+                if (otherAlt.quantity) {
+                  const altQty = {
+                    quantity: otherAlt.quantity,
+                    ...otherAlt.unit && {
+                      unit: otherAlt.unit.name
+                    },
+                    ...otherAlt.equivalents && {
+                      equivalents: otherAlt.equivalents.map(
+                        (eq) => toPlainUnit(eq)
+                      )
+                    }
+                  };
+                  ref.quantities = [altQty];
+                }
+                return ref;
+              })
+            );
+          } else if (!hasExplicitChoice && !isGrouped && allAltsFlat.length > 1) {
+            alternativeRefs = allAltsFlat.filter((alt) => alt.index !== alternative.index).map((otherAlt) => {
               const ref = { index: otherAlt.index };
               if (otherAlt.quantity) {
                 const altQty = {
@@ -3547,8 +3652,10 @@ var _Recipe = class _Recipe {
         }
       }
     }
-    for (const alternatives of newRecipe.choices.ingredientGroups.values()) {
-      scaleAlternativesBy(alternatives, factor);
+    for (const subgroups of newRecipe.choices.ingredientGroups.values()) {
+      for (const subgroup of subgroups) {
+        scaleAlternativesBy(subgroup, factor);
+      }
     }
     for (const alternatives of newRecipe.choices.ingredientItems.values()) {
       scaleAlternativesBy(alternatives, factor);
@@ -3558,37 +3665,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 = Big4(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(
-          Big4(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(
-          Big4(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(
-          Big4(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;
@@ -3738,8 +3842,10 @@ var _Recipe = class _Recipe {
         }
       }
     }
-    for (const alternatives of newRecipe.choices.ingredientGroups.values()) {
-      convertAlternatives(alternatives);
+    for (const subgroups of newRecipe.choices.ingredientGroups.values()) {
+      for (const subgroup of subgroups) {
+        convertAlternatives(subgroup);
+      }
     }
     for (const alternatives of newRecipe.choices.ingredientItems.values()) {
       convertAlternatives(alternatives);
@@ -3791,6 +3897,11 @@ __publicField(_Recipe, "unitSystems", /* @__PURE__ */ new WeakMap());
  * Used for giving ID numbers to items during parsing.
  */
 __publicField(_Recipe, "itemCounts", /* @__PURE__ */ new WeakMap());
+/**
+ * External storage for subgroup index tracking during parsing.
+ * Maps groupKey → subgroupKey → index within the subgroups array.
+ */
+__publicField(_Recipe, "subgroupIndices", /* @__PURE__ */ new WeakMap());
 var Recipe = _Recipe;
 
 // src/classes/shopping_list.ts
@@ -4628,10 +4739,10 @@ function isGroupedItem(item) {
 function isAlternativeSelected(recipe, choices, item, alternativeIndex) {
   if (item.group) {
     const selectedIndex2 = choices?.ingredientGroups?.get(item.group);
-    const groupAlternatives = recipe.choices.ingredientGroups.get(item.group);
-    if (groupAlternatives && selectedIndex2 !== void 0 && selectedIndex2 < groupAlternatives.length) {
-      const selectedItemId = groupAlternatives[selectedIndex2]?.itemId;
-      return selectedItemId === item.id;
+    const groupSubgroups = recipe.choices.ingredientGroups.get(item.group);
+    if (groupSubgroups && selectedIndex2 !== void 0 && selectedIndex2 < groupSubgroups.length) {
+      const selectedSubgroup = groupSubgroups[selectedIndex2];
+      return selectedSubgroup?.some((alt) => alt.itemId === item.id);
     }
     return false;
   }
@@ -4671,6 +4782,7 @@ export {
 // 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