fix: parsing of single-word ingredient ending with {}

Fixes: #2
e.g. @flour{}

Author: tmlmt

src/regex.ts

@@ -3,7 +3,7 @@ export const metadataRegex = /---\n(.*?)\n---/s;
 const multiwordIngredient =
   /@(?<mIngredientModifier>[@\-&+*!?])?(?<mIngredientName>(?:[^\s@#~\[\]{(.,;:!?]+(?:\s+[^\s@#~\[\]{(.,;:!?]+)+))(?=\s*(?:\{|\}|\(\s*[^)]*\s*\)))(?:\{(?<mIngredientQuantity>\p{No}|(?:\p{Nd}+(?:[.,\/][\p{Nd}]+)?))?(?:%(?<mIngredientUnits>[^}]+?))?\})?(?:\((?<mIngredientPreparation>[^)]*?)\))?/gu;
 const singleWordIngredient =
-  /@(?<sIngredientModifier>[@\-&+*!?])?(?<sIngredientName>[^\s@#~\[\]{(.,;:!?]+)(?:\{(?<sIngredientQuantity>\p{No}|(?:\p{Nd}+(?:[.,\/][\p{Nd}]+)?))(?:%(?<sIngredientUnits>[^}]+?))?\})?(?:\((?<sIngredientPreparation>[^)]*?)\))?/gu;
+  /@(?<sIngredientModifier>[@\-&+*!?])?(?<sIngredientName>[^\s@#~\[\]{(.,;:!?]+)(?:\{(?:(?<sIngredientQuantity>\p{No}|(?:\p{Nd}+(?:[.,\/][\p{Nd}]+)?))(?:%(?<sIngredientUnits>[^}]+?))?)?\})?(?:\((?<sIngredientPreparation>[^)]*?)\))?/gu;
 
 const multiwordCookware =
   /#(?<mCookwareModifier>[\-&+*!?])?(?<mCookwareName>(?:[^\s@#~\[\]{(.,;:!?]+(?:\s+[^\s@#~\[\]{(.,;:!?]+)+))(?=\s*(?:\{|\}|\(\s*[^)]*\s*\)))\{(?<mCookwareQuantity>.*?)\}/;

test/__snapshots__/recipe_parsing.test.ts.snap

@@ -24,12 +24,20 @@ exports[`parse function > extracts steps correctly 1`] = `
           },
           {
             "type": "text",
-            "value": ", and add ",
+            "value": ". Mix with some ",
           },
           {
             "type": "ingredient",
             "value": 1,
           },
+          {
+            "type": "text",
+            "value": " and add ",
+          },
+          {
+            "type": "ingredient",
+            "value": 2,
+          },
           {
             "type": "text",
             "value": ".",
@@ -44,7 +52,7 @@ exports[`parse function > extracts steps correctly 1`] = `
           },
           {
             "type": "ingredient",
-            "value": 2,
+            "value": 3,
           },
           {
             "type": "text",

test/fixtures/recipes.ts

@@ -4,7 +4,7 @@ title: Pancakes
 tags: [breakfast, easy]
 ---
 
-Crack the @eggs{3} into a #bowl, and add @coarse salt{}.
+Crack the @eggs{3} into a #bowl. Mix with some @flour{} and add @coarse salt{}.
 
 Melt the @butter{50%g} in a #pan{} on medium heat.
 

test/recipe_parsing.test.ts

@@ -11,34 +11,45 @@ describe("parse function", () => {
 
   it("extracts ingredients correctly", () => {
     const result = new Recipe(simpleRecipe);
-    expect(result.ingredients.length).toBe(3);
-    expect(result.ingredients[0]).toEqual({
-      name: "eggs",
-      optional: false,
-      hidden: false,
-      quantity: 3,
-      unit: undefined,
-      preparation: undefined,
-      isRecipe: false,
-    });
-    expect(result.ingredients[1]).toEqual({
-      name: "coarse salt",
-      optional: false,
-      hidden: false,
-      quantity: undefined,
-      unit: undefined,
-      preparation: undefined,
-      isRecipe: false,
-    });
-    expect(result.ingredients[2]).toEqual({
-      name: "butter",
-      optional: false,
-      hidden: false,
-      quantity: 50,
-      unit: "g",
-      preparation: undefined,
-      isRecipe: false,
-    });
+    expect(result.ingredients.length).toBe(4);
+    expect(result.ingredients).toEqual([
+      {
+        name: "eggs",
+        optional: false,
+        hidden: false,
+        quantity: 3,
+        unit: undefined,
+        preparation: undefined,
+        isRecipe: false,
+      },
+      {
+        name: "flour",
+        optional: false,
+        hidden: false,
+        quantity: undefined,
+        unit: undefined,
+        preparation: undefined,
+        isRecipe: false,
+      },
+      {
+        name: "coarse salt",
+        hidden: false,
+        isRecipe: false,
+        optional: false,
+        preparation: undefined,
+        quantity: undefined,
+        unit: undefined,
+      },
+      {
+        name: "butter",
+        optional: false,
+        hidden: false,
+        quantity: 50,
+        unit: "g",
+        preparation: undefined,
+        isRecipe: false,
+      },
+    ]);
   });
 
   it("parses ingredients that are other recipes", () => {