refactoring

mate-academy · Oct 9, 2023 · 2f88954 · 2f88954
1 parent 42a7483
commit 2f88954
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/app.js b/src/app.js
@@ -28,15 +28,17 @@ function startGame() {
       console.log('I expect a 4 digit num, love');
       console.log('fix your answer and try again');
       console.log('------------------------------');
-      startGame();
-    } else {
-      const [bulls, cows] = getBullsAndCows(correctAnswer, userInput);
 
-      console.log('------------------------------');
-      console.log(`Bulls: ${bulls}; Cows: ${cows}.`);
-      console.log('------------------------------');
-      startGame();
+      return startGame();
     }
+
+    const { bulls, cows } = getBullsAndCows(correctAnswer, userInput);
+
+    console.log('------------------------------');
+    console.log(`Bulls: ${bulls}; Cows: ${cows}.`);
+    console.log('------------------------------');
+
+    return startGame();
   });
 };
 

diff --git a/src/constants.js b/src/constants.js
@@ -2,4 +2,6 @@
 
 const MAX_LENGTH = 4;
 
-module.exports = MAX_LENGTH;
+module.exports = {
+  MAX_LENGTH,
+};
diff --git a/src/getBullsAndCows.js b/src/getBullsAndCows.js
@@ -16,7 +16,10 @@ function getBullsAndCows(correctNumber, userNumber) {
     }
   }
 
-  return [bulls, cows];
+  return {
+    bulls,
+    cows,
+  };
 }
 
 module.exports = {

diff --git a/src/getRandomNums.js b/src/getRandomNums.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const MAX_LENGTH = require('./constants');
+const { MAX_LENGTH } = require('./constants');
 
 function getRandomNum() {
   return Math.floor(Math.random() * 9) + 1;