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

package/dist/index.cjs

@@ -2092,7 +2092,7 @@ function unionOfSets(s1, s2) {
 }
 function getAlternativeSignature(alternatives) {
   if (!alternatives || alternatives.length === 0) return null;
-  return alternatives.map((a2) => a2.index).sort((a2, b) => a2 - b).join(",");
+  return alternatives.flat().map((a2) => a2.index).sort((a2, b) => a2 - b).join(",");
 }
 
 // src/classes/pantry.ts
@@ -2487,7 +2487,7 @@ var Section = class {
 };
 
 // src/quantities/alternatives.ts
-var import_big3 = __toESM(require("big.js"), 1);
+var import_big4 = __toESM(require("big.js"), 1);
 
 // src/units/lookup.ts
 function findListWithCompatibleQuantity(list, quantity) {
@@ -2510,7 +2510,40 @@ function findCompatibleQuantityWithinList(list, quantity) {
 }
 
 // src/utils/general.ts
-var deepClone = (v) => structuredClone(v);
+var import_big3 = __toESM(require("big.js"), 1);
+var legacyDeepClone = (v) => {
+  if (v === null || typeof v !== "object") {
+    return v;
+  }
+  if (v instanceof import_big3.default) {
+    return new import_big3.default(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) => legacyDeepClone(v);
 
 // src/quantities/alternatives.ts
 function getEquivalentUnitsLists(...quantities) {
@@ -2736,7 +2769,7 @@ function regroupQuantitiesAndExpandEquivalents(sum, unitsLists, system) {
       return main.reduce((acc, v) => {
         const mainInList = findCompatibleQuantityWithinList(list, v);
         const conversionRatio = getBaseUnitRatio(v, mainInList);
-        const valueInOriginalUnit = (0, import_big3.default)(getAverageValue(v.quantity)).times(
+        const valueInOriginalUnit = (0, import_big4.default)(getAverageValue(v.quantity)).times(
           conversionRatio
         );
         const newValue = {
@@ -2748,7 +2781,7 @@ function regroupQuantitiesAndExpandEquivalents(sum, unitsLists, system) {
                 decimal: valueInOriginalUnit.toNumber()
               }
             },
-            (0, import_big3.default)(getAverageValue(equiv.quantity)).div(
+            (0, import_big4.default)(getAverageValue(equiv.quantity)).div(
               getAverageValue(mainInList.quantity)
             )
           )
@@ -2832,7 +2865,7 @@ function recomputeEquivalents(primaries, ratioMap, equivUnits) {
 }
 
 // src/classes/recipe.ts
-var import_big4 = __toESM(require("big.js"), 1);
+var import_big5 = __toESM(require("big.js"), 1);
 var _Recipe = class _Recipe {
   /**
    * Creates a new Recipe instance.
@@ -3372,7 +3405,7 @@ var _Recipe = class _Recipe {
             const currentSubgroupIdx = groupSubgroups.findIndex(
               (sg) => sg.some((alt) => alt.itemId === item.id)
             );
-            alternativeRefs = groupSubgroups.filter((_, idx) => idx !== currentSubgroupIdx).flatMap(
+            alternativeRefs = groupSubgroups.filter((_, idx) => idx !== currentSubgroupIdx).map(
               (subgroup) => subgroup.map((otherAlt) => {
                 const ref = {
                   index: otherAlt.index
@@ -3411,7 +3444,7 @@ var _Recipe = class _Recipe {
                 };
                 ref.quantities = [altQty];
               }
-              return ref;
+              return [ref];
             });
           }
           const altIndices = getAlternativeSignature(alternativeRefs) ?? "";
@@ -3432,28 +3465,36 @@ var _Recipe = class _Recipe {
           if (!groupsForIng.has(signature)) {
             groupsForIng.set(signature, {
               quantities: [],
-              alternativeQuantities: /* @__PURE__ */ new Map()
+              alternativeQuantities: /* @__PURE__ */ new Map(),
+              alternativeSubgroups: []
             });
           }
           const group = groupsForIng.get(signature);
           group.quantities.push(quantityEntry);
-          for (const ref of alternativeRefs ?? []) {
-            if (!group.alternativeQuantities.has(ref.index)) {
-              group.alternativeQuantities.set(ref.index, []);
-            }
-            for (const altQty of ref.quantities ?? []) {
-              const extended = toExtendedUnit({
-                quantity: altQty.quantity,
-                unit: altQty.unit
-              });
-              if (altQty.equivalents?.length) {
-                const eqEntries = [
-                  extended,
-                  ...altQty.equivalents.map((eq) => toExtendedUnit(eq))
-                ];
-                group.alternativeQuantities.get(ref.index).push({ or: eqEntries });
-              } else {
-                group.alternativeQuantities.get(ref.index).push(extended);
+          if (alternativeRefs && alternativeRefs.length > 0 && group.alternativeSubgroups.length === 0) {
+            group.alternativeSubgroups = alternativeRefs.map(
+              (subgroup) => subgroup.map((ref) => ref.index)
+            );
+          }
+          for (const subgroup of alternativeRefs ?? []) {
+            for (const ref of subgroup) {
+              if (!group.alternativeQuantities.has(ref.index)) {
+                group.alternativeQuantities.set(ref.index, []);
+              }
+              for (const altQty of ref.quantities ?? []) {
+                const extended = toExtendedUnit({
+                  quantity: altQty.quantity,
+                  unit: altQty.unit
+                });
+                if (altQty.equivalents?.length) {
+                  const eqEntries = [
+                    extended,
+                    ...altQty.equivalents.map((eq) => toExtendedUnit(eq))
+                  ];
+                  group.alternativeQuantities.get(ref.index).push({ or: eqEntries });
+                } else {
+                  group.alternativeQuantities.get(ref.index).push(extended);
+                }
               }
             }
           }
@@ -3576,17 +3617,25 @@ var _Recipe = class _Recipe {
               this.unitSystem
             );
             const flattened = flattenPlainUnitGroup(summed);
-            const alternatives = group.alternativeQuantities.size > 0 ? [...group.alternativeQuantities].map(([altIdx, altQtys]) => ({
-              index: altIdx,
-              ...altQtys.length > 0 && {
-                quantities: flattenPlainUnitGroup(
-                  addEquivalentsAndSimplify(altQtys, this.unitSystem)
-                ).flatMap(
-                  /* v8 ignore next -- item.and branch requires complex nested AND-with-equivalents structure */
-                  (item) => "quantity" in item ? [item] : item.and
-                )
-              }
-            })) : void 0;
+            let alternatives;
+            if (group.alternativeSubgroups.length > 0) {
+              alternatives = group.alternativeSubgroups.map(
+                (subgroupIndices) => subgroupIndices.map((altIdx) => {
+                  const altQtys = group.alternativeQuantities.get(altIdx);
+                  return {
+                    index: altIdx,
+                    ...altQtys.length > 0 && {
+                      quantities: flattenPlainUnitGroup(
+                        addEquivalentsAndSimplify(altQtys, this.unitSystem)
+                      ).flatMap(
+                        /* v8 ignore next -- item.and branch requires complex nested AND-with-equivalents structure */
+                        (item) => "quantity" in item ? [item] : item.and
+                      )
+                    }
+                  };
+                })
+              );
+            }
             for (const gq of flattened) {
               if ("and" in gq) {
                 quantityGroups.push({
@@ -3864,7 +3913,7 @@ var _Recipe = class _Recipe {
     if (originalServings === void 0 || originalServings === 0) {
       originalServings = 1;
     }
-    const factor = (0, import_big4.default)(newServings).div(originalServings);
+    const factor = (0, import_big5.default)(newServings).div(originalServings);
     return this.scaleBy(factor);
   }
   /**
@@ -3883,7 +3932,7 @@ var _Recipe = class _Recipe {
     function scaleAlternativesBy(alternatives, factor2) {
       for (const alternative of alternatives) {
         if (alternative.quantity) {
-          const scaleFactor = alternative.scalable ? (0, import_big4.default)(factor2) : 1;
+          const scaleFactor = alternative.scalable ? (0, import_big5.default)(factor2) : 1;
           if (alternative.quantity.type !== "fixed" || alternative.quantity.value.type !== "text") {
             alternative.quantity = multiplyQuantityValue(
               alternative.quantity,
@@ -3956,10 +4005,10 @@ var _Recipe = class _Recipe {
       arbitrary.unit = optimized.unit;
     }
     newRecipe._populateIngredientQuantities();
-    newRecipe.servings = (0, import_big4.default)(originalServings).times(factor).toNumber();
+    newRecipe.servings = (0, import_big5.default)(originalServings).times(factor).toNumber();
     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();
+        newRecipe.metadata[metaVar] = (0, import_big5.default)(newRecipe.metadata[metaVar]).times(factor).toNumber();
       }
     }
     if (newRecipe.metadata.yield && this.metadata.yield) {