@jclind/ingredient-parser 1.0.6 → 1.0.8

package/dist/funcs/calculatePrice.js

@@ -0,0 +1,18 @@
+import { converter } from '@jclind/ingredient-unit-converter';
+export const calculatePrice = (quantity, unit, price) => {
+    if (!quantity)
+        return price;
+    if (!unit)
+        return price * quantity;
+    let convertedUnit;
+    try {
+        convertedUnit = converter(quantity, unit);
+    }
+    catch (error) {
+        return null;
+    }
+    const convertedGrams = convertedUnit.quantity;
+    const total = convertedGrams * price;
+    return Math.ceil(total * 100) / 100;
+};
+//# sourceMappingURL=calculatePrice.js.map

package/dist/funcs/calculatePrice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculatePrice.js","sourceRoot":"","sources":["../../src/funcs/calculatePrice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAA;AAE7D,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAgB,EAChB,IAAY,EACZ,KAAa,EACE,EAAE;IACjB,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,GAAG,QAAQ,CAAA;IAElC,IAAI,aAAa,CAAA;IACjB,IAAI;QACF,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAA;IAC7C,MAAM,KAAK,GAAG,cAAc,GAAG,KAAK,CAAA;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;AACrC,CAAC,CAAA"}

package/dist/funcs/editIngredientString.js

@@ -0,0 +1,15 @@
+export const editIngredientString = (ingrStr) => {
+    // Get string after first comment in ingredient string
+    let ingr = ingrStr.split(',')[0]?.trim() ?? ingrStr;
+    let comment = ingrStr.split(',')[1]?.trim() ?? null;
+    const formattedIngrName = ingr
+        .trim()
+        .replace(/\s{2,}/g, ' ')
+        .replace(/,/g, '')
+        .replace(/^(fluid )/, '')
+        .replace(/^(fl )/, '')
+        .replace(/^(oz )/, '')
+        .trim();
+    return { formattedIngrName, comment };
+};
+//# sourceMappingURL=editIngredientString.js.map

package/dist/funcs/editIngredientString.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editIngredientString.js","sourceRoot":"","sources":["../../src/funcs/editIngredientString.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE;IACtD,sDAAsD;IACtD,IAAI,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,OAAO,CAAA;IACnD,IAAI,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAA;IAEnD,MAAM,iBAAiB,GAAG,IAAI;SAC3B,IAAI,EAAE;SACN,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;SACxB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,IAAI,EAAE,CAAA;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAA;AACvC,CAAC,CAAA"}

package/dist/funcs/ingredientParser.js

@@ -1,31 +1,7 @@
 import { parse } from 'recipe-ingredient-parser-v3';
+import { calculatePrice } from './calculatePrice.js';
+import { editIngredientString } from './editIngredientString.js';
 import { getIngredientInfo } from './getIngredientInfo.js';
-import { converter } from '@jclind/ingredient-unit-converter';
-const editIngredientString = (ingrStr) => {
-    // Get string after first comment in ingredient string
-    let ingr = ingrStr.split(',')[0]?.trim() ?? ingrStr;
-    let comment = ingrStr.split(',')[1]?.trim() ?? null;
-    const formattedIngrName = ingr
-        .trim()
-        .replace(/\s{2,}/g, ' ')
-        .replace(/,/g, '')
-        .replace(/^(fluid )/, '')
-        .replace(/^(fl )/, '')
-        .replace(/^(oz )/, '')
-        .trim();
-    return { formattedIngrName, comment };
-};
-const calculatePrice = (quantity, unit, price) => {
-    if (!quantity)
-        return price;
-    if (!unit)
-        return price * quantity;
-    const convertedUnit = converter(quantity, unit);
-    if (convertedUnit.error)
-        return convertedUnit.error;
-    const convertedGrams = convertedUnit.quantity;
-    return convertedGrams * price;
-};
 const ingredientParser = async (ingrString, spoonacularAPIKey) => {
     const parsedIngr = parse(ingrString, 'eng');
     const formattedIngr = editIngredientString(parsedIngr.ingredient);
@@ -37,12 +13,25 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
     };
     if (formattedIngr) {
         const ingrData = await getIngredientInfo(formattedIngrName, spoonacularAPIKey);
-        const totalPrice = calculatePrice(parsedIngr.quantity, parsedIngr.unit, ingrData.estimatedCost.value);
-        return { ...ingrData, parsedIngredient: updatedParsedIngr, totalPrice };
+        const { estimatedCost, meta, categoryPath, unit, unitShort, unitLong, original, id, ...reducedIngrData } = ingrData;
+        const totalPrice = calculatePrice(parsedIngr.quantity, parsedIngr.unit, estimatedCost.value);
+        const imgPath = `https://spoonacular.com/cdn/ingredients_100x100/${reducedIngrData.image}`;
+        const ingredientId = id;
+        const updatedIngrData = {
+            ...reducedIngrData,
+            ingredientId,
+            imgPath,
+            totalPriceUSACents: totalPrice,
+        };
+        return {
+            ingredientData: updatedIngrData,
+            parsedIngredient: updatedParsedIngr,
+        };
     }
     else {
         return {
             error: 'Ingredient not formatted correctly. Please pass ingredient comments/instructions after a comma',
+            ingredientData: null,
             parsedIngredient: updatedParsedIngr,
         };
     }

