@dhis2/expression-parser 1.1.9 → 1.1.11

package/expression-parser.js

@@ -413,7 +413,7 @@
     return joinToString(filterNotNull(values), '');
   }
   function d2_count(value) {
-    var tmp1_safe_receiver = value == null ? null : value.c1c_1;
+    var tmp1_safe_receiver = value == null ? null : value.d1c_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.o();
     return tmp2_elvis_lhs == null ? 0 : tmp2_elvis_lhs;
   }
@@ -425,7 +425,7 @@
       var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.collections.count' call
-        var this_0 = value.c1c_1;
+        var this_0 = value.d1c_1;
         var tmp_0;
         if (isInterface(this_0, Collection)) {
           tmp_0 = this_0.m();
@@ -453,7 +453,7 @@
     return tmp;
   }
   function d2_countIfZeroPos(value) {
-    var tmp1_safe_receiver = value == null ? null : value.c1c_1;
+    var tmp1_safe_receiver = value == null ? null : value.d1c_1;
     var tmp;
     if (tmp1_safe_receiver == null) {
       tmp = null;
@@ -525,7 +525,7 @@
     return roles.r(role);
   }
   function d2_hasValue(value) {
-    return !((value == null ? null : value.b1c_1) == null);
+    return !((value == null ? null : value.c1c_1) == null);
   }
   function d2_inOrgUnitGroup(group, orgUnit, supplementaryValues) {
     // Inline function 'kotlin.collections.get' call
@@ -534,7 +534,7 @@
     if (orgUnit == null) {
       tmp = '';
     } else {
-      var tmp0_safe_receiver = orgUnit.b1c_1;
+      var tmp0_safe_receiver = orgUnit.c1c_1;
       tmp = tmp0_safe_receiver == null ? null : replace(tmp0_safe_receiver, "'", '');
     }
     var uid = tmp;
@@ -542,10 +542,10 @@
   }
   function d2_lastEventDate(value) {
     var tmp;
-    if ((value == null ? null : value.d1c_1) == null) {
+    if ((value == null ? null : value.e1c_1) == null) {
       tmp = null;
     } else {
-      tmp = Companion_getInstance_0().ul(value.d1c_1);
+      tmp = Companion_getInstance_0().ul(value.e1c_1);
     }
     return tmp;
   }
@@ -573,7 +573,7 @@
       var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.collections.maxOfOrNull' call
-        var iterator = value.c1c_1.j();
+        var iterator = value.d1c_1.j();
         if (!iterator.k()) {
           tmp$ret$0 = null;
           break $l$block;
@@ -619,7 +619,7 @@
       var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.collections.minOfOrNull' call
-        var iterator = value.c1c_1.j();
+        var iterator = value.d1c_1.j();
         if (!iterator.k()) {
           tmp$ret$0 = null;
           break $l$block;
@@ -3882,7 +3882,7 @@
     if (value == null)
       return null;
     if (value instanceof VariableValue)
-      return value.b1c_1 == null ? null : this.z1b(this.y1b(value));
+      return this.z1b(this.y1b(value));
     if (value instanceof LocalDate)
       return value;
     if (!(value == null) ? typeof value === 'string' : false)
@@ -3891,11 +3891,11 @@
       return toLocalDateTime(value, Companion_getInstance_1().dm()).am();
     throw IllegalArgumentException_init_$Create$("Count not coerce to date: '" + toString_0(value) + "'");
   };
-  protoOf(Companion_7).e1c = function (value) {
+  protoOf(Companion_7).a1c = function (value) {
     if (value == null)
       return null;
     if (value instanceof VariableValue)
-      return this.e1c(this.y1b(value));
+      return this.a1c(this.y1b(value));
     if (isNumber(value))
       return isNonFractionValue(this, value) ? numberToInt(value).toString() : toString(value);
     return toString(value);
@@ -3905,7 +3905,7 @@
       return null;
     var tmp;
     if (value instanceof VariableValue) {
-      switch (value.a1c_1.h2_1) {
+      switch (value.b1c_1.h2_1) {
         case 1:
           tmp = this.s13(value.f1c());
           break;
@@ -3916,7 +3916,7 @@
           tmp = this.z1b(value.f1c());
           break;
         default:
-          tmp = this.e1c(value.f1c());
+          tmp = this.a1c(value.f1c());
           break;
       }
     } else {
@@ -4052,7 +4052,7 @@
       var value = $data.s10_1.d2(variable.c15(0).v14());
       var tmp;
       if (!(value == null)) {
-        (variable instanceof VariableNode ? variable : THROW_CCE()).s19(value.a1c_1);
+        (variable instanceof VariableNode ? variable : THROW_CCE()).s19(value.b1c_1);
         tmp = Unit_instance;
       }
       return Unit_instance;
@@ -4607,7 +4607,7 @@
   }
   function Typed$Companion$toStringTypeCoercion$ref($boundThis) {
     var l = function (p0) {
-      return $boundThis.e1c(p0);
+      return $boundThis.a1c(p0);
     };
     l.callableName = 'toStringTypeCoercion';
     return l;
@@ -11770,7 +11770,7 @@
     ValueType_MIXED_instance = new ValueType('MIXED', 0, '');
     ValueType_NUMBER_instance = new ValueType('NUMBER', 1, 0.0);
     ValueType_BOOLEAN_instance = new ValueType('BOOLEAN', 2, false);
-    ValueType_DATE_instance = new ValueType('DATE', 3, '2020-01-01');
+    ValueType_DATE_instance = new ValueType('DATE', 3, null);
     ValueType_STRING_instance = new ValueType('STRING', 4, '');
     ValueType_SAME_instance = new ValueType('SAME', 5, '');
   }
@@ -11901,32 +11901,32 @@
     return VariableValue_init_$Init$(valueType, objectCreate(protoOf(VariableValue)));
   }
   function VariableValue(valueType, value, candidates, eventDate) {
-    this.a1c_1 = valueType;
-    this.b1c_1 = value;
-    this.c1c_1 = candidates;
-    this.d1c_1 = eventDate;
+    this.b1c_1 = valueType;
+    this.c1c_1 = value;
+    this.d1c_1 = candidates;
+    this.e1c_1 = eventDate;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!(!this.a1c_1.equals(ValueType_SAME_getInstance()) && !this.a1c_1.equals(ValueType_MIXED_getInstance()))) {
+    if (!(!this.b1c_1.equals(ValueType_SAME_getInstance()) && !this.b1c_1.equals(ValueType_MIXED_getInstance()))) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
   }
   protoOf(VariableValue).f1c = function () {
-    var tmp0_elvis_lhs = this.b1c_1;
-    return tmp0_elvis_lhs == null ? this.a1c_1.t1g_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = this.c1c_1;
+    return tmp0_elvis_lhs == null ? this.b1c_1.t1g_1 : tmp0_elvis_lhs;
   };
   protoOf(VariableValue).toString = function () {
-    return 'VariableValue(valueType=' + this.a1c_1.toString() + ', value=' + this.b1c_1 + ', candidates=' + toString(this.c1c_1) + ', eventDate=' + this.d1c_1 + ')';
+    return 'VariableValue(valueType=' + this.b1c_1.toString() + ', value=' + this.c1c_1 + ', candidates=' + toString(this.d1c_1) + ', eventDate=' + this.e1c_1 + ')';
   };
   protoOf(VariableValue).hashCode = function () {
-    var result = this.a1c_1.hashCode();
-    result = imul(result, 31) + (this.b1c_1 == null ? 0 : getStringHashCode(this.b1c_1)) | 0;
-    result = imul(result, 31) + hashCode(this.c1c_1) | 0;
-    result = imul(result, 31) + (this.d1c_1 == null ? 0 : getStringHashCode(this.d1c_1)) | 0;
+    var result = this.b1c_1.hashCode();
+    result = imul(result, 31) + (this.c1c_1 == null ? 0 : getStringHashCode(this.c1c_1)) | 0;
+    result = imul(result, 31) + hashCode(this.d1c_1) | 0;
+    result = imul(result, 31) + (this.e1c_1 == null ? 0 : getStringHashCode(this.e1c_1)) | 0;
     return result;
   };
   protoOf(VariableValue).equals = function (other) {
@@ -11935,13 +11935,13 @@
     if (!(other instanceof VariableValue))
       return false;
     var tmp0_other_with_cast = other instanceof VariableValue ? other : THROW_CCE();
-    if (!this.a1c_1.equals(tmp0_other_with_cast.a1c_1))
+    if (!this.b1c_1.equals(tmp0_other_with_cast.b1c_1))
       return false;
-    if (!(this.b1c_1 == tmp0_other_with_cast.b1c_1))
+    if (!(this.c1c_1 == tmp0_other_with_cast.c1c_1))
       return false;
-    if (!equals(this.c1c_1, tmp0_other_with_cast.c1c_1))
+    if (!equals(this.d1c_1, tmp0_other_with_cast.d1c_1))
       return false;
-    if (!(this.d1c_1 == tmp0_other_with_cast.d1c_1))
+    if (!(this.e1c_1 == tmp0_other_with_cast.e1c_1))
       return false;
     return true;
   };