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

package/dist/index.cjs

@@ -32,11 +32,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  BadIndentationError: () => BadIndentationError,
   CategoryConfig: () => CategoryConfig,
   NoProductCatalogForCartError: () => NoProductCatalogForCartError,
   NoShoppingListForCartError: () => NoShoppingListForCartError,
-  NoTabAsIndentError: () => NoTabAsIndentError,
   Pantry: () => Pantry,
   ProductCatalog: () => ProductCatalog,
   Recipe: () => Recipe,
@@ -51,11 +49,14 @@ __export(index_exports, {
   formatQuantityWithUnit: () => formatQuantityWithUnit,
   formatSingleValue: () => formatSingleValue,
   formatUnit: () => formatUnit,
+  getEffectiveChoices: () => getEffectiveChoices,
   hasAlternatives: () => hasAlternatives,
   isAlternativeSelected: () => isAlternativeSelected,
   isAndGroup: () => isAndGroup,
   isGroupedItem: () => isGroupedItem,
+  isSectionActive: () => isSectionActive,
   isSimpleGroup: () => isSimpleGroup,
+  isStepActive: () => isStepActive,
   renderFractionAsVulgar: () => renderFractionAsVulgar
 });
 module.exports = __toCommonJS(index_exports);
@@ -334,8 +335,8 @@ 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().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 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().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().startGroup().literal("[").startNamedGroup("gIngredientNote").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();
@@ -350,11 +351,18 @@ 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,
+var yieldPrefixPart = d().startAnchor().literal("yield").literal(":").anyOf("	 ").zeroOrMore().startNamedGroup("servingsPrefix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().lazy().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().toRegExp();
+var yieldSuffixPart = d().anyOf("	 ").zeroOrMore().startNamedGroup("servingsSuffix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().endAnchor().toRegExp();
+var yieldMetaValueWithUnitRegex = new RegExp(
+  yieldPrefixPart.source + arbitraryScalableRegex.source + yieldSuffixPart.source,
+  "m"
+);
+var yieldMetaValueAsQuantityRegex = d().startAnchor().literal("yield:").anyOf("	 ").zeroOrMore().startNamedGroup("quantity").notAnyOf("{}|%\\n\\r").oneOrMore().endGroup().optional().startGroup().literal("%").startNamedGroup("unit").notAnyOf("\\n\\r|}").oneOrMore().endGroup().endGroup().optional().anyOf("	 ").zeroOrMore().endAnchor().toRegExp();
+var yieldMetaValueRegex = new RegExp(
+  [
+    yieldMetaValueWithUnitRegex.source,
+    yieldMetaValueAsQuantityRegex.source
+  ].join("|"),
   "m"
 );
 var commentRegex = d().literal("--").anyCharacter().zeroOrMore().global().toRegExp();
@@ -363,6 +371,7 @@ var shoppingListRegex = d().literal("[").startNamedGroup("name").anyCharacter().
 var rangeRegex = d().startAnchor().digit().oneOrMore().startGroup().anyOf(".,/").exactly(1).digit().oneOrMore().endGroup().optional().literal("-").digit().oneOrMore().startGroup().anyOf(".,/").exactly(1).digit().oneOrMore().endGroup().optional().endAnchor().toRegExp();
 var numberLikeRegex = d().startAnchor().digit().oneOrMore().startGroup().anyOf(".,/").exactly(1).digit().oneOrMore().endGroup().optional().endAnchor().toRegExp();
 var floatRegex = d().startAnchor().digit().oneOrMore().startGroup().anyOf(".").exactly(1).digit().oneOrMore().endGroup().optional().endAnchor().toRegExp();
+var variantTagRegex = d().startAnchor().literal("[").startNamedGroup("variantOptionalPrefix").literal("?").endGroup().optional().startNamedGroup("variantNames").notAnyOf("\\]").oneOrMore().endGroup().optional().literal("]").whitespace().zeroOrMore().toRegExp();
 var mdEscaped = d().literal("\\").startCaptureGroup().anyOf("*_`").endGroup();
 var mdInlineCode = d().literal("`").startCaptureGroup().notAnyOf("`").oneOrMore().lazy().endGroup().literal("`");
 var mdLink = d().literal("[").startCaptureGroup().notAnyOf("\\]").oneOrMore().lazy().endGroup().literal("](").startCaptureGroup().notAnyOf(")").oneOrMore().lazy().endGroup().literal(")");
@@ -938,7 +947,7 @@ var NoProductMatchError = class extends Error {
   constructor(item_name, code) {
     const messageMap = {
       incompatibleUnits: `The units of the products in the catalogue are incompatible with ingredient ${item_name} in the shopping list.`,
-      noProduct: "No product was found linked to ingredient name ${item_name} in the shopping list",
+      noProduct: `No product was found linked to ingredient name ${item_name} in the shopping list`,
       textValue: `Ingredient ${item_name} has a text value as quantity and can therefore not be matched with any product in the catalogue.`,
       noQuantity: `Ingredient ${item_name} has no quantity and can therefore not be matched with any product in the catalogue.`,
       textValue_incompatibleUnits: `Multiple alternative quantities were provided for ingredient ${item_name} in the shopping list but they were either text values or no product in catalog were found to have compatible units`
@@ -1417,9 +1426,12 @@ function flushPendingNote(section, noteItems) {
   }
   return noteItems;
 }
-function flushPendingItems(section, items) {
+function flushPendingItems(section, items, stepVariants, stepOptional) {
   if (items.length > 0) {
-    section.content.push({ type: "step", items: [...items] });
+    const step = { type: "step", items: [...items] };
+    if (stepVariants) step.variants = stepVariants;
+    if (stepOptional) step.optional = true;
+    section.content.push(step);
     items.length = 0;
     return true;
   }
@@ -1538,7 +1550,7 @@ function stringifyFixedValue(quantity) {
     return String(quantity.value.decimal);
   else return quantity.value.text;
 }
-function parseQuantityInput(input_str) {
+function parseQuantityValue(input_str) {
   const clean_str = String(input_str).trim();
   if (rangeRegex.test(clean_str)) {
     const range_parts = clean_str.split("-");
@@ -1552,12 +1564,12 @@ function parseQuantityWithUnit(input) {
   const trimmed = input.trim();
   const separatorIndex = trimmed.indexOf("%");
   if (separatorIndex === -1) {
-    return { value: parseQuantityInput(trimmed) };
+    return { value: parseQuantityValue(trimmed) };
   }
   const valuePart = trimmed.slice(0, separatorIndex).trim();
   const unitPart = trimmed.slice(separatorIndex + 1).trim();
   return {
-    value: parseQuantityInput(valuePart),
+    value: parseQuantityValue(valuePart),
     unit: unitPart || void 0
   };
 }
@@ -1747,7 +1759,7 @@ function parseArbitraryQuantity(raw) {
       "Arbitrary quantities must have a numerical value"
     );
   }
-  const value = parseQuantityInput(quantityMatch.groups.quantity);
+  const value = parseQuantityValue(quantityMatch.groups.quantity);
   const unit = quantityMatch.groups.unit;
   if (!value || value.type === "fixed" && value.value.type === "text") {
     throw new InvalidQuantityFormat(
@@ -1761,40 +1773,40 @@ function parseArbitraryQuantity(raw) {
   if (unit) arbitrary.unit = unit;
   return arbitrary;
 }
-function parseScalingMetaVar(content, varName) {
-  const complexMatch = content.match(scalingMetaValueWithUnitRegex(varName));
-  if (complexMatch?.groups?.arbitraryQuantity) {
-    const parsed = parseArbitraryQuantity(
-      complexMatch.groups.arbitraryQuantity
-    );
-    const result2 = {
+function parseServingsMetaVar(content, varName) {
+  const raw = parseSimpleMetaVar(content, varName);
+  if (raw === void 0) return void 0;
+  const num = Number(raw);
+  if (isNaN(num)) {
+    return { numericValue: 1, rawValue: raw };
+  }
+  return { numericValue: num, rawValue: num };
+}
+function parseYieldMetaVar(content) {
+  const match = content.match(yieldMetaValueRegex);
+  if (!match) return void 0;
+  if (match.groups?.arbitraryQuantity) {
+    const parsed = parseArbitraryQuantity(match.groups.arbitraryQuantity);
+    const result = {
       quantity: parsed.quantity
     };
-    if (parsed.unit) result2.unit = parsed.unit;
-    if (complexMatch.groups.servingsPrefix) {
-      result2.textBefore = complexMatch.groups.servingsPrefix;
+    if (parsed.unit) result.unit = parsed.unit;
+    if (match.groups.servingsPrefix) {
+      result.textBefore = match.groups.servingsPrefix;
     }
-    if (complexMatch.groups.servingsSuffix) {
-      result2.textAfter = complexMatch.groups.servingsSuffix;
+    if (match.groups.servingsSuffix) {
+      result.textAfter = match.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 result;
   }
-  const numericValue = Number(varMatch[2]?.trim());
-  const result = {
-    quantity: {
-      type: "fixed",
-      value: { type: "decimal", decimal: numericValue }
-    }
-  };
-  if (varMatch[3]) {
-    result.text = `${varMatch[3].trim()}`;
+  if (match.groups?.quantity) {
+    const result = {
+      quantity: parseQuantityValue(match.groups.quantity)
+    };
+    if (match.groups.unit) result.unit = match.groups.unit;
+    return result;
   }
-  return result;
+  return void 0;
 }
 function parseListMetaVar(content, varName) {
   const listMatch = content.match(
@@ -1912,12 +1924,12 @@ function parseAnyMetaVar(content, varName) {
   if (simple) return parseMetadataValue(simple);
   return void 0;
 }
-function getNumericValueFromMetaVar(v) {
+function getNumericValueFromYield(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;
+  return 1;
 }
 function extractMetadata(content) {
   const metadata = {};
@@ -1963,7 +1975,8 @@ function extractMetadata(content) {
     "yield",
     "serves",
     // List fields
-    "tags"
+    "tags",
+    "variants"
   ]);
   for (const metaVar of [
     "title",
@@ -2041,15 +2054,22 @@ function extractMetadata(content) {
     };
     unitSystem = unitSystemMap[unitSystemRaw.toLowerCase()];
   }
-  for (const metaVar of ["servings", "yield", "serves"]) {
-    const scalingMetaValue = parseScalingMetaVar(metadataContent, metaVar);
-    if (scalingMetaValue) {
-      metadata[metaVar] = scalingMetaValue;
-      servings = getNumericValueFromMetaVar(scalingMetaValue);
+  const yieldValue = parseYieldMetaVar(metadataContent);
+  if (yieldValue) {
+    metadata.yield = yieldValue;
+    servings = getNumericValueFromYield(yieldValue);
+  }
+  for (const metaVar of ["serves", "servings"]) {
+    const result = parseServingsMetaVar(metadataContent, metaVar);
+    if (result !== void 0) {
+      metadata[metaVar] = result.rawValue;
+      servings = result.numericValue;
     }
   }
   const tags = parseListMetaVar(metadataContent, "tags");
   if (tags) metadata.tags = tags;
+  const variants = parseListMetaVar(metadataContent, "variants");
+  if (variants) metadata.variants = variants;
   const allKeys = extractAllMetadataKeys(metadataContent);
   for (const key of allKeys) {
     if (handledKeys.has(key)) continue;
@@ -2324,7 +2344,7 @@ var ProductCatalog = class {
         const sizeStrings = Array.isArray(size) ? size : [size];
         const sizes = sizeStrings.map((sizeStr) => {
           const sizeAndUnitRaw = sizeStr.split("%");
-          const sizeParsed = parseQuantityInput(
+          const sizeParsed = parseQuantityValue(
             sizeAndUnitRaw[0]
           );
           const productSize = { size: sizeParsed };
@@ -2437,8 +2457,10 @@ var Section = class {
   /**
    * Creates an instance of Section.
    * @param name - The name of the section. Defaults to an empty string.
+   * @param variants - Optional variant names for this section.
+   * @param optional - Whether the section is optional.
    */
-  constructor(name = "") {
+  constructor(name = "", variants, optional) {
     /**
      * The name of the section. Can be an empty string for the default (first) section.
      * @defaultValue `""`
@@ -2446,7 +2468,13 @@ var Section = class {
     __publicField(this, "name");
     /** An array of steps and notes that make up the content of the section. */
     __publicField(this, "content", []);
+    /** Optional list of variant names this section belongs to. */
+    __publicField(this, "variants");
+    /** Whether the section has been marked as optional ([?]) */
+    __publicField(this, "optional");
     this.name = name;
+    if (variants) this.variants = variants;
+    if (optional) this.optional = true;
   }
   /**
    * Checks if the section is blank (has no name and no content).
@@ -2482,34 +2510,7 @@ function findCompatibleQuantityWithinList(list, quantity) {
 }
 
 // src/utils/general.ts
-var legacyDeepClone = (v) => {
-  if (v === null || typeof v !== "object") {
-    return v;
-  }
-  if (v instanceof Map) {
-    return new Map(
-      Array.from(v.entries()).map(([k, val]) => [
-        legacyDeepClone(k),
-        legacyDeepClone(val)
-      ])
-    );
-  }
-  if (v instanceof Set) {
-    return new Set(Array.from(v).map((val) => legacyDeepClone(val)));
-  }
-  if (v instanceof Date) {
-    return new Date(v.getTime());
-  }
-  if (Array.isArray(v)) {
-    return v.map((item) => legacyDeepClone(item));
-  }
-  const cloned = {};
-  for (const key of Object.keys(v)) {
-    cloned[key] = legacyDeepClone(v[key]);
-  }
-  return cloned;
-};
-var deepClone = (v) => typeof structuredClone === "function" ? structuredClone(v) : legacyDeepClone(v);
+var deepClone = (v) => structuredClone(v);
 
 // src/quantities/alternatives.ts
 function getEquivalentUnitsLists(...quantities) {
@@ -2788,6 +2789,47 @@ function addEquivalentsAndSimplify(quantities, system) {
     return { and: regrouped.map(toPlainUnit) };
   }
 }
+function buildEquivalenceRatioMap(unitsLists) {
+  const ratioMap = {};
+  for (const list of unitsLists) {
+    for (const equiv of list) {
+      const equivValue = getAverageValue(equiv.quantity);
+      for (const primary of list) {
+        if (primary === equiv) continue;
+        const primaryValue = getAverageValue(primary.quantity);
+        const equivUnit = normalizeUnit(equiv.unit.name)?.name ?? equiv.unit.name;
+        const primaryUnit = normalizeUnit(primary.unit.name)?.name ?? primary.unit.name;
+        ratioMap[equivUnit] ?? (ratioMap[equivUnit] = {});
+        ratioMap[equivUnit][primaryUnit] = equivValue / primaryValue;
+      }
+    }
+  }
+  return ratioMap;
+}
+function recomputeEquivalents(primaries, ratioMap, equivUnits) {
+  const equivalents = [];
+  for (const equivUnit of equivUnits) {
+    const ratios = ratioMap[normalizeUnit(equivUnit)?.name ?? equivUnit];
+    let total = 0;
+    for (const primary of primaries) {
+      const pUnit = normalizeUnit(primary.unit ?? NO_UNIT)?.name ?? primary.unit ?? NO_UNIT;
+      const ratio = ratios[pUnit];
+      if (ratio === void 0) continue;
+      const pValue = getAverageValue(primary.quantity);
+      total += pValue * ratio;
+    }
+    if (total > 0) {
+      equivalents.push({
+        quantity: {
+          type: "fixed",
+          value: { type: "decimal", decimal: total }
+        },
+        ...equivUnit !== "" && { unit: equivUnit }
+      });
+    }
+  }
+  return equivalents.length > 0 ? equivalents : void 0;
+}
 
 // src/classes/recipe.ts
 var import_big4 = __toESM(require("big.js"), 1);
@@ -2806,7 +2848,8 @@ var _Recipe = class _Recipe {
      */
     __publicField(this, "choices", {
       ingredientItems: /* @__PURE__ */ new Map(),
-      ingredientGroups: /* @__PURE__ */ new Map()
+      ingredientGroups: /* @__PURE__ */ new Map(),
+      variants: []
     });
     /**
      * The parsed recipe ingredients.
@@ -2911,7 +2954,7 @@ var _Recipe = class _Recipe {
     let quantityMatch = quantityRaw.match(quantityAlternativeRegex);
     const quantities = [];
     while (quantityMatch?.groups) {
-      const value = quantityMatch.groups.quantity ? parseQuantityInput(quantityMatch.groups.quantity) : void 0;
+      const value = quantityMatch.groups.quantity ? parseQuantityValue(quantityMatch.groups.quantity) : void 0;
       const unit = quantityMatch.groups.unit;
       if (value) {
         const newQuantity = { quantity: value };
@@ -3123,6 +3166,10 @@ var _Recipe = class _Recipe {
     if (itemQuantity) {
       Object.assign(alternative, itemQuantity);
     }
+    const note = groups.gIngredientNote?.trim();
+    if (note) {
+      alternative.note = note;
+    }
     const existingSubgroups = this.choices.ingredientGroups.get(groupKey);
     const existingAlternativesFlat = existingSubgroups?.flat();
     function upsertAlternativeToIngredient(ingredients, ingredientIdx, newAlternativeIdx) {
@@ -3216,6 +3263,8 @@ var _Recipe = class _Recipe {
   /** @internal */
   collectQuantityGroups(options) {
     const { section, step, choices } = options || {};
+    const activeVariant = choices?.variant;
+    const isDefaultVariant = activeVariant === void 0 || activeVariant === "*";
     const sectionsToProcess = section !== void 0 ? (() => {
       const idx = typeof section === "number" ? section : this.sections.indexOf(section);
       return idx >= 0 && idx < this.sections.length ? [this.sections[idx]] : [];
@@ -3223,12 +3272,29 @@ var _Recipe = class _Recipe {
     const ingredientGroups = /* @__PURE__ */ new Map();
     const selectedIndices = /* @__PURE__ */ new Set();
     const referencedIndices = /* @__PURE__ */ new Set();
+    const dynamicOptionalIndices = /* @__PURE__ */ new Set();
     for (const currentSection of sectionsToProcess) {
+      if (currentSection.variants) {
+        if (isDefaultVariant) {
+          if (!currentSection.variants.includes("*")) continue;
+        } else {
+          if (!currentSection.variants.includes(activeVariant)) continue;
+        }
+      }
       const allSteps = currentSection.content.filter(
         (item) => item.type === "step"
       );
+      const isOptionalSection = currentSection.optional === true;
       const stepsToProcess = step === void 0 ? allSteps : typeof step === "number" ? step >= 0 && step < allSteps.length ? [allSteps[step]] : [] : allSteps.includes(step) ? [step] : [];
       for (const currentStep of stepsToProcess) {
+        if (currentStep.variants) {
+          if (isDefaultVariant) {
+            if (!currentStep.variants.includes("*")) continue;
+          } else {
+            if (!currentStep.variants.includes(activeVariant)) continue;
+          }
+        }
+        const isOptionalStep = currentStep.optional === true || isOptionalSection;
         for (const item of currentStep.items.filter(
           (item2) => item2.type === "ingredient"
         )) {
@@ -3240,18 +3306,55 @@ var _Recipe = class _Recipe {
           if (isGrouped) {
             const groupChoice = choices?.ingredientGroups?.get(item.group);
             hasExplicitChoice = groupChoice !== void 0;
-            const targetSubgroupIndex = groupChoice ?? 0;
-            const selectedSubgroup = groupSubgroups?.[targetSubgroupIndex];
-            isSelected = selectedSubgroup?.some((alt) => alt.itemId === item.id) ?? false;
+            if (!hasExplicitChoice && !isDefaultVariant) {
+              const matchingSubgroupIdx = groupSubgroups?.findIndex(
+                (sg) => sg.some(
+                  (alt) => alt.note && alt.note.toLowerCase().includes(activeVariant.toLowerCase())
+                )
+              );
+              if (matchingSubgroupIdx !== void 0 && matchingSubgroupIdx >= 0) {
+                const matchedSubgroup = groupSubgroups[matchingSubgroupIdx];
+                isSelected = matchedSubgroup.some(
+                  (alt) => alt.itemId === item.id
+                );
+                hasExplicitChoice = true;
+                selectedAltIndex = 0;
+              } else {
+                const targetSubgroupIndex = 0;
+                const selectedSubgroup = groupSubgroups?.[targetSubgroupIndex];
+                isSelected = selectedSubgroup.some(
+                  (alt) => alt.itemId === item.id
+                );
+              }
+            } else {
+              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;
-            selectedAltIndex = itemChoice ?? 0;
+            if (!hasExplicitChoice && !isDefaultVariant) {
+              const matchingIndices = item.alternatives.map((alt, idx) => ({ alt, idx })).filter(
+                ({ alt }) => alt.note && alt.note.toLowerCase().includes(activeVariant.toLowerCase())
+              ).map(({ idx }) => idx);
+              if (matchingIndices.length > 0) {
+                selectedAltIndex = matchingIndices[0];
+                hasExplicitChoice = true;
+              } else {
+                selectedAltIndex = itemChoice ?? 0;
+              }
+            } else {
+              selectedAltIndex = itemChoice ?? 0;
+            }
             isSelected = true;
           }
           const alternative = item.alternatives[selectedAltIndex];
           if (!alternative || !isSelected) continue;
           selectedIndices.add(alternative.index);
+          if (isOptionalStep) {
+            dynamicOptionalIndices.add(alternative.index);
+          }
           const allAltsFlat = isGrouped ? groupSubgroups.flat() : item.alternatives;
           for (const alt of allAltsFlat) {
             referencedIndices.add(alt.index);
@@ -3357,7 +3460,12 @@ var _Recipe = class _Recipe {
         }
       }
     }
-    return { ingredientGroups, selectedIndices, referencedIndices };
+    return {
+      ingredientGroups,
+      selectedIndices,
+      referencedIndices,
+      dynamicOptionalIndices
+    };
   }
   /**
    * Gets the raw (unprocessed) quantity groups for each ingredient, before
@@ -3376,12 +3484,21 @@ var _Recipe = class _Recipe {
    * ```
    */
   getRawQuantityGroups(options) {
-    const { ingredientGroups, selectedIndices, referencedIndices } = this.collectQuantityGroups(options);
+    const {
+      ingredientGroups,
+      selectedIndices,
+      referencedIndices,
+      dynamicOptionalIndices
+    } = this.collectQuantityGroups(options);
     const result = [];
     for (let index = 0; index < this.ingredients.length; index++) {
       if (!referencedIndices.has(index)) continue;
       const orig = this.ingredients[index];
       const usedAsPrimary = selectedIndices.has(index);
+      let flags = orig.flags;
+      if (dynamicOptionalIndices.has(index) && !flags?.includes("optional")) {
+        flags = [...flags ?? [], "optional"];
+      }
       const quantities = [];
       if (usedAsPrimary) {
         const groupsForIng = ingredientGroups.get(index);
@@ -3394,7 +3511,7 @@ var _Recipe = class _Recipe {
       result.push({
         name: orig.name,
         ...usedAsPrimary && { usedAsPrimary: true },
-        ...orig.flags && { flags: orig.flags },
+        ...flags && { flags },
         quantities
       });
     }
@@ -3428,15 +3545,24 @@ var _Recipe = class _Recipe {
    * ```
    */
   getIngredientQuantities(options) {
-    const { ingredientGroups, selectedIndices, referencedIndices } = this.collectQuantityGroups(options);
+    const {
+      ingredientGroups,
+      selectedIndices,
+      referencedIndices,
+      dynamicOptionalIndices
+    } = this.collectQuantityGroups(options);
     const result = [];
     for (let index = 0; index < this.ingredients.length; index++) {
       if (!referencedIndices.has(index)) continue;
       const orig = this.ingredients[index];
+      let flags = orig.flags;
+      if (dynamicOptionalIndices.has(index) && !flags?.includes("optional")) {
+        flags = [...flags ?? [], "optional"];
+      }
       const ing = {
         name: orig.name,
         ...orig.preparation && { preparation: orig.preparation },
-        ...orig.flags && { flags: orig.flags },
+        ...flags && { flags },
         ...orig.extras && { extras: orig.extras }
       };
       if (selectedIndices.has(index)) {
@@ -3487,6 +3613,59 @@ var _Recipe = class _Recipe {
     }
     return result;
   }
+  /**
+   * Returns the list of cookware items that are used in the active variant.
+   * Cookware in steps/sections not matching the active variant are excluded.
+   * Hidden cookware is always excluded.
+   *
+   * @param options - Options for filtering:
+   *   - `choices`: The choices to apply (only `variant` is used)
+   * @returns Array of Cookware objects referenced by active steps
+   *
+   * @example
+   * ```typescript
+   * // Get all cookware for the default variant
+   * const cookware = recipe.getCookwareForVariant();
+   *
+   * // Get cookware for a specific variant
+   * const veganCookware = recipe.getCookwareForVariant({ choices: { variant: 'vegan' } });
+   * ```
+   */
+  getCookwareForVariant(options) {
+    const { choices } = options || {};
+    const activeVariant = choices?.variant;
+    const isDefaultVariant = activeVariant === void 0 || activeVariant === "*";
+    const cookwareIndices = /* @__PURE__ */ new Set();
+    for (const currentSection of this.sections) {
+      if (currentSection.variants) {
+        if (isDefaultVariant) {
+          if (!currentSection.variants.includes("*")) continue;
+        } else {
+          if (!currentSection.variants.includes(activeVariant)) continue;
+        }
+      }
+      const allSteps = currentSection.content.filter(
+        (item) => item.type === "step"
+      );
+      for (const currentStep of allSteps) {
+        if (currentStep.variants) {
+          if (isDefaultVariant) {
+            if (!currentStep.variants.includes("*")) continue;
+          } else {
+            if (!currentStep.variants.includes(activeVariant)) continue;
+          }
+        }
+        for (const item of currentStep.items) {
+          if (item.type === "cookware") {
+            cookwareIndices.add(item.index);
+          }
+        }
+      }
+    }
+    return this.cookware.filter(
+      (cw, idx) => cookwareIndices.has(idx) && !cw.flags?.includes("hidden")
+    );
+  }
   /**
    * Parses a recipe from a string.
    * @param content - The recipe content to parse.
@@ -3502,9 +3681,14 @@ var _Recipe = class _Recipe {
     const items = [];
     let noteText = "";
     let inNote = false;
+    let stepVariants;
+    let stepOptional;
+    const discoveredVariants = /* @__PURE__ */ new Set();
     for (const line of cleanContent) {
       if (line.trim().length === 0) {
-        flushPendingItems(section, items);
+        flushPendingItems(section, items, stepVariants, stepOptional);
+        stepVariants = void 0;
+        stepOptional = void 0;
         flushPendingNote(
           section,
           noteText ? this._parseNoteText(noteText) : []
@@ -3515,26 +3699,42 @@ var _Recipe = class _Recipe {
         continue;
       }
       if (line.startsWith("=")) {
-        flushPendingItems(section, items);
+        flushPendingItems(section, items, stepVariants, stepOptional);
+        stepVariants = void 0;
+        stepOptional = void 0;
         flushPendingNote(
           section,
           noteText ? this._parseNoteText(noteText) : []
         );
         noteText = "";
-        if (this.sections.length === 0 && section.isBlank()) {
-          section.name = line.replace(/^=+|=+$/g, "").trim();
-        } else {
-          if (!section.isBlank()) {
-            this.sections.push(section);
+        let sectionName = line.replace(/^=+|=+$/g, "").trim();
+        let sectionVariants;
+        let sectionOptional;
+        const sectionVarMatch = sectionName.match(variantTagRegex);
+        if (sectionVarMatch?.groups) {
+          const isOptionalPrefix = sectionVarMatch.groups.variantOptionalPrefix === "?";
+          const names = (sectionVarMatch.groups.variantNames ?? "").split(",").map((n2) => n2.trim()).filter((n2) => n2.length > 0);
+          if (names.length > 0) {
+            sectionVariants = names;
+            for (const v of names) discoveredVariants.add(v);
+          }
+          if (isOptionalPrefix) {
+            sectionOptional = true;
           }
-          section = new Section(line.replace(/^=+|=+$/g, "").trim());
+          sectionName = sectionName.slice(sectionVarMatch[0].length).trim();
         }
+        if (!section.isBlank()) {
+          this.sections.push(section);
+        }
+        section = new Section(sectionName, sectionVariants, sectionOptional);
         blankLineBefore = true;
         inNote = false;
         continue;
       }
       if (blankLineBefore && line.startsWith(">")) {
-        flushPendingItems(section, items);
+        flushPendingItems(section, items, stepVariants, stepOptional);
+        stepVariants = void 0;
+        stepOptional = void 0;
         noteText = line.substring(1).trim();
         inNote = true;
         blankLineBefore = false;
@@ -3549,11 +3749,31 @@ var _Recipe = class _Recipe {
         blankLineBefore = false;
         continue;
       }
+      let currentLine = line;
+      if (items.length === 0) {
+        const varMatch = currentLine.match(variantTagRegex);
+        if (varMatch?.groups) {
+          const isOptionalPrefix = varMatch.groups.variantOptionalPrefix === "?";
+          const names = (varMatch.groups.variantNames ?? "").split(",").map((n2) => n2.trim()).filter((n2) => n2.length > 0);
+          if (names.length > 0) {
+            stepVariants = names;
+            for (const v of names) discoveredVariants.add(v);
+          }
+          if (isOptionalPrefix) {
+            stepOptional = true;
+          }
+          currentLine = currentLine.slice(varMatch[0].length);
+          if (currentLine.trim().length === 0) {
+            blankLineBefore = false;
+            continue;
+          }
+        }
+      }
       let cursor = 0;
-      for (const match of line.matchAll(tokensRegex)) {
+      for (const match of currentLine.matchAll(tokensRegex)) {
         const idx = match.index;
         if (idx > cursor) {
-          items.push(...parseMarkdownSegments(line.slice(cursor, idx)));
+          items.push(...parseMarkdownSegments(currentLine.slice(cursor, idx)));
         }
         const groups = match.groups;
         if (groups.mIngredientName || groups.sIngredientName) {
@@ -3572,7 +3792,7 @@ var _Recipe = class _Recipe {
           if (modifiers !== void 0 && modifiers.includes("-")) {
             flags.push("hidden");
           }
-          const quantity = quantityRaw ? parseQuantityInput(quantityRaw) : void 0;
+          const quantity = quantityRaw ? parseQuantityValue(quantityRaw) : void 0;
           const newCookware = {
             name
           };
@@ -3604,7 +3824,7 @@ var _Recipe = class _Recipe {
             throw new Error("Timer missing unit");
           }
           const name = groups.timerName || void 0;
-          const duration = parseQuantityInput(durationStr);
+          const duration = parseQuantityValue(durationStr);
           const timerObj = {
             name,
             duration,
@@ -3614,16 +3834,21 @@ var _Recipe = class _Recipe {
         }
         cursor = idx + match[0].length;
       }
-      if (cursor < line.length) {
-        items.push(...parseMarkdownSegments(line.slice(cursor)));
+      if (cursor < currentLine.length) {
+        items.push(...parseMarkdownSegments(currentLine.slice(cursor)));
       }
       blankLineBefore = false;
     }
-    flushPendingItems(section, items);
+    flushPendingItems(section, items, stepVariants, stepOptional);
     flushPendingNote(section, noteText ? this._parseNoteText(noteText) : []);
     if (!section.isBlank()) {
       this.sections.push(section);
     }
+    const metaVariants = this.metadata.variants ?? [];
+    const allVariants = /* @__PURE__ */ new Set([...metaVariants, ...discoveredVariants]);
+    if (allVariants.size > 0) {
+      this.choices.variants = [...allVariants];
+    }
     this._populateIngredientQuantities();
   }
   /**
@@ -3732,9 +3957,15 @@ var _Recipe = class _Recipe {
     }
     newRecipe._populateIngredientQuantities();
     newRecipe.servings = (0, import_big4.default)(originalServings).times(factor).toNumber();
-    for (const metaVar of ["servings", "yield", "serves"]) {
-      if (newRecipe.metadata[metaVar] && this.metadata[metaVar]) {
-        const original = this.metadata[metaVar];
+    for (const metaVar of ["servings", "serves"]) {
+      if (typeof newRecipe.metadata[metaVar] === "number") {
+        newRecipe.metadata[metaVar] = (0, import_big4.default)(newRecipe.metadata[metaVar]).times(factor).toNumber();
+      }
+    }
+    if (newRecipe.metadata.yield && this.metadata.yield) {
+      const original = this.metadata.yield;
+      if (original.quantity.type === "fixed" && original.quantity.value.type === "text") {
+      } else {
         const scaledQuantity = multiplyQuantityValue(
           original.quantity,
           factor
@@ -3749,8 +3980,7 @@ var _Recipe = class _Recipe {
         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;
+        newRecipe.metadata.yield = scaled;
       }
     }
     return newRecipe;
@@ -3934,7 +4164,11 @@ var _Recipe = class _Recipe {
     newRecipe.metadata = deepClone(this.metadata);
     newRecipe.ingredients = deepClone(this.ingredients);
     newRecipe.sections = this.sections.map((section) => {
-      const newSection = new Section(section.name);
+      const newSection = new Section(
+        section.name,
+        section.variants,
+        section.optional
+      );
       newSection.content = deepClone(section.content);
       return newSection;
     });
@@ -3963,7 +4197,7 @@ __publicField(_Recipe, "subgroupIndices", /* @__PURE__ */ new WeakMap());
 var Recipe = _Recipe;
 
 // src/classes/shopping_list.ts
-var ShoppingList = class _ShoppingList {
+var ShoppingList = class {
   /**
    * Creates a new ShoppingList instance
    * @param categoryConfigStr - The category configuration to parse.
@@ -4058,7 +4292,7 @@ var ShoppingList = class _ShoppingList {
         }
       }
       if (numericEntries.length > 1) {
-        const ratioMap = _ShoppingList.buildEquivalenceRatioMap(
+        const ratioMap = buildEquivalenceRatioMap(
           getEquivalentUnitsLists(...numericEntries)
         );
         if (Object.keys(ratioMap).length > 0) {
@@ -4115,10 +4349,12 @@ var ShoppingList = class _ShoppingList {
           const pantryHasUnit = pantryExtended.unit !== void 0 && pantryExtended.unit.name !== "";
           const ratioMap = this.equivalenceRatios.get(ingredient.name);
           const unitMismatch = leafHasUnit !== pantryHasUnit && ratioMap !== void 0;
+          const leafDef = normalizeUnit(leaf.unit);
+          const pantryDef = normalizeUnit(pantryExtended.unit?.name);
           if (unitMismatch) {
             const leafUnit = leaf.unit ?? NO_UNIT;
             const pantryUnit = pantryExtended.unit?.name ?? NO_UNIT;
-            const ratioFromPantry = ratioMap[leafUnit]?.[pantryUnit];
+            const ratioFromPantry = ratioMap[normalizeUnit(leafUnit)?.name ?? leafUnit]?.[normalizeUnit(pantryUnit)?.name ?? pantryUnit];
             if (ratioFromPantry !== void 0) {
               const pantryValue = getAverageValue(pantryExtended.quantity);
               const leafValue = getAverageValue(ingredientExtended.quantity);
@@ -4133,7 +4369,7 @@ var ShoppingList = class _ShoppingList {
                   type: "fixed",
                   value: { type: "decimal", decimal: remainingLeafValue }
                 };
-                const consumedInPantryUnits = ratioFromPantry !== 0 ? subtracted / ratioFromPantry : pantryValue;
+                const consumedInPantryUnits = subtracted / ratioFromPantry;
                 const remainingPantryValue = Math.max(
                   pantryValue - consumedInPantryUnits,
                   0
@@ -4150,9 +4386,10 @@ var ShoppingList = class _ShoppingList {
                 };
                 continue;
               }
+            } else {
+              continue;
             }
-          }
-          try {
+          } else if (leafDef && pantryDef && areUnitsConvertible(leafDef, pantryDef) || (leaf.unit ?? "").toLowerCase() === (pantryExtended.unit?.name ?? "").toLowerCase()) {
             const remaining = subtractQuantities(
               ingredientExtended,
               pantryExtended,
@@ -4167,7 +4404,47 @@ var ShoppingList = class _ShoppingList {
             const updated = toPlainUnit(remaining);
             leaf.quantity = updated.quantity;
             leaf.unit = updated.unit;
-          } catch {
+          } else if (ratioMap) {
+            const canonicalLeaf = normalizeUnit(leaf.unit)?.name ?? leaf.unit;
+            const leafValue = getAverageValue(ingredientExtended.quantity);
+            const pantryValue = getAverageValue(pantryExtended.quantity);
+            if (typeof leafValue === "number" && typeof pantryValue === "number" && pantryDef) {
+              for (const [equivUnit, ratios] of Object.entries(ratioMap)) {
+                const ratio = ratios[canonicalLeaf];
+                if (ratio === void 0) continue;
+                const equivDef = normalizeUnit(equivUnit);
+                if (!equivDef || !areUnitsConvertible(equivDef, pantryDef))
+                  continue;
+                const pantryInEquiv = pantryValue * getToBase(pantryDef) / getToBase(equivDef);
+                const pantryInLeafUnits = pantryInEquiv / ratio;
+                const subtracted = Math.min(pantryInLeafUnits, leafValue);
+                const remainingLeafValue = Math.max(
+                  leafValue - pantryInLeafUnits,
+                  0
+                );
+                leaf.quantity = {
+                  type: "fixed",
+                  value: { type: "decimal", decimal: remainingLeafValue }
+                };
+                const consumedInEquiv = subtracted * ratio;
+                const consumedInPantryUnits = consumedInEquiv * getToBase(equivDef) / getToBase(pantryDef);
+                const remainingPantryValue = Math.max(
+                  pantryValue - consumedInPantryUnits,
+                  0
+                );
+                pantryExtended = {
+                  quantity: {
+                    type: "fixed",
+                    value: {
+                      type: "decimal",
+                      decimal: remainingPantryValue
+                    }
+                  },
+                  ...pantryExtended.unit && { unit: pantryExtended.unit }
+                };
+                break;
+              }
+            }
           }
         }
         if ("and" in entry) {
@@ -4178,8 +4455,8 @@ var ShoppingList = class _ShoppingList {
           entry.and.push(...nonZero);
           const ratioMap = this.equivalenceRatios.get(ingredient.name);
           if (entry.equivalents && ratioMap) {
-            const equivUnits = entry.equivalents.map((e2) => e2.unit ?? NO_UNIT);
-            entry.equivalents = _ShoppingList.recomputeEquivalents(
+            const equivUnits = entry.equivalents.map((e2) => e2.unit);
+            entry.equivalents = recomputeEquivalents(
               entry.and,
               ratioMap,
               equivUnits
@@ -4190,17 +4467,17 @@ var ShoppingList = class _ShoppingList {
             ingredient.quantities[i2] = {
               quantity: single.quantity,
               ...single.unit && { unit: single.unit },
-              ...entry.equivalents && { equivalents: entry.equivalents },
-              ...entry.alternatives && { alternatives: entry.alternatives }
+              ...entry.equivalents && { equivalents: entry.equivalents }
             };
           }
         } else if ("equivalents" in entry && entry.equivalents) {
           const ratioMap = this.equivalenceRatios.get(ingredient.name);
           if (ratioMap) {
             const equivUnits = entry.equivalents.map(
-              (e2) => e2.unit ?? NO_UNIT
+              (e2) => e2.unit
+              // equivalents always have units
             );
-            const recomputed = _ShoppingList.recomputeEquivalents(
+            const recomputed = recomputeEquivalents(
               [entry],
               ratioMap,
               equivUnits
@@ -4223,57 +4500,6 @@ var ShoppingList = class _ShoppingList {
     }
     this.resultingPantry = clonedPantry;
   }
-  /**
-   * Builds a ratio map from equivalence lists.
-   * For each equivalence list, stores ratio = equiv_value / primary_value
-   * for every pair of units, so equivalents can be recomputed after
-   * pantry subtraction modifies primary quantities.
-   */
-  static buildEquivalenceRatioMap(unitsLists) {
-    const ratioMap = {};
-    for (const list of unitsLists) {
-      for (const equiv of list) {
-        const equivValue = getAverageValue(equiv.quantity);
-        for (const primary of list) {
-          if (primary === equiv) continue;
-          const primaryValue = getAverageValue(primary.quantity);
-          const equivUnit = equiv.unit.name;
-          const primaryUnit = primary.unit.name;
-          ratioMap[equivUnit] ?? (ratioMap[equivUnit] = {});
-          ratioMap[equivUnit][primaryUnit] = equivValue / primaryValue;
-        }
-      }
-    }
-    return ratioMap;
-  }
-  /**
-   * Recomputes equivalent quantities from current primary values and stored ratios.
-   * For each equivalent unit in equivUnits, new_value = Σ (primary_value × ratio[equivUnit][primaryUnit]).
-   * Returns undefined if all equivalents compute to zero.
-   */
-  static recomputeEquivalents(primaries, ratioMap, equivUnits) {
-    const equivalents = [];
-    for (const equivUnit of equivUnits) {
-      const ratios = ratioMap[equivUnit];
-      let total = 0;
-      for (const primary of primaries) {
-        const pUnit = primary.unit ?? NO_UNIT;
-        const ratio = ratios[pUnit];
-        const pValue = getAverageValue(primary.quantity);
-        total += pValue * ratio;
-      }
-      if (total > 0) {
-        equivalents.push({
-          quantity: {
-            type: "fixed",
-            value: { type: "decimal", decimal: total }
-          },
-          ...equivUnit !== "" && { unit: equivUnit }
-        });
-      }
-    }
-    return equivalents.length > 0 ? equivalents : void 0;
-  }
   /**
    * Adds a recipe to the shopping list, then automatically
    * recalculates the quantities and recategorize the ingredients.
@@ -4807,13 +5033,53 @@ function isAlternativeSelected(recipe, choices, item, alternativeIndex) {
   const selectedIndex = choices?.ingredientItems?.get(item.id);
   return alternativeIndex === selectedIndex;
 }
+function isSectionActive(section, variant) {
+  if (!section.variants) return true;
+  const isDefault = variant === void 0 || variant === "*";
+  if (isDefault) {
+    return section.variants.includes("*");
+  }
+  return section.variants.includes(variant);
+}
+function isStepActive(step, variant) {
+  if (!step.variants) return true;
+  const isDefault = variant === void 0 || variant === "*";
+  if (isDefault) {
+    return step.variants.includes("*");
+  }
+  return step.variants.includes(variant);
+}
+function getEffectiveChoices(recipe, variant) {
+  const choices = { variant };
+  if (variant === void 0 || variant === "*") return choices;
+  const variantLower = variant.toLowerCase();
+  for (const [itemId, alternatives] of recipe.choices.ingredientItems) {
+    const matchIdx = alternatives.findIndex(
+      (alt) => alt.note && alt.note.toLowerCase().includes(variantLower)
+    );
+    if (matchIdx >= 0) {
+      if (!choices.ingredientItems) choices.ingredientItems = /* @__PURE__ */ new Map();
+      choices.ingredientItems.set(itemId, matchIdx);
+    }
+  }
+  for (const [groupId, subgroups] of recipe.choices.ingredientGroups) {
+    const matchIdx = subgroups.findIndex(
+      (sg) => sg.some(
+        (alt) => alt.note && alt.note.toLowerCase().includes(variantLower)
+      )
+    );
+    if (matchIdx >= 0) {
+      if (!choices.ingredientGroups) choices.ingredientGroups = /* @__PURE__ */ new Map();
+      choices.ingredientGroups.set(groupId, matchIdx);
+    }
+  }
+  return choices;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BadIndentationError,
   CategoryConfig,
   NoProductCatalogForCartError,
   NoShoppingListForCartError,
-  NoTabAsIndentError,
   Pantry,
   ProductCatalog,
   Recipe,
@@ -4828,11 +5094,14 @@ function isAlternativeSelected(recipe, choices, item, alternativeIndex) {
   formatQuantityWithUnit,
   formatSingleValue,
   formatUnit,
+  getEffectiveChoices,
   hasAlternatives,
   isAlternativeSelected,
   isAndGroup,
   isGroupedItem,
+  isSectionActive,
   isSimpleGroup,
+  isStepActive,
   renderFractionAsVulgar
 });
 /* v8 ignore else -- @preserve */
@@ -4845,6 +5114,9 @@ function isAlternativeSelected(recipe, choices, item, alternativeIndex) {
 // v8 ignore if -- @preserve: defensive type guard
 /* v8 ignore if -- @preserve */
 // v8 ignore next -- @preserve
+// v8 ignore else -- @preserve: text quantities never reach the equivalence path
 // v8 ignore else --@preserve: defensive type guard
 // v8 ignore else -- @preserve: detection if
+/* v8 ignore else -- @preserve: only act when there are matches */
+/* v8 ignore else -- @preserve: initialization pattern */
 //# sourceMappingURL=index.cjs.map