@dhis2/expression-parser 1.3.1 → 1.4.0

package/Kotlin-DateTime-library-kotlinx-datetime.js

@@ -352,7 +352,7 @@
   function addFormatStructureForTime(structure) {
     this.ik(structure);
   }
-  initMetadataForInterface(AbstractWithDateTimeBuilder, 'AbstractWithDateTimeBuilder', VOID, VOID, [AbstractWithDateBuilder, AbstractWithTimeBuilder, WithDate, WithTime]);
+  initMetadataForInterface(AbstractWithDateTimeBuilder, 'AbstractWithDateTimeBuilder', VOID, VOID, [AbstractWithDateBuilder, AbstractWithTimeBuilder, WithTime, WithDate]);
   initMetadataForClass(Builder_0, 'Builder', VOID, VOID, [AbstractDateTimeFormatBuilder, AbstractWithDateTimeBuilder]);
   initMetadataForClass(LocalDateTimeFormat, 'LocalDateTimeFormat', VOID, AbstractDateTimeFormat);
   function set_fractionOfSecond(value) {

package/expression-parser.js

@@ -23,6 +23,7 @@
   var numberToDouble = kotlin_kotlin.$_$.w6;
   var isNaN_0 = kotlin_kotlin.$_$.u9;
   var isInfinite = kotlin_kotlin.$_$.t9;
+  var Exception = kotlin_kotlin.$_$.c9;
   var Long = kotlin_kotlin.$_$.e9;
   var RoundingMode_ROUND_HALF_AWAY_FROM_ZERO_getInstance = kotlin_com_ionspin_kotlin_bignum.$_$.b;
   var DecimalMode = kotlin_com_ionspin_kotlin_bignum.$_$.a;
@@ -61,7 +62,6 @@
   var numberToChar = kotlin_kotlin.$_$.v6;
   var toBoolean = kotlin_kotlin.$_$.p8;
   var toDouble = kotlin_kotlin.$_$.r8;
-  var Exception = kotlin_kotlin.$_$.c9;
   var getKClassFromExpression = kotlin_kotlin.$_$.j7;
   var toMutableList = kotlin_kotlin.$_$.p4;
   var THROW_CCE = kotlin_kotlin.$_$.h9;
@@ -618,7 +618,7 @@
     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
@@ -1466,6 +1466,22 @@
     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;
@@ -1484,7 +1500,7 @@
     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':
@@ -1501,7 +1517,7 @@
           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;
             }
@@ -1514,7 +1530,7 @@
     }
     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';
@@ -1527,7 +1543,7 @@
     }
     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';
@@ -1540,7 +1556,7 @@
     }
     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';
@@ -1553,7 +1569,7 @@
     }
     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';
@@ -1566,7 +1582,7 @@
     }
     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';
@@ -1579,7 +1595,7 @@
     }
     return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) % numberToDouble(right) : Companion_getInstance().ky(numberToDouble(left)).nz(Companion_getInstance().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';
@@ -1601,17 +1617,17 @@
     }
     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) {
@@ -1622,7 +1638,7 @@
     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;
   };
@@ -1637,7 +1653,7 @@
     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;
   };
@@ -1652,7 +1668,7 @@
     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;
   };
@@ -1667,7 +1683,7 @@
     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;
   };
@@ -1676,27 +1692,43 @@
       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);
@@ -1740,12 +1772,12 @@
   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();
@@ -2926,7 +2958,7 @@
   }
   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;
@@ -3029,7 +3061,7 @@
   }
   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;
@@ -3041,14 +3073,14 @@
   }
   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() {
@@ -3835,11 +3867,11 @@
   }
   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)
@@ -3894,7 +3926,7 @@
     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());
@@ -3921,7 +3953,7 @@
   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();
@@ -4001,7 +4033,7 @@
   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;
@@ -4404,7 +4436,7 @@
   }
   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;
@@ -4418,7 +4450,7 @@
   }
   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;
@@ -4432,7 +4464,7 @@
   }
   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;
@@ -4492,7 +4524,7 @@
   }
   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;
@@ -4506,7 +4538,7 @@
   }
   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;
@@ -4520,7 +4552,7 @@
   }
   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;
@@ -4534,7 +4566,7 @@
   }
   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;
@@ -4548,7 +4580,7 @@
   }
   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;
@@ -4562,7 +4594,7 @@
   }
   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;
@@ -4607,7 +4639,7 @@
   }
   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;
@@ -5481,7 +5513,7 @@
     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)) {