package/dist/funcs/ingredientParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ingredientParser.js","sourceRoot":"","sources":["../../src/funcs/ingredientParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAA;AAE7D,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,sDAAsD;IACtD,IAAI,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,OAAO,CAAA;IACnD,IAAI,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAA;IAEnD,MAAM,iBAAiB,GAAG,IAAI;SAC3B,IAAI,EAAE;SACN,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;SACxB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,IAAI,EAAE,CAAA;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,KAAa,EAAE,EAAE;IACvE,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,GAAG,QAAQ,CAAA;IAElC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC/C,IAAI,aAAa,CAAC,KAAK;QAAE,OAAO,aAAa,CAAC,KAAK,CAAA;IAEnD,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAA;IAE7C,OAAO,cAAc,GAAG,KAAK,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAkB,EAClB,iBAAyB,EACX,EAAE;IAChB,MAAM,UAAU,GAAqB,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC7D,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACjE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;IAEpD,MAAM,iBAAiB,GAAG;QACxB,GAAG,UAAU;QACb,UAAU,EAAE,iBAAiB;QAC7B,OAAO;KACR,CAAA;IACD,IAAI,aAAa,EAAE;QACjB,MAAM,QAAQ,GAAmB,MAAM,iBAAiB,CACtD,iBAAiB,EACjB,iBAAiB,CAClB,CAAA;QAED,MAAM,UAAU,GAAG,cAAc,CAC/B,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,IAAI,EACf,QAAQ,CAAC,aAAa,CAAC,KAAK,CAC7B,CAAA;QACD,OAAO,EAAE,GAAG,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAA;KACxE;SAAM;QACL,OAAO;YACL,KAAK,EACH,gGAAgG;YAClG,gBAAgB,EAAE,iBAAiB;SACpC,CAAA;KACF;AACH,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"ingredientParser.js","sourceRoot":"","sources":["../../src/funcs/ingredientParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAkB,EAClB,iBAAyB,EACX,EAAE;IAChB,MAAM,UAAU,GAAqB,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC7D,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACjE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;IAEpD,MAAM,iBAAiB,GAAG;QACxB,GAAG,UAAU;QACb,UAAU,EAAE,iBAAiB;QAC7B,OAAO;KACR,CAAA;IACD,IAAI,aAAa,EAAE;QACjB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CACtC,iBAAiB,EACjB,iBAAiB,CAClB,CAAA;QAED,MAAM,EACJ,aAAa,EACb,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,EAAE,EACF,GAAG,eAAe,EACnB,GAAG,QAAQ,CAAA;QAEZ,MAAM,UAAU,GAAG,cAAc,CAC/B,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,IAAI,EACf,aAAa,CAAC,KAAK,CACpB,CAAA;QAED,MAAM,OAAO,GAAG,mDAAmD,eAAe,CAAC,KAAK,EAAE,CAAA;QAC1F,MAAM,YAAY,GAAG,EAAE,CAAA;QACvB,MAAM,eAAe,GAAmB;YACtC,GAAG,eAAe;YAClB,YAAY;YACZ,OAAO;YACP,kBAAkB,EAAE,UAAU;SAC/B,CAAA;QAED,OAAO;YACL,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,iBAAiB;SACpC,CAAA;KACF;SAAM;QACL,OAAO;YACL,KAAK,EACH,gGAAgG;YAClG,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,iBAAiB;SACpC,CAAA;KACF;AACH,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/dist/index.js

@@ -1,4 +1,4 @@
 import ingredientParser from './funcs/ingredientParser.js';
-export default ingredientParser;
+export { ingredientParser };
 // export { default as ingredientParser } from './funcs/ingredientParser.js'
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,6BAA6B,CAAA;AAC1D,eAAe,gBAAgB,CAAA;AAC/B,4EAA4E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,6BAA6B,CAAA;AAM1D,OAAO,EAAE,gBAAgB,EAA4C,CAAA;AACrE,4EAA4E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Parses given sentence including ingredient information and attemps to return quantity, measurement and ingredient data",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",