5. refactoring code - update cliEven

Author: WisdomQuest

Makefile

@@ -5,7 +5,7 @@ brain-games:
 	node bin/brain-games.js
 
 publish:
-	npm publish --dry-run
+	bra --dry-run
 
 lint:
 	npx eslint .

bin/brain-even.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import Hello from './brain-games.js';
+import { welcomeUser } from '../src/cli.js';
 import evenGame from '../src/cliEven.js';
 
-Hello();
+welcomeUser();
 evenGame();

bin/brain-games.js

@@ -1,11 +1,4 @@
 #!/usr/bin/env node
-import { getUserName } from '../src/cli.js';
+import { welcomeUser } from '../src/cli.js';
 
-const Hello = () => {
-  console.log('Welcome to the Brain Games!');
-  getUserName();
-};
-
-Hello();
-
-export default Hello;
+welcomeUser();

src/cli.js

@@ -1,9 +1,9 @@
 import readlineSync from 'readline-sync';
 
-const userName = readlineSync.question('May I have your name? ');
+const userName = readlineSync.question('Welcome to the Brain Games!\nMay I have your name? ');
 
-const getUserName = () => {
-  console.log(`Hello , ${userName} !`);
+const welcomeUser = () => {
+  console.log(`Hello , ${userName}!`);
 };
 
-export { getUserName, userName };
+export { welcomeUser, userName };

src/cliEven.js

@@ -3,41 +3,33 @@ import { userName } from './cli.js';
 
 const outAnswer = (answer, questionNum) => {
   const isEvenNum = questionNum % 2 === 0;
-  let win = 4;
-  if (answer === 'yes') {
-    if (isEvenNum) {
-      console.log('Correct!');
-      win = 1;
-    } else {
-      console.log("'yes' is wrong answer ;(. Correct answer was 'no'.");
-      console.log(`Let's try again, ${userName}!`);
-    }
-  }
-  if (answer === 'no') {
-    if (isEvenNum === false) {
-      console.log('Correct!');
-      win = 1;
-    } else {
-      console.log("'no' is wrong answer ;(. Correct answer was 'yes'.");
-      console.log(`Let's try again, ${userName}!`);
-    }
+  let win = Infinity;
+
+  if ((answer === 'yes' && isEvenNum) || (answer === 'no' && isEvenNum === false)) {
+    console.log('Correct!');
+    win = 1;
+  } else {
+    const correctAnswer = isEvenNum ? 'yes' : 'no';
+    console.log(
+      `'${answer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\n`,
+      `Let's try again, ${userName}!`,
+    );
   }
+
   return win;
 };
 
 const descriptionGame = 'Answer "yes" if the number is even, otherwise answer "no".';
 
 const qestionEven = () => {
-  let win = 0;
-  while (win < 3) {
+  let winCount = 0;
+  while (winCount < 3) {
     const randomNumber = Math.floor(Math.random() * 100);
-    const question = `Question: ${randomNumber}`;
-    console.log(question);
+    console.log(`Question: ${randomNumber}`);
     const yourAnswer = readlineSync.question('Your answer: ');
-    const countWin = outAnswer(yourAnswer, randomNumber);
-    win += countWin;
+    winCount += outAnswer(yourAnswer, randomNumber);
   }
-  if (win === 3) {
+  if (winCount === 3) {
     console.log(`Congratulations, ${userName}!`);
   }
 };