Refactor evalBoolean code

cfe08d3a53d191a31fe7ebd893433c439413f67e

Wolfsblvt <wolfsblvt@gmail.com>

Parents: aea95adf60b088bfff5e7776a023e1c171ef9144

public/scripts/variables.js+13 -38 Viewed

  * @returns {boolean} True if the rule yields true, false otherwise
  */
 export function evalBoolean(rule, a, b) {
-    let result = false;
     if (b === undefined && rule === 'eq') {
         // If right-hand side was not provided, whe just check if the left side is truthy
         if (isTrueBoolean(String(a))) return true;

         switch (rule) {
             case 'not':
-                result = !aNumber;
+                return !aNumber;
-                break;
             case 'gt':
-                result = aNumber > bNumber;
+                return aNumber > bNumber;
-                break;
             case 'gte':
-                result = aNumber >= bNumber;
+                return aNumber >= bNumber;
-                break;
             case 'lt':
-                result = aNumber < bNumber;
+                return aNumber < bNumber;
-                break;
             case 'lte':
-                result = aNumber <= bNumber;
+                return aNumber <= bNumber;
-                break;
             case 'eq':
-                result = aNumber === bNumber;
+                return aNumber === bNumber;
-                break;
             case 'neq':
-                result = aNumber !== bNumber;
+                return aNumber !== bNumber;
-                break;
             default:
                 toastr.error('Unknown boolean comparison rule for type number.', 'Invalid command');
                 throw new Error('Invalid command.');
+        }
     } else {
         // otherwise do case-insensitive string comparsion, stringify non-strings
-        let aString;
+        let aString = (typeof a === 'string') ? a.toLowerCase() : JSON.stringify(a).toLowerCase();
-        let bString;
+        let bString = (typeof b === 'string') ? b.toLowerCase() : JSON.stringify(b).toLowerCase();
-        if (typeof a == 'string') {
-            aString = a.toLowerCase();
-        } else {
-            aString = JSON.stringify(a).toLowerCase();
-        }
-        if (typeof b == 'string') {
-            bString = b.toLowerCase();
-        } else {
-            bString = JSON.stringify(b).toLowerCase();
-        }
         switch (rule) {
             case 'in':
-                result = aString.includes(bString);
+                return aString.includes(bString);
-                break;
             case 'nin':
-                result = !aString.includes(bString);
+                return !aString.includes(bString);
-                break;
             case 'eq':
-                result = aString === bString;
+                return aString === bString;
-                break;
             case 'neq':
-                result = aString !== bString;
+                return aString !== bString;
-                break;
             default:
                 toastr.error('Unknown boolean comparison rule for type string.', 'Invalid /if command');
                 throw new Error('Unknown boolean comparison rule for type string.');
+        }
+    }
-    return result;
+}
 /**