@jclind/ingredient-parser 1.0.25 → 1.0.27

package/dist/funcs/convertFractions.js

@@ -0,0 +1,27 @@
+export const convertFractions = (str) => {
+    const fractions = {
+        '¼': '1/4',
+        '½': '1/2',
+        '¾': '3/4',
+        '⅓': '1/3',
+        '⅔': '2/3',
+        '⅛': '1/8',
+        '⅜': '3/8',
+        '⅝': '5/8',
+        '⅞': '7/8',
+        '⅕': '1/5',
+        '⅖': '2/5',
+        '⅗': '3/5',
+        '⅘': '4/5',
+        '⅙': '1/6',
+        '⅚': '5/6',
+        '⅐': '1/7',
+        '⅑': '1/9',
+        '⅒': '1/10',
+    };
+    for (const [fraction, value] of Object.entries(fractions)) {
+        const re = new RegExp(fraction, 'g');
+        str = str.replace(re, value);
+    }
+    return str;
+};

package/dist/funcs/parseIngredientString.js

@@ -1,4 +1,5 @@
 import { parse } from 'recipe-ingredient-parser-v3';
+import { convertFractions } from './convertFractions.js';
 export const parseIngredientString = (ingrStr) => {
     // Define regular expressions for text inside parentheses and text before the first comma
     const parenRegex = /\((.*?)\)/;
@@ -6,9 +7,24 @@ export const parseIngredientString = (ingrStr) => {
     // Find the index of the first ',' character
     const commaIndex = ingrStr.indexOf(',');
     // Extract the text inside the parentheses and the text before the first comma using regular expressions
-    const textInParentheses = ingrStr.match(parenRegex)?.[1] ?? '';
-    const comment = ingrStr.substring(commaIndex + 1) + ' ' + textInParentheses;
-    const ingrText = ingrStr.match(commaRegex)?.[1] ?? '';
+    const parenthesesStr = ingrStr.match(parenRegex)?.[1] ?? '';
+    const textInParenthesesStr = parenthesesStr ? ` (${parenthesesStr})` : '';
+    let ingrText;
+    let comment;
+    // If there is no comma in the string don't include a comment
+    if (commaIndex !== -1) {
+        ingrText = convertFractions(ingrStr.substring(0, commaIndex).replace(parenRegex, ''));
+        comment =
+            ingrStr
+                .replace(parenRegex, '')
+                .substring(commaIndex + 1)
+                .trim() + textInParenthesesStr;
+    }
+    else {
+        ingrText = convertFractions(ingrStr.replace(parenRegex, '').trim());
+        comment = textInParenthesesStr;
+    }
+    console.log(comment);
     const parsedIngrRes = parse(ingrText, 'eng');
     if (!parsedIngrRes.ingredient) {
         return { ...parsedIngrRes, originalIngredientString: ingrStr, comment };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Parses given sentence including ingredient information and attemps to return quantity, measurement and ingredient data",
   "keywords": [
     "recipe",