@jclind/ingredient-parser 1.0.20 → 1.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/funcs/calculatePrice.js +4 -1
  2. package/dist/funcs/calculatePrice.js.map +1 -1
  3. package/dist/funcs/editIngredientString.js +3 -0
  4. package/dist/funcs/editIngredientString.js.map +1 -1
  5. package/package.json +1 -1
package/dist/funcs/calculatePrice.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { converter } from '@jclind/ingredient-unit-converter';
2
2
  export const calculatePrice = (quantity, unit, price) => {
3
+ console.log(quantity, unit, price);
3
4
  if (!quantity)
4
5
  return price;
5
6
  if (!unit)
@@ -11,7 +12,9 @@ export const calculatePrice = (quantity, unit, price) => {
11
12
  catch (error) {
12
13
  return null;
13
14
  }
14
- const convertedGrams = convertedUnit.quantity;
15
+ if (!convertedUnit || convertedUnit.error)
16
+ return price * quantity;
17
+ const convertedGrams = Number(convertedUnit.quantity);
15
18
  const total = convertedGrams * price;
16
19
  return Math.ceil(total * 100) / 100;
17
20
  };
package/dist/funcs/calculatePrice.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -2,6 +2,8 @@ export const editIngredientString = (ingrStr) => {
2
2
  // Get string after first comment in ingredient string
3
3
  let ingr = ingrStr.split(',')[0]?.trim() ?? ingrStr;
4
4
  let comment = ingrStr.split(',')[1]?.trim() ?? null;
5
+ const wordsToRemove = ['small', 'medium', 'large', 'fresh', 'canned'];
6
+ const regex = new RegExp('\\b(' + wordsToRemove.join('|') + ')\\b', 'gi');
5
7
  const formattedIngrName = ingr
6
8
  .trim()
7
9
  .replace(/\s{2,}/g, ' ')
@@ -9,6 +11,7 @@ export const editIngredientString = (ingrStr) => {
9
11
  .replace(/^(fluid )/, '')
10
12
  .replace(/^(fl )/, '')
11
13
  .replace(/^(oz )/, '')
14
+ .replace(regex, '')
12
15
  .trim();
13
16
  return { formattedIngrName, comment };
14
17
  };
package/dist/funcs/editIngredientString.js.map CHANGED
@@ -1 +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"}
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,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jclind/ingredient-parser",
3
- "version": "1.0.20",
3
+ "version": "1.0.21",
4
4
  "description": "Parses given sentence including ingredient information and attemps to return quantity, measurement and ingredient data",
5
5
  "keywords": [
6
6
  "recipe",