@jclind/ingredient-parser 1.2.11 → 1.2.13

package/dist/index.js

@@ -13,9 +13,12 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseIngredientString = exports.ingredientParser = void 0;
-const ingredientParser_1 = require("./src/funcs/ingredientParser");
+const ingredientParser_1 = __importDefault(require("./src/funcs/ingredientParser"));
 exports.ingredientParser = ingredientParser_1.default;
 var parseIngredientString_1 = require("./src/funcs/parseIngredientString");
 Object.defineProperty(exports, "parseIngredientString", { enumerable: true, get: function () { return parseIngredientString_1.parseIngredientString; } });

package/dist/src/api/http.js

@@ -1,18 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIngredientServerHttp = exports.spoonacularHttp = void 0;
-const axios_1 = require("axios");
-const DEFAULT_SERVER_URL = 'https://prepify-ingredients.up.railway.app';
+const axios_1 = __importDefault(require("axios"));
+const DEFAULT_SERVER_URL = 'https://ingredient-parser-service-production-2635.up.railway.app';
 exports.spoonacularHttp = axios_1.default.create({
     baseURL: 'https://api.spoonacular.com/food/ingredients/',
     headers: {
         'Content-type': 'application/json',
     },
+    timeout: 8000,
 });
 const createIngredientServerHttp = (serverUrl) => axios_1.default.create({
     baseURL: serverUrl || DEFAULT_SERVER_URL,
     headers: {
         'Content-type': 'application/json',
     },
+    timeout: 8000,
 });
 exports.createIngredientServerHttp = createIngredientServerHttp;

package/dist/src/api/requests.d.ts

@@ -1,4 +1,4 @@
 import { IngredientData } from '../../types.js';
 export declare const parseAndEnrich: (ingredientString: string, spoonacularApiKey: string, serverUrl?: string) => Promise<IngredientData | null>;
-export declare const searchIngredient: (name: string, spoonacularAPIKey: string) => Promise<any>;
-export declare const getIngredientInformation: (ingrId: number, unit: boolean, spoonacularAPIKey: string) => Promise<any>;
+export declare const searchIngredient: (name: string, spoonacularAPIKey: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const getIngredientInformation: (ingrId: number, unit: boolean, spoonacularAPIKey: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;

package/dist/src/api/requests.js

@@ -8,50 +8,58 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIngredientInformation = exports.searchIngredient = exports.parseAndEnrich = void 0;
+const axios_1 = __importDefault(require("axios"));
 const http_js_1 = require("./http.js");
+function handleRequestError(error) {
+    var _a, _b, _c;
+    if (axios_1.default.isAxiosError(error)) {
+        const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
+        const code = (_c = (_b = error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.code;
+        if (status === 401 || code === 401)
+            throw new Error('API Key Not Valid');
+        if (status === 429)
+            throw new Error('Rate limit exceeded, please try again later');
+        if (error.response)
+            throw new Error('Error Occurred, Please Try Again');
+        throw new Error('Network error, please try again');
+    }
+    throw new Error('Network error, please try again');
+}
 const parseAndEnrich = (ingredientString, spoonacularApiKey, serverUrl) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const serverHttp = (0, http_js_1.createIngredientServerHttp)(serverUrl);
-    const response = yield serverHttp.post('/parse', {
-        ingredientString,
-        spoonacularApiKey,
-    });
-    return (_a = response.data.data) !== null && _a !== void 0 ? _a : null;
+    try {
+        const serverHttp = (0, http_js_1.createIngredientServerHttp)(serverUrl);
+        const response = yield serverHttp.post('/parse', {
+            ingredientString,
+            spoonacularApiKey,
+        });
+        return (_a = response.data.data) !== null && _a !== void 0 ? _a : null;
+    }
+    catch (error) {
+        handleRequestError(error);
+    }
 });
 exports.parseAndEnrich = parseAndEnrich;
 const searchIngredient = (name, spoonacularAPIKey) => __awaiter(void 0, void 0, void 0, function* () {
-    let searchedIngr;
     try {
-        searchedIngr = yield http_js_1.spoonacularHttp.get(`search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`);
+        return yield http_js_1.spoonacularHttp.get(`search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`);
     }
     catch (error) {
-        const res = error.response.data;
-        if (res.code === 401) {
-            throw new Error('API Key Not Valid');
-        }
-        else {
-            throw new Error('Error Occurred, Please Try Again');
-        }
+        handleRequestError(error);
     }
-    return searchedIngr;
 });
 exports.searchIngredient = searchIngredient;
 const getIngredientInformation = (ingrId, unit, spoonacularAPIKey) => __awaiter(void 0, void 0, void 0, function* () {
-    let ingrData;
     try {
-        ingrData = yield http_js_1.spoonacularHttp.get(`${ingrId}/information?amount=1&${unit ? 'unit=grams&' : ''}apiKey=${spoonacularAPIKey}`);
+        return yield http_js_1.spoonacularHttp.get(`${ingrId}/information?amount=1&${unit ? 'unit=grams&' : ''}apiKey=${spoonacularAPIKey}`);
     }
     catch (error) {
-        const res = error.response.data;
-        if (res.code === 401) {
-            throw new Error('API Key Not Valid');
-        }
-        else {
-            throw new Error('Error Occurred, Please Try Again');
-        }
+        handleRequestError(error);
     }
-    return ingrData;
 });
 exports.getIngredientInformation = getIngredientInformation;

package/dist/src/funcs/calculatePrice.js

@@ -8,6 +8,8 @@ const calculatePrice = (quantity, unit, price) => {
     const unitPrice = (_b = price.estimatedSingleUnitPrice) !== null && _b !== void 0 ? _b : 0;
     if (quantity === null)
         return unitPrice || null;
+    if (quantity === 0)
+        return 0;
     if (!unit)
         return (unitPrice * quantity) || null;
     let convertedUnit;
@@ -15,7 +17,7 @@ const calculatePrice = (quantity, unit, price) => {
         convertedUnit = (0, ingredient_unit_converter_1.converter)(quantity, unit);
     }
     catch (error) {
-        return null;
+        return (unitPrice * quantity) || null;
     }
     if (!convertedUnit || 'error' in convertedUnit)
         return (unitPrice * quantity) || null;

package/dist/src/funcs/getSpoonacularIngrData.js

@@ -15,15 +15,13 @@ function getSpoonacularIngrData(name, spoonacularAPIKey) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
         const searchedIngr = yield (0, requests_js_1.searchIngredient)(name, spoonacularAPIKey);
-        if (searchedIngr.error)
-            return searchedIngr;
         const ingrId = (_c = (_b = (_a = searchedIngr === null || searchedIngr === void 0 ? void 0 : searchedIngr.data) === null || _a === void 0 ? void 0 : _a.results[0]) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null;
         if (!ingrId)
             throw new Error(`No Data Found, unknown ingredient: ${name}`);
-        const ingrDataGram = yield (0, requests_js_1.getIngredientInformation)(ingrId, true, spoonacularAPIKey);
-        const ingrDataSingleUnit = yield (0, requests_js_1.getIngredientInformation)(ingrId, false, spoonacularAPIKey);
-        if (ingrDataGram.error || ingrDataSingleUnit.error)
-            return ingrDataGram;
+        const [ingrDataGram, ingrDataSingleUnit] = yield Promise.all([
+            (0, requests_js_1.getIngredientInformation)(ingrId, true, spoonacularAPIKey),
+            (0, requests_js_1.getIngredientInformation)(ingrId, false, spoonacularAPIKey),
+        ]);
         const estimatedGramPrice = (_e = (_d = ingrDataGram.data.estimatedCost) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : 0;
         const estimatedSingleUnitPrice = (_g = (_f = ingrDataSingleUnit.data.estimatedCost) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : 0;
         const ingrData = Object.assign(Object.assign({}, ingrDataGram.data), { name, ingredientId: ingrId, estimatedPrices: { estimatedGramPrice, estimatedSingleUnitPrice } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "Parses given sentence including ingredient information and attempts to return quantity, measurement and ingredient data",
   "keywords": [
     "recipe",
@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/jclind/ingredient-parser#readme",
   "dependencies": {
-    "@jclind/ingredient-unit-converter": "^1.0.6",
+    "@jclind/ingredient-unit-converter": "^1.1.0",
     "axios": "^1.0.0",
     "recipe-ingredient-parser-v3": "^1.5.0"
   },