@jclind/ingredient-parser 1.0.2 → 1.0.4

package/dist/api/http.js

@@ -0,0 +1,14 @@
+import axios from 'axios';
+export const mongoHttp = axios.create({
+    baseURL: 'https://us-east-1.aws.data.mongodb-api.com/app/prepify-ixumn/endpoint',
+    headers: {
+        'Content-type': 'application/json',
+    },
+});
+export const spoonacularHttp = axios.create({
+    baseURL: 'https://api.spoonacular.com/food/ingredients/',
+    headers: {
+        'Content-type': 'application/json',
+    },
+});
+//# sourceMappingURL=http.js.map

package/dist/api/http.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/api/http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;IACpC,OAAO,EACL,uEAAuE;IACzE,OAAO,EAAE;QACP,cAAc,EAAE,kBAAkB;KACnC;CACF,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1C,OAAO,EAAE,+CAA+C;IACxD,OAAO,EAAE;QACP,cAAc,EAAE,kBAAkB;KACnC;CACF,CAAC,CAAA"}

package/dist/api/requests.js

@@ -0,0 +1,40 @@
+import { mongoHttp, spoonacularHttp } from './http.js';
+export const checkIngredient = async (name) => {
+    return await mongoHttp.get(`checkIngredient?name=${name}`);
+};
+export const searchIngredient = async (name, spoonacularAPIKey) => {
+    let searchedIngr;
+    try {
+        searchedIngr = await spoonacularHttp.get(`search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`);
+    }
+    catch (error) {
+        const res = error.response.data;
+        if (res.code === 401) {
+            return { errorMsg: 'API Key Not Valid', error };
+        }
+        else {
+            return { errorMsg: 'Error Occurred, Please Try Again', error };
+        }
+    }
+    return searchedIngr;
+};
+export const getIngredientInformation = async (ingrId, spoonacularAPIKey) => {
+    let ingrData;
+    try {
+        ingrData = await spoonacularHttp.get(`${ingrId}/information?amount=1&apiKey=${spoonacularAPIKey}`);
+    }
+    catch (error) {
+        const res = error.response.data;
+        if (res.code === 401) {
+            return { errorMsg: 'API Key Not Valid', error };
+        }
+        else {
+            return { errorMsg: 'Error Occurred, Please Try Again', error };
+        }
+    }
+    return ingrData;
+};
+export const setMongoDBIngrData = async (data) => {
+    await mongoHttp.post(`addIngredient`, data);
+};
+//# sourceMappingURL=requests.js.map

package/dist/api/requests.js.map

@@ -0,0 +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,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAA;SAChD;aAAM;YACL,OAAO,EAAE,QAAQ,EAAE,kCAAkC,EAAE,KAAK,EAAE,CAAA;SAC/D;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,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAA;SAChD;aAAM;YACL,OAAO,EAAE,QAAQ,EAAE,kCAAkC,EAAE,KAAK,EAAE,CAAA;SAC/D;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"}

package/dist/funcs/getIngredientInfo.js

@@ -0,0 +1,16 @@
+import { checkIngredient } from '../api/requests.js';
+import { getSpoonacularIngrData } from './getSpoonacularIngrData.js';
+export async function getIngredientInfo(ingrName, spoonacularAPIKey) {
+    const ingrNameLower = ingrName.toLowerCase();
+    if (!ingrNameLower)
+        return;
+    const mongoIngrData = await checkIngredient(ingrNameLower);
+    if (!mongoIngrData.data) {
+        const ingrData = await getSpoonacularIngrData(ingrNameLower, spoonacularAPIKey);
+        return ingrData;
+    }
+    else {
+        return mongoIngrData.data;
+    }
+}
+//# sourceMappingURL=getIngredientInfo.js.map

package/dist/funcs/getIngredientInfo.js.map

@@ -0,0 +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,OAAM;IAC1B,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"}

package/dist/funcs/getSpoonacularIngrData.js

@@ -0,0 +1,16 @@
+import { getIngredientInformation, searchIngredient, setMongoDBIngrData, } from '../api/requests.js';
+export async function getSpoonacularIngrData(name, spoonacularAPIKey) {
+    const searchedIngr = await searchIngredient(name, spoonacularAPIKey);
+    if (searchedIngr.error)
+        return searchedIngr;
+    const ingrId = searchedIngr?.data?.results[0]?.id ?? null;
+    if (!ingrId)
+        return { error: 'No Data Found', errorMsg: 'No Data Found' };
+    const ingrData = await getIngredientInformation(ingrId, spoonacularAPIKey);
+    if (ingrData.error)
+        return ingrData;
+    const mongoDBIngrData = { ...ingrData.data, name };
+    setMongoDBIngrData(mongoDBIngrData);
+    return mongoDBIngrData;
+}
+//# sourceMappingURL=getSpoonacularIngrData.js.map

package/dist/funcs/getSpoonacularIngrData.js.map

@@ -0,0 +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,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAA;IAEzE,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"}

package/dist/funcs/ingredientParser.js

