Update architecture & bug fixes

Author: thedoorbell

src/games/calc.js

@@ -1,30 +1,36 @@
-import playGame from '../index.js';
+import playGame, { getRandomNum } from '../index.js';
 
 const rules = 'What is the result of the expression?';
 
-const calc = () => {
-  const firstNum = Math.floor(Math.random() * 50) + 1;
-  const secondNum = Math.floor(Math.random() * 25) + 1;
-  const operations = ['+', '-', '*'];
-  const operation = operations[Math.floor(Math.random() * 3)];
-  const expression = `${firstNum} ${operation} ${secondNum}`;
-  let correctAnswer = 0;
+const calc = (operation, a, b) => {
+  let result = 0;
 
   switch (operation) {
     case '+':
-      correctAnswer = firstNum + secondNum;
+      result = a + b;
       break;
     case '-':
-      correctAnswer = firstNum - secondNum;
+      result = a - b;
       break;
     case '*':
-      correctAnswer = firstNum * secondNum;
+      result = a * b;
       break;
     default:
       break;
   }
 
+  return result;
+};
+
+const getGameData = () => {
+  const firstNum = getRandomNum(50) + 1;
+  const secondNum = getRandomNum(25) + 1;
+  const operations = ['+', '-', '*'];
+  const operation = operations[getRandomNum(3)];
+  const expression = `${firstNum} ${operation} ${secondNum}`;
+  const correctAnswer = calc(operation, firstNum, secondNum);
+
   return [expression, String(correctAnswer)];
 };
 
-export default () => playGame(rules, calc);
+export default () => playGame(rules, getGameData);

src/games/even.js

@@ -1,11 +1,14 @@
-import playGame from '../index.js';
+import playGame, { getRandomNum } from '../index.js';
 
 const rules = 'Answer "yes" if the number is even, otherwise answer "no".';
 
-const askIsEven = () => {
-  const evenNum = Math.floor(Math.random() * 100) + 1;
-  const correctAnswer = evenNum % 2 === 0 ? 'yes' : 'no';
-  return [evenNum, correctAnswer];
+const isEven = (num) => num % 2 === 0;
+
+const getGameData = () => {
+  const num = getRandomNum(100) + 1;
+  const correctAnswer = isEven(num) ? 'yes' : 'no';
+
+  return [num, correctAnswer];
 };
 
-export default () => playGame(rules, askIsEven);
+export default () => playGame(rules, getGameData);

src/games/gcd.js

@@ -1,21 +1,27 @@
-import playGame from '../index.js';
+import playGame, { getRandomNum } from '../index.js';
 
 const rules = 'Find the greatest common divisor of given numbers.';
 
-const findGcd = () => {
-  const firstNum = Math.floor(Math.random() * 150) + 1;
-  const secondNum = Math.floor(Math.random() * 50) + 1;
-  const minNum = Math.min(firstNum, secondNum);
-  const question = `${firstNum} ${secondNum}`;
-  let correctAnswer = 1;
+const getGcd = (a, b) => {
+  const min = Math.min(a, b);
+  let result = 1;
 
-  for (let i = 2; i <= minNum; i += 1) {
-    if (firstNum % i === 0 && secondNum % i === 0) {
-      correctAnswer = i;
+  for (let i = 2; i <= min; i += 1) {
+    if (a % i === 0 && b % i === 0) {
+      result = i;
     }
   }
 
+  return result;
+};
+
+const getGameData = () => {
+  const firstNum = getRandomNum(150) + 1;
+  const secondNum = getRandomNum(50) + 1;
+  const question = `${firstNum} ${secondNum}`;
+  const correctAnswer = getGcd(firstNum, secondNum);
+
   return [question, String(correctAnswer)];
 };
 
-export default () => playGame(rules, findGcd);
+export default () => playGame(rules, getGameData);

src/games/prime.js

@@ -1,11 +1,10 @@
-import playGame from '../index.js';
+import playGame, { getRandomNum } from '../index.js';
 
 const rules = 'Answer "yes" if given number is prime. Otherwise answer "no".';
 
-const askIfPrime = () => {
-  const num = Math.floor(Math.random() * 100) + 1;
+const isPrime = (num) => {
   let divisors = 1;
-  let correctAnswer = '';
+  let result = '';
 
   for (let i = 2; i <= num; i += 1) {
     if (num % i === 0) {
@@ -15,9 +14,16 @@ const askIfPrime = () => {
       }
     }
   }
-  correctAnswer = divisors === 2 ? 'yes' : 'no';
+  result = divisors === 2 ? 'yes' : 'no';
+
+  return result;
+};
+
+const getGameData = () => {
+  const num = getRandomNum(100) + 1;
+  const correctAnswer = isPrime(num);
 
   return [num, correctAnswer];
 };
 
-export default () => playGame(rules, askIfPrime);
+export default () => playGame(rules, getGameData);

src/games/progression.js

@@ -1,22 +1,27 @@
-import playGame from '../index.js';
+import playGame, { getRandomNum } from '../index.js';
 
 const rules = 'What number is missing in the progression?';
 
-const findNumberInProgression = () => {
-  const increasedBy = Math.floor(Math.random() * 10) + 1;
-  let progressionNumber = Math.floor(Math.random() * 50);
+const getProgression = () => {
+  const increasedBy = getRandomNum(10) + 1;
+  let progressionNumber = getRandomNum(50);
   const progression = [progressionNumber];
 
   for (let i = 1; i < 10; i += 1) {
     progressionNumber += increasedBy;
     progression.push(progressionNumber);
   }
 
-  const position = Math.floor(Math.random() * 10);
+  return progression;
+};
+
+const getGameData = () => {
+  const progression = getProgression();
+  const position = getRandomNum(10);
   const correctAnswer = progression[position];
   progression[position] = '..';
 
   return [progression.join(' '), String(correctAnswer)];
 };
 
-export default () => playGame(rules, findNumberInProgression);
+export default () => playGame(rules, getGameData);

src/index.js

@@ -1,8 +1,15 @@
 import readlineSync from 'readline-sync';
-import getName from './cli.js';
 
-const playGame = (rules, game) => {
-  const name = getName();
+export const getRandomNum = (x) => {
+  const num = Math.floor(Math.random() * x);
+
+  return num;
+};
+
+export default (rules, game) => {
+  console.log('Welcome to the Brain Games!');
+  const name = readlineSync.question('May I have your name? ');
+  console.log(`Hello, ${name}!`);
   console.log(rules);
 
   for (let gameRound = 1; gameRound <= 3; gameRound += 1) {
@@ -22,5 +29,3 @@ const playGame = (rules, game) => {
     }
   }
 };
-
-export default playGame;