@jclind/ingredient-parser 1.0.19 → 1.0.21

package/README.md

@@ -26,6 +26,7 @@ Returns an object `{id: (randomly generated id unique to every request), parsedI
     unitPlural: 'cups',
     symbol: 'c',
     ingredient: 'rice',
+    originalIngredientString: '1 cup rice, washed'
     minQty: 1,
     maxQty: 1,
     comment: 'washed'
@@ -82,6 +83,7 @@ parseIngredient('Invalid Text', YOUR_API_KEY)
     unitPlural: 'q.b.',
     symbol: null,
     ingredient: 'Invalid Text',
+    originalIngredientString: 'Invalid Text',
     minQty: 0,
     maxQty: 0,
     comment: null
@@ -101,7 +103,8 @@ parseIngredient('1 cup rice', INVALID_API_KEY)
     unit: 'cup',
     unitPlural: 'cups',
     symbol: 'c',
-    ingredient: 'black beans',
+    ingredient: 'rice',
+    originalIngredientString: '1 cup rice'
     minQty: 1,
     maxQty: 1,
     comment: null

package/dist/funcs/calculatePrice.js

@@ -1,5 +1,6 @@
 import { converter } from '@jclind/ingredient-unit-converter';
 export const calculatePrice = (quantity, unit, price) => {
+    console.log(quantity, unit, price);
     if (!quantity)
         return price;
     if (!unit)
@@ -11,7 +12,9 @@ export const calculatePrice = (quantity, unit, price) => {
     catch (error) {
         return null;
     }
-    const convertedGrams = convertedUnit.quantity;
+    if (!convertedUnit || convertedUnit.error)
+        return price * quantity;
+    const convertedGrams = Number(convertedUnit.quantity);
     const total = convertedGrams * price;
     return Math.ceil(total * 100) / 100;
 };

package/dist/funcs/calculatePrice.js.map

@@ -1 +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"}
+{"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,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAClC,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,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,KAAK;QAAE,OAAO,KAAK,GAAG,QAAQ,CAAA;IAElE,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,KAAK,GAAW,cAAc,GAAG,KAAK,CAAA;IAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;AACrC,CAAC,CAAA"}

package/dist/funcs/editIngredientString.js

@@ -2,6 +2,8 @@ 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 wordsToRemove = ['small', 'medium', 'large', 'fresh', 'canned'];
+    const regex = new RegExp('\\b(' + wordsToRemove.join('|') + ')\\b', 'gi');
     const formattedIngrName = ingr
         .trim()
         .replace(/\s{2,}/g, ' ')
@@ -9,6 +11,7 @@ export const editIngredientString = (ingrStr) => {
         .replace(/^(fluid )/, '')
         .replace(/^(fl )/, '')
         .replace(/^(oz )/, '')
+        .replace(regex, '')
         .trim();
     return { formattedIngrName, comment };
 };

package/dist/funcs/editIngredientString.js.map

@@ -1 +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"}
+{"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,aAAa,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACrE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,CAAA;IAEzE,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,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,IAAI,EAAE,CAAA;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAA;AACvC,CAAC,CAAA"}

package/dist/funcs/ingredientParser.js

@@ -9,6 +9,7 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
     const updatedParsedIngr = {
         ...parsedIngr,
         ingredient: formattedIngrName,
+        originalIngredientString: ingrString,
         comment,
     };
     let ingrData = null;

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;AAMnD,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,EACI,EAAE;IAC/B,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,QAAQ,GAAG,IAAI,CAAA;IACnB,IAAI;QACF,QAAQ,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO;YACL,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;YACjC,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,iBAAiB,IAAI,IAAI;SAC5C,CAAA;KACF;IACD,IAAI,aAAa,IAAI,QAAQ,EAAE;QAC7B,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,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;QACtC,MAAM,UAAU,GAAG,cAAc,CAC/B,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,IAAI,EACf,aAAa,CAAC,KAAK,CACpB,CAAA;QAED,MAAM,SAAS,GAAG,mDAAmD,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5F,MAAM,eAAe,GAAmB;YACtC,GAAG,eAAe;YAClB,SAAS;YACT,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,EAAE;gBACL,OAAO,EACL,sHAAsH;aACzH;YACD,cAAc,EAAE,IAAI;YACpB,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;AAMnD,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,EACI,EAAE;IAC/B,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,wBAAwB,EAAE,UAAU;QACpC,OAAO;KACR,CAAA;IACD,IAAI,QAAQ,GAAG,IAAI,CAAA;IACnB,IAAI;QACF,QAAQ,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO;YACL,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;YACjC,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,iBAAiB,IAAI,IAAI;SAC5C,CAAA;KACF;IACD,IAAI,aAAa,IAAI,QAAQ,EAAE;QAC7B,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,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;QACtC,MAAM,UAAU,GAAG,cAAc,CAC/B,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,IAAI,EACf,aAAa,CAAC,KAAK,CACpB,CAAA;QAED,MAAM,SAAS,GAAG,mDAAmD,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5F,MAAM,eAAe,GAAmB;YACtC,GAAG,eAAe;YAClB,SAAS;YACT,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,EAAE;gBACL,OAAO,EACL,sHAAsH;aACzH;YACD,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,iBAAiB;SACpC,CAAA;KACF;AACH,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/package.json

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