@@ -0,0 +1,38 @@
+import { parse } from 'recipe-ingredient-parser-v3';
+import { getIngredientInfo } from './getIngredientInfo.js';
+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 ingredientParser = async (ingrString, spoonacularAPIKey) => {
+    const parsedIngr = parse(ingrString, 'eng');
+    const formattedIngr = editIngredientString(parsedIngr.ingredient);
+    const { formattedIngrName, comment } = formattedIngr;
+    const updatedParsedIngr = {
+        ...parsedIngr,
+        ingredient: formattedIngrName,
+        comment,
+    };
+    if (formattedIngr) {
+        const ingrData = await getIngredientInfo(formattedIngrName, spoonacularAPIKey);
+        return { ...ingrData, parsedIngredient: updatedParsedIngr };
+    }
+    else {
+        return {
+            error: 'Ingredient not formatted correctly. Please pass ingredient comments/instructions after a comma',
+            parsedIngredient: updatedParsedIngr,
+        };
+    }
+};
+export default ingredientParser;
+//# sourceMappingURL=ingredientParser.js.map

package/dist/funcs/ingredientParser.js.map

@@ -0,0 +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;AAE1D,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,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;QACD,OAAO,EAAE,GAAG,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAA;KAC5D;SAAM;QACL,OAAO;YACL,KAAK,EACH,gGAAgG;YAClG,gBAAgB,EAAE,iBAAiB;SACpC,CAAA;KACF;AACH,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/dist/index.js

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

package/dist/index.js.map

@@ -0,0 +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"}

package/dist/types/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.0.2",
-  "description": "Parses given sentence including ingredient information and attemps to return quantity, measurement and ingredient",
-  "main": "index.js",
+  "version": "1.0.4",
+  "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",
+  "type": "module",
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "tsc"
   },
   "repository": {
     "type": "git",
@@ -17,8 +22,10 @@
   },
   "homepage": "https://github.com/jclind/ingredient-parser#readme",
   "dependencies": {
+    "@types/axios": "^0.14.0",
     "dotenv": "^16.0.3",
     "parse-ingredient": "^0.6.0",
-    "recipe-ingredient-parser-v3": "^1.2.18"
+    "recipe-ingredient-parser-v3": "^1.2.18",
+    "typescript": "^4.9.4"
   }
 }

package/http-common.ts

@@ -1,16 +0,0 @@
-const axios = require('axios')
-
-const mongoHttp = axios.create({
-  baseURL:
-    'https://us-east-1.aws.data.mongodb-api.com/app/prepify-ixumn/endpoint',
-  headers: {
-    'Content-type': 'application/json',
-  },
-})
-const spoonacularHttp = axios.create({
-  baseURL: 'https://api.spoonacular.com/food/ingredients/',
-  headers: {
-    'Content-type': 'application/json',
-  },
-})
-module.exports = { mongoHttp, spoonacularHttp }

package/index.js

@@ -1,87 +0,0 @@
-const { mongoHttp, spoonacularHttp } = require('./http-common.ts')
-const { parse } = require('recipe-ingredient-parser-v3')
-
-const ingredientParser = async (ingrString, spoonacularAPIKey) => {
-  const parsedIngr = parse(ingrString, 'eng')
-  const formattedIngr = parsedIngr.ingredient
-    .trim()
-    .replace(/\s{2,}/g, ' ')
-    .replace(/,/g, '')
-    .replace(/^(fluid )/, '')
-    .replace(/^(fl )/, '')
-    .replace(/^(oz )/, '')
-    .trim()
-  if (formattedIngr) {
-    const ingrData = await getIngredientInfo(formattedIngr, spoonacularAPIKey)
-    return ingrData
-  } else {
-    return null
-  }
-}
-
-async function getIngredientInfo(ingrName, spoonacularAPIKey) {
-  const ingrNameLower = ingrName.toLowerCase()
-  if (!ingrNameLower) return
-  const mongoIngrData = await checkIngredient(ingrNameLower)
-  if (!mongoIngrData.data) {
-    const ingrData = await getSpoonacularIngrData(
-      ingrNameLower,
-      spoonacularAPIKey
-    )
-    return ingrData
-  } else {
-    return mongoIngrData.data
-  }
-}
-
-async function checkIngredient(name) {
-  return await mongoHttp.get(`checkIngredient?name=${name}`)
-}
-async function getSpoonacularIngrData(name, spoonacularAPIKey) {
-  let searchedIngr = null
-  try {
-    searchedIngr = await spoonacularHttp.get(
-      `search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`
-    )
-  } catch (error) {
-    const res = error.response.data
-    if (res.code === 401) {
-      return { errorMsg: 'API Key Not Valid', error }
-    } else {
-      return { errorMsg: 'Error Occurred, Please Try Again', error }
-    }
-  }
-
-  if (
-    !searchedIngr.data ||
-    !searchedIngr.data.results ||
-    searchedIngr.data.results.length <= 0
-  ) {
-    return null
-  }
-
-  const ingrId = searchedIngr.data.results[0].id
-
-  let ingrData = null
-  try {
-    ingrData = await spoonacularHttp.get(
-      `${ingrId}/information?amount=1&apiKey=${process.env.SPOONACULAR_API_KEY}`
-    )
-  } catch (error) {
-    if (res.code === 401) {
-      return { errorMsg: 'API Key Not Valid', error }
-    } else {
-      return { errorMsg: 'Error Occurred, Please Try Again', error }
-    }
-  }
-  const mongoDBIngrData = { ...ingrData.data, name }
-  setMongoDBIngrData(mongoDBIngrData)
-  return mongoDBIngrData
-}
-
-async function setMongoDBIngrData(data) {
-  await mongoHttp.post(`addIngredient`, data)
-  return data
-}
-
-module.exports = ingredientParser