@dhis2/expression-parser 1.4.1 → 1.4.3

package/expression-parser.js

@@ -328,34 +328,34 @@
     return !(n == null) && numberToDouble(n) === 0.0 ? null : n;
   }
   function avg(values) {
-    return VectorAggregation_instance.j17(values);
+    return VectorAggregation_instance.i17(values);
   }
   function count(values) {
-    return VectorAggregation_instance.k17(values);
+    return VectorAggregation_instance.j17(values);
   }
   function max_0(values) {
-    return VectorAggregation_instance.l17(values);
+    return VectorAggregation_instance.k17(values);
   }
   function median(values) {
-    return VectorAggregation_instance.m17(values);
+    return VectorAggregation_instance.l17(values);
   }
   function min_0(values) {
-    return VectorAggregation_instance.n17(values);
+    return VectorAggregation_instance.m17(values);
   }
   function percentileCont(values, fraction) {
     return VectorAggregation_instance.x1o(values, fraction);
   }
   function stddev(values) {
-    return VectorAggregation_instance.r17(values);
+    return VectorAggregation_instance.q17(values);
   }
   function stddevPop(values) {
-    return VectorAggregation_instance.q17(values);
+    return VectorAggregation_instance.p17(values);
   }
   function stddevSamp(values) {
-    return VectorAggregation_instance.r17(values);
+    return VectorAggregation_instance.q17(values);
   }
   function sum_1(values) {
-    return VectorAggregation_instance.s17(values);
+    return VectorAggregation_instance.r17(values);
   }
   function variance(values) {
     // Inline function 'kotlin.collections.isEmpty' call
@@ -488,6 +488,12 @@
     }
     return daysUntil(start, end);
   }
+  function d2_exponent(base, exponent) {
+    var tmp0 = numberToDouble(base == null ? 1.0 : base);
+    // Inline function 'kotlin.math.pow' call
+    var x = numberToDouble(exponent == null ? 0 : exponent);
+    return Math.pow(tmp0, x);
+  }
   function d2_extractDataMatrixValue(gs1Key, value) {
     return Companion_instance_14.i1o(ensureNotNull(gs1Key)).n1o(value);
   }
@@ -533,7 +539,7 @@
     if ((value == null ? null : value.u1l_1) == null) {
       tmp = null;
     } else {
-      tmp = Companion_getInstance_0().hu(value.u1l_1);
+      tmp = Companion_getInstance_0().gu(value.u1l_1);
     }
     return tmp;
   }
@@ -585,7 +591,7 @@
       var message_0 = 'end parameter of d2:minutesBetween must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return imul(this.c18(start, end), 1440);
+    return imul(this.b18(start, end), 1440);
   }
   function d2_minValue(value) {
     var tmp;
@@ -645,10 +651,10 @@
       return NaN;
     var tmp0_elvis_lhs = precision_0;
     precision_0 = tmp0_elvis_lhs == null ? 0 : tmp0_elvis_lhs;
-    var roundedNumber = Companion_getInstance().ky(numberToDouble(value)).ez(fromInt(precision_0));
-    if (precision_0 === 0 || roundedNumber.a10())
-      return toDouble(roundedNumber.h10());
-    var str = roundedNumber.h10();
+    var roundedNumber = Companion_getInstance().jy(numberToDouble(value)).dz(fromInt(precision_0));
+    if (precision_0 === 0 || roundedNumber.zz())
+      return toDouble(roundedNumber.g10());
+    var str = roundedNumber.g10();
     if (!contains_1(str, _Char___init__impl__6a9atx(46)))
       return toDouble(str);
     var len = str.length;
@@ -663,7 +669,7 @@
     // Inline function 'kotlin.text.toRegex' call
     var this_0 = Companion_getInstance_2().o9(delimiter);
     // Inline function 'kotlin.text.split' call
-    var tmp0 = Regex_init_$Create$(this_0).z9(input, 0);
+    var tmp0 = Regex_init_$Create$(this_0).y9(input, 0);
     var tmp$ret$4;
     $l$block: {
       // Inline function 'kotlin.collections.dropLastWhile' call
@@ -699,15 +705,7 @@
     return tmp5_elvis_lhs == null ? '' : tmp5_elvis_lhs;
   }
   function d2_validatePattern(input, regex) {
-    var tmp;
-    if (!(input == null) && !(regex == null)) {
-      // Inline function 'kotlin.text.toRegex' call
-      // Inline function 'kotlin.text.matches' call
-      tmp = Regex_init_$Create$(regex).w9(input);
-    } else {
-      tmp = false;
-    }
-    return tmp;
+    return !(input == null) && !(regex == null) && matchesPattern(input, regex);
   }
   function d2_weeksBetween(start, end) {
     // Inline function 'kotlin.require' call
@@ -720,7 +718,7 @@
       var message_0 = 'end parameter of d2:weeksBetween must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return this.c18(start, end) / 7 | 0;
+    return this.b18(start, end) / 7 | 0;
   }
   function d2_yearsBetween(start, end) {
     // Inline function 'kotlin.require' call
@@ -1250,13 +1248,13 @@
   initMetadataForClass(VariableValueJs, 'VariableValueJs');
   //endregion
   function sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0(function_0) {
-    this.w16_1 = function_0;
+    this.v16_1 = function_0;
   }
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).x16 = function (name) {
-    return this.w16_1(name);
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).w16 = function (name) {
+    return this.v16_1(name);
   };
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).o2 = function () {
-    return this.w16_1;
+    return this.v16_1;
   };
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).equals = function (other) {
     var tmp;
@@ -1464,7 +1462,7 @@
     return ExpressionMode_ANDROID_CUSTOM_INTENT_EXPRESSION_instance;
   }
   function asBigDecimal($this, n) {
-    return Companion_getInstance().wy(numberToDouble(n), $this.r1c_1);
+    return Companion_getInstance().vy(numberToDouble(n), $this.r1c_1);
   }
   function isSpecialDouble($this, n) {
     if (n == null)
@@ -1547,7 +1545,7 @@
       var message_0 = 'right operator of addition must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) + numberToDouble(right) : asBigDecimal(this, left).fz(asBigDecimal(this, right)).b10(false);
+    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) + numberToDouble(right) : asBigDecimal(this, left).ez(asBigDecimal(this, right)).a10(false);
   };
   protoOf(Companion).a1d = function (left, right) {
     // Inline function 'kotlin.require' call
@@ -1560,7 +1558,7 @@
       var message_0 = 'right operator of subtraction must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) - numberToDouble(right) : asBigDecimal(this, left).hz(asBigDecimal(this, right)).b10(false);
+    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) - numberToDouble(right) : asBigDecimal(this, left).gz(asBigDecimal(this, right)).a10(false);
   };
   protoOf(Companion).b1d = function (left, right) {
     // Inline function 'kotlin.require' call
@@ -1573,7 +1571,7 @@
       var message_0 = 'right operator of multiplication must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) * numberToDouble(right) : asBigDecimal(this, left).jz(asBigDecimal(this, right)).b10(false);
+    return isSpecialDouble(this, left) || isSpecialDouble(this, right) ? numberToDouble(left) * numberToDouble(right) : asBigDecimal(this, left).iz(asBigDecimal(this, right)).a10(false);
   };
   protoOf(Companion).c1d = function (left, right) {
     // Inline function 'kotlin.require' call
@@ -1586,7 +1584,7 @@
       var message_0 = 'right operator of division must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) / numberToDouble(right) : asBigDecimal(this, left).lz(asBigDecimal(this, right)).b10(false);
+    return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) / numberToDouble(right) : asBigDecimal(this, left).kz(asBigDecimal(this, right)).a10(false);
   };
   protoOf(Companion).d1d = function (left, right) {
     // Inline function 'kotlin.require' call
@@ -1599,7 +1597,7 @@
       var message_0 = 'right operator of modulo must not be null';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    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);
+    return isSpecialDouble(this, left) || isSpecialDouble(this, right) || numberToDouble(right) === 0.0 ? numberToDouble(left) % numberToDouble(right) : Companion_getInstance().jy(numberToDouble(left)).mz(Companion_getInstance().jy(numberToDouble(right))).a10(false);
   };
   protoOf(Companion).e1d = function (base, exponent) {
     // Inline function 'kotlin.require' call
@@ -1619,7 +1617,7 @@
       var x = numberToDouble(exponent);
       tmp = Math.pow(tmp0, x);
     } else {
-      tmp = asBigDecimal(this, base).vz(numberToInt(exponent)).b10(false);
+      tmp = asBigDecimal(this, base).uz(numberToInt(exponent)).a10(false);
     }
     return tmp;
   };
@@ -1966,6 +1964,7 @@
   var NamedFunction_d2_countIfValue_instance;
   var NamedFunction_d2_countIfZeroPos_instance;
   var NamedFunction_d2_daysBetween_instance;
+  var NamedFunction_d2_exponent_instance;
   var NamedFunction_d2_extractDataMatrixValue_instance;
   var NamedFunction_d2_floor_instance;
   var NamedFunction_d2_hasUserRole_instance;
@@ -1975,6 +1974,7 @@
   var NamedFunction_d2_lastEventDate_instance;
   var NamedFunction_d2_left_instance;
   var NamedFunction_d2_length_instance;
+  var NamedFunction_d2_log_instance;
   var NamedFunction_d2_maxValue_instance;
   var NamedFunction_d2_minutesBetween_instance;
   var NamedFunction_d2_minValue_instance;
@@ -2025,7 +2025,7 @@
     return Companion_instance_0;
   }
   function values_1() {
-    return [NamedFunction_contains_getInstance(), NamedFunction_containsItems_getInstance(), NamedFunction_firstNonNull_getInstance(), NamedFunction_greatest_getInstance(), NamedFunction_ifThenElse_getInstance(), NamedFunction_isNotNull_getInstance(), NamedFunction_isNull_getInstance(), NamedFunction_least_getInstance(), NamedFunction_log_getInstance(), NamedFunction_log10_getInstance(), NamedFunction_orgUnit_ancestor_getInstance(), NamedFunction_orgUnit_dataSet_getInstance(), NamedFunction_orgUnit_group_getInstance(), NamedFunction_orgUnit_program_getInstance(), NamedFunction_removeZeros_getInstance(), NamedFunction_subExpression_getInstance(), NamedFunction_avg_getInstance(), NamedFunction_count_getInstance(), NamedFunction_max_getInstance(), NamedFunction_median_getInstance(), NamedFunction_min_getInstance(), NamedFunction_percentileCont_getInstance(), NamedFunction_stddev_getInstance(), NamedFunction_stddevPop_getInstance(), NamedFunction_stddevSamp_getInstance(), NamedFunction_sum_getInstance(), NamedFunction_variance_getInstance(), NamedFunction_normDistCum_getInstance(), NamedFunction_normDistDen_getInstance(), NamedFunction_d2_addDays_getInstance(), NamedFunction_d2_ceil_getInstance(), NamedFunction_d2_concatenate_getInstance(), NamedFunction_d2_condition_getInstance(), NamedFunction_d2_contains_getInstance(), NamedFunction_d2_containsItems_getInstance(), NamedFunction_d2_count_getInstance(), NamedFunction_d2_countIfCondition_getInstance(), NamedFunction_d2_countIfValue_getInstance(), NamedFunction_d2_countIfZeroPos_getInstance(), NamedFunction_d2_daysBetween_getInstance(), NamedFunction_d2_extractDataMatrixValue_getInstance(), NamedFunction_d2_floor_getInstance(), NamedFunction_d2_hasUserRole_getInstance(), NamedFunction_d2_inUserGroup_getInstance(), NamedFunction_d2_hasValue_getInstance(), NamedFunction_d2_inOrgUnitGroup_getInstance(), NamedFunction_d2_lastEventDate_getInstance(), NamedFunction_d2_left_getInstance(), NamedFunction_d2_length_getInstance(), NamedFunction_d2_maxValue_getInstance(), NamedFunction_d2_minutesBetween_getInstance(), NamedFunction_d2_minValue_getInstance(), NamedFunction_d2_modulus_getInstance(), NamedFunction_d2_monthsBetween_getInstance(), NamedFunction_d2_oizp_getInstance(), NamedFunction_d2_relationshipCount_getInstance(), NamedFunction_d2_right_getInstance(), NamedFunction_d2_round_getInstance(), NamedFunction_d2_split_getInstance(), NamedFunction_d2_substring_getInstance(), NamedFunction_d2_validatePattern_getInstance(), NamedFunction_d2_weeksBetween_getInstance(), NamedFunction_d2_yearsBetween_getInstance(), NamedFunction_d2_zing_getInstance(), NamedFunction_d2_zpvc_getInstance(), NamedFunction_d2_zScoreHFA_getInstance(), NamedFunction_d2_zScoreWFA_getInstance(), NamedFunction_d2_zScoreWFH_getInstance()];
+    return [NamedFunction_contains_getInstance(), NamedFunction_containsItems_getInstance(), NamedFunction_firstNonNull_getInstance(), NamedFunction_greatest_getInstance(), NamedFunction_ifThenElse_getInstance(), NamedFunction_isNotNull_getInstance(), NamedFunction_isNull_getInstance(), NamedFunction_least_getInstance(), NamedFunction_log_getInstance(), NamedFunction_log10_getInstance(), NamedFunction_orgUnit_ancestor_getInstance(), NamedFunction_orgUnit_dataSet_getInstance(), NamedFunction_orgUnit_group_getInstance(), NamedFunction_orgUnit_program_getInstance(), NamedFunction_removeZeros_getInstance(), NamedFunction_subExpression_getInstance(), NamedFunction_avg_getInstance(), NamedFunction_count_getInstance(), NamedFunction_max_getInstance(), NamedFunction_median_getInstance(), NamedFunction_min_getInstance(), NamedFunction_percentileCont_getInstance(), NamedFunction_stddev_getInstance(), NamedFunction_stddevPop_getInstance(), NamedFunction_stddevSamp_getInstance(), NamedFunction_sum_getInstance(), NamedFunction_variance_getInstance(), NamedFunction_normDistCum_getInstance(), NamedFunction_normDistDen_getInstance(), NamedFunction_d2_addDays_getInstance(), NamedFunction_d2_ceil_getInstance(), NamedFunction_d2_concatenate_getInstance(), NamedFunction_d2_condition_getInstance(), NamedFunction_d2_contains_getInstance(), NamedFunction_d2_containsItems_getInstance(), NamedFunction_d2_count_getInstance(), NamedFunction_d2_countIfCondition_getInstance(), NamedFunction_d2_countIfValue_getInstance(), NamedFunction_d2_countIfZeroPos_getInstance(), NamedFunction_d2_daysBetween_getInstance(), NamedFunction_d2_exponent_getInstance(), NamedFunction_d2_extractDataMatrixValue_getInstance(), NamedFunction_d2_floor_getInstance(), NamedFunction_d2_hasUserRole_getInstance(), NamedFunction_d2_inUserGroup_getInstance(), NamedFunction_d2_hasValue_getInstance(), NamedFunction_d2_inOrgUnitGroup_getInstance(), NamedFunction_d2_lastEventDate_getInstance(), NamedFunction_d2_left_getInstance(), NamedFunction_d2_length_getInstance(), NamedFunction_d2_log_getInstance(), NamedFunction_d2_maxValue_getInstance(), NamedFunction_d2_minutesBetween_getInstance(), NamedFunction_d2_minValue_getInstance(), NamedFunction_d2_modulus_getInstance(), NamedFunction_d2_monthsBetween_getInstance(), NamedFunction_d2_oizp_getInstance(), NamedFunction_d2_relationshipCount_getInstance(), NamedFunction_d2_right_getInstance(), NamedFunction_d2_round_getInstance(), NamedFunction_d2_split_getInstance(), NamedFunction_d2_substring_getInstance(), NamedFunction_d2_validatePattern_getInstance(), NamedFunction_d2_weeksBetween_getInstance(), NamedFunction_d2_yearsBetween_getInstance(), NamedFunction_d2_zing_getInstance(), NamedFunction_d2_zpvc_getInstance(), NamedFunction_d2_zScoreHFA_getInstance(), NamedFunction_d2_zScoreWFA_getInstance(), NamedFunction_d2_zScoreWFH_getInstance()];
   }
   function get_entries_1() {
     if ($ENTRIES_1 == null)
@@ -2077,34 +2077,36 @@
     NamedFunction_d2_countIfValue_instance = NamedFunction_init_$Create$('d2_countIfValue', 37, 'd2:countIfValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance(), ValueType_MIXED_getInstance()]);
     NamedFunction_d2_countIfZeroPos_instance = NamedFunction_init_$Create$('d2_countIfZeroPos', 38, 'd2:countIfZeroPos', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
     NamedFunction_d2_daysBetween_instance = NamedFunction_init_$Create$('d2_daysBetween', 39, 'd2:daysBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_extractDataMatrixValue_instance = NamedFunction_init_$Create$('d2_extractDataMatrixValue', 40, 'd2:extractDataMatrixValue', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_floor_instance = NamedFunction_init_$Create$('d2_floor', 41, 'd2:floor', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_hasUserRole_instance = NamedFunction_init_$Create$('d2_hasUserRole', 42, 'd2:hasUserRole', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_inUserGroup_instance = NamedFunction_init_$Create$('d2_inUserGroup', 43, 'd2:inUserGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 44, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 45, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 46, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 47, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 48, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 49, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 50, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 51, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 52, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 53, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 54, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 55, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 56, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 57, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 58, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 59, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 60, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 61, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 62, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 63, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 64, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 65, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 66, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 67, 'd2:zScoreWFH', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_exponent_instance = NamedFunction_init_$Create$('d2_exponent', 40, 'd2:exponent', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_extractDataMatrixValue_instance = NamedFunction_init_$Create$('d2_extractDataMatrixValue', 41, 'd2:extractDataMatrixValue', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_floor_instance = NamedFunction_init_$Create$('d2_floor', 42, 'd2:floor', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_hasUserRole_instance = NamedFunction_init_$Create$('d2_hasUserRole', 43, 'd2:hasUserRole', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_inUserGroup_instance = NamedFunction_init_$Create$('d2_inUserGroup', 44, 'd2:inUserGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 45, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 46, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 47, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 48, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 49, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_log_instance = NamedFunction_init_$Create$('d2_log', 50, 'd2:log', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 51, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 52, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 53, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 54, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 55, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 56, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 57, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 58, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 59, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 60, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 61, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 62, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 63, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 64, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 65, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 66, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 67, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 68, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 69, 'd2:zScoreWFH', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
   }
   var $ENTRIES_1;
   function NamedFunction(name, ordinal, fnName, returnType, isVarargs, parameterTypes) {
@@ -2286,6 +2288,10 @@
     NamedFunction_initEntries();
     return NamedFunction_d2_daysBetween_instance;
   }
+  function NamedFunction_d2_exponent_getInstance() {
+    NamedFunction_initEntries();
+    return NamedFunction_d2_exponent_instance;
+  }
   function NamedFunction_d2_extractDataMatrixValue_getInstance() {
     NamedFunction_initEntries();
     return NamedFunction_d2_extractDataMatrixValue_instance;
@@ -2322,6 +2328,10 @@
     NamedFunction_initEntries();
     return NamedFunction_d2_length_instance;
   }
+  function NamedFunction_d2_log_getInstance() {
+    NamedFunction_initEntries();
+    return NamedFunction_d2_log_instance;
+  }
   function NamedFunction_d2_maxValue_getInstance() {
     NamedFunction_initEntries();
     return NamedFunction_d2_maxValue_instance;
@@ -2543,14 +2553,14 @@
           if (isUnary(operator)) {
             operator.h1e(operand);
           } else {
-            grouped.fb(operand);
+            grouped.eb(operand);
           }
           operand = operator;
         }
          while (0 <= inductionVariable);
         tmp_1 = Unit_instance;
       }
-      grouped.fb(operand);
+      grouped.eb(operand);
       return grouped;
     };
   }
@@ -3112,7 +3122,7 @@
   }
   function LocalDate$Companion$parse$ref(p0) {
     return function (receiver) {
-      return p0.hu(receiver);
+      return p0.gu(receiver);
     };
   }
   function Nodes$ConstantNode$_init_$lambda_ccqcxa(_unused_var__etf5q3) {
@@ -3881,7 +3891,7 @@
     if (typeof value === 'boolean')
       return equals(value, true) ? 1.0 : 0.0;
     if (value instanceof LocalDate)
-      return toNumber(value.ju());
+      return toNumber(value.iu());
     var tmp0_safe_receiver = isNumber(value) ? value : null;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : numberToDouble(tmp0_safe_receiver);
     return tmp1_elvis_lhs == null ? toDouble(toString(value)) : tmp1_elvis_lhs;
@@ -3911,9 +3921,9 @@
     if (value instanceof LocalDate)
       return value;
     if (typeof value === 'string')
-      return Companion_getInstance_0().hu(value);
+      return Companion_getInstance_0().gu(value);
     if (value instanceof Instant)
-      return toLocalDateTime(value, Companion_getInstance_1().av()).xk_1;
+      return toLocalDateTime(value, Companion_getInstance_1().zu()).wk_1;
     throw IllegalArgumentException_init_$Create$("Count not coerce to date: '" + toString(value) + "'");
   };
   protoOf(Companion_7).q1l = function (value) {
@@ -4326,37 +4336,37 @@
     var tmp_4;
     switch (fn.g1e().d2_1) {
       case 16:
-        tmp_4 = $this.i1m_1.j17(values);
+        tmp_4 = $this.i1m_1.i17(values);
         break;
       case 17:
-        tmp_4 = $this.i1m_1.k17(values);
+        tmp_4 = $this.i1m_1.j17(values);
         break;
       case 18:
-        tmp_4 = $this.i1m_1.l17(values);
+        tmp_4 = $this.i1m_1.k17(values);
         break;
       case 19:
-        tmp_4 = $this.i1m_1.m17(values);
+        tmp_4 = $this.i1m_1.l17(values);
         break;
       case 20:
-        tmp_4 = $this.i1m_1.n17(values);
+        tmp_4 = $this.i1m_1.m17(values);
         break;
       case 21:
-        tmp_4 = $this.i1m_1.o17(values, $this.l1m(fn.r1e(1)));
+        tmp_4 = $this.i1m_1.n17(values, $this.l1m(fn.r1e(1)));
         break;
       case 22:
-        tmp_4 = $this.i1m_1.p17(values);
+        tmp_4 = $this.i1m_1.o17(values);
         break;
       case 23:
-        tmp_4 = $this.i1m_1.q17(values);
+        tmp_4 = $this.i1m_1.p17(values);
         break;
       case 24:
-        tmp_4 = $this.i1m_1.r17(values);
+        tmp_4 = $this.i1m_1.q17(values);
         break;
       case 25:
-        tmp_4 = $this.i1m_1.s17(values);
+        tmp_4 = $this.i1m_1.r17(values);
         break;
       case 26:
-        tmp_4 = $this.i1m_1.t17(values);
+        tmp_4 = $this.i1m_1.s17(values);
         break;
       default:
         throw UnsupportedOperationException_init_$Create$_0();
@@ -4392,6 +4402,18 @@
     }
     return tmp;
   }
+  function evalToRawString($this, node) {
+    switch (node.i1e().d2_1) {
+      case 10:
+        return node.k1e();
+      case 1:
+        return evalToRawString($this, node.r1e(0));
+      case 0:
+        return evalToRawString($this, node.r1e(0));
+      default:
+        return $this.m1m(node);
+    }
+  }
   function evalToInteger($this, node) {
     var tmp0_elvis_lhs = $this.l1m(node);
     var tmp;
@@ -4471,7 +4493,7 @@
   }
   function Calculator$evalToBoolean$ref(p0) {
     var l = function (_this__u8e3s4) {
-      return p0.m1m(_this__u8e3s4);
+      return p0.n1m(_this__u8e3s4);
     };
     l.callableName = 'evalToBoolean';
     return l;
@@ -4485,7 +4507,7 @@
   }
   function Calculator$evalToBoolean$ref_0(p0) {
     var l = function (_this__u8e3s4) {
-      return p0.m1m(_this__u8e3s4);
+      return p0.n1m(_this__u8e3s4);
     };
     l.callableName = 'evalToBoolean';
     return l;
@@ -4709,7 +4731,7 @@
   }
   function Calculator$evalToStrings$lambda(this$0) {
     return function (node) {
-      return this$0.n1m(node);
+      return this$0.m1m(node);
     };
   }
   function Calculator(functions, data) {
@@ -4801,7 +4823,7 @@
     var tmp;
     switch (operator.g1e().d2_1) {
       case 2:
-        var tmp1_safe_receiver = this.m1m(operand);
+        var tmp1_safe_receiver = this.n1m(operand);
         tmp = tmp1_safe_receiver == null ? null : !tmp1_safe_receiver;
         break;
       case 0:
@@ -4827,79 +4849,80 @@
       var tmp_0;
       switch (fnInfo.d2_1) {
         case 0:
-          tmp_0 = this.i1m_1.y16(this.n1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
+          tmp_0 = this.i1m_1.x16(this.m1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
           break;
         case 1:
-          tmp_0 = this.i1m_1.z16(this.n1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
+          tmp_0 = this.i1m_1.y16(this.m1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
           break;
         case 2:
-          tmp_0 = this.i1m_1.a17(evalToMixed_0(this, fn.v1e()));
+          tmp_0 = this.i1m_1.z16(evalToMixed_0(this, fn.v1e()));
           break;
         case 3:
-          tmp_0 = this.i1m_1.b17(evalToNumbers(this, fn.v1e()));
+          tmp_0 = this.i1m_1.a17(evalToNumbers(this, fn.v1e()));
           break;
         case 4:
         case 32:
-          tmp_0 = this.i1m_1.c17(this.m1m(fn.r1e(0)), evalToMixed(this, fn.r1e(1)), evalToMixed(this, fn.r1e(2)));
+          tmp_0 = this.i1m_1.b17(this.n1m(fn.r1e(0)), evalToMixed(this, fn.r1e(1)), evalToMixed(this, fn.r1e(2)));
           break;
         case 5:
-          tmp_0 = this.i1m_1.d17(evalToMixed(this, fn.r1e(0)));
+          tmp_0 = this.i1m_1.c17(evalToMixed(this, fn.r1e(0)));
           break;
         case 6:
-          tmp_0 = this.i1m_1.e17(evalToMixed(this, fn.r1e(0)));
+          tmp_0 = this.i1m_1.d17(evalToMixed(this, fn.r1e(0)));
           break;
         case 7:
-          tmp_0 = this.i1m_1.f17(evalToNumbers(this, fn.v1e()));
+          tmp_0 = this.i1m_1.e17(evalToNumbers(this, fn.v1e()));
           break;
         case 8:
-          tmp_0 = fn.q1e() === 1 ? this.i1m_1.g17(this.l1m(fn.r1e(0))) : this.i1m_1.g17(this.l1m(fn.r1e(0))) / this.i1m_1.g17(this.l1m(fn.r1e(1)));
+        case 50:
+          tmp_0 = fn.q1e() === 1 ? this.i1m_1.f17(this.l1m(fn.r1e(0))) : this.i1m_1.f17(this.l1m(fn.r1e(0))) / this.i1m_1.f17(this.l1m(fn.r1e(1)));
           break;
         case 9:
-          tmp_0 = this.i1m_1.h17(this.l1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.g17(this.l1m(fn.r1e(0)));
           break;
         case 14:
-          tmp_0 = this.i1m_1.i17(this.l1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.h17(this.l1m(fn.r1e(0)));
           break;
         case 29:
-          tmp_0 = this.i1m_1.w17(this.r1m(fn.r1e(0)), this.l1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.v17(this.r1m(fn.r1e(0)), this.l1m(fn.r1e(1)));
           break;
         case 30:
-          tmp_0 = this.i1m_1.x17(this.l1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.w17(this.l1m(fn.r1e(0)));
           break;
         case 31:
-          tmp_0 = this.i1m_1.y17(evalToStrings(this, fn.v1e()));
+          tmp_0 = this.i1m_1.x17(evalToStrings(this, fn.v1e()));
           break;
         case 33:
-          tmp_0 = this.i1m_1.y16(this.n1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
+          tmp_0 = this.i1m_1.x16(this.m1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
           break;
         case 34:
-          tmp_0 = this.i1m_1.z16(this.n1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
+          tmp_0 = this.i1m_1.y16(this.m1m(fn.r1e(0)), drop(evalToStrings(this, fn.v1e()), 1));
           break;
         case 35:
-          tmp_0 = this.i1m_1.z17(evalToVar(this, fn.r1e(0)));
+          tmp_0 = this.i1m_1.y17(evalToVar(this, fn.r1e(0)));
           break;
         case 37:
-          tmp_0 = this.i1m_1.a18(evalToVar(this, fn.r1e(0)), this.n1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.z17(evalToVar(this, fn.r1e(0)), this.m1m(fn.r1e(1)));
           break;
         case 38:
-          tmp_0 = this.i1m_1.b18(evalToVar(this, fn.r1e(0)));
+          tmp_0 = this.i1m_1.a18(evalToVar(this, fn.r1e(0)));
           break;
         case 39:
-          tmp_0 = this.i1m_1.c18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
-          break;
-        case 40:
-          tmp_0 = this.i1m_1.d18(this.n1m(fn.r1e(0)), this.n1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.b18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
           break;
         case 41:
-          tmp_0 = this.i1m_1.e18(this.l1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.d18(this.m1m(fn.r1e(0)), this.m1m(fn.r1e(1)));
           break;
         case 42:
-          tmp_0 = this.i1m_1.f18(this.n1m(fn.r1e(0)), this.j1m_1.g1a_1.z1('USER_ROLES'));
+          tmp_0 = this.i1m_1.e18(this.l1m(fn.r1e(0)));
           break;
         case 43:
-          tmp_0 = this.i1m_1.g18(this.n1m(fn.r1e(0)), this.j1m_1.g1a_1.z1('USER_GROUPS'));
+          tmp_0 = this.i1m_1.f18(this.m1m(fn.r1e(0)), this.j1m_1.g1a_1.z1('USER_ROLES'));
           break;
         case 44:
+          tmp_0 = this.i1m_1.g18(this.m1m(fn.r1e(0)), this.j1m_1.g1a_1.z1('USER_GROUPS'));
+          break;
+        case 45:
           var tmp_1;
           try {
             tmp_1 = this.i1m_1.h18(evalToVar(this, fn.r1e(0)));
@@ -4916,80 +4939,83 @@
 
           tmp_0 = tmp_1;
           break;
-        case 45:
-          tmp_0 = this.i1m_1.i18(this.n1m(fn.r1e(0)), this.j1m_1.e1a_1.z1('org_unit'), this.j1m_1.g1a_1);
-          break;
         case 46:
-          tmp_0 = this.i1m_1.j18(evalToVar(this, fn.r1e(0)));
+          tmp_0 = this.i1m_1.i18(this.m1m(fn.r1e(0)), this.j1m_1.e1a_1.z1('org_unit'), this.j1m_1.g1a_1);
           break;
         case 47:
-          tmp_0 = this.i1m_1.k18(this.n1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)));
+          tmp_0 = this.i1m_1.j18(evalToVar(this, fn.r1e(0)));
           break;
         case 48:
-          tmp_0 = this.i1m_1.l18(this.n1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.k18(this.m1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)));
           break;
         case 49:
+          tmp_0 = this.i1m_1.l18(this.m1m(fn.r1e(0)));
+          break;
+        case 51:
           tmp_0 = this.i1m_1.m18(evalToVar(this, fn.r1e(0)));
           break;
-        case 50:
+        case 52:
           tmp_0 = this.i1m_1.n18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
           break;
-        case 51:
+        case 53:
           tmp_0 = this.i1m_1.o18(evalToVar(this, fn.r1e(0)));
           break;
-        case 52:
+        case 54:
           tmp_0 = this.i1m_1.p18(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)));
           break;
-        case 53:
+        case 55:
           tmp_0 = this.i1m_1.q18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
           break;
-        case 54:
-          tmp_0 = this.i1m_1.r18(this.l1m(fn.r1e(0)));
-          break;
         case 56:
-          tmp_0 = this.i1m_1.s18(this.n1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)));
+          tmp_0 = this.i1m_1.r18(this.l1m(fn.r1e(0)));
           break;
-        case 57:
-          tmp_0 = this.i1m_1.t18(this.l1m(fn.r1e(0)), fn.q1e() <= 1 ? 0 : evalToInteger(this, fn.r1e(1)));
+        case 40:
+          tmp_0 = this.i1m_1.c18(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)));
           break;
         case 58:
-          tmp_0 = this.i1m_1.u18(this.n1m(fn.r1e(0)), this.n1m(fn.r1e(1)), evalToInteger(this, fn.r1e(2)));
+          tmp_0 = this.i1m_1.s18(this.m1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)));
           break;
         case 59:
-          tmp_0 = this.i1m_1.v18(this.n1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)), evalToInteger(this, fn.r1e(2)));
+          tmp_0 = this.i1m_1.t18(this.l1m(fn.r1e(0)), fn.q1e() <= 1 ? 0 : evalToInteger(this, fn.r1e(1)));
           break;
         case 60:
-          tmp_0 = this.i1m_1.w18(this.n1m(fn.r1e(0)), this.n1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.u18(this.m1m(fn.r1e(0)), this.m1m(fn.r1e(1)), evalToInteger(this, fn.r1e(2)));
           break;
         case 61:
-          tmp_0 = this.i1m_1.x18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.v18(this.m1m(fn.r1e(0)), evalToInteger(this, fn.r1e(1)), evalToInteger(this, fn.r1e(2)));
           break;
         case 62:
-          tmp_0 = this.i1m_1.y18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
+          tmp_0 = this.i1m_1.w18(this.m1m(fn.r1e(0)), evalToRawString(this, fn.r1e(1)));
           break;
         case 63:
-          tmp_0 = this.i1m_1.z18(this.l1m(fn.r1e(0)));
+          tmp_0 = this.i1m_1.x18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
           break;
         case 64:
-          tmp_0 = this.i1m_1.a19(evalToNumbers(this, fn.v1e()));
+          tmp_0 = this.i1m_1.y18(this.r1m(fn.r1e(0)), this.r1m(fn.r1e(1)));
           break;
         case 65:
-          tmp_0 = this.i1m_1.b19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.n1m(fn.r1e(2)));
+          tmp_0 = this.i1m_1.z18(this.l1m(fn.r1e(0)));
           break;
         case 66:
-          tmp_0 = this.i1m_1.c19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.n1m(fn.r1e(2)));
+          tmp_0 = this.i1m_1.a19(evalToNumbers(this, fn.v1e()));
           break;
         case 67:
-          tmp_0 = this.i1m_1.d19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.n1m(fn.r1e(2)));
+          tmp_0 = this.i1m_1.b19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.m1m(fn.r1e(2)));
+          break;
+        case 68:
+          tmp_0 = this.i1m_1.c19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.m1m(fn.r1e(2)));
+          break;
+        case 69:
+          tmp_0 = this.i1m_1.d19(this.l1m(fn.r1e(0)), this.l1m(fn.r1e(1)), this.m1m(fn.r1e(2)));
           break;
         case 27:
-          tmp_0 = this.i1m_1.u17(this.l1m(fn.r1e(0)), fn.q1e() > 1 ? this.l1m(fn.r1e(1)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'avg')).h1e(fn.r1e(0))), fn.q1e() > 2 ? this.l1m(fn.r1e(2)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'stddev')).h1e(fn.r1e(0))));
+          tmp_0 = this.i1m_1.t17(this.l1m(fn.r1e(0)), fn.q1e() > 1 ? this.l1m(fn.r1e(1)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'avg')).h1e(fn.r1e(0))), fn.q1e() > 2 ? this.l1m(fn.r1e(2)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'stddev')).h1e(fn.r1e(0))));
           break;
         case 28:
-          tmp_0 = this.i1m_1.v17(this.l1m(fn.r1e(0)), fn.q1e() > 1 ? this.l1m(fn.r1e(1)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'avg')).h1e(fn.r1e(0))), fn.q1e() > 2 ? this.l1m(fn.r1e(2)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'stddev')).h1e(fn.r1e(0))));
+          tmp_0 = this.i1m_1.u17(this.l1m(fn.r1e(0)), fn.q1e() > 1 ? this.l1m(fn.r1e(1)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'avg')).h1e(fn.r1e(0))), fn.q1e() > 2 ? this.l1m(fn.r1e(2)) : evalAggFunction(this, (new FunctionNode(NodeType_FUNCTION_getInstance(), 'stddev')).h1e(fn.r1e(0))));
           break;
         default:
-          tmp_0 = this.i1m_1.x16(fnInfo.z1d());
+          tmp_0 = this.i1m_1.w16(fnInfo.z1d());
           break;
       }
       tmp = tmp_0;
@@ -5025,7 +5051,7 @@
     return tmp;
   };
   protoOf(Calculator).w1m = function (variable) {
-    var name = this.n1m(variable.r1e(0));
+    var name = this.m1m(variable.r1e(0));
     // Inline function 'kotlin.collections.ifEmpty' call
     var this_0 = this.j1m_1.e1a_1;
     var tmp;
@@ -5068,10 +5094,10 @@
   protoOf(Calculator).f1n = function (value) {
     return value.g1e();
   };
-  protoOf(Calculator).n1m = function (node) {
+  protoOf(Calculator).m1m = function (node) {
     return eval_1(this, node, 'String', Typed$Companion$toStringTypeCoercion$ref(Companion_instance_7));
   };
-  protoOf(Calculator).m1m = function (node) {
+  protoOf(Calculator).n1m = function (node) {
     return eval_1(this, node, 'Boolean', Typed$Companion$toBooleanTypeCoercion$ref(Companion_instance_7));
   };
   protoOf(Calculator).l1m = function (node) {
@@ -5576,8 +5602,8 @@
             var tmp0 = new IntRange(0, expectedTypes.q());
             // Inline function 'kotlin.collections.filterTo' call
             var destination = ArrayList_init_$Create$_0();
-            var inductionVariable_0 = tmp0.fd_1;
-            var last_0 = tmp0.gd_1;
+            var inductionVariable_0 = tmp0.ed_1;
+            var last_0 = tmp0.fd_1;
             if (inductionVariable_0 <= last_0)
               do {
                 var element = inductionVariable_0;
@@ -5667,7 +5693,7 @@
   function sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0(function_0) {
     this.h1o_1 = function_0;
   }
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).x16 = function (name) {
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).w16 = function (name) {
     return this.h1o_1(name);
   };
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).o2 = function () {
@@ -5714,7 +5740,7 @@
   }
   function Calculator$evalToString$ref(p0) {
     return function (receiver) {
-      p0.n1m(receiver);
+      p0.m1m(receiver);
       return Unit_instance;
     };
   }
@@ -5726,7 +5752,7 @@
   }
   function Calculator$evalToBoolean$ref_1(p0) {
     return function (receiver) {
-      p0.m1m(receiver);
+      p0.n1m(receiver);
       return Unit_instance;
     };
   }
@@ -9023,7 +9049,7 @@
     // Inline function 'kotlin.text.toRegex' call
     var this_0 = GS1Elements_GS1_GROUP_SEPARATOR_getInstance().l1o_1;
     // Inline function 'kotlin.text.split' call
-    var tmp0_0 = Regex_init_$Create$(this_0).z9(tmp0, 0);
+    var tmp0_0 = Regex_init_$Create$(this_0).y9(tmp0, 0);
     var tmp$ret$4;
     $l$block: {
       // Inline function 'kotlin.collections.dropLastWhile' call
@@ -9599,9 +9625,9 @@
   }
   function VectorAggregation() {
   }
-  protoOf(VectorAggregation).j17 = function (values) {
+  protoOf(VectorAggregation).i17 = function (values) {
     var sampleSize = values.length;
-    var xbar = this.s17(values) / sampleSize;
+    var xbar = this.r17(values) / sampleSize;
     var correction = 0.0;
     var inductionVariable = 0;
     var last = values.length;
@@ -9612,10 +9638,10 @@
     }
     return xbar + correction / sampleSize;
   };
-  protoOf(VectorAggregation).k17 = function (values) {
+  protoOf(VectorAggregation).j17 = function (values) {
     return values.length;
   };
-  protoOf(VectorAggregation).l17 = function (values) {
+  protoOf(VectorAggregation).k17 = function (values) {
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -9634,10 +9660,10 @@
   protoOf(VectorAggregation).w1o = function (values) {
     return sum(values) / values.length;
   };
-  protoOf(VectorAggregation).m17 = function (values) {
+  protoOf(VectorAggregation).l17 = function (values) {
     return this.x1o(values, 0.5);
   };
-  protoOf(VectorAggregation).n17 = function (values) {
+  protoOf(VectorAggregation).m17 = function (values) {
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -9702,17 +9728,17 @@
     var pos = indexR7(this, numberToDouble(fraction), work.length);
     return estimate(this, work, pivotsHeap, pos);
   };
-  protoOf(VectorAggregation).q17 = function (values) {
+  protoOf(VectorAggregation).p17 = function (values) {
     // Inline function 'kotlin.math.sqrt' call
     var x = this.y1o(values, false);
     return Math.sqrt(x);
   };
-  protoOf(VectorAggregation).r17 = function (values) {
+  protoOf(VectorAggregation).q17 = function (values) {
     // Inline function 'kotlin.math.sqrt' call
     var x = this.z1o(values);
     return Math.sqrt(x);
   };
-  protoOf(VectorAggregation).s17 = function (values) {
+  protoOf(VectorAggregation).r17 = function (values) {
     return sum(values);
   };
   protoOf(VectorAggregation).y1o = function (values, biasCorrected) {
@@ -11078,10 +11104,10 @@
   protoOf(ID).toString = function () {
     return this.value;
   };
-  protoOf(ID).vb = function () {
+  protoOf(ID).ub = function () {
     return this.type;
   };
-  protoOf(ID).wb = function () {
+  protoOf(ID).vb = function () {
     return this.value;
   };
   protoOf(ID).z1p = function (type, value) {
@@ -12244,7 +12270,7 @@
     var raw = expr.g1s('data item', Expr$Companion$dataItem$lambda);
     // Inline function 'kotlin.text.toRegex' call
     // Inline function 'kotlin.text.split' call
-    var tmp0 = Regex_init_$Create$('\\.').z9(raw, 0);
+    var tmp0 = Regex_init_$Create$('\\.').y9(raw, 0);
     var tmp$ret$4;
     $l$block: {
       // Inline function 'kotlin.collections.dropLastWhile' call
@@ -12302,7 +12328,7 @@
           var tmp0_0 = substring(part, nameEndPos + 1 | 0);
           // Inline function 'kotlin.text.toRegex' call
           // Inline function 'kotlin.text.split' call
-          var tmp0_1 = Regex_init_$Create$('&').z9(tmp0_0, 0);
+          var tmp0_1 = Regex_init_$Create$('&').y9(tmp0_0, 0);
           var tmp$ret$12;
           $l$block_1: {
             // Inline function 'kotlin.collections.dropLastWhile' call
@@ -12350,7 +12376,7 @@
     var str = substring(expr, indexOf(expr, _Char___init__impl__6a9atx(58)) + 1 | 0);
     // Inline function 'kotlin.text.toRegex' call
     // Inline function 'kotlin.text.split' call
-    var tmp0 = Regex_init_$Create$('&').z9(str, 0);
+    var tmp0 = Regex_init_$Create$('&').y9(str, 0);
     var tmp$ret$4;
     $l$block: {
       // Inline function 'kotlin.collections.dropLastWhile' call
@@ -13249,7 +13275,7 @@
     this.l1b_1 = listOf([fn(this, NamedFunction_orgUnit_ancestor_getInstance(), [this.u1a_1.j1t()]), fn(this, NamedFunction_orgUnit_dataSet_getInstance(), [this.u1a_1.j1t()]), fn(this, NamedFunction_orgUnit_group_getInstance(), [this.u1a_1.j1t()]), fn(this, NamedFunction_orgUnit_program_getInstance(), [this.u1a_1.j1t()])]);
     this.m1b_1 = listOf([fn(this, NamedFunction_avg_getInstance(), [this.x1a_1]), fn(this, NamedFunction_count_getInstance(), [this.x1a_1]), fn(this, NamedFunction_max_getInstance(), [this.x1a_1]), fn(this, NamedFunction_min_getInstance(), [this.x1a_1]), fn(this, NamedFunction_stddev_getInstance(), [this.x1a_1]), fn(this, NamedFunction_sum_getInstance(), [this.x1a_1])]);
     this.n1b_1 = listOf([fn(this, NamedFunction_median_getInstance(), [this.x1a_1]), fn(this, NamedFunction_percentileCont_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_stddevPop_getInstance(), [this.x1a_1]), fn(this, NamedFunction_stddevSamp_getInstance(), [this.x1a_1]), fn(this, NamedFunction_variance_getInstance(), [this.x1a_1])]);
-    this.o1b_1 = listOf([fn(this, NamedFunction_d2_condition_getInstance(), [this.r1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_contains_getInstance(), [this.x1a_1, this.x1a_1.j1t()]), fn(this, NamedFunction_d2_containsItems_getInstance(), [this.x1a_1, this.x1a_1.j1t()]), fn(this, NamedFunction_d2_count_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_countIfValue_getInstance(), [this.y1a_1, this.x1a_1]), fn(this, NamedFunction_d2_daysBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_hasValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_maxValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_minutesBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_minValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_monthsBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_oizp_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_weeksBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_yearsBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_zing_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_zpvc_getInstance(), [this.x1a_1.j1t()])]);
+    this.o1b_1 = listOf([fn(this, NamedFunction_d2_condition_getInstance(), [this.r1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_contains_getInstance(), [this.x1a_1, this.x1a_1.j1t()]), fn(this, NamedFunction_d2_containsItems_getInstance(), [this.x1a_1, this.x1a_1.j1t()]), fn(this, NamedFunction_d2_count_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_countIfValue_getInstance(), [this.y1a_1, this.x1a_1]), fn(this, NamedFunction_d2_daysBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_exponent_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_hasValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_log_getInstance(), [this.x1a_1, this.x1a_1.i1t()]), fn(this, NamedFunction_d2_maxValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_minutesBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_minValue_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_monthsBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_oizp_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_weeksBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_yearsBetween_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_zing_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_zpvc_getInstance(), [this.x1a_1.j1t()])]);
     this.p1b_1 = listOf([fn(this, NamedFunction_d2_addDays_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_ceil_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_concatenate_getInstance(), [this.x1a_1.j1t()]), fn(this, NamedFunction_d2_countIfZeroPos_getInstance(), [this.y1a_1]), fn(this, NamedFunction_d2_extractDataMatrixValue_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_floor_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_hasUserRole_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_inUserGroup_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_inOrgUnitGroup_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_lastEventDate_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_left_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_length_getInstance(), [this.x1a_1]), fn(this, NamedFunction_d2_modulus_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_right_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_round_getInstance(), [this.x1a_1, this.t1a_1.i1t()]), fn(this, NamedFunction_d2_split_getInstance(), [this.x1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_substring_getInstance(), [this.x1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_validatePattern_getInstance(), [this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_zScoreHFA_getInstance(), [this.x1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_zScoreWFA_getInstance(), [this.x1a_1, this.x1a_1, this.x1a_1]), fn(this, NamedFunction_d2_zScoreWFH_getInstance(), [this.x1a_1, this.x1a_1, this.x1a_1])]);
     this.q1b_1 = listOf([fn(this, NamedFunction_d2_countIfCondition_getInstance(), [this.x1a_1, this.s1a_1]), fn(this, NamedFunction_d2_relationshipCount_getInstance(), [this.u1a_1.k1t().i1t()])]);
     this.r1b_1 = listOf([Companion_instance_19.y1t(NodeType_NULL_getInstance(), 'null'), Companion_instance_19.y1t(NodeType_BOOLEAN_getInstance(), 'true'), Companion_instance_19.y1t(NodeType_BOOLEAN_getInstance(), 'false')]);
@@ -14147,15 +14173,15 @@
     if (this.m1u_1.o()) {
       var r = new ParenthesesNode(NodeType_PAR_getInstance(), '');
       r.h1e(node);
-      this.m1u_1.gb(r);
+      this.m1u_1.fb(r);
       this.n1u_1 = r;
     } else {
-      this.m1u_1.eb().h1e(node);
+      this.m1u_1.db().h1e(node);
     }
-    this.m1u_1.gb(node);
+    this.m1u_1.fb(node);
   };
   protoOf(Parser).e1s = function (type, end) {
-    var node = this.m1u_1.ib();
+    var node = this.m1u_1.hb();
     node.l1f(end);
   };
   function Terminal$parse$lambda($type) {
@@ -14197,19 +14223,19 @@
   protoOf(DataItemJs).t1u = function () {
     return this.modifiers;
   };
-  protoOf(DataItemJs).vb = function () {
+  protoOf(DataItemJs).ub = function () {
     return this.type;
   };
-  protoOf(DataItemJs).wb = function () {
+  protoOf(DataItemJs).vb = function () {
     return this.uid0;
   };
-  protoOf(DataItemJs).ve = function () {
+  protoOf(DataItemJs).ue = function () {
     return this.uid1;
   };
-  protoOf(DataItemJs).x12 = function () {
+  protoOf(DataItemJs).w12 = function () {
     return this.uid2;
   };
-  protoOf(DataItemJs).y12 = function () {
+  protoOf(DataItemJs).x12 = function () {
     return this.modifiers;
   };
   protoOf(DataItemJs).u1u = function (type, uid0, uid1, uid2, modifiers) {
@@ -14278,19 +14304,19 @@
   protoOf(ExpressionDataJs).z1u = function () {
     return this.namedValues;
   };
-  protoOf(ExpressionDataJs).vb = function () {
+  protoOf(ExpressionDataJs).ub = function () {
     return this.programRuleVariableValues;
   };
-  protoOf(ExpressionDataJs).wb = function () {
+  protoOf(ExpressionDataJs).vb = function () {
     return this.programVariableValues;
   };
-  protoOf(ExpressionDataJs).ve = function () {
+  protoOf(ExpressionDataJs).ue = function () {
     return this.supplementaryValues;
   };
-  protoOf(ExpressionDataJs).x12 = function () {
+  protoOf(ExpressionDataJs).w12 = function () {
     return this.dataItemValues;
   };
-  protoOf(ExpressionDataJs).y12 = function () {
+  protoOf(ExpressionDataJs).x12 = function () {
     return this.namedValues;
   };
   protoOf(ExpressionDataJs).a1v = function (programRuleVariableValues, programVariableValues, supplementaryValues, dataItemValues, namedValues) {
@@ -14371,12 +14397,12 @@
   }
   function LocalDate$Companion$parse$ref_0(p0) {
     return function (receiver) {
-      return p0.hu(receiver);
+      return p0.gu(receiver);
     };
   }
   function LocalDate$Companion$parse$ref_1(p0) {
     return function (receiver) {
-      return p0.hu(receiver);
+      return p0.gu(receiver);
     };
   }
   function ExpressionJs$Companion$toExpressionDataJava$lambda(it) {
@@ -14620,12 +14646,12 @@
   }
   function LocalDate$Companion$parse$ref_2(p0) {
     return function (receiver) {
-      return p0.hu(receiver);
+      return p0.gu(receiver);
     };
   }
   function LocalDate$Companion$parse$ref_3(p0) {
     return function (receiver) {
-      return p0.hu(receiver);
+      return p0.gu(receiver);
     };
   }
   function QueryModifiersJs(periodAggregation, aggregationType, maxDate, minDate, periodOffset, stageOffset, yearToDate, subExpression) {
@@ -14666,22 +14692,22 @@
   protoOf(QueryModifiersJs).q1v = function () {
     return this.subExpression;
   };
-  protoOf(QueryModifiersJs).vb = function () {
+  protoOf(QueryModifiersJs).ub = function () {
     return this.periodAggregation;
   };
-  protoOf(QueryModifiersJs).wb = function () {
+  protoOf(QueryModifiersJs).vb = function () {
     return this.aggregationType;
   };
-  protoOf(QueryModifiersJs).ve = function () {
+  protoOf(QueryModifiersJs).ue = function () {
     return this.maxDate;
   };
-  protoOf(QueryModifiersJs).x12 = function () {
+  protoOf(QueryModifiersJs).w12 = function () {
     return this.minDate;
   };
-  protoOf(QueryModifiersJs).y12 = function () {
+  protoOf(QueryModifiersJs).x12 = function () {
     return this.periodOffset;
   };
-  protoOf(QueryModifiersJs).z12 = function () {
+  protoOf(QueryModifiersJs).y12 = function () {
     return this.stageOffset;
   };
   protoOf(QueryModifiersJs).r1v = function () {
@@ -14751,10 +14777,10 @@
   protoOf(VariableJs).t1u = function () {
     return this.modifiers;
   };
-  protoOf(VariableJs).vb = function () {
+  protoOf(VariableJs).ub = function () {
     return this.name;
   };
-  protoOf(VariableJs).wb = function () {
+  protoOf(VariableJs).vb = function () {
     return this.modifiers;
   };
   protoOf(VariableJs).u1v = function (name, modifiers) {
@@ -14802,16 +14828,16 @@
   protoOf(VariableValueJs).x1v = function () {
     return this.eventDate;
   };
-  protoOf(VariableValueJs).vb = function () {
+  protoOf(VariableValueJs).ub = function () {
     return this.valueType;
   };
-  protoOf(VariableValueJs).wb = function () {
+  protoOf(VariableValueJs).vb = function () {
     return this.value;
   };
-  protoOf(VariableValueJs).ve = function () {
+  protoOf(VariableValueJs).ue = function () {
     return this.candidates;
   };
-  protoOf(VariableValueJs).x12 = function () {
+  protoOf(VariableValueJs).w12 = function () {
     return this.eventDate;
   };
   protoOf(VariableValueJs).y1v = function (valueType, value, candidates, eventDate) {
@@ -14849,38 +14875,43 @@
       return false;
     return true;
   };
+  function matchesPattern(input, pattern) {
+    var tmp = (new RegExp('^(?:' + pattern + ')$')).test(input);
+    return (!(tmp == null) ? typeof tmp === 'boolean' : false) ? tmp : THROW_CCE();
+  }
   //region block: post-declaration
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).y16 = contains_2;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).z16 = containsItems;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).a17 = firstNonNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).b17 = greatest;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).c17 = ifThenElse;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).d17 = isNotNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).e17 = isNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).f17 = least;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).g17 = log;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).h17 = log10_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).i17 = removeZeros;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).j17 = avg;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).k17 = count;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).l17 = max_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).m17 = median;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).n17 = min_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).o17 = percentileCont;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).p17 = stddev;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).q17 = stddevPop;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).r17 = stddevSamp;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).s17 = sum_1;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).t17 = variance;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).u17 = normDistCum;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).v17 = normDistDen;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).w17 = d2_addDays;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).x17 = d2_ceil;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).y17 = d2_concatenate;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).z17 = d2_count;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).a18 = d2_countIfValue;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).b18 = d2_countIfZeroPos;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).c18 = d2_daysBetween;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).x16 = contains_2;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).y16 = containsItems;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).z16 = firstNonNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).a17 = greatest;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).b17 = ifThenElse;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).c17 = isNotNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).d17 = isNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).e17 = least;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).f17 = log;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).g17 = log10_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).h17 = removeZeros;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).i17 = avg;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).j17 = count;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).k17 = max_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).l17 = median;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).m17 = min_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).n17 = percentileCont;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).o17 = stddev;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).p17 = stddevPop;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).q17 = stddevSamp;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).r17 = sum_1;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).s17 = variance;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).t17 = normDistCum;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).u17 = normDistDen;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).v17 = d2_addDays;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).w17 = d2_ceil;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).x17 = d2_concatenate;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).y17 = d2_count;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).z17 = d2_countIfValue;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).a18 = d2_countIfZeroPos;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).b18 = d2_daysBetween;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).c18 = d2_exponent;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).d18 = d2_extractDataMatrixValue;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).e18 = d2_floor;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0).f18 = d2_hasUserRole;
@@ -14932,37 +14963,38 @@
   protoOf(Calculator).g1n = evalParentheses;
   protoOf(Calculator).h1n = evalArgument;
   protoOf(Describer).y1l = visitNode;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).y16 = contains_2;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).z16 = containsItems;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).a17 = firstNonNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).b17 = greatest;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).c17 = ifThenElse;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).d17 = isNotNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).e17 = isNull;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).f17 = least;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).g17 = log;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).h17 = log10_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).i17 = removeZeros;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).j17 = avg;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).k17 = count;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).l17 = max_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).m17 = median;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).n17 = min_0;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).o17 = percentileCont;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).p17 = stddev;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).q17 = stddevPop;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).r17 = stddevSamp;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).s17 = sum_1;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).t17 = variance;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).u17 = normDistCum;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).v17 = normDistDen;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).w17 = d2_addDays;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).x17 = d2_ceil;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).y17 = d2_concatenate;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).z17 = d2_count;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).a18 = d2_countIfValue;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).b18 = d2_countIfZeroPos;
-  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).c18 = d2_daysBetween;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).x16 = contains_2;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).y16 = containsItems;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).z16 = firstNonNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).a17 = greatest;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).b17 = ifThenElse;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).c17 = isNotNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).d17 = isNull;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).e17 = least;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).f17 = log;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).g17 = log10_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).h17 = removeZeros;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).i17 = avg;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).j17 = count;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).k17 = max_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).l17 = median;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).m17 = min_0;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).n17 = percentileCont;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).o17 = stddev;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).p17 = stddevPop;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).q17 = stddevSamp;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).r17 = sum_1;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).s17 = variance;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).t17 = normDistCum;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).u17 = normDistDen;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).v17 = d2_addDays;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).w17 = d2_ceil;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).x17 = d2_concatenate;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).y17 = d2_count;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).z17 = d2_countIfValue;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).a18 = d2_countIfZeroPos;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).b18 = d2_daysBetween;
+  protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).c18 = d2_exponent;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).d18 = d2_extractDataMatrixValue;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).e18 = d2_floor;
   protoOf(sam$org_hisp_dhis_lib_expression_spi_ExpressionFunctions$0_0).f18 = d2_hasUserRole;