barcart - npm Package Compare versions

Comparing version 0.0.2 to 0.0.3

lib/cocktails.js

@@ -1291,1 +1291,2 @@ "use strict";
 ];
+//# sourceMappingURL=cocktails.js.map

lib/find/index.js

@@ -7,17 +7,17 @@ "use strict";
 exports.findByLiquor = exports.findByGlass = void 0;
-var chalk_1 = __importDefault(require("chalk"));
-var cocktails_1 = require("../cocktails");
-var utils_1 = require("../utils/utils");
-var log = console.log;
-var prefix = 'You need to supply a type of';
+const chalk_1 = __importDefault(require("chalk"));
+const cocktails_1 = require("../cocktails");
+const utils_1 = require("../utils/utils");
+const log = console.log;
+const prefix = 'You need to supply a type of';
 // todo fix any
-var findByGlass = function (input) {
+const findByGlass = (input) => {
     if (input) {
-        var drinks = cocktails_1.data.filter(function (x) { return x.glass === input; });
+        const drinks = cocktails_1.data.filter(x => x.glass === input);
         if (drinks.length) {
-            log("" + chalk_1.default.magenta.bold("Here are all the drinks you can make with a " + input + " glass"));
-            drinks.map(function (x) { return log("" + utils_1.spacer + x.name); });
+            log(`${chalk_1.default.magenta.bold("Here are all the drinks you can make with a " + input + " glass")}`);
+            drinks.map(x => log(`${utils_1.spacer}${x.name}`));
         }
         else {
-            log("" + chalk_1.default.magenta.bold("No drinks found using a " + input + " glass"));
+            log(`${chalk_1.default.magenta.bold("No drinks found using a " + input + " glass")}`);
         }
@@ -27,3 +27,3 @@ return drinks;
     else {
-        var errorString = prefix + " glass!";
+        const errorString = `${prefix} glass!`;
         log(errorString);
@@ -34,9 +34,19 @@ return errorString;
 exports.findByGlass = findByGlass;
-var findByLiquor = function (input) {
+const findByLiquor = (input) => {
     if (input) {
-        log(input);
-        return input;
+        let drinkArray = [];
+        // Check the entire list of ingredients (normalized) and push to new array if found
+        cocktails_1.data.map(drink => { var _a; return (_a = drink.ingredients) === null || _a === void 0 ? void 0 : _a.map(ingredientList => ingredientList.ingredient && (utils_1.normalizeLiquor(ingredientList.ingredient) === utils_1.normalizeLiquor(input)) && drinkArray.push(drink.name)); });
+        // The array of found pushes every time it is found, so dedupe list before logging
+        const dedeupeDrinkArray = [...new Set(drinkArray)];
+        if (drinkArray.length) {
+            dedeupeDrinkArray.map(drink => log(drink));
+        }
+        else {
+            log('No drinks found');
+        }
+        return dedeupeDrinkArray;
     }
     else {
-        var errorString = prefix + " liquor!";
+        const errorString = `${prefix} liquor!`;
         log(errorString);
@@ -47,1 +57,2 @@ return errorString;
 exports.findByLiquor = findByLiquor;
+//# sourceMappingURL=index.js.map

lib/index.js

@@ -7,7 +7,7 @@ #!/usr/bin/env node
 Object.defineProperty(exports, "__esModule", { value: true });
-var yargs_1 = __importDefault(require("yargs"));
-var find_1 = require("./find");
-var make_1 = require("./make");
-var utils_1 = require("./utils/utils");
-var argv = yargs_1.default
+const yargs_1 = __importDefault(require("yargs"));
+const find_1 = require("./find");
+const make_1 = require("./make");
+const utils_1 = require("./utils/utils");
+const argv = yargs_1.default
     .command('make', 'Learn how to make a cocktail of your choice', {
@@ -48,3 +48,3 @@ make: {
     else {
-        var input = argv._;
+        const input = argv._;
         make_1.makeByName(utils_1.getCocktailName(input));
@@ -65,1 +65,2 @@ }
 // log('All of the args', argv);
+//# sourceMappingURL=index.js.map

lib/make/index.js

@@ -8,10 +8,10 @@ #!/usr/bin/env node
 exports.makeRandom = exports.makeByName = void 0;
-var cocktails_1 = require("../cocktails");
-var output_1 = __importDefault(require("./output"));
-var utils_1 = require("../utils/utils");
-var log = console.log;
+const cocktails_1 = require("../cocktails");
+const output_1 = __importDefault(require("./output"));
+const utils_1 = require("../utils/utils");
+const log = console.log;
 // todo fix any
-var makeByName = function (input) {
-    var drinkInput = input.toLowerCase();
-    var recipe = cocktails_1.data.find(function (x) { return x.name.toLowerCase() === drinkInput; });
+const makeByName = (input) => {
+    const drinkInput = input.toLowerCase();
+    const recipe = cocktails_1.data.find(x => x.name.toLowerCase() === drinkInput);
     if (recipe) {
@@ -22,3 +22,3 @@ output_1.default(recipe);
     else {
-        var errorString = "I don't know that one 😭";
+        const errorString = "I don't know that one 😭";
         log(errorString);
@@ -30,5 +30,5 @@ return (errorString);
 // todo fix any
-var makeRandom = function () {
-    var drinkInput = utils_1.getRandomInt(cocktails_1.data.length);
-    var recipe = cocktails_1.data[drinkInput];
+const makeRandom = () => {
+    const drinkInput = utils_1.getRandomInt(cocktails_1.data.length);
+    const recipe = cocktails_1.data[drinkInput];
     log('Picking a random cocktail for you!');
@@ -39,1 +39,2 @@ output_1.default(recipe);
 exports.makeRandom = makeRandom;
+//# sourceMappingURL=index.js.map

lib/make/output.js

@@ -6,15 +6,15 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var chalk_1 = __importDefault(require("chalk"));
-var utils_1 = require("../utils/utils");
-var log = console.log;
-var logOutput = function (result) {
+const chalk_1 = __importDefault(require("chalk"));
+const utils_1 = require("../utils/utils");
+const log = console.log;
+const logOutput = (result) => {
     var _a, _b;
-    var outputArray = [];
-    var ingredientsArray = [];
+    const outputArray = [];
+    const ingredientsArray = [];
     // Name
-    var drinkName = "Here's how you make a " + result.name;
-    log("" + chalk_1.default.magenta.bold(drinkName));
+    const drinkName = `Here's how you make a ${result.name}`;
+    log(`${chalk_1.default.magenta.bold(drinkName)}`);
     outputArray.push(drinkName);
     // Glass
-    var glassType = "Glassware: " + result.glass;
+    const glassType = `Glassware: ${result.glass}`;
     log(glassType);
@@ -24,11 +24,11 @@ outputArray.push(glassType);
     log('Mix together:');
-    (_a = result.ingredients) === null || _a === void 0 ? void 0 : _a.map(function (x) {
+    (_a = result.ingredients) === null || _a === void 0 ? void 0 : _a.map(x => {
         if (x.unit) {
-            var ingredient = "" + x.amount + x.unit + " of " + (x.label || x.ingredient);
-            console.log("" + utils_1.spacer + ingredient);
+            const ingredient = `${x.amount}${x.unit} of ${x.label || x.ingredient}`;
+            console.log(`${utils_1.spacer}${ingredient}`);
             ingredientsArray.push(ingredient);
         }
         if (x.special) {
-            var special = x.special;
-            log("" + utils_1.spacer + special);
+            const special = x.special;
+            log(`${utils_1.spacer}${special}`);
             ingredientsArray.push(special);
@@ -39,11 +39,11 @@ }
     // Preparation
-    var prep = "" + result.preparation;
+    const prep = `${result.preparation}`;
     log(prep);
     outputArray.push(prep);
     // Garnish
-    var garnish = "Garnish: " + ((_b = result.garnish) === null || _b === void 0 ? void 0 : _b.toLowerCase());
+    const garnish = `Garnish: ${(_b = result.garnish) === null || _b === void 0 ? void 0 : _b.toLowerCase()}`;
     result.garnish && log(garnish);
     outputArray.push(garnish);
     // Finish
-    var finish = 'Drink up 🥃';
+    const finish = 'Drink up 🥃';
     log(finish);
@@ -54,1 +54,2 @@ outputArray.push(finish);
 exports.default = logOutput;
+//# sourceMappingURL=output.js.map

lib/utils/utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCocktailName = exports.spacer = exports.getRandomInt = void 0;
-var getRandomInt = function (max) {
+exports.normalizeLiquor = exports.getCocktailName = exports.spacer = exports.getRandomInt = void 0;
+const getRandomInt = (max) => {
     return Math.floor(Math.random() * Math.floor(max));
@@ -10,7 +10,7 @@ };
 // todo fix any
-var getCocktailName = function (input) {
-    var drinkInput = "" + input[1];
+const getCocktailName = (input) => {
+    let drinkInput = `${input[1]}`;
     //check if two word cocktail
     if (input[2]) {
-        drinkInput = drinkInput + " " + input[2];
+        drinkInput = `${drinkInput} ${input[2]}`;
     }
@@ -20,1 +20,20 @@ return drinkInput;
 exports.getCocktailName = getCocktailName;
+// TODO:
+// all rums return rum
+// whiskey || whiskey returns whiskey
+const normalizeLiquor = (input) => {
+    let drinkInput = input.toLowerCase();
+    let normalized;
+    if (drinkInput === 'whisky' || drinkInput === 'whiskey') {
+        normalized = 'whiskey';
+    }
+    else if (drinkInput.includes('rum')) {
+        normalized = 'rum';
+    }
+    else {
+        normalized = input;
+    }
+    return normalized;
+};
+exports.normalizeLiquor = normalizeLiquor;
+//# sourceMappingURL=utils.js.map

package.json

 {
   "name": "barcart",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "find cocktails based on what you have",
@@ -5,0 +5,0 @@ "main": "cli.js",

No alert changes

Improved metrics

Total package byte prevSize

100635

increased by75.47%

Number of package files

26

increased by225%

Lines of code

1682

increased by12.21%

No dependency changes