@jclind/ingredient-parser 1.2.10 → 1.2.12

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.d.ts

@@ -1 +1,2 @@
 export declare const spoonacularHttp: import("axios").AxiosInstance;
+export declare const createIngredientServerHttp: (serverUrl?: string) => import("axios").AxiosInstance;

package/dist/src/api/http.js

@@ -1,10 +1,21 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spoonacularHttp = void 0;
-const axios_1 = require("axios");
+exports.createIngredientServerHttp = exports.spoonacularHttp = void 0;
+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',
     },
 });
+const createIngredientServerHttp = (serverUrl) => axios_1.default.create({
+    baseURL: serverUrl || DEFAULT_SERVER_URL,
+    headers: {
+        'Content-type': 'application/json',
+    },
+});
+exports.createIngredientServerHttp = createIngredientServerHttp;

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

@@ -1,2 +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>;

package/dist/src/api/requests.js

@@ -9,8 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIngredientInformation = exports.searchIngredient = void 0;
+exports.getIngredientInformation = exports.searchIngredient = exports.parseAndEnrich = void 0;
 const http_js_1 = require("./http.js");
+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;
+});
+exports.parseAndEnrich = parseAndEnrich;
 const searchIngredient = (name, spoonacularAPIKey) => __awaiter(void 0, void 0, void 0, function* () {
     let searchedIngr;
     try {

package/dist/src/funcs/calculatePrice.d.ts

@@ -1,4 +1,4 @@
 export declare const calculatePrice: (quantity: number | null, unit: string | null, price: {
-    estimatedSingleUnitPrice: number;
-    estimatedGramPrice: number;
+    estimatedSingleUnitPrice?: number;
+    estimatedGramPrice?: number;
 }) => number | null;

package/dist/src/funcs/calculatePrice.js

@@ -3,21 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculatePrice = void 0;
 const ingredient_unit_converter_1 = require("@jclind/ingredient-unit-converter");
 const calculatePrice = (quantity, unit, price) => {
+    var _a, _b;
+    const gramPrice = (_a = price.estimatedGramPrice) !== null && _a !== void 0 ? _a : 0;
+    const unitPrice = (_b = price.estimatedSingleUnitPrice) !== null && _b !== void 0 ? _b : 0;
     if (quantity === null)
-        return price.estimatedSingleUnitPrice;
+        return unitPrice || null;
+    if (quantity === 0)
+        return 0;
     if (!unit)
-        return price.estimatedSingleUnitPrice * quantity;
+        return (unitPrice * quantity) || null;
     let convertedUnit;
     try {
         convertedUnit = (0, ingredient_unit_converter_1.converter)(quantity, unit);
     }
     catch (error) {
-        return null;
+        return (unitPrice * quantity) || null;
     }
     if (!convertedUnit || 'error' in convertedUnit)
-        return price.estimatedSingleUnitPrice * quantity;
+        return (unitPrice * quantity) || null;
     const convertedGrams = Number(convertedUnit.quantity);
-    const total = convertedGrams * price.estimatedGramPrice;
+    const total = convertedGrams * gramPrice;
     return Math.ceil(total * 100) / 100;
 };
 exports.calculatePrice = calculatePrice;

package/dist/src/funcs/getIngredientInfo.d.ts

@@ -1 +1,2 @@
-export declare function getIngredientInfo(ingrName: string, spoonacularAPIKey: string): Promise<any>;
+import { IngredientData } from '../../types.js';
+export declare function getIngredientInfo(ingredientString: string, spoonacularAPIKey: string, serverUrl?: string): Promise<IngredientData | null>;

package/dist/src/funcs/getIngredientInfo.js

@@ -10,13 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIngredientInfo = getIngredientInfo;
-const getSpoonacularIngrData_js_1 = require("./getSpoonacularIngrData.js");
-function getIngredientInfo(ingrName, spoonacularAPIKey) {
+const requests_js_1 = require("../api/requests.js");
+function getIngredientInfo(ingredientString, spoonacularAPIKey, serverUrl) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ingrNameLower = ingrName.toLowerCase();
-        if (!ingrNameLower)
-            throw new Error('Ingredient Invalid');
-        const ingrData = yield (0, getSpoonacularIngrData_js_1.getSpoonacularIngrData)(ingrNameLower, spoonacularAPIKey);
-        return ingrData;
+        try {
+            return yield (0, requests_js_1.parseAndEnrich)(ingredientString, spoonacularAPIKey, serverUrl);
+        }
+        catch (error) {
+            throw new Error(error.message || 'Failed to fetch ingredient data');
+        }
     });
 }

package/dist/src/funcs/ingredientParser.js

@@ -29,7 +29,7 @@ const ingredientParser = (ingrString, spoonacularAPIKey, options) => __awaiter(v
     const parsedIngr = (0, parseIngredientString_js_1.parseIngredientString)(ingrString);
     let ingrData = null;
     try {
-        ingrData = yield (0, getIngredientInfo_js_1.getIngredientInfo)(parsedIngr.ingredient || '', spoonacularAPIKey);
+        ingrData = yield (0, getIngredientInfo_js_1.getIngredientInfo)(parsedIngr.ingredient || '', spoonacularAPIKey, options === null || options === void 0 ? void 0 : options.serverUrl);
     }
     catch (error) {
         return {
@@ -40,10 +40,12 @@ const ingredientParser = (ingrString, spoonacularAPIKey, options) => __awaiter(v
     }
     if (parsedIngr.ingredient && ingrData) {
         const { estimatedPrices, meta, categoryPath, unit, unitShort, unitLong, original, id, nutrition } = ingrData, reducedIngrData = __rest(ingrData, ["estimatedPrices", "meta", "categoryPath", "unit", "unitShort", "unitLong", "original", "id", "nutrition"]);
-        const totalPrice = (0, calculatePrice_js_1.calculatePrice)(parsedIngr.quantity, parsedIngr.unit, estimatedPrices);
+        const totalPrice = estimatedPrices
+            ? (0, calculatePrice_js_1.calculatePrice)(parsedIngr.quantity, parsedIngr.unit, estimatedPrices)
+            : null;
         const imageSize = (_a = options === null || options === void 0 ? void 0 : options.imageSize) !== null && _a !== void 0 ? _a : '100x100';
         const imagePath = `https://spoonacular.com/cdn/ingredients_${imageSize}/${reducedIngrData.image}`;
-        const updatedIngrData = Object.assign(Object.assign(Object.assign({}, reducedIngrData), { imagePath, totalPriceUSACents: totalPrice }), ((options === null || options === void 0 ? void 0 : options.returnNutritionData) && { nutrition }));
+        const updatedIngrData = Object.assign(Object.assign(Object.assign(Object.assign({}, reducedIngrData), { imagePath }), (totalPrice !== null && { totalPriceUSACents: totalPrice })), ((options === null || options === void 0 ? void 0 : options.returnNutritionData) && { nutrition }));
         return {
             ingredientData: updatedIngrData,
             parsedIngredient: parsedIngr,

package/dist/types.d.ts

@@ -24,19 +24,30 @@ export type ParsedIngredient = {
     comment: StringOrNull;
 };
 export interface IngredientData {
-    _id: string;
-    ingredientId: number;
-    originalName: string;
+    _id?: string;
+    ingredientId?: number;
+    originalName?: string;
     name: string;
-    amount: number;
-    possibleUnits: string[];
-    consistency: string;
-    shoppingListUnits: string[];
-    aisle: string;
-    image: string;
-    imagePath: string;
-    nutrition: Nutrition;
-    totalPriceUSACents: number;
+    amount?: number;
+    possibleUnits?: string[];
+    consistency?: string;
+    shoppingListUnits?: string[];
+    aisle?: string;
+    image?: string;
+    imagePath?: string;
+    nutrition?: Nutrition;
+    totalPriceUSACents?: number;
+    estimatedPrices?: {
+        estimatedGramPrice?: number;
+        estimatedSingleUnitPrice?: number;
+    };
+    meta?: any;
+    categoryPath?: any;
+    unit?: string;
+    unitShort?: string;
+    unitLong?: string;
+    original?: any;
+    id?: number;
 }
 export interface Nutrition {
     nutrients: Nutrient[];
@@ -74,5 +85,6 @@ export type SpoonacularImageSize = '100x100' | '250x250' | '500x500';
 export type OptionsType = {
     returnNutritionData?: boolean;
     imageSize?: SpoonacularImageSize;
+    serverUrl?: string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "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"
   },