Handle punctuation in single word cookware/ingredients (#15)

Add tests for singleword punctation
cooklang · May 18, 2023 · 3e2f98f · 3e2f98f
1 parent d459df0
commit 3e2f98f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/tokens.ts b/src/tokens.ts
@@ -1,15 +1,15 @@
 const metadata = /^>>\s*(?<key>.+?):\s*(?<value>.+)/;
 
-const multiwordIngredient = /@(?<mIngredientName>[^@#~[]+?){(?<mIngredientQuantity>[^]*?)(?:%(?<mIngredientUnits>[^}]+?))?}/;
-const singleWordIngredient = /@(?<sIngredientName>[^\s]+)/;
+const multiwordIngredient = /@(?<mIngredientName>[^@#~[]+?)\{(?<mIngredientQuantity>[^]*?)(?:%(?<mIngredientUnits>[^}]+?))?\}/;
+const singleWordIngredient = /@(?<sIngredientName>[^\s\t\p{Zs}\p{P}]+)/;
 
-const multiwordCookware = /#(?<mCookwareName>[^@#~[]+?){(?<mCookwareQuantity>.*?)}/;
-const singleWordCookware = /#(?<sCookwareName>[^\s]+)/;
+const multiwordCookware = /#(?<mCookwareName>[^@#~[]+?)\{(?<mCookwareQuantity>.*?)\}/;
+const singleWordCookware = /#(?<sCookwareName>[^\s\t\p{Zs}\p{P}]+)/;
 
-const timer = /~(?<timerName>.*?)(?:{(?<timerQuantity>.*?)(?:%(?<timerUnits>.+?))?})/;
+const timer = /~(?<timerName>.*?)(?:\{(?<timerQuantity>.*?)(?:%(?<timerUnits>.+?))?\})/;
 
 export const comment = /--.*/g;
 export const blockComment = /\s*\[\-.*?\-\]\s*/g;
 
 export const shoppingList = /\[(?<name>.+)\]\n(?<items>[^]*?)(?:\n\n|$)/g;
-export const tokens = new RegExp([metadata, multiwordIngredient, singleWordIngredient, multiwordCookware, singleWordCookware, timer].map(r => r.source).join('|'), 'g');
+export const tokens = new RegExp([metadata, multiwordIngredient, singleWordIngredient, multiwordCookware, singleWordCookware, timer].map(r => r.source).join('|'), 'gu');
diff --git a/tests/custom.yaml b/tests/custom.yaml
@@ -58,6 +58,19 @@ tests:
             name: "ingredient with spaces"
       metadata: []
 
+  testSingleWordIngredientFollowedByPunctuation:
+    source: |
+      @ingredient, then step.
+    result:
+      steps:
+        -
+          - type: ingredient
+            quantity: "some"
+            units: ""
+            name: "ingredient"
+          - type: text
+            value: ", then step."
+      metadata: []
 
   testMultiWordFollowingSingleWordCookware:
     source: |
@@ -75,6 +88,19 @@ tests:
             quantity: 1
       metadata: []
 
+  testSingleWordCookwareFollowedByPunctuation:
+    source: |
+      #pan, then step.
+    result:
+      steps:
+        -
+          - type: cookware
+            name: "pan"
+            quantity: 1
+          - type: text
+            value: ", then step."
+      metadata: []
+
 
   testMultiWordFollowingSingleWordCookwareAndIngredient:
     source: |