fix(ShoppingList): only require choices expected for the selected variant when adding a recipe

Author: tmlmt

src/classes/shopping_list.ts

@@ -579,18 +579,20 @@ export class ShoppingList {
     recipe: Recipe,
     choices?: import("../types").RecipeChoices,
   ): string | undefined {
+    const activeVariant = choices?.variant;
+    const expectedAlternatives = recipe.getChoicesForVariant(activeVariant);
     const missingItems: string[] = [];
     const missingGroups: string[] = [];
 
     // Check for inline alternatives without choices
-    for (const itemId of recipe.choices.ingredientItems.keys()) {
+    for (const itemId of expectedAlternatives.ingredientItems.keys()) {
       if (!choices?.ingredientItems?.has(itemId)) {
         missingItems.push(itemId);
       }
     }
 
     // Check for grouped alternatives without choices
-    for (const groupId of recipe.choices.ingredientGroups.keys()) {
+    for (const groupId of expectedAlternatives.ingredientGroups.keys()) {
       // v8 ignore else -- @preserve: detection if
       if (!choices?.ingredientGroups?.has(groupId)) {
         missingGroups.push(groupId);

test/shopping_list.test.ts

@@ -740,6 +740,57 @@ Mix @|milk|milk{200%ml} or @|milk|almond milk{100%ml}
         /Recipe has unresolved alternatives.*ingredientGroups.*milk/,
       );
     });
+
+    it("should only require choices expected for the selected variant", () => {
+      const shoppingList = new ShoppingList();
+      const recipeWithVariantLinkedChoices = new Recipe(`
+---
+servings: 1
+---
+[*] Add @milk{200%ml}|oat milk{200%ml}.
+
+[vegan] Add @water{100%ml}|broth{100%ml}.
+
+[*] Use @|protein|chicken{200%g} or @|protein|turkey{200%g}.
+
+[vegan] Use @|protein|tofu{200%g} or @|protein|tempeh{200%g}.
+`);
+
+      expect(() =>
+        shoppingList.addRecipe(recipeWithVariantLinkedChoices, {
+          choices: {
+            variant: "vegan",
+            ingredientItems: new Map([["ingredient-item-1", 1]]),
+            ingredientGroups: new Map([["protein", 1]]),
+          },
+        }),
+      ).not.toThrow();
+    });
+
+    it("should only require choices expected for the default variant", () => {
+      const shoppingList = new ShoppingList();
+      const recipeWithVariantLinkedChoices = new Recipe(`
+---
+servings: 1
+---
+[*] Add @milk{200%ml}|oat milk{200%ml}.
+
+[vegan] Add @water{100%ml}|broth{100%ml}[for vegan].
+
+[*] Use @|protein|chicken{200%g} or @|protein|turkey{200%g}.
+
+[vegan] Use @|protein|tofu{200%g}[for vegan] or @|protein|tempeh{200%g}[for vegan].
+`);
+
+      expect(() =>
+        shoppingList.addRecipe(recipeWithVariantLinkedChoices, {
+          choices: {
+            ingredientItems: new Map([["ingredient-item-0", 1]]),
+            ingredientGroups: new Map([["protein", 1]]),
+          },
+        }),
+      ).not.toThrow();
+    });
   });
 
   describe("Association with CategoryConfig", () => {