@jclind/ingredient-parser 1.0.8 → 1.0.9
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.
- package/README.md +0 -0
- package/dist/api/requests.js +4 -4
- package/dist/api/requests.js.map +1 -1
- package/dist/funcs/getIngredientInfo.js +1 -1
- package/dist/funcs/getIngredientInfo.js.map +1 -1
- package/dist/funcs/getSpoonacularIngrData.js +2 -1
- package/dist/funcs/getSpoonacularIngrData.js.map +1 -1
- package/dist/funcs/ingredientParser.js +16 -3
- package/dist/funcs/ingredientParser.js.map +1 -1
- package/package.json +7 -1
package/README.md
CHANGED
|
Binary file
|
package/dist/api/requests.js
CHANGED
|
@@ -10,10 +10,10 @@ export const searchIngredient = async (name, spoonacularAPIKey) => {
|
|
|
10
10
|
catch (error) {
|
|
11
11
|
const res = error.response.data;
|
|
12
12
|
if (res.code === 401) {
|
|
13
|
-
|
|
13
|
+
throw new Error('API Key Not Valid');
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
|
|
16
|
+
throw new Error('Error Occurred, Please Try Again');
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
return searchedIngr;
|
|
@@ -26,10 +26,10 @@ export const getIngredientInformation = async (ingrId, spoonacularAPIKey) => {
|
|
|
26
26
|
catch (error) {
|
|
27
27
|
const res = error.response.data;
|
|
28
28
|
if (res.code === 401) {
|
|
29
|
-
|
|
29
|
+
throw new Error('API Key Not Valid');
|
|
30
30
|
}
|
|
31
31
|
else {
|
|
32
|
-
|
|
32
|
+
throw new Error('Error Occurred, Please Try Again');
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
return ingrData;
|
package/dist/api/requests.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/api/requests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IACpD,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,IAAY,EAAE,iBAAiB,EAAE,EAAE;IACxE,IAAI,YAAiB,CAAA;IACrB,IAAI;QACF,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,CACtC,gBAAgB,IAAI,oBAAoB,iBAAiB,EAAE,CAC5D,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,GAAG,GAAQ,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA;QACpC,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;YACpB,
|
|
1
|
+
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/api/requests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IACpD,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,IAAY,EAAE,iBAAiB,EAAE,EAAE;IACxE,IAAI,YAAiB,CAAA;IACrB,IAAI;QACF,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,CACtC,gBAAgB,IAAI,oBAAoB,iBAAiB,EAAE,CAC5D,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,GAAG,GAAQ,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA;QACpC,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACpD;KACF;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,MAAc,EACd,iBAAiB,EACjB,EAAE;IACF,IAAI,QAAa,CAAA;IACjB,IAAI;QACF,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,CAClC,GAAG,MAAM,gCAAgC,iBAAiB,EAAE,CAC7D,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,GAAG,GAAQ,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAA;QACpC,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACpD;KACF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAC,IAAI,EAAC,EAAE;IAC7C,MAAM,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;AAC7C,CAAC,CAAA"}
|
|
@@ -3,7 +3,7 @@ import { getSpoonacularIngrData } from './getSpoonacularIngrData.js';
|
|
|
3
3
|
export async function getIngredientInfo(ingrName, spoonacularAPIKey) {
|
|
4
4
|
const ingrNameLower = ingrName.toLowerCase();
|
|
5
5
|
if (!ingrNameLower)
|
|
6
|
-
|
|
6
|
+
throw new Error('Ingredient Invalid');
|
|
7
7
|
const mongoIngrData = await checkIngredient(ingrNameLower);
|
|
8
8
|
if (!mongoIngrData.data) {
|
|
9
9
|
const ingrData = await getSpoonacularIngrData(ingrNameLower, spoonacularAPIKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getIngredientInfo.js","sourceRoot":"","sources":["../../src/funcs/getIngredientInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,iBAAyB;IAEzB,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAA;IAC5C,IAAI,CAAC,aAAa;QAAE,
|
|
1
|
+
{"version":3,"file":"getIngredientInfo.js","sourceRoot":"","sources":["../../src/funcs/getIngredientInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,iBAAyB;IAEzB,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAA;IAC5C,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACzD,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;QACvB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAC3C,aAAa,EACb,iBAAiB,CAClB,CAAA;QACD,OAAO,QAAQ,CAAA;KAChB;SAAM;QACL,OAAO,aAAa,CAAC,IAAI,CAAA;KAC1B;AACH,CAAC"}
|
|
@@ -5,7 +5,8 @@ export async function getSpoonacularIngrData(name, spoonacularAPIKey) {
|
|
|
5
5
|
return searchedIngr;
|
|
6
6
|
const ingrId = searchedIngr?.data?.results[0]?.id ?? null;
|
|
7
7
|
if (!ingrId)
|
|
8
|
-
|
|
8
|
+
throw new Error(`No Data Found, unknown ingredient: ${name}`);
|
|
9
|
+
1;
|
|
9
10
|
const ingrData = await getIngredientInformation(ingrId, spoonacularAPIKey);
|
|
10
11
|
if (ingrData.error)
|
|
11
12
|
return ingrData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSpoonacularIngrData.js","sourceRoot":"","sources":["../../src/funcs/getSpoonacularIngrData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAE3B,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAY,EACZ,iBAAyB;IAEzB,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;IACpE,IAAI,YAAY,CAAC,KAAK;QAAE,OAAO,YAAY,CAAA;IAC3C,MAAM,MAAM,GAAG,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,CAAA;IAEzD,IAAI,CAAC,MAAM;QAAE,
|
|
1
|
+
{"version":3,"file":"getSpoonacularIngrData.js","sourceRoot":"","sources":["../../src/funcs/getSpoonacularIngrData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAE3B,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAY,EACZ,iBAAyB;IAEzB,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;IACpE,IAAI,YAAY,CAAC,KAAK;QAAE,OAAO,YAAY,CAAA;IAC3C,MAAM,MAAM,GAAG,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,CAAA;IAEzD,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;IAC1E,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;IAC1E,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAA;IAEnC,MAAM,eAAe,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAA;IAClD,kBAAkB,CAAC,eAAe,CAAC,CAAA;IACnC,OAAO,eAAe,CAAA;AACxB,CAAC"}
|
|
@@ -11,8 +11,19 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
|
|
|
11
11
|
ingredient: formattedIngrName,
|
|
12
12
|
comment,
|
|
13
13
|
};
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
let ingrData = null;
|
|
15
|
+
try {
|
|
16
|
+
ingrData = await getIngredientInfo(formattedIngrName, spoonacularAPIKey);
|
|
17
|
+
console.log(ingrData);
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
return {
|
|
21
|
+
error: { message: error.message },
|
|
22
|
+
ingredientData: null,
|
|
23
|
+
parsedIngredient: updatedParsedIngr ?? null,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
if (formattedIngr && ingrData) {
|
|
16
27
|
const { estimatedCost, meta, categoryPath, unit, unitShort, unitLong, original, id, ...reducedIngrData } = ingrData;
|
|
17
28
|
const totalPrice = calculatePrice(parsedIngr.quantity, parsedIngr.unit, estimatedCost.value);
|
|
18
29
|
const imgPath = `https://spoonacular.com/cdn/ingredients_100x100/${reducedIngrData.image}`;
|
|
@@ -30,7 +41,9 @@ const ingredientParser = async (ingrString, spoonacularAPIKey) => {
|
|
|
30
41
|
}
|
|
31
42
|
else {
|
|
32
43
|
return {
|
|
33
|
-
error:
|
|
44
|
+
error: {
|
|
45
|
+
message: 'Ingredient not formatted correctly or Ingredient Unknown. Please pass ingredient comments/instructions after a comma',
|
|
46
|
+
},
|
|
34
47
|
ingredientData: null,
|
|
35
48
|
parsedIngredient: updatedParsedIngr,
|
|
36
49
|
};
|
|
@@ -1 +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,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,
|
|
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,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,QAAQ,GAAG,IAAI,CAAA;IACnB,IAAI;QACF,QAAQ,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;QACxE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;KACtB;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,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,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
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jclind/ingredient-parser",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"description": "Parses given sentence including ingredient information and attemps to return quantity, measurement and ingredient data",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"recipe",
|
|
7
|
+
"ingredient",
|
|
8
|
+
"parse",
|
|
9
|
+
"units"
|
|
10
|
+
],
|
|
5
11
|
"main": "dist/index.js",
|
|
6
12
|
"types": "dist/index.d.ts",
|
|
7
13
|
"type": "module",
|