@jclind/ingredient-parser 1.0.41 → 1.1.0

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import ingredientParser from './funcs/ingredientParser';
-export * from '@jclind/ingredient-parser';
+import ingredientParser from './src/funcs/ingredientParser';
 export { ingredientParser };
+export * from './types';

package/dist/index.js

@@ -15,6 +15,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ingredientParser = void 0;
-const ingredientParser_1 = require("./funcs/ingredientParser");
+const ingredientParser_1 = require("./src/funcs/ingredientParser");
 exports.ingredientParser = ingredientParser_1.default;
-__exportStar(require("@jclind/ingredient-parser"), exports);
+// const test = async () => {
+//   const ingrData = await ingredientParser(
+//     '1 lb boneless skinless chicken breast',
+//     'e8064d74f9804ebd82a947fb7b86189b'
+//   )
+//   return console.log(ingrData)
+// }
+// test()
+__exportStar(require("./types"), exports);

package/dist/{api → src/api}/requests.d.ts

@@ -1,4 +1,4 @@
-import { IngredientData } from '@jclind/ingredient-parser';
+import { IngredientData } from '../../types.js';
 export declare const checkIngredient: (name: string) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const searchIngredient: (name: string, spoonacularAPIKey: string) => Promise<any>;
 export declare const getIngredientInformation: (ingrId: number, unit: boolean, spoonacularAPIKey: string) => Promise<any>;

package/dist/{funcs → src/funcs}/calculatePrice.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculatePrice = void 0;
-//@ts-ignore
 const ingredient_unit_converter_1 = require("@jclind/ingredient-unit-converter");
 const calculatePrice = (quantity, unit, price) => {
     if (!quantity)
@@ -15,7 +14,7 @@ const calculatePrice = (quantity, unit, price) => {
     catch (error) {
         return null;
     }
-    if (!convertedUnit || convertedUnit.error)
+    if (!convertedUnit || 'error' in convertedUnit)
         return price.estimatedSingleUnitPrice * quantity;
     const convertedGrams = Number(convertedUnit.quantity);
     const total = convertedGrams * price.estimatedGramPrice;

package/dist/{funcs → src/funcs}/ingredientParser.d.ts

@@ -1,3 +1,3 @@
-import { IngredientResponse } from '@jclind/ingredient-parser';
+import { IngredientResponse } from '../../types.js';
 declare const ingredientParser: (ingrString: string, spoonacularAPIKey: string) => Promise<IngredientResponse>;
 export default ingredientParser;

package/dist/{funcs → src/funcs}/parseIngredientString.d.ts

@@ -1,2 +1,2 @@
-import { ParsedIngredient } from '@jclind/ingredient-parser';
+import { ParsedIngredient } from '../../types.js';
 export declare const parseIngredientString: (ingrStr: string) => ParsedIngredient;

package/dist/{funcs → src/funcs}/parseIngredientString.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseIngredientString = void 0;
-const recipe_ingredient_parser_v3_1 = require("recipe-ingredient-parser-v3");
 // import { ParsedIngredient } from '../../index.js'
 const convertFractions_js_1 = require("./convertFractions.js");
+const parseStringConsecutiveTs_js_1 = require("./parseStringConsecutiveTs.js");
 const parseIngredientString = (ingrStr) => {
     var _a, _b;
     // Define regular expressions for text inside parentheses and text before the first comma
@@ -41,7 +41,8 @@ const parseIngredientString = (ingrStr) => {
             return 'pounds';
         }
     });
-    const parsedIngrRes = (0, recipe_ingredient_parser_v3_1.parse)(prepIngrText, 'eng');
+    const parsedIngrRes = (0, parseStringConsecutiveTs_js_1.parseStringConsecutiveTs)(prepIngrText);
+    console.log(parsedIngrRes);
     if (!parsedIngrRes.ingredient) {
         return Object.assign(Object.assign({}, parsedIngrRes), { originalIngredientString: ingrStr, comment });
     }

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

@@ -0,0 +1,4 @@
+import { ParsedIngredient } from '../../types';
+type ParsedIngredientOmitType = Omit<ParsedIngredient, 'originalIngredientString' | 'comment'>;
+export declare const parseStringConsecutiveTs: (ingrStr: string) => ParsedIngredientOmitType;
+export {};

package/dist/src/funcs/parseStringConsecutiveTs.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStringConsecutiveTs = void 0;
+const recipe_ingredient_parser_v3_1 = require("recipe-ingredient-parser-v3");
+// returns words that have consecutive t's with those t's removed in a string array
+const removeConsecutiveTs = (str) => {
+    const regex = /t{2,}/gi;
+    const words = str.split(' ');
+    const modifiedWords = words
+        .map(word => {
+        const modified = word.replace(regex, '');
+        return {
+            original: word,
+            modified: modified,
+        };
+    })
+        .filter(({ original, modified }) => original !== modified && modified !== '');
+    return modifiedWords;
+};
+const replaceModifiedWords = (words, str) => {
+    let updatedStr = str;
+    words.forEach(({ original, modified }) => {
+        updatedStr = updatedStr.replace(modified, original);
+    });
+    return updatedStr;
+};
+const parseStringConsecutiveTs = (ingrStr) => {
+    var _a;
+    // Fixes bug where words with 'tt' in them will replace
+    const removeTTsIngrName = ingrStr.replace(/t{2,}/g, '');
+    const modifiedWords = removeConsecutiveTs(ingrStr);
+    if (modifiedWords.length > 0) {
+        const parsedIngrNoTs = (0, recipe_ingredient_parser_v3_1.parse)(removeTTsIngrName, 'eng');
+        console.log('parsedIngrNoTs', parsedIngrNoTs);
+        const correctIngrStr = replaceModifiedWords(modifiedWords, (_a = parsedIngrNoTs.ingredient) !== null && _a !== void 0 ? _a : '');
+        const parsedIngr = Object.assign(Object.assign({}, parsedIngrNoTs), { ingredient: correctIngrStr });
+        return parsedIngr;
+    }
+    else {
+        return (0, recipe_ingredient_parser_v3_1.parse)(ingrStr, 'eng');
+    }
+};
+exports.parseStringConsecutiveTs = parseStringConsecutiveTs;

package/dist/types.d.ts

@@ -0,0 +1,73 @@
+type StringOrNull = string | null;
+type NumberOrNull = number | null;
+export type IngredientResponse = {
+    parsedIngredient: ParsedIngredient;
+    ingredientData: IngredientData;
+    id?: string;
+} | {
+    error: {
+        message: string;
+    };
+    parsedIngredient: ParsedIngredient;
+    ingredientData: IngredientData | null;
+    id?: string;
+};
+export type ParsedIngredient = {
+    quantity: NumberOrNull;
+    unit: StringOrNull;
+    unitPlural: StringOrNull;
+    symbol: StringOrNull;
+    ingredient: StringOrNull;
+    originalIngredientString: string;
+    minQty: NumberOrNull;
+    maxQty: NumberOrNull;
+    comment: StringOrNull;
+};
+export interface IngredientData {
+    _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;
+}
+export interface Nutrition {
+    nutrients: Nutrient[];
+    properties: Property[];
+    flavonoids: Flavonoid[];
+    caloricBreakdown: CaloricBreakdown;
+    weightPerServing: WeightPerServing;
+}
+export interface Nutrient {
+    name: string;
+    amount: number;
+    unit: string;
+    percentOfDailyNeeds: number;
+}
+export interface Property {
+    name: string;
+    amount: number;
+    unit: string;
+}
+export interface Flavonoid {
+    name: string;
+    amount: number;
+    unit: string;
+}
+export interface CaloricBreakdown {
+    percentProtein: number;
+    percentFat: number;
+    percentCarbs: number;
+}
+export interface WeightPerServing {
+    amount: number;
+    unit: string;
+}
+export {};

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.0.41",
+  "version": "1.1.0",
   "description": "Parses given sentence including ingredient information and attempts to return quantity, measurement and ingredient data",
   "keywords": [
     "recipe",
@@ -9,6 +9,8 @@
     "units"
   ],
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "type": "commonjs",
   "files": [
     "dist"
   ],
@@ -26,7 +28,7 @@
   },
   "homepage": "https://github.com/jclind/ingredient-parser#readme",
   "dependencies": {
-    "@jclind/ingredient-unit-converter": "^1.0.2",
+    "@jclind/ingredient-unit-converter": "^1.0.5",
     "@types/axios": "^0.14.0",
     "convert-units": "^2.3.4",
     "dotenv": "^16.0.3",