fix: Logical operators

marverix · Mar 25, 2020 · 86b7824 · 86b7824
1 parent 22d783b
commit 86b7824
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 20 deletions.
diff --git a/dist/meval.js b/dist/meval.js
@@ -1,4 +1,4 @@
-/* meval v1.0.1 | Copyright 2020 (c) Marek Sierociński| https://github.com/marverix/meval/blob/master/LICENSE */
+/* meval v1.0.2 | 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) :
@@ -834,15 +834,19 @@
     _createClass(MemberAccessOperator, [{
       key: "_execute",
       value: function _execute(leftSide, rightSide, context) {
-        leftSide = this.resolveSide(leftSide, context);
-        rightSide = this.resolveSide(rightSide, false);
-        var result = leftSide[rightSide];
+        try {
+          leftSide = this.resolveSide(leftSide, context);
+          rightSide = this.resolveSide(rightSide, false);
+          var result = leftSide[rightSide];
 
-        if (typeof result === 'function') {
-          result = result.bind(leftSide);
-        }
+          if (typeof result === 'function') {
+            result = result.bind(leftSide);
+          }
 
-        return result;
+          return result;
+        } catch (e) {
+          return e;
+        }
       }
     }]);
 

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.1",
+  "version": "1.0.2",
   "description": "Mimic eval in given context",
   "main": "dist/meval.js",
   "scripts": {

diff --git a/src/operators/MemberAccess.js b/src/operators/MemberAccess.js
@@ -9,15 +9,19 @@ class MemberAccessOperator extends Abstract2ArgOperator {
   }
 
   _execute (leftSide, rightSide, context) {
-    leftSide = this.resolveSide(leftSide, context);
-    rightSide = this.resolveSide(rightSide, false);
-
-    let result = leftSide[rightSide];
-    if (typeof result === 'function') {
-      result = result.bind(leftSide);
+    try {
+      leftSide = this.resolveSide(leftSide, context);
+      rightSide = this.resolveSide(rightSide, false);
+
+      let result = leftSide[rightSide];
+      if (typeof result === 'function') {
+        result = result.bind(leftSide);
+      }
+
+      return result;
+    } catch (e) {
+      return e;
     }
-
-    return result;
   }
 
 }

diff --git a/test/test.js b/test/test.js
@@ -376,6 +376,11 @@ describe('meval', function() {
       var ret = meval('false && false', testContext);
       expect(ret).to.be.false;
     });
+
+    it('Should not check right side', function() {
+      var ret = meval('false && item.x.notExisting', testContext);
+      expect(ret).to.be.false;
+    });
   });
 
   describe('Test 2 argument operator: ||', function() {
@@ -398,6 +403,11 @@ describe('meval', function() {
       var ret = meval('false || false', testContext);
       expect(ret).to.be.false;
     });
+
+    it('Should not check right side', function() {
+      var ret = meval('true || item.x.notExisting', testContext);
+      expect(ret).to.be.true;
+    });
   });
 
   describe('Test mixing 2 argument operators', function() {