Custom logical and/or

marverix · Mar 25, 2020 · 586b956 · 586b956
1 parent 86b7824
commit 586b956
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/dist/meval.js b/dist/meval.js
@@ -1,4 +1,4 @@
-/* meval v1.0.2 | Copyright 2020 (c) Marek Sierociński| https://github.com/marverix/meval/blob/master/LICENSE */
+/* meval v1.0.3 | Copyright 2020 (c) Marek Sierociński| https://github.com/marverix/meval/blob/master/LICENSE */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1325,7 +1325,13 @@
     _createClass(LogicalAndOperator, [{
       key: "_execute",
       value: function _execute(leftSide, rightSide, context) {
-        return this.resolveSide(leftSide, context) && this.resolveSide(rightSide, context);
+        var leftSideResolved = this.resolveSide(leftSide, context);
+
+        if (!leftSideResolved) {
+          return false;
+        } else {
+          return this.resolveSide(rightSide, context);
+        }
       }
     }]);
 
@@ -1349,7 +1355,13 @@
     _createClass(LogicalOrOperator, [{
       key: "_execute",
       value: function _execute(leftSide, rightSide, context) {
-        return this.resolveSide(leftSide, context) || this.resolveSide(rightSide, context);
+        var leftSideResolved = this.resolveSide(leftSide, context);
+
+        if (leftSideResolved) {
+          return true;
+        } else {
+          return this.resolveSide(rightSide, context);
+        }
       }
     }]);
 

diff --git a/dist/meval.min.js b/dist/meval.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meval",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Mimic eval in given context",
   "main": "dist/meval.js",
   "scripts": {

diff --git a/src/operators/LogicalAnd.js b/src/operators/LogicalAnd.js
@@ -9,7 +9,12 @@ class LogicalAndOperator extends Abstract2ArgOperator {
   }
 
   _execute (leftSide, rightSide, context) {
-    return this.resolveSide(leftSide, context) && this.resolveSide(rightSide, context);
+    let leftSideResolved = this.resolveSide(leftSide, context);
+    if (!leftSideResolved) {
+      return false;
+    } else {
+      return this.resolveSide(rightSide, context);
+    }
   }
 
 }

diff --git a/src/operators/LogicalOr.js b/src/operators/LogicalOr.js
@@ -9,7 +9,12 @@ class LogicalOrOperator extends Abstract2ArgOperator {
   }
 
   _execute (leftSide, rightSide, context) {
-    return this.resolveSide(leftSide, context) || this.resolveSide(rightSide, context);
+    let leftSideResolved = this.resolveSide(leftSide, context);
+    if (leftSideResolved) {
+      return true;
+    } else {
+      return this.resolveSide(rightSide, context);
+    }
   }
 
 }