@dhis2/expression-parser 1.3.1 → 1.4.0

package/expression-parser.mjs

@@ -18,6 +18,7 @@ import {
   numberToDouble210hrknaofnhf as numberToDouble,
   isNaNymqb93xtq8w8 as isNaN_0,
   isInfinite12nl8hpz1hbp2 as isInfinite,
+  Exceptiondt2hlxn7j7vw as Exception,
   Long2qws0ah9gnpki as Long,
   NoSuchElementException_init_$Create$4w03vct39ryy as NoSuchElementException_init_$Create$,
   toString1pkumu07cwy4m as toString,
@@ -54,7 +55,6 @@ import {
   numberToChar93r9buh19yek as numberToChar,
   toBoolean2azvnq2ukl7b3 as toBoolean,
   toDouble1kn912gjoizjp as toDouble,
-  Exceptiondt2hlxn7j7vw as Exception,
   getKClassFromExpression348iqjl4fnx2f as getKClassFromExpression,
   toMutableList20rdgwi7d3cwi as toMutableList,
   THROW_CCE2g6jy02ryeudk as THROW_CCE,
@@ -622,7 +622,7 @@ function d2_minValue(value) {
   return tmp;
 }
 function d2_modulus(left, right) {
-  return numberToDouble(Companion_getInstance_3().a1d(left, right));
+  return numberToDouble(Companion_getInstance_3().b1d(left, right));
 }
 function d2_monthsBetween(start, end) {
   // Inline function 'kotlin.require' call
@@ -1470,6 +1470,22 @@ function isSpecialDouble($this, n) {
   var d = numberToDouble(n);
   return isNaN_0(d) || isInfinite(d);
 }
+function tryToNumber($this, value) {
+  var tmp;
+  try {
+    tmp = Companion_instance_7.q1c(value);
+  } catch ($p) {
+    var tmp_0;
+    if ($p instanceof Exception) {
+      var _unused_var__etf5q3 = $p;
+      tmp_0 = null;
+    } else {
+      throw $p;
+    }
+    tmp = tmp_0;
+  }
+  return tmp;
+}
 var BinaryOperator_EXP_instance;
 var BinaryOperator_MUL_instance;
 var BinaryOperator_DIV_instance;
@@ -1488,7 +1504,7 @@ function Companion() {
   Companion_instance = this;
   this.p1c_1 = new DecimalMode(new Long(16, 0), RoundingMode_ROUND_HALF_AWAY_FROM_ZERO_getInstance());
 }
-protoOf(Companion).q1c = function (symbol) {
+protoOf(Companion).r1c = function (symbol) {
   var tmp;
   switch (symbol) {
     case 'and':
@@ -1505,7 +1521,7 @@ protoOf(Companion).q1c = function (symbol) {
         var _iterator__ex2g4s = tmp0.l();
         while (_iterator__ex2g4s.m()) {
           var element = _iterator__ex2g4s.n();
-          if (element.t1c_1 === symbol) {
+          if (element.u1c_1 === symbol) {
             tmp$ret$1 = element;
             break $l$block;
           }
@@ -1518,7 +1534,7 @@ protoOf(Companion).q1c = function (symbol) {
   }
   return tmp;
 };
-protoOf(Companion).w1c = function (left, right) {
+protoOf(Companion).x1c = function (left, right) {
   // Inline function 'kotlin.require' call
   if (!!(left == null)) {
     var message = 'left operator of addition must not be null';
@@ -1531,7 +1547,7 @@ protoOf(Companion).w1c = function (left, right) {
   }
   return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) + numberToDouble(right) : asBigDecimal(this, left).fz(asBigDecimal(this, right)).b10(false);
 };
-protoOf(Companion).x1c = function (left, right) {
+protoOf(Companion).y1c = function (left, right) {
   // Inline function 'kotlin.require' call
   if (!!(left == null)) {
     var message = 'left operator of subtraction must not be null';
@@ -1544,7 +1560,7 @@ protoOf(Companion).x1c = function (left, right) {
   }
   return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) - numberToDouble(right) : asBigDecimal(this, left).hz(asBigDecimal(this, right)).b10(false);
 };
-protoOf(Companion).y1c = function (left, right) {
+protoOf(Companion).z1c = function (left, right) {
   // Inline function 'kotlin.require' call
   if (!!(left == null)) {
     var message = 'left operator of multiplication must not be null';
@@ -1557,7 +1573,7 @@ protoOf(Companion).y1c = function (left, right) {
   }
   return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) * numberToDouble(right) : asBigDecimal(this, left).jz(asBigDecimal(this, right)).b10(false);
 };
-protoOf(Companion).z1c = function (left, right) {
+protoOf(Companion).a1d = function (left, right) {
   // Inline function 'kotlin.require' call
   if (!!(left == null)) {
     var message = 'left operator of division must not be null';
@@ -1570,7 +1586,7 @@ protoOf(Companion).z1c = function (left, right) {
   }
   return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) / numberToDouble(right) : asBigDecimal(this, left).lz(asBigDecimal(this, right)).b10(false);
 };
-protoOf(Companion).a1d = function (left, right) {
+protoOf(Companion).b1d = function (left, right) {
   // Inline function 'kotlin.require' call
   if (!!(left == null)) {
     var message = 'left operator of modulo must not be null';
@@ -1583,7 +1599,7 @@ protoOf(Companion).a1d = function (left, right) {
   }
   return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) % numberToDouble(right) : Companion_getInstance_0().ky(numberToDouble(left)).nz(Companion_getInstance_0().ky(numberToDouble(right))).b10(false);
 };
-protoOf(Companion).b1d = function (base, exponent) {
+protoOf(Companion).c1d = function (base, exponent) {
   // Inline function 'kotlin.require' call
   if (!!(base == null)) {
     var message = 'base operator of exponential function must not be null';
@@ -1605,17 +1621,17 @@ protoOf(Companion).b1d = function (base, exponent) {
   }
   return tmp;
 };
-protoOf(Companion).c1d = function (left, right) {
+protoOf(Companion).d1d = function (left, right) {
   if (left == null)
     return right === true ? true : null;
   if (right == null)
     return left === true ? true : null;
   return left || right;
 };
-protoOf(Companion).d1d = function (left, right) {
+protoOf(Companion).e1d = function (left, right) {
   return left == null || right == null ? null : left && right;
 };
-protoOf(Companion).e1d = function (left, right) {
+protoOf(Companion).f1d = function (left, right) {
   var tmp;
   var tmp_0;
   if (!(left == null) ? typeof left === 'string' : false) {
@@ -1626,7 +1642,7 @@ protoOf(Companion).e1d = function (left, right) {
   if (tmp_0) {
     tmp = compareTo(left, right) < 0;
   } else {
-    tmp = ensureNotNull(Companion_instance_7.f1d(left)) < ensureNotNull(Companion_instance_7.f1d(right));
+    tmp = ensureNotNull(Companion_instance_7.q1c(left)) < ensureNotNull(Companion_instance_7.q1c(right));
   }
   return tmp;
 };
@@ -1641,7 +1657,7 @@ protoOf(Companion).g1d = function (left, right) {
   if (tmp_0) {
     tmp = compareTo(left, right) <= 0;
   } else {
-    tmp = ensureNotNull(Companion_instance_7.f1d(left)) <= ensureNotNull(Companion_instance_7.f1d(right));
+    tmp = ensureNotNull(Companion_instance_7.q1c(left)) <= ensureNotNull(Companion_instance_7.q1c(right));
   }
   return tmp;
 };
@@ -1656,7 +1672,7 @@ protoOf(Companion).h1d = function (left, right) {
   if (tmp_0) {
     tmp = compareTo(left, right) > 0;
   } else {
-    tmp = ensureNotNull(Companion_instance_7.f1d(left)) > ensureNotNull(Companion_instance_7.f1d(right));
+    tmp = ensureNotNull(Companion_instance_7.q1c(left)) > ensureNotNull(Companion_instance_7.q1c(right));
   }
   return tmp;
 };
@@ -1671,7 +1687,7 @@ protoOf(Companion).i1d = function (left, right) {
   if (tmp_0) {
     tmp = compareTo(left, right) >= 0;
   } else {
-    tmp = ensureNotNull(Companion_instance_7.f1d(left)) >= ensureNotNull(Companion_instance_7.f1d(right));
+    tmp = ensureNotNull(Companion_instance_7.q1c(left)) >= ensureNotNull(Companion_instance_7.q1c(right));
   }
   return tmp;
 };
@@ -1680,27 +1696,43 @@ protoOf(Companion).j1d = function (left, right) {
     return left == null && right == null;
   }
   var tmp;
-  if (typeof left === 'boolean') {
+  if (isNumber(left)) {
     tmp = true;
   } else {
-    tmp = typeof right === 'boolean';
+    tmp = isNumber(right);
   }
   if (tmp) {
-    return Companion_instance_7.k1d(left) == Companion_instance_7.k1d(right);
+    var tmp0_elvis_lhs = tryToNumber(this, left);
+    var tmp_0;
+    if (tmp0_elvis_lhs == null) {
+      return false;
+    } else {
+      tmp_0 = tmp0_elvis_lhs;
+    }
+    var leftNum = tmp_0;
+    var tmp1_elvis_lhs = tryToNumber(this, right);
+    var tmp_1;
+    if (tmp1_elvis_lhs == null) {
+      return false;
+    } else {
+      tmp_1 = tmp1_elvis_lhs;
+    }
+    var rightNum = tmp_1;
+    return leftNum === rightNum;
   }
-  var tmp_0;
-  var tmp_1;
-  if (isNumber(left)) {
-    tmp_1 = true;
+  var tmp_2;
+  var tmp_3;
+  if (typeof left === 'boolean') {
+    tmp_3 = true;
   } else {
-    tmp_1 = isNumber(right);
+    tmp_3 = typeof right === 'boolean';
   }
-  if (tmp_1) {
-    tmp_0 = Companion_instance_7.f1d(left) == Companion_instance_7.f1d(right);
+  if (tmp_3) {
+    tmp_2 = Companion_instance_7.k1d(left) == Companion_instance_7.k1d(right);
   } else {
-    tmp_0 = equals(left, right);
+    tmp_2 = equals(left, right);
   }
-  return tmp_0;
+  return tmp_2;
 };
 protoOf(Companion).l1d = function (left, right) {
   return !this.j1d(left, right);
@@ -1744,12 +1776,12 @@ function BinaryOperator_initEntries() {
 var $ENTRIES_0;
 function BinaryOperator(name, ordinal, symbol, returnType, operandsType) {
   Enum.call(this, name, ordinal);
-  this.t1c_1 = symbol;
-  this.u1c_1 = returnType;
-  this.v1c_1 = operandsType;
+  this.u1c_1 = symbol;
+  this.v1c_1 = returnType;
+  this.w1c_1 = operandsType;
 }
 protoOf(BinaryOperator).m1d = function () {
-  return this.u1c_1;
+  return this.v1c_1;
 };
 function BinaryOperator_EXP_getInstance() {
   BinaryOperator_initEntries();
@@ -2930,7 +2962,7 @@ function Nodes$TextNode$_init_$lambda_upoqix(it) {
 }
 function VariableType$Companion$fromSymbol$ref(p0) {
   var l = function (_this__u8e3s4) {
-    return p0.q1c(_this__u8e3s4);
+    return p0.r1c(_this__u8e3s4);
   };
   l.callableName = 'fromSymbol';
   return l;
@@ -3033,7 +3065,7 @@ function Nodes$Utf8StringNode$_init_$lambda_3cq3o4(raw) {
 }
 function UnaryOperator$Companion$fromSymbol$ref(p0) {
   var l = function (_this__u8e3s4) {
-    return p0.q1c(_this__u8e3s4);
+    return p0.r1c(_this__u8e3s4);
   };
   l.callableName = 'fromSymbol';
   return l;
@@ -3045,14 +3077,14 @@ function UnaryOperator$_get_symbol_$ref_7bcm8j() {
 }
 function BinaryOperator$Companion$fromSymbol$ref(p0) {
   var l = function (_this__u8e3s4) {
-    return p0.q1c(_this__u8e3s4);
+    return p0.r1c(_this__u8e3s4);
   };
   l.callableName = 'fromSymbol';
   return l;
 }
 function BinaryOperator$_get_symbol_$ref_w802f3() {
   return function (p0) {
-    return p0.t1c_1;
+    return p0.u1c_1;
   };
 }
 function toBoolean$ref() {
@@ -3839,11 +3871,11 @@ function isNonFractionValue($this, value) {
 }
 function Companion_7() {
 }
-protoOf(Companion_7).f1d = function (value) {
+protoOf(Companion_7).q1c = function (value) {
   if (value == null)
     return null;
   if (value instanceof VariableValue)
-    return this.f1d(this.l1l(value));
+    return this.q1c(this.l1l(value));
   if (typeof value === 'boolean')
     return equals(value, true) ? 1.0 : 0.0;
   if (value instanceof LocalDate)
@@ -3898,7 +3930,7 @@ protoOf(Companion_7).l1l = function (value) {
   if (value instanceof VariableValue) {
     switch (value.o1l_1.d2_1) {
       case 1:
-        tmp = this.f1d(value.s1l());
+        tmp = this.q1c(value.s1l());
         break;
       case 2:
         tmp = this.k1d(value.s1l());
@@ -3925,7 +3957,7 @@ var UnaryOperator_NOT_instance;
 var UnaryOperator_DISTINCT_instance;
 function Companion_8() {
 }
-protoOf(Companion_8).q1c = function (symbol) {
+protoOf(Companion_8).r1c = function (symbol) {
   var tmp;
   if ('not' === symbol) {
     tmp = UnaryOperator_NOT_getInstance();
@@ -4005,7 +4037,7 @@ var VariableType_PROGRAM_instance;
 var VariableType_PROGRAM_RULE_instance;
 function Companion_9() {
 }
-protoOf(Companion_9).q1c = function (symbol) {
+protoOf(Companion_9).r1c = function (symbol) {
   return 'V' === symbol ? VariableType_PROGRAM_getInstance() : VariableType_PROGRAM_RULE_getInstance();
 };
 var Companion_instance_9;
@@ -4408,7 +4440,7 @@ function Calculator$evalToMixed$ref_0(p0) {
 }
 function BinaryOperator$Companion$and$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.d1d(_this__u8e3s4, p0_0);
+    return p0.e1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'and';
   return l;
@@ -4422,7 +4454,7 @@ function Calculator$evalToBoolean$ref(p0) {
 }
 function BinaryOperator$Companion$or$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.c1d(_this__u8e3s4, p0_0);
+    return p0.d1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'or';
   return l;
@@ -4436,7 +4468,7 @@ function Calculator$evalToBoolean$ref_0(p0) {
 }
 function BinaryOperator$Companion$lessThan$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.e1d(_this__u8e3s4, p0_0);
+    return p0.f1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'lessThan';
   return l;
@@ -4496,7 +4528,7 @@ function Calculator$evalToMixed$ref_4(p0) {
 }
 function BinaryOperator$Companion$add$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.w1c(_this__u8e3s4, p0_0);
+    return p0.x1c(_this__u8e3s4, p0_0);
   };
   l.callableName = 'add';
   return l;
@@ -4510,7 +4542,7 @@ function Calculator$evalToNumber$ref(p0) {
 }
 function BinaryOperator$Companion$subtract$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.x1c(_this__u8e3s4, p0_0);
+    return p0.y1c(_this__u8e3s4, p0_0);
   };
   l.callableName = 'subtract';
   return l;
@@ -4524,7 +4556,7 @@ function Calculator$evalToNumber$ref_0(p0) {
 }
 function BinaryOperator$Companion$multiply$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.y1c(_this__u8e3s4, p0_0);
+    return p0.z1c(_this__u8e3s4, p0_0);
   };
   l.callableName = 'multiply';
   return l;
@@ -4538,7 +4570,7 @@ function Calculator$evalToNumber$ref_1(p0) {
 }
 function BinaryOperator$Companion$divide$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.z1c(_this__u8e3s4, p0_0);
+    return p0.a1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'divide';
   return l;
@@ -4552,7 +4584,7 @@ function Calculator$evalToNumber$ref_2(p0) {
 }
 function BinaryOperator$Companion$modulo$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.a1d(_this__u8e3s4, p0_0);
+    return p0.b1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'modulo';
   return l;
@@ -4566,7 +4598,7 @@ function Calculator$evalToNumber$ref_3(p0) {
 }
 function BinaryOperator$Companion$exp$ref(p0) {
   var l = function (_this__u8e3s4, p0_0) {
-    return p0.b1d(_this__u8e3s4, p0_0);
+    return p0.c1d(_this__u8e3s4, p0_0);
   };
   l.callableName = 'exp';
   return l;
@@ -4611,7 +4643,7 @@ function Typed$Companion$toBooleanTypeCoercion$ref(p0) {
 }
 function Typed$Companion$toNumberTypeCoercion$ref(p0) {
   var l = function (_this__u8e3s4) {
-    return p0.f1d(_this__u8e3s4);
+    return p0.q1c(_this__u8e3s4);
   };
   l.callableName = 'toNumberTypeCoercion';
   return l;
@@ -5485,7 +5517,7 @@ function isStaticallyDefined($this, node) {
   return type === NodeType_BINARY_OPERATOR_getInstance() && isStaticallyDefined($this, node.p1e(0)) && isStaticallyDefined($this, node.p1e(1));
 }
 function checkBinaryOperatorOperand($this, operator, operand, name) {
-  var expected = operator.e1e().v1c_1;
+  var expected = operator.e1e().w1c_1;
   var leftActual = operand.m1d();
   if (!leftActual.isAssignableTo(expected)) {
     if (isStaticallyDefined(Companion_instance_13, operand)) {