From 586b956349e97b5e48fc01e7e5a2acec102c6233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Sieroci=C5=84ski?= <marek.sierocinski@bitbar.com>
Date: Wed, 25 Mar 2020 08:11:14 +0100
Subject: [PATCH] Custom logical and/or

---
 dist/meval.js               | 18 +++++++++++++++---
 dist/meval.min.js           |  4 ++--
 package-lock.json           |  2 +-
 package.json                |  2 +-
 src/operators/LogicalAnd.js |  7 ++++++-
 src/operators/LogicalOr.js  |  7 ++++++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/dist/meval.js b/dist/meval.js
index 913b36d..c362466 100644
--- 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
index 86f0e12..1e5c2ef 100644
--- a/dist/meval.min.js
+++ b/dist/meval.min.js
@@ -1,2 +1,2 @@
-/* meval v1.0.2 | Copyright 2020 (c) Marek Sierociński| https://github.com/marverix/meval/blob/master/LICENSE */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).meval=e()}(this,function(){"use strict";function i(t){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function u(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function s(t,e,n){return e&&r(t.prototype,e),n&&r(t,n),t}function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&n(t,e)}function a(t){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function n(t,e){return(n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function c(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function l(t,e,n){return(l="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=a(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}var e=function(){function t(){u(this,t),this.data=""}return s(t,[{key:"add",value:function(t){this.data+=t}},{key:"take",value:function(){throw new Error("Overwrite this method!")}},{key:"$pattern",get:function(){return this.constructor.$pattern}}]),t}(),h=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,e),s(t,[{key:"resolve",value:function(){return this.data}},{key:"last",get:function(){return this.data[this.data.length-1]}}]),t}(),f=-1,v=0,d=1,t=function(){function e(){var t;return u(this,e),(t=c(this,a(e).call(this))).hasDot=!1,t}return o(e,h),s(e,[{key:"take",value:function(t){if(this.$pattern.test(t))this.add(t);else{if("."!==t||this.hasDot)return f;this.add(t),this.hasDot=!0}return v}},{key:"resolve",value:function(){if("."===this.last)throw new Error("Unexpected end of the float number!");return this.hasDot?parseFloat(this.data):parseInt(this.data,10)}}]),e}();t.$pattern=/^\d/;var p=t,y=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"true":return!0;case"false":return!1;default:throw new Error("Unexpected end of the boolean")}}}]),t}();y.$pattern=/^(?:true|false)/;var x=y,k=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"undefined":return;case"null":return null;case"NaN":return NaN;case"Infinity":return 1/0;default:throw new Error("Unexpected end of the property")}}}]),t}();k.$pattern=/^(?:undefined|null|NaN|Infinity)/;var S=k,w=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"Date":return Date;case"Math":return Math;case"Number":return Number;case"String":return String;case"Array":return Array;case"Object":return Object;default:throw new Error("Unexpected end of the global object")}}}]),t}();w.$pattern=/^(?:Date|Math|Number|String|Array|Object)/;var $=w,m=function(){function e(){var t;return u(this,e),(t=c(this,a(e).call(this))).delimiter=null,t.escape=!1,t}return o(e,h),s(e,[{key:"take",value:function(t){return null==this.delimiter?(this.delimiter=t,v):t===this.delimiter?this.escape?(this.add(this.delimiter),this.escape=!1,v):(this.delimiter=null,d):(this.escape||"\\"!==t?(this.escape&&(this.add("\\"),this.escape=!1),this.add(t)):this.escape=!0,v)}},{key:"resolve",value:function(){if(null!=this.delimiter)throw new Error("Unexpected end of the string!");return this.data}}]),e}();m.$pattern=/^['"`]/;var E=m,_=/^[$_A-Za-z0-9]/,b=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return _.test(t)?(this.add(t),v):f}},{key:"resolve",value:function(t){return t?t[this.data]:this.data}}]),t}();b.$pattern=/^[$_A-Za-z]/;var g=[p,x,S,$,E,b];var O={find:function(t){var e=!0,n=!1,r=void 0;try{for(var i,u=g[Symbol.iterator]();!(e=(i=u.next()).done);e=!0){var s=i.value;if(s.$pattern.test(t))return s}}catch(t){n=!0,r=t}finally{try{e||null==u.return||u.return()}finally{if(n)throw r}}return null},isConsumer:function(t){return t instanceof h}},C=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,e),s(t,[{key:"take",value:function(t){if(null==this.$pattern)throw new Error("Incorrect operator");return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"execute",value:function(){throw new Error("Overwrite this method!")}},{key:"resolveSide",value:function(t,e){return t instanceof h?t.resolve(e):t}},{key:"$priority",get:function(){return this.constructor.$priority}}]),t}(),F=function(){function n(t){var e;return u(this,n),(e=c(this,a(n).call(this))).args=t,e}return o(n,C),s(n,[{key:"execute",value:function(t,e,n){var r=e-1,i=this.resolveSide(n[r],t).apply(null,this.args);n.splice(r,2,i)}}]),n}();F.$pattern=null,F.$prevMustBeConsumer=!0;var j=F,N=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=n[e+1],i=r instanceof C?this._executeForOperator(r,t):this._executeForConsumer(r,t);null===i?n.splice(e,2):n.splice(e,2,i)}},{key:"_executeForOperator",value:function(){throw new Error("Overwrite this method!")}},{key:"_executeForConsumer",value:function(){throw new Error("Overwrite this method!")}}]),t}();N.$prevMustntBeConsumer=!0;var I=N,M=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return new P;if(t instanceof e)return this;throw new Error("Invalid usage of unary negation")}},{key:"_executeForConsumer",value:function(t,e){return-this.resolveSide(t,e)}}]),e}();M.$pattern=/^-/;var P=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return this;if(t instanceof M)return new M;throw new Error("Invalid usage of unary plus")}},{key:"_executeForConsumer",value:function(t,e){return+this.resolveSide(t,e)}}]),e}();P.$pattern=/^\+/;var D={Plus:P,Negation:M},B="Invalid usage of three-argument operator",A=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=e-1;if(!(n[e+2]instanceof U))throw new Error(B);var i=this.resolveSide(n[r],t)?this.resolveSide(n[e+1],t):this.resolveSide(n[e+3],t);n.splice(r,5,i)}}]),t}();A.$prevMustBeConsumer=!0,A.$pattern=/^\?/;var U=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(){throw new Error(B)}}]),t}();U.$prevMustBeConsumer=!0,U.$pattern=/^:/;var R={Start:A,End:U},T=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=e-1,i=this._execute(n[r],n[e+1],t);n.splice(r,3,i)}},{key:"_execute",value:function(){throw new Error("Overwrite this method!")}}]),t}();T.$prevMustBeConsumer=!0;var z=T,L=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){try{var r=(t=this.resolveSide(t,n))[e=this.resolveSide(e,!1)];return"function"==typeof r&&(r=r.bind(t)),r}catch(t){return t}}}]),t}();L.$pattern=/^\./;var Z=L,q=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return null;throw new Error("Invalid usage of logical not")}},{key:"_executeForConsumer",value:function(t,e){return!this.resolveSide(t,e)}}]),e}();q.$pattern=/^!(?!=)/;var G=q,H=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return null;throw new Error("Invalid usage of bitwise not")}},{key:"_executeForConsumer",value:function(t,e){return~this.resolveSide(t,e)}}]),e}();H.$pattern=/^~/;var J=H,K=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,I),s(t,[{key:"_executeForOperator",value:function(){throw new Error("Invalid usage of typeof")}},{key:"_executeForConsumer",value:function(t,e){return i(this.resolveSide(t,e))}}]),t}();K.$pattern=/^typeof(?![A-Za-z0-9$_])/;var Q=K,V=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)*this.resolveSide(e,n)}}]),t}();V.$pattern=/^\*/;var W=V,X=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)/this.resolveSide(e,n)}}]),t}();X.$pattern=/^\//;var Y=X,tt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)%this.resolveSide(e,n)}}]),t}();tt.$pattern=/^%/;var et=tt,nt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)+this.resolveSide(e,n)}}]),t}();nt.$pattern=/^\+/;var rt=nt,it=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)-this.resolveSide(e,n)}}]),t}();it.$pattern=/^-/;var ut=it,st=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)>=this.resolveSide(e,n)}}]),t}();st.$pattern=/^>=/;var ot=st,at=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)<=this.resolveSide(e,n)}}]),t}();at.$pattern=/^<=/;var ct=at,lt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)>this.resolveSide(e,n)}}]),t}();lt.$pattern=/^>/;var ht=lt,ft=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)<this.resolveSide(e,n)}}]),t}();ft.$pattern=/^</;var vt=ft,dt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)instanceof this.resolveSide(e,n)}}]),t}();dt.$pattern=/^instanceof/;var pt=dt,yt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)in this.resolveSide(e,n)}}]),t}();yt.$pattern=/^in/;var xt=yt,kt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)===this.resolveSide(e,n)}}]),t}();kt.$pattern=/^===/;var St=kt,wt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)!==this.resolveSide(e,n)}}]),t}();wt.$pattern=/^!==/;var $t=wt,mt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)==this.resolveSide(e,n)}}]),t}();mt.$pattern=/^==/;var Et=mt,_t=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)!=this.resolveSide(e,n)}}]),t}();_t.$pattern=/^!=/;var bt=_t,gt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)&&this.resolveSide(e,n)}}]),t}();gt.$pattern=/^&&/;var Ot=gt,Ct=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)||this.resolveSide(e,n)}}]),t}();Ct.$pattern=/^\|\|/;var Ft=Ct,jt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)&this.resolveSide(e,n)}}]),t}();jt.$pattern=/^&/;var Nt=jt,It=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)|this.resolveSide(e,n)}}]),t}();It.$pattern=/^\|/;var Mt=It,Pt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)^this.resolveSide(e,n)}}]),t}();Pt.$pattern=/^\^/;for(var Dt=[Z,j,G,J,D.Plus,D.Negation,Q,W,Y,et,rt,ut,ot,ct,ht,vt,pt,xt,St,$t,Et,bt,Ot,Ft,Nt,Mt,Pt,R.Start,R.End],Bt=0;Bt<Dt.length;Bt++)Dt[Bt].$priority=Dt.length-Bt;var At={find:function(t,e){var n=!0,r=!1,i=void 0;try{for(var u,s=Dt[Symbol.iterator]();!(n=(u=s.next()).done);n=!0){var o=u.value;if(null!=o.$pattern&&o.$pattern.test(t)&&(!o.$prevMustBeConsumer&&!e||!o.$prevMustntBeConsumer&&e))return o}}catch(t){r=!0,i=t}finally{try{n||null==s.return||s.return()}finally{if(r)throw i}}return null},isOperator:function(t){return t instanceof C},FunctionCall:j},Ut=/\s/,Rt=/\(/,Tt=/\)/,zt=/,/,Lt=function(){function t(){u(this,t),this.entities=[],this.currentEntity=null}return s(t,[{key:"run",value:function(){return this.readExpression(),this.execute()}},{key:"readExpression",value:function(){var t,e,n;for(this.idx;this.idx<this.expression.length;this.idx++){if(t=this.expression[this.idx],null==this.currentEntity){if(this.shouldFinish(t))break;if(this.shouldSkip(t))continue;if(null==(n=this.findEntity()))throw new Error("Unexpected char ".concat(t," at index ").concat(this.idx));this.currentEntity=new n}(e=this.currentEntity.take(t))===d?this.resolveEntity():e===f&&(this.resolveEntity(),--this.idx)}null!=this.currentEntity&&this.resolveEntity()}},{key:"execute",value:function(){for(;1<this.entities.length;){for(var t={priority:0,index:-1},e=0;e<this.entities.length;e++)if(At.isOperator(this.entities[e])){var n=this.entities[e].$priority;t.priority<n&&(t.priority=n,t.index=e)}this.entities[t.index].execute(this.context,t.index,this.entities)}return O.isConsumer(this.entities[0])&&(this.entities[0]=this.entities[0].resolve(this.context)),this.entities[0]}},{key:"shouldSkip",value:function(t){return!!Ut.test(t)||!!Rt.test(t)&&(this.subEvaluate(this.isLastEntityConsumer),!0)}},{key:"shouldFinish",value:function(){return!1}},{key:"findEntity",value:function(){var t=this.expression.substr(this.idx),e=At.find(t,this.isLastEntityConsumer);return null==e&&(e=O.find(t)),e}},{key:"resolveEntity",value:function(){this.entities.push(this.currentEntity),this.currentEntity=null}},{key:"subEvaluate",value:function(t){var e=0<arguments.length&&void 0!==t&&t?Gt:qt;this.idx++,this.currentEntity=new e(this).run(),this.resolveEntity()}},{key:"isLastEntityConsumer",get:function(){return 0<this.entities.length&&!At.isOperator(this.entities[this.entities.length-1])}}]),t}(),Zt=function(){function r(t,e){var n;if(u(this,r),n=c(this,a(r).call(this)),"string"!=typeof t)throw new TypeError("expression is not a String");if("object"!==i(e)||null===e)throw new TypeError("context is not an Object");return n.expression=t,n.context=e,n.idx=0,n}return o(r,Lt),r}(),qt=function(){function n(t){var e;return u(this,n),(e=c(this,a(n).call(this))).parent=t,e}return o(n,Lt),s(n,[{key:"shouldFinish",value:function(t){return!(!Tt.test(t)&&!zt.test(t))&&(this.idx++,!0)}},{key:"expression",get:function(){return this.parent.expression}},{key:"context",get:function(){return this.parent.context}},{key:"idx",get:function(){return this.parent.idx},set:function(t){this.parent.idx=t}}]),n}(),Gt=function(){function e(t){return u(this,e),c(this,a(e).call(this,t))}return o(e,qt),s(e,[{key:"shouldSkip",value:function(t){return l(a(e.prototype),"shouldSkip",this).call(this,t)||(this.idx--,this.subEvaluate(!1)),!0}},{key:"execute",value:function(){return this.idx--,new At.FunctionCall(this.entities)}}]),e}(),Ht=Zt;return function(t,e){return new Ht(t,e).run()}});
+/* meval v1.0.3 | Copyright 2020 (c) Marek Sierociński| https://github.com/marverix/meval/blob/master/LICENSE */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).meval=e()}(this,function(){"use strict";function i(t){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function u(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function s(t,e,n){return e&&r(t.prototype,e),n&&r(t,n),t}function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&n(t,e)}function a(t){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function n(t,e){return(n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function c(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function l(t,e,n){return(l="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=a(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}var e=function(){function t(){u(this,t),this.data=""}return s(t,[{key:"add",value:function(t){this.data+=t}},{key:"take",value:function(){throw new Error("Overwrite this method!")}},{key:"$pattern",get:function(){return this.constructor.$pattern}}]),t}(),h=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,e),s(t,[{key:"resolve",value:function(){return this.data}},{key:"last",get:function(){return this.data[this.data.length-1]}}]),t}(),f=-1,v=0,d=1,t=function(){function e(){var t;return u(this,e),(t=c(this,a(e).call(this))).hasDot=!1,t}return o(e,h),s(e,[{key:"take",value:function(t){if(this.$pattern.test(t))this.add(t);else{if("."!==t||this.hasDot)return f;this.add(t),this.hasDot=!0}return v}},{key:"resolve",value:function(){if("."===this.last)throw new Error("Unexpected end of the float number!");return this.hasDot?parseFloat(this.data):parseInt(this.data,10)}}]),e}();t.$pattern=/^\d/;var p=t,y=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"true":return!0;case"false":return!1;default:throw new Error("Unexpected end of the boolean")}}}]),t}();y.$pattern=/^(?:true|false)/;var x=y,k=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"undefined":return;case"null":return null;case"NaN":return NaN;case"Infinity":return 1/0;default:throw new Error("Unexpected end of the property")}}}]),t}();k.$pattern=/^(?:undefined|null|NaN|Infinity)/;var S=k,w=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"resolve",value:function(){switch(this.data){case"Date":return Date;case"Math":return Math;case"Number":return Number;case"String":return String;case"Array":return Array;case"Object":return Object;default:throw new Error("Unexpected end of the global object")}}}]),t}();w.$pattern=/^(?:Date|Math|Number|String|Array|Object)/;var $=w,m=function(){function e(){var t;return u(this,e),(t=c(this,a(e).call(this))).delimiter=null,t.escape=!1,t}return o(e,h),s(e,[{key:"take",value:function(t){return null==this.delimiter?(this.delimiter=t,v):t===this.delimiter?this.escape?(this.add(this.delimiter),this.escape=!1,v):(this.delimiter=null,d):(this.escape||"\\"!==t?(this.escape&&(this.add("\\"),this.escape=!1),this.add(t)):this.escape=!0,v)}},{key:"resolve",value:function(){if(null!=this.delimiter)throw new Error("Unexpected end of the string!");return this.data}}]),e}();m.$pattern=/^['"`]/;var E=m,_=/^[$_A-Za-z0-9]/,b=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,h),s(t,[{key:"take",value:function(t){return _.test(t)?(this.add(t),v):f}},{key:"resolve",value:function(t){return t?t[this.data]:this.data}}]),t}();b.$pattern=/^[$_A-Za-z]/;var g=[p,x,S,$,E,b];var O={find:function(t){var e=!0,n=!1,r=void 0;try{for(var i,u=g[Symbol.iterator]();!(e=(i=u.next()).done);e=!0){var s=i.value;if(s.$pattern.test(t))return s}}catch(t){n=!0,r=t}finally{try{e||null==u.return||u.return()}finally{if(n)throw r}}return null},isConsumer:function(t){return t instanceof h}},C=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,e),s(t,[{key:"take",value:function(t){if(null==this.$pattern)throw new Error("Incorrect operator");return this.add(t),this.$pattern.test(this.data)?d:v}},{key:"execute",value:function(){throw new Error("Overwrite this method!")}},{key:"resolveSide",value:function(t,e){return t instanceof h?t.resolve(e):t}},{key:"$priority",get:function(){return this.constructor.$priority}}]),t}(),F=function(){function n(t){var e;return u(this,n),(e=c(this,a(n).call(this))).args=t,e}return o(n,C),s(n,[{key:"execute",value:function(t,e,n){var r=e-1,i=this.resolveSide(n[r],t).apply(null,this.args);n.splice(r,2,i)}}]),n}();F.$pattern=null,F.$prevMustBeConsumer=!0;var j=F,N=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=n[e+1],i=r instanceof C?this._executeForOperator(r,t):this._executeForConsumer(r,t);null===i?n.splice(e,2):n.splice(e,2,i)}},{key:"_executeForOperator",value:function(){throw new Error("Overwrite this method!")}},{key:"_executeForConsumer",value:function(){throw new Error("Overwrite this method!")}}]),t}();N.$prevMustntBeConsumer=!0;var I=N,M=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return new P;if(t instanceof e)return this;throw new Error("Invalid usage of unary negation")}},{key:"_executeForConsumer",value:function(t,e){return-this.resolveSide(t,e)}}]),e}();M.$pattern=/^-/;var P=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return this;if(t instanceof M)return new M;throw new Error("Invalid usage of unary plus")}},{key:"_executeForConsumer",value:function(t,e){return+this.resolveSide(t,e)}}]),e}();P.$pattern=/^\+/;var D={Plus:P,Negation:M},B="Invalid usage of three-argument operator",A=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=e-1;if(!(n[e+2]instanceof U))throw new Error(B);var i=this.resolveSide(n[r],t)?this.resolveSide(n[e+1],t):this.resolveSide(n[e+3],t);n.splice(r,5,i)}}]),t}();A.$prevMustBeConsumer=!0,A.$pattern=/^\?/;var U=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(){throw new Error(B)}}]),t}();U.$prevMustBeConsumer=!0,U.$pattern=/^:/;var R={Start:A,End:U},T=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,C),s(t,[{key:"execute",value:function(t,e,n){var r=e-1,i=this._execute(n[r],n[e+1],t);n.splice(r,3,i)}},{key:"_execute",value:function(){throw new Error("Overwrite this method!")}}]),t}();T.$prevMustBeConsumer=!0;var z=T,L=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){try{var r=(t=this.resolveSide(t,n))[e=this.resolveSide(e,!1)];return"function"==typeof r&&(r=r.bind(t)),r}catch(t){return t}}}]),t}();L.$pattern=/^\./;var Z=L,q=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return null;throw new Error("Invalid usage of logical not")}},{key:"_executeForConsumer",value:function(t,e){return!this.resolveSide(t,e)}}]),e}();q.$pattern=/^!(?!=)/;var G=q,H=function(){function e(){return u(this,e),c(this,a(e).call(this))}return o(e,I),s(e,[{key:"_executeForOperator",value:function(t){if(t instanceof e)return null;throw new Error("Invalid usage of bitwise not")}},{key:"_executeForConsumer",value:function(t,e){return~this.resolveSide(t,e)}}]),e}();H.$pattern=/^~/;var J=H,K=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,I),s(t,[{key:"_executeForOperator",value:function(){throw new Error("Invalid usage of typeof")}},{key:"_executeForConsumer",value:function(t,e){return i(this.resolveSide(t,e))}}]),t}();K.$pattern=/^typeof(?![A-Za-z0-9$_])/;var Q=K,V=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)*this.resolveSide(e,n)}}]),t}();V.$pattern=/^\*/;var W=V,X=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)/this.resolveSide(e,n)}}]),t}();X.$pattern=/^\//;var Y=X,tt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)%this.resolveSide(e,n)}}]),t}();tt.$pattern=/^%/;var et=tt,nt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)+this.resolveSide(e,n)}}]),t}();nt.$pattern=/^\+/;var rt=nt,it=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)-this.resolveSide(e,n)}}]),t}();it.$pattern=/^-/;var ut=it,st=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)>=this.resolveSide(e,n)}}]),t}();st.$pattern=/^>=/;var ot=st,at=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)<=this.resolveSide(e,n)}}]),t}();at.$pattern=/^<=/;var ct=at,lt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)>this.resolveSide(e,n)}}]),t}();lt.$pattern=/^>/;var ht=lt,ft=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)<this.resolveSide(e,n)}}]),t}();ft.$pattern=/^</;var vt=ft,dt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)instanceof this.resolveSide(e,n)}}]),t}();dt.$pattern=/^instanceof/;var pt=dt,yt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)in this.resolveSide(e,n)}}]),t}();yt.$pattern=/^in/;var xt=yt,kt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)===this.resolveSide(e,n)}}]),t}();kt.$pattern=/^===/;var St=kt,wt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)!==this.resolveSide(e,n)}}]),t}();wt.$pattern=/^!==/;var $t=wt,mt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)==this.resolveSide(e,n)}}]),t}();mt.$pattern=/^==/;var Et=mt,_t=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)!=this.resolveSide(e,n)}}]),t}();_t.$pattern=/^!=/;var bt=_t,gt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return!!this.resolveSide(t,n)&&this.resolveSide(e,n)}}]),t}();gt.$pattern=/^&&/;var Ot=gt,Ct=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return!!this.resolveSide(t,n)||this.resolveSide(e,n)}}]),t}();Ct.$pattern=/^\|\|/;var Ft=Ct,jt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)&this.resolveSide(e,n)}}]),t}();jt.$pattern=/^&/;var Nt=jt,It=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)|this.resolveSide(e,n)}}]),t}();It.$pattern=/^\|/;var Mt=It,Pt=function(){function t(){return u(this,t),c(this,a(t).call(this))}return o(t,z),s(t,[{key:"_execute",value:function(t,e,n){return this.resolveSide(t,n)^this.resolveSide(e,n)}}]),t}();Pt.$pattern=/^\^/;for(var Dt=[Z,j,G,J,D.Plus,D.Negation,Q,W,Y,et,rt,ut,ot,ct,ht,vt,pt,xt,St,$t,Et,bt,Ot,Ft,Nt,Mt,Pt,R.Start,R.End],Bt=0;Bt<Dt.length;Bt++)Dt[Bt].$priority=Dt.length-Bt;var At={find:function(t,e){var n=!0,r=!1,i=void 0;try{for(var u,s=Dt[Symbol.iterator]();!(n=(u=s.next()).done);n=!0){var o=u.value;if(null!=o.$pattern&&o.$pattern.test(t)&&(!o.$prevMustBeConsumer&&!e||!o.$prevMustntBeConsumer&&e))return o}}catch(t){r=!0,i=t}finally{try{n||null==s.return||s.return()}finally{if(r)throw i}}return null},isOperator:function(t){return t instanceof C},FunctionCall:j},Ut=/\s/,Rt=/\(/,Tt=/\)/,zt=/,/,Lt=function(){function t(){u(this,t),this.entities=[],this.currentEntity=null}return s(t,[{key:"run",value:function(){return this.readExpression(),this.execute()}},{key:"readExpression",value:function(){var t,e,n;for(this.idx;this.idx<this.expression.length;this.idx++){if(t=this.expression[this.idx],null==this.currentEntity){if(this.shouldFinish(t))break;if(this.shouldSkip(t))continue;if(null==(n=this.findEntity()))throw new Error("Unexpected char ".concat(t," at index ").concat(this.idx));this.currentEntity=new n}(e=this.currentEntity.take(t))===d?this.resolveEntity():e===f&&(this.resolveEntity(),--this.idx)}null!=this.currentEntity&&this.resolveEntity()}},{key:"execute",value:function(){for(;1<this.entities.length;){for(var t={priority:0,index:-1},e=0;e<this.entities.length;e++)if(At.isOperator(this.entities[e])){var n=this.entities[e].$priority;t.priority<n&&(t.priority=n,t.index=e)}this.entities[t.index].execute(this.context,t.index,this.entities)}return O.isConsumer(this.entities[0])&&(this.entities[0]=this.entities[0].resolve(this.context)),this.entities[0]}},{key:"shouldSkip",value:function(t){return!!Ut.test(t)||!!Rt.test(t)&&(this.subEvaluate(this.isLastEntityConsumer),!0)}},{key:"shouldFinish",value:function(){return!1}},{key:"findEntity",value:function(){var t=this.expression.substr(this.idx),e=At.find(t,this.isLastEntityConsumer);return null==e&&(e=O.find(t)),e}},{key:"resolveEntity",value:function(){this.entities.push(this.currentEntity),this.currentEntity=null}},{key:"subEvaluate",value:function(t){var e=0<arguments.length&&void 0!==t&&t?Gt:qt;this.idx++,this.currentEntity=new e(this).run(),this.resolveEntity()}},{key:"isLastEntityConsumer",get:function(){return 0<this.entities.length&&!At.isOperator(this.entities[this.entities.length-1])}}]),t}(),Zt=function(){function r(t,e){var n;if(u(this,r),n=c(this,a(r).call(this)),"string"!=typeof t)throw new TypeError("expression is not a String");if("object"!==i(e)||null===e)throw new TypeError("context is not an Object");return n.expression=t,n.context=e,n.idx=0,n}return o(r,Lt),r}(),qt=function(){function n(t){var e;return u(this,n),(e=c(this,a(n).call(this))).parent=t,e}return o(n,Lt),s(n,[{key:"shouldFinish",value:function(t){return!(!Tt.test(t)&&!zt.test(t))&&(this.idx++,!0)}},{key:"expression",get:function(){return this.parent.expression}},{key:"context",get:function(){return this.parent.context}},{key:"idx",get:function(){return this.parent.idx},set:function(t){this.parent.idx=t}}]),n}(),Gt=function(){function e(t){return u(this,e),c(this,a(e).call(this,t))}return o(e,qt),s(e,[{key:"shouldSkip",value:function(t){return l(a(e.prototype),"shouldSkip",this).call(this,t)||(this.idx--,this.subEvaluate(!1)),!0}},{key:"execute",value:function(){return this.idx--,new At.FunctionCall(this.entities)}}]),e}(),Ht=Zt;return function(t,e){return new Ht(t,e).run()}});
diff --git a/package-lock.json b/package-lock.json
index 8bebd7b..9ed3201 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "meval",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5e92d30..72f456c 100644
--- 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
index a7ff98c..eb4a07b 100644
--- 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
index 599a4c1..6bb1cc1 100644
--- 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);
+    }
   }
 
 }