@jclind/ingredient-parser 1.0.24 → 1.0.25

package/dist/funcs/ingredientParser.js

@@ -1,29 +1,21 @@
-import { parse } from 'recipe-ingredient-parser-v3';
 import { calculatePrice } from './calculatePrice.js';
-import { editIngredientString } from './editIngredientString.js';
+import { parseIngredientString } from './parseIngredientString.js';
 import { getIngredientInfo } from './getIngredientInfo.js';
 const ingredientParser = async (ingrString, spoonacularAPIKey) => {
-    const parsedIngr = parse(ingrString, 'eng');
-    const formattedIngr = editIngredientString(parsedIngr.ingredient ?? '');
-    const { formattedIngrName, comment } = formattedIngr;
-    const updatedParsedIngr = {
-        ...parsedIngr,
-        ingredient: formattedIngrName,
-        originalIngredientString: ingrString,
-        comment,
-    };
+    // const parsedIngr: ParsedIngredient = parse(ingrString, 'eng')
+    const parsedIngr = parseIngredientString(ingrString);
     let ingrData = null;
     try {
-        ingrData = await getIngredientInfo(formattedIngrName, spoonacularAPIKey);
+        ingrData = await getIngredientInfo(parsedIngr.ingredient || '', spoonacularAPIKey);
     }
     catch (error) {
         return {
             error: { message: error.message },
             ingredientData: null,
-            parsedIngredient: updatedParsedIngr ?? null,
+            parsedIngredient: parsedIngr ?? null,
         };
     }
-    if (formattedIngr && ingrData) {
+    if (parsedIngr.ingredient && ingrData) {
         const { estimatedPrices, meta, categoryPath, unit, unitShort, unitLong, original, id, ...reducedIngrData } = ingrData;
         const totalPrice = calculatePrice(parsedIngr.quantity, parsedIngr.unit, estimatedPrices);
         const imagePath = `https://spoonacular.com/cdn/ingredients_100x100/${reducedIngrData.image}`;
@@ -34,7 +26,7 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
         };
         return {
             ingredientData: updatedIngrData,
-            parsedIngredient: updatedParsedIngr,
+            parsedIngredient: parsedIngr,
         };
     }
     else {
@@ -43,7 +35,7 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
                 message: 'Ingredient not formatted correctly or Ingredient Unknown. Please pass ingredient comments/instructions after a comma',
             },
             ingredientData: null,
-            parsedIngredient: updatedParsedIngr,
+            parsedIngredient: parsedIngr,
         };
     }
 };

package/dist/funcs/parseIngredientString.js

@@ -0,0 +1,31 @@
+import { parse } from 'recipe-ingredient-parser-v3';
+export const parseIngredientString = (ingrStr) => {
+    // Define regular expressions for text inside parentheses and text before the first comma
+    const parenRegex = /\((.*?)\)/;
+    const commaRegex = /^(.*?)(?=,)/;
+    // 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 parsedIngrRes = parse(ingrText, 'eng');
+    if (!parsedIngrRes.ingredient) {
+        return { ...parsedIngrRes, originalIngredientString: ingrStr, comment };
+    }
+    const wordsToRemove = ['small', 'medium', 'large', 'fresh', 'canned'];
+    const regex = new RegExp('\\b(' + wordsToRemove.join('|') + ')\\b', 'gi');
+    const formattedIngrName = parsedIngrRes.ingredient
+        .trim()
+        .replace(/\s{2,}/g, ' ') // Replace multiple whitespace characters with a single space
+        .replace(/,/g, '') // Remove commas
+        .replace(/^(fluid|fl|oz) /, '') // Remove "fluid ", "fl ", or "oz " at the beginning of the string
+        .replace(regex, '')
+        .trim();
+    return {
+        ...parsedIngrRes,
+        ingredient: formattedIngrName,
+        originalIngredientString: ingrStr,
+        comment,
+    };
+};

package/package.json

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