@tmlmt/cooklang-parser 3.0.0-alpha.11 → 3.0.0-alpha.12

package/dist/index.cjs

@@ -2290,7 +2290,7 @@ var _Recipe = class _Recipe {
         alternative.note = note;
       }
       if (itemQuantity) {
-        alternative.itemQuantity = itemQuantity;
+        Object.assign(alternative, itemQuantity);
       }
       alternatives.push(alternative);
       testString = groups.ingredientAlternative || "";
@@ -2398,7 +2398,7 @@ var _Recipe = class _Recipe {
       displayName
     };
     if (itemQuantity) {
-      alternative.itemQuantity = itemQuantity;
+      Object.assign(alternative, itemQuantity);
     }
     const existingAlternatives = this.choices.ingredientGroups.get(groupKey);
     function upsertAlternativeToIngredient(ingredients, ingredientIdx, newAlternativeIdx) {
@@ -2534,28 +2534,28 @@ var _Recipe = class _Recipe {
           for (const alt of allAlts) {
             referencedIndices.add(alt.index);
           }
-          if (!alternative.itemQuantity) continue;
+          if (!alternative.quantity) continue;
           const baseQty = {
-            quantity: alternative.itemQuantity.quantity,
-            ...alternative.itemQuantity.unit && {
-              unit: alternative.itemQuantity.unit
+            quantity: alternative.quantity,
+            ...alternative.unit && {
+              unit: alternative.unit
             }
           };
-          const quantityEntry = alternative.itemQuantity.equivalents?.length ? { or: [baseQty, ...alternative.itemQuantity.equivalents] } : baseQty;
+          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) => {
               const ref = { index: otherAlt.index };
-              if (otherAlt.itemQuantity) {
+              if (otherAlt.quantity) {
                 const altQty = {
-                  quantity: otherAlt.itemQuantity.quantity,
-                  ...otherAlt.itemQuantity.unit && {
-                    unit: otherAlt.itemQuantity.unit.name
+                  quantity: otherAlt.quantity,
+                  ...otherAlt.unit && {
+                    unit: otherAlt.unit.name
                   },
-                  ...otherAlt.itemQuantity.equivalents && {
-                    equivalents: otherAlt.itemQuantity.equivalents.map(
+                  ...otherAlt.equivalents && {
+                    equivalents: otherAlt.equivalents.map(
                       (eq) => toPlainUnit(eq)
                     )
                   }
@@ -2568,14 +2568,10 @@ var _Recipe = class _Recipe {
           const altIndices = getAlternativeSignature(alternativeRefs) ?? "";
           let signature;
           if (isGrouped) {
-            const resolvedUnit = resolveUnit(
-              alternative.itemQuantity.unit?.name
-            );
+            const resolvedUnit = resolveUnit(alternative.unit?.name);
             signature = `group:${item.group}|${altIndices}|${resolvedUnit.type}`;
           } else if (altIndices) {
-            const resolvedUnit = resolveUnit(
-              alternative.itemQuantity.unit?.name
-            );
+            const resolvedUnit = resolveUnit(alternative.unit?.name);
             signature = `${altIndices}|${resolvedUnit.type}}`;
           } else {
             signature = null;
@@ -2843,16 +2839,16 @@ var _Recipe = class _Recipe {
     const unitSystem = this.unitSystem;
     function scaleAlternativesBy(alternatives, factor2) {
       for (const alternative of alternatives) {
-        if (alternative.itemQuantity) {
-          const scaleFactor = alternative.itemQuantity.scalable ? (0, import_big4.default)(factor2) : 1;
-          if (alternative.itemQuantity.quantity.type !== "fixed" || alternative.itemQuantity.quantity.value.type !== "text") {
-            alternative.itemQuantity.quantity = multiplyQuantityValue(
-              alternative.itemQuantity.quantity,
+        if (alternative.quantity) {
+          const scaleFactor = alternative.scalable ? (0, import_big4.default)(factor2) : 1;
+          if (alternative.quantity.type !== "fixed" || alternative.quantity.value.type !== "text") {
+            alternative.quantity = multiplyQuantityValue(
+              alternative.quantity,
               scaleFactor
             );
           }
-          if (alternative.itemQuantity.equivalents) {
-            alternative.itemQuantity.equivalents = alternative.itemQuantity.equivalents.map(
+          if (alternative.equivalents) {
+            alternative.equivalents = alternative.equivalents.map(
               (altQuantity) => {
                 if (altQuantity.quantity.type === "fixed" && altQuantity.quantity.value.type === "text") {
                   return altQuantity;
@@ -2870,15 +2866,15 @@ var _Recipe = class _Recipe {
           }
           const optimizedPrimary = applyBestUnit(
             {
-              quantity: alternative.itemQuantity.quantity,
-              unit: alternative.itemQuantity.unit
+              quantity: alternative.quantity,
+              unit: alternative.unit
             },
             unitSystem
           );
-          alternative.itemQuantity.quantity = optimizedPrimary.quantity;
-          alternative.itemQuantity.unit = optimizedPrimary.unit;
-          if (alternative.itemQuantity.equivalents) {
-            alternative.itemQuantity.equivalents = alternative.itemQuantity.equivalents.map(
+          alternative.quantity = optimizedPrimary.quantity;
+          alternative.unit = optimizedPrimary.unit;
+          if (alternative.equivalents) {
+            alternative.equivalents = alternative.equivalents.map(
               (eq) => applyBestUnit(eq, unitSystem)
             );
           }
@@ -2982,18 +2978,27 @@ var _Recipe = class _Recipe {
       }
       return newPrimary;
     }
-    function convertItemQuantity(itemQuantity) {
-      const primaryUnit = resolveUnit(itemQuantity.unit?.name);
-      const equivalents = itemQuantity.equivalents ?? [];
+    function convertAlternativeQuantity(alternative) {
+      const primaryUnit = resolveUnit(alternative.unit?.name);
+      const equivalents = alternative.equivalents ?? [];
       const oldPrimary = {
-        quantity: itemQuantity.quantity,
-        unit: itemQuantity.unit
+        quantity: alternative.quantity,
+        unit: alternative.unit
       };
       if (primaryUnit.type !== "other" && isUnitCompatibleWithSystem(primaryUnit, system)) {
         if (method === "remove") {
-          return { ...itemQuantity, equivalents: void 0 };
+          return {
+            quantity: alternative.quantity,
+            unit: alternative.unit,
+            scalable: alternative.scalable
+          };
         }
-        return itemQuantity;
+        return {
+          quantity: alternative.quantity,
+          unit: alternative.unit,
+          scalable: alternative.scalable,
+          equivalents
+        };
       }
       const targetEquivIndex = equivalents.findIndex((eq) => {
         const eqUnit = resolveUnit(eq.unit?.name);
@@ -3008,7 +3013,7 @@ var _Recipe = class _Recipe {
           targetEquiv,
           oldPrimary,
           remainingEquivalents,
-          itemQuantity.scalable,
+          alternative.scalable,
           targetEquiv.unit?.integerProtected,
           "swapped"
         );
@@ -3019,8 +3024,8 @@ var _Recipe = class _Recipe {
           converted,
           oldPrimary,
           equivalents,
-          itemQuantity.scalable,
-          itemQuantity.unit?.integerProtected,
+          alternative.scalable,
+          alternative.unit?.integerProtected,
           "swapped"
         );
       }
@@ -3033,24 +3038,37 @@ var _Recipe = class _Recipe {
             convertedEquiv,
             oldPrimary,
             remainingEquivalents,
-            itemQuantity.scalable,
+            alternative.scalable,
             equiv.unit?.integerProtected,
             "converted"
           );
         }
       }
       if (method === "remove") {
-        return { ...itemQuantity, equivalents: void 0 };
+        return {
+          quantity: alternative.quantity,
+          unit: alternative.unit,
+          scalable: alternative.scalable
+        };
       } else {
-        return itemQuantity;
+        return {
+          quantity: alternative.quantity,
+          unit: alternative.unit,
+          scalable: alternative.scalable,
+          equivalents
+        };
       }
     }
     function convertAlternatives(alternatives) {
       for (const alternative of alternatives) {
-        if (alternative.itemQuantity) {
-          alternative.itemQuantity = convertItemQuantity(
-            alternative.itemQuantity
+        if (alternative.quantity) {
+          const converted = convertAlternativeQuantity(
+            alternative
           );
+          alternative.quantity = converted.quantity;
+          alternative.unit = converted.unit;
+          alternative.scalable = converted.scalable;
+          alternative.equivalents = converted.equivalents;
         }
       }
     }