@jclind/ingredient-parser 1.0.42 → 1.1.1

package/dist/index.js

@@ -17,4 +17,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ingredientParser = void 0;
 const ingredientParser_1 = require("./src/funcs/ingredientParser");
 exports.ingredientParser = ingredientParser_1.default;
+// const test = async () => {
+//   const ingrData = await ingredientParser(
+//     '1 lb boneless skinless chicken breast',
+//     'e8064d74f9804ebd82a947fb7b86189b'
+//   )
+//   return console.log(ingrData)
+// }
+// test()
 __exportStar(require("./types"), exports);

package/dist/src/funcs/calculatePrice.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculatePrice = void 0;
-//@ts-ignore
 const ingredient_unit_converter_1 = require("@jclind/ingredient-unit-converter");
 const calculatePrice = (quantity, unit, price) => {
     if (!quantity)
@@ -15,7 +14,7 @@ const calculatePrice = (quantity, unit, price) => {
     catch (error) {
         return null;
     }
-    if (!convertedUnit || convertedUnit.error)
+    if (!convertedUnit || 'error' in convertedUnit)
         return price.estimatedSingleUnitPrice * quantity;
     const convertedGrams = Number(convertedUnit.quantity);
     const total = convertedGrams * price.estimatedGramPrice;

package/dist/src/funcs/parseIngredientString.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseIngredientString = void 0;
-const recipe_ingredient_parser_v3_1 = require("recipe-ingredient-parser-v3");
 // import { ParsedIngredient } from '../../index.js'
 const convertFractions_js_1 = require("./convertFractions.js");
+const parseStringConsecutiveTs_js_1 = require("./parseStringConsecutiveTs.js");
 const parseIngredientString = (ingrStr) => {
     var _a, _b;
     // Define regular expressions for text inside parentheses and text before the first comma
@@ -32,16 +32,22 @@ const parseIngredientString = (ingrStr) => {
         ingrText = (0, convertFractions_js_1.convertFractions)(ingrStr.replace(parenRegex, '').trim());
         comment = parenthesesStr.trim();
     }
-    const prepIngrText = ingrText.replace(/\b(lb|lbs)\b/g, match => {
-        // Replace lb or lbs with pound or pounds respectively
+    const prepIngrText = ingrText.replace(/\b(lb|lbs|tablespoon|tablespoon)\b/gi, match => {
         if (match === 'lb') {
             return 'pound';
         }
-        else {
+        else if (match === 'lbs') {
             return 'pounds';
         }
+        else if (match === 'tablespoon') {
+            return 'tbsp';
+        }
+        else {
+            return 'tbsps';
+        }
     });
-    const parsedIngrRes = (0, recipe_ingredient_parser_v3_1.parse)(prepIngrText, 'eng');
+    const parsedIngrRes = (0, parseStringConsecutiveTs_js_1.parseStringConsecutiveTs)(prepIngrText);
+    console.log(parsedIngrRes);
     if (!parsedIngrRes.ingredient) {
         return Object.assign(Object.assign({}, parsedIngrRes), { originalIngredientString: ingrStr, comment });
     }

package/dist/src/funcs/parseStringConsecutiveTs.d.ts

@@ -0,0 +1,4 @@
+import { ParsedIngredient } from '../../types';
+type ParsedIngredientOmitType = Omit<ParsedIngredient, 'originalIngredientString' | 'comment'>;
+export declare const parseStringConsecutiveTs: (ingrStr: string) => ParsedIngredientOmitType;
+export {};

package/dist/src/funcs/parseStringConsecutiveTs.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStringConsecutiveTs = void 0;
+const recipe_ingredient_parser_v3_1 = require("recipe-ingredient-parser-v3");
+// returns words that have consecutive t's with those t's removed in a string array
+const removeConsecutiveTs = (str) => {
+    const regex = /t{2,}/gi;
+    const words = str.split(' ');
+    const modifiedWords = words
+        .map(word => {
+        const modified = word.replace(regex, '');
+        return {
+            original: word,
+            modified: modified,
+        };
+    })
+        .filter(({ original, modified }) => original !== modified && modified !== '');
+    return modifiedWords;
+};
+const replaceModifiedWords = (words, str) => {
+    let updatedStr = str;
+    words.forEach(({ original, modified }) => {
+        updatedStr = updatedStr.replace(modified, original);
+    });
+    return updatedStr;
+};
+const parseStringConsecutiveTs = (ingrStr) => {
+    var _a;
+    // Fixes bug where words with 'tt' in them will replace
+    const removeTTsIngrName = ingrStr.replace(/t{2,}/g, '');
+    const modifiedWords = removeConsecutiveTs(ingrStr);
+    if (modifiedWords.length > 0) {
+        const parsedIngrNoTs = (0, recipe_ingredient_parser_v3_1.parse)(removeTTsIngrName, 'eng');
+        console.log('parsedIngrNoTs', parsedIngrNoTs);
+        const correctIngrStr = replaceModifiedWords(modifiedWords, (_a = parsedIngrNoTs.ingredient) !== null && _a !== void 0 ? _a : '');
+        const parsedIngr = Object.assign(Object.assign({}, parsedIngrNoTs), { ingredient: correctIngrStr });
+        return parsedIngr;
+    }
+    else {
+        return (0, recipe_ingredient_parser_v3_1.parse)(ingrStr, 'eng');
+    }
+};
+exports.parseStringConsecutiveTs = parseStringConsecutiveTs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.0.42",
+  "version": "1.1.1",
   "description": "Parses given sentence including ingredient information and attempts to return quantity, measurement and ingredient data",
   "keywords": [
     "recipe",
@@ -10,6 +10,7 @@
   ],
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "commonjs",
   "files": [
     "dist"
   ],
@@ -27,7 +28,7 @@
   },
   "homepage": "https://github.com/jclind/ingredient-parser#readme",
   "dependencies": {
-    "@jclind/ingredient-unit-converter": "^1.0.2",
+    "@jclind/ingredient-unit-converter": "^1.0.5",
     "@types/axios": "^0.14.0",
     "convert-units": "^2.3.4",
     "dotenv": "^16.0.3",