Add support for the word "to" to indicate a range

jakeboone02 · Feb 15, 2021 · 9929441 · 9929441
1 parent 2dc25ec
commit 9929441
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 6 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -28,6 +28,60 @@ it('works', () => {
       isGroupHeader: false,
     },
   ]);
+  expect(parseIngredient('1\u20132 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
+  expect(parseIngredient('1\u20142 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
+  expect(parseIngredient('1 \u2013 2 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
+  expect(parseIngredient('1 \u2014 2 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
+  expect(parseIngredient('1 to 2 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
+  expect(parseIngredient('1 TO 2 cups stuff')).toEqual([
+    {
+      quantity: 1,
+      quantity2: 2,
+      unitOfMeasure: 'cups',
+      description: 'stuff',
+      isGroupHeader: false,
+    },
+  ]);
   expect(parseIngredient('1-NaN cups stuff')).toEqual([
     {
       quantity: 1,

diff --git a/src/index.ts b/src/index.ts
@@ -112,13 +112,16 @@ const parseIngredient = (ingText: string): Ingredient[] => {
     }
 
     // Now check the description for a `quantity2` at the beginning.
-    // First we look for a dash to indicate a range, then process the next seven
-    // characters just like we did for `quantity`.
-    const firstChar = oIng.description.substring(0, 1);
-    if (firstChar === '-' || firstChar === '\u2013' || firstChar === '\u2014') {
+    // First we look for a dash, emdash, endash, or the word "to" to indicate
+    // a range, then process the next seven characters just like we did for
+    // `quantity`.
+    const q2re = /^(-|–|—|to )/i;
+    const q2reMatch = q2re.exec(oIng.description);
+    if (q2reMatch) {
+      const q2reMatchLen = q2reMatch[1].length;
       const nqResultFirstChar = numericQuantity(
         oIng.description
-          .substring(1)
+          .substring(q2reMatchLen)
           .trim()
           .substring(0, 1)
       );
@@ -128,7 +131,9 @@ const parseIngredient = (ingText: string): Ingredient[] => {
         let nqResult = NaN;
 
         while (lenNum > 0 && isNaN(nqResult)) {
-          nqResult = numericQuantity(oIng.description.substring(1, lenNum));
+          nqResult = numericQuantity(
+            oIng.description.substring(q2reMatchLen, lenNum)
+          );
 
           if (!isNaN(nqResult)) {
             oIng.quantity2 = nqResult;