created checkOptions function

mankal111 · Oct 9, 2018 · 65693c3 · 65693c3
1 parent 6a3cf09
commit 65693c3
Showing 1 changed file with 38 additions and 34 deletions.
diff --git a/index.js b/index.js
@@ -1,38 +1,49 @@
 'use strict';
 
 /**
- * Returns a random number
+ * Checks options for type or other errors
  * @param {object} options - The properties of the random number
  * @param {number} options.min - Minimum possible number
  * @param {number} options.max - Maximum possible number
- * @param {string} [options.type=float] - The type of the number
- * @returns {number} The random number
+ * @returns {boolean} True if the options object is ok
  */
-const getNumber = (options) => {
+const checkOptions = (options) => {
     if (typeof options !== 'object') {
         throw new TypeError(`Parameter's type is '${typeof options}' but it should be 'object'.`);
     } else if (isNaN(options.min) || isNaN(options.max)) {
         throw new TypeError(`The parameters 'min' and 'max' have values '${options.min}' and '${options.max}' respectively, but they should both be numbers.`);
     } else if (options.min > options.max) {
         throw new Error(`The parameter 'min' (value:${options.min}) is greater than 'max' (value:${options.max}) but 'min' should be less or equal than 'max'`);
     } else {
-        const type = options.type || 'float';
-        let result;
+        return true;
+    }
+}
 
-        switch (type) {
-            case 'float':
-                result = Math.random() * (options.max - options.min) + options.min;
-                break;
-            case 'integer':
-                const max = Math.floor(options.max);
-                const min = Math.ceil(options.min);
-                result = Math.floor(Math.random() * (max - min + 1)) + min;
-                break;
-            default:
-                throw RangeError(`'${type}' is not a supported type`);
-        }
-        return result;
+/**
+ * Returns a random number
+ * @param {object} options - The properties of the random number
+ * @param {number} options.min - Minimum possible number
+ * @param {number} options.max - Maximum possible number
+ * @param {string} [options.type=float] - The type of the number
+ * @returns {number} The random number
+ */
+const getNumber = (options) => {
+    checkOptions(options);
+    const type = options.type || 'float';
+    let result;
+    switch (type) {
+        case 'float':
+            result = Math.random() * (options.max - options.min) + options.min;
+            break;
+        case 'integer':
+            const max = Math.floor(options.max);
+            const min = Math.ceil(options.min);
+            result = Math.floor(Math.random() * (max - min + 1)) + min;
+            break;
+        default:
+            throw RangeError(`'${type}' is not a supported type`);
     }
+    return result;
 }
 
 /**
@@ -46,21 +57,14 @@ const getNumber = (options) => {
  * @returns {number[]} Array with the two endpoints of the random interval
  */
 const getInterval = (options) => {
-    if (typeof options !== 'object') {
-        throw new TypeError(`Parameter's type is '${typeof options}' but it should be 'object'.`);
-    } else if (isNaN(options.min) || isNaN(options.max)) {
-        throw new TypeError(`The parameters 'min' and 'max' have values '${options.min}' and '${options.max}' respectively, but they should both be numbers.`);
-    } else if (options.min > options.max) {
-        throw new Error(`The parameter 'min' (value:${options.min}) is greater than 'max' (value:${options.max}) but 'min' should be less or equal than 'max'`);
-    } else {
-        const minLength = options.minLength || 0;
-        const maxLength = options.maxLength || options.max - options.min;
-        const type = options.type || 'float';
-        const intervalLength = getNumber({min: minLength, max: maxLength, type});
-        const leftEndpoint = getNumber({min: options.min, max: options.max - intervalLength, type});
-        const rightEndpoint = leftEndpoint + intervalLength;
-        return [leftEndpoint, rightEndpoint];
-    }
+    checkOptions(options);
+    const minLength = options.minLength || 0;
+    const maxLength = options.maxLength || options.max - options.min;
+    const type = options.type || 'float';
+    const intervalLength = getNumber({min: minLength, max: maxLength, type});
+    const leftEndpoint = getNumber({min: options.min, max: options.max - intervalLength, type});
+    const rightEndpoint = leftEndpoint + intervalLength;
+    return [leftEndpoint, rightEndpoint];
 }
 
 const JXRand = {