@dhis2/expression-parser 1.1.2 → 1.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1975,6 +1975,8 @@ var NamedFunction_d2_addDays_instance;
1975
1975
  var NamedFunction_d2_ceil_instance;
1976
1976
  var NamedFunction_d2_concatenate_instance;
1977
1977
  var NamedFunction_d2_condition_instance;
1978
+ var NamedFunction_d2_contains_instance;
1979
+ var NamedFunction_d2_containsItems_instance;
1978
1980
  var NamedFunction_d2_count_instance;
1979
1981
  var NamedFunction_d2_countIfCondition_instance;
1980
1982
  var NamedFunction_d2_countIfValue_instance;
@@ -2038,7 +2040,7 @@ function Companion_getInstance_5() {
2038
2040
  return Companion_instance_0;
2039
2041
  }
2040
2042
  function values_1() {
2041
- 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_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_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()];
2043
+ 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_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()];
2042
2044
  }
2043
2045
  function get_entries_1() {
2044
2046
  if ($ENTRIES_1 == null)
@@ -2083,38 +2085,40 @@ function NamedFunction_initEntries() {
2083
2085
  NamedFunction_d2_ceil_instance = NamedFunction_init_$Create$('d2_ceil', 30, 'd2:ceil', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2084
2086
  NamedFunction_d2_concatenate_instance = new NamedFunction('d2_concatenate', 31, 'd2:concatenate', ValueType_STRING_getInstance(), true, [ValueType_STRING_getInstance()]);
2085
2087
  NamedFunction_d2_condition_instance = NamedFunction_init_$Create$('d2_condition', 32, 'd2:condition', ValueType_SAME_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_SAME_getInstance(), ValueType_SAME_getInstance()]);
2086
- NamedFunction_d2_count_instance = NamedFunction_init_$Create$('d2_count', 33, 'd2:count', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2087
- NamedFunction_d2_countIfCondition_instance = NamedFunction_init_$Create$('d2_countIfCondition', 34, 'd2:countIfCondition', ValueType_NUMBER_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_MIXED_getInstance()]);
2088
- NamedFunction_d2_countIfValue_instance = NamedFunction_init_$Create$('d2_countIfValue', 35, 'd2:countIfValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance(), ValueType_MIXED_getInstance()]);
2089
- NamedFunction_d2_countIfZeroPos_instance = NamedFunction_init_$Create$('d2_countIfZeroPos', 36, 'd2:countIfZeroPos', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2090
- NamedFunction_d2_daysBetween_instance = NamedFunction_init_$Create$('d2_daysBetween', 37, 'd2:daysBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2091
- NamedFunction_d2_extractDataMatrixValue_instance = NamedFunction_init_$Create$('d2_extractDataMatrixValue', 38, 'd2:extractDataMatrixValue', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2092
- NamedFunction_d2_floor_instance = NamedFunction_init_$Create$('d2_floor', 39, 'd2:floor', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2093
- NamedFunction_d2_hasUserRole_instance = NamedFunction_init_$Create$('d2_hasUserRole', 40, 'd2:hasUserRole', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
2094
- NamedFunction_d2_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 41, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
2095
- NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 42, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
2096
- NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 43, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
2097
- NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 44, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2098
- NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 45, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
2099
- NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 46, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2100
- NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 47, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2101
- NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 48, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2102
- NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 49, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2103
- NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 50, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2104
- NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 51, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2105
- NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 52, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
2106
- NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 53, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2107
- NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 54, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2108
- NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 55, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2109
- NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 56, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2110
- NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 57, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2111
- NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 58, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2112
- NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 59, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2113
- NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 60, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2114
- NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 61, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
2115
- NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 62, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2116
- NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 63, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2117
- NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 64, 'd2:zScoreWFH', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2088
+ NamedFunction_d2_contains_instance = new NamedFunction('d2_contains', 33, 'd2:contains', ValueType_BOOLEAN_getInstance(), true, [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2089
+ NamedFunction_d2_containsItems_instance = new NamedFunction('d2_containsItems', 34, 'd2:containsItems', ValueType_BOOLEAN_getInstance(), true, [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2090
+ NamedFunction_d2_count_instance = NamedFunction_init_$Create$('d2_count', 35, 'd2:count', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2091
+ NamedFunction_d2_countIfCondition_instance = NamedFunction_init_$Create$('d2_countIfCondition', 36, 'd2:countIfCondition', ValueType_NUMBER_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_MIXED_getInstance()]);
2092
+ NamedFunction_d2_countIfValue_instance = NamedFunction_init_$Create$('d2_countIfValue', 37, 'd2:countIfValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance(), ValueType_MIXED_getInstance()]);
2093
+ NamedFunction_d2_countIfZeroPos_instance = NamedFunction_init_$Create$('d2_countIfZeroPos', 38, 'd2:countIfZeroPos', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2094
+ NamedFunction_d2_daysBetween_instance = NamedFunction_init_$Create$('d2_daysBetween', 39, 'd2:daysBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2095
+ NamedFunction_d2_extractDataMatrixValue_instance = NamedFunction_init_$Create$('d2_extractDataMatrixValue', 40, 'd2:extractDataMatrixValue', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2096
+ NamedFunction_d2_floor_instance = NamedFunction_init_$Create$('d2_floor', 41, 'd2:floor', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2097
+ NamedFunction_d2_hasUserRole_instance = NamedFunction_init_$Create$('d2_hasUserRole', 42, 'd2:hasUserRole', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
2098
+ NamedFunction_d2_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 43, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
2099
+ NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 44, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
2100
+ NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 45, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
2101
+ NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 46, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2102
+ NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 47, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
2103
+ NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 48, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2104
+ NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 49, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2105
+ NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 50, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
2106
+ NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 51, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2107
+ NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 52, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2108
+ NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 53, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2109
+ NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 54, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
2110
+ NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 55, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2111
+ NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 56, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2112
+ NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 57, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
2113
+ NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 58, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
2114
+ NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 59, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
2115
+ NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 60, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2116
+ NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 61, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
2117
+ NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 62, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
2118
+ NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 63, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
2119
+ NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 64, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2120
+ NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 65, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2121
+ NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 66, 'd2:zScoreWFH', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
2118
2122
  }
2119
2123
  var $ENTRIES_1;
2120
2124
  function NamedFunction(name, ordinal, fnName, returnType, isVarargs, parameterTypes) {
@@ -2268,6 +2272,14 @@ function NamedFunction_d2_condition_getInstance() {
2268
2272
  NamedFunction_initEntries();
2269
2273
  return NamedFunction_d2_condition_instance;
2270
2274
  }
2275
+ function NamedFunction_d2_contains_getInstance() {
2276
+ NamedFunction_initEntries();
2277
+ return NamedFunction_d2_contains_instance;
2278
+ }
2279
+ function NamedFunction_d2_containsItems_getInstance() {
2280
+ NamedFunction_initEntries();
2281
+ return NamedFunction_d2_containsItems_instance;
2282
+ }
2271
2283
  function NamedFunction_d2_count_getInstance() {
2272
2284
  NamedFunction_initEntries();
2273
2285
  return NamedFunction_d2_count_instance;
@@ -4190,6 +4202,15 @@ function evalBinaryLogicOperator($this, op, operator, eval_0) {
4190
4202
  var rVal = eval_0(right);
4191
4203
  return op(lVal, rVal);
4192
4204
  }
4205
+ function evalBinaryLogicOperatorShortCircuit($this, op, operator, eval_0, shortCircuitOn) {
4206
+ var left = operator.mz(0);
4207
+ var right = operator.mz(1);
4208
+ var lVal = eval_0(left);
4209
+ if (!(lVal == null) ? lVal === shortCircuitOn : false)
4210
+ return shortCircuitOn;
4211
+ var rVal = eval_0(right);
4212
+ return op(lVal, rVal);
4213
+ }
4193
4214
  function evalBinaryOperator($this, op, operator, eval_0) {
4194
4215
  var left = operator.mz(0);
4195
4216
  var right = operator.mz(1);
@@ -4642,12 +4663,12 @@ protoOf(Calculator).h17 = function (operator) {
4642
4663
  case 12:
4643
4664
  var tmp_4 = Companion_instance_10;
4644
4665
  var tmp_5 = BinaryOperator$Companion$and$ref(Companion_getInstance_4());
4645
- tmp = evalBinaryOperator(tmp_4, tmp_5, operator, Calculator$evalToBoolean$ref(this));
4666
+ tmp = evalBinaryLogicOperatorShortCircuit(tmp_4, tmp_5, operator, Calculator$evalToBoolean$ref(this), false);
4646
4667
  break;
4647
4668
  case 13:
4648
4669
  var tmp_6 = Companion_instance_10;
4649
4670
  var tmp_7 = BinaryOperator$Companion$or$ref(Companion_getInstance_4());
4650
- tmp = evalBinaryOperator(tmp_6, tmp_7, operator, Calculator$evalToBoolean$ref_0(this));
4671
+ tmp = evalBinaryLogicOperatorShortCircuit(tmp_6, tmp_7, operator, Calculator$evalToBoolean$ref_0(this), true);
4651
4672
  break;
4652
4673
  case 6:
4653
4674
  var tmp_8 = Companion_instance_10;
@@ -4777,93 +4798,99 @@ protoOf(Calculator).j17 = function (fn) {
4777
4798
  tmp = this.b17_1.zs(evalToStrings(this, fn.pz()));
4778
4799
  break;
4779
4800
  case 33:
4780
- tmp = this.b17_1.at(evalToVar(this, fn.mz(0)));
4801
+ tmp = this.b17_1.zr(this.g17(fn.mz(0)), drop(evalToStrings(this, fn.pz()), 1));
4802
+ break;
4803
+ case 34:
4804
+ tmp = this.b17_1.as(this.g17(fn.mz(0)), drop(evalToStrings(this, fn.pz()), 1));
4781
4805
  break;
4782
4806
  case 35:
4807
+ tmp = this.b17_1.at(evalToVar(this, fn.mz(0)));
4808
+ break;
4809
+ case 37:
4783
4810
  tmp = this.b17_1.bt(evalToVar(this, fn.mz(0)), this.g17(fn.mz(1)));
4784
4811
  break;
4785
- case 36:
4812
+ case 38:
4786
4813
  tmp = this.b17_1.ct(evalToVar(this, fn.mz(0)));
4787
4814
  break;
4788
- case 37:
4815
+ case 39:
4789
4816
  tmp = this.b17_1.dt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
4790
4817
  break;
4791
- case 38:
4818
+ case 40:
4792
4819
  tmp = this.b17_1.et(this.g17(fn.mz(0)), this.g17(fn.mz(1)));
4793
4820
  break;
4794
- case 39:
4821
+ case 41:
4795
4822
  tmp = this.b17_1.ft(this.e17(fn.mz(0)));
4796
4823
  break;
4797
- case 40:
4824
+ case 42:
4798
4825
  tmp = this.b17_1.gt(this.g17(fn.mz(0)), this.c17_1.ev_1.c2('USER'));
4799
4826
  break;
4800
- case 41:
4827
+ case 43:
4801
4828
  tmp = this.b17_1.ht(evalToVar(this, fn.mz(0)));
4802
4829
  break;
4803
- case 42:
4830
+ case 44:
4804
4831
  tmp = this.b17_1.it(this.g17(fn.mz(0)), this.c17_1.cv_1.c2('org_unit'), this.c17_1.ev_1);
4805
4832
  break;
4806
- case 43:
4833
+ case 45:
4807
4834
  tmp = this.b17_1.jt(evalToVar(this, fn.mz(0)));
4808
4835
  break;
4809
- case 44:
4836
+ case 46:
4810
4837
  tmp = this.b17_1.kt(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)));
4811
4838
  break;
4812
- case 45:
4839
+ case 47:
4813
4840
  tmp = this.b17_1.lt(this.g17(fn.mz(0)));
4814
4841
  break;
4815
- case 46:
4842
+ case 48:
4816
4843
  tmp = this.b17_1.mt(evalToVar(this, fn.mz(0)));
4817
4844
  break;
4818
- case 47:
4845
+ case 49:
4819
4846
  tmp = this.b17_1.nt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
4820
4847
  break;
4821
- case 48:
4848
+ case 50:
4822
4849
  tmp = this.b17_1.ot(evalToVar(this, fn.mz(0)));
4823
4850
  break;
4824
- case 49:
4851
+ case 51:
4825
4852
  tmp = this.b17_1.pt(this.e17(fn.mz(0)), this.e17(fn.mz(1)));
4826
4853
  break;
4827
- case 50:
4854
+ case 52:
4828
4855
  tmp = this.b17_1.qt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
4829
4856
  break;
4830
- case 51:
4857
+ case 53:
4831
4858
  tmp = this.b17_1.rt(this.e17(fn.mz(0)));
4832
4859
  break;
4833
- case 53:
4860
+ case 55:
4834
4861
  tmp = this.b17_1.st(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)));
4835
4862
  break;
4836
- case 54:
4863
+ case 56:
4837
4864
  tmp = this.b17_1.tt(this.e17(fn.mz(0)), fn.lz() <= 1 ? 0 : evalToInteger(this, fn.mz(1)));
4838
4865
  break;
4839
- case 55:
4866
+ case 57:
4840
4867
  tmp = this.b17_1.ut(this.g17(fn.mz(0)), this.g17(fn.mz(1)), evalToInteger(this, fn.mz(2)));
4841
4868
  break;
4842
- case 56:
4869
+ case 58:
4843
4870
  tmp = this.b17_1.vt(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)), evalToInteger(this, fn.mz(2)));
4844
4871
  break;
4845
- case 57:
4872
+ case 59:
4846
4873
  tmp = this.b17_1.wt(this.g17(fn.mz(0)), this.g17(fn.mz(1)));
4847
4874
  break;
4848
- case 58:
4875
+ case 60:
4849
4876
  tmp = this.b17_1.xt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
4850
4877
  break;
4851
- case 59:
4878
+ case 61:
4852
4879
  tmp = this.b17_1.yt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
4853
4880
  break;
4854
- case 60:
4881
+ case 62:
4855
4882
  tmp = this.b17_1.zt(this.e17(fn.mz(0)));
4856
4883
  break;
4857
- case 61:
4884
+ case 63:
4858
4885
  tmp = this.b17_1.au(evalToNumbers(this, fn.pz()));
4859
4886
  break;
4860
- case 62:
4887
+ case 64:
4861
4888
  tmp = this.b17_1.bu(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
4862
4889
  break;
4863
- case 63:
4890
+ case 65:
4864
4891
  tmp = this.b17_1.cu(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
4865
4892
  break;
4866
- case 64:
4893
+ case 66:
4867
4894
  tmp = this.b17_1.du(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
4868
4895
  break;
4869
4896
  case 27:
@@ -10895,7 +10922,7 @@ function ExpressionGrammar() {
10895
10922
  this.iw_1 = listOf([fn(this, NamedFunction_orgUnit_ancestor_getInstance(), [this.rv_1.d1e()]), fn(this, NamedFunction_orgUnit_dataSet_getInstance(), [this.rv_1.d1e()]), fn(this, NamedFunction_orgUnit_group_getInstance(), [this.rv_1.d1e()]), fn(this, NamedFunction_orgUnit_program_getInstance(), [this.rv_1.d1e()])]);
10896
10923
  this.jw_1 = listOf([fn(this, NamedFunction_avg_getInstance(), [this.uv_1]), fn(this, NamedFunction_count_getInstance(), [this.uv_1]), fn(this, NamedFunction_max_getInstance(), [this.uv_1]), fn(this, NamedFunction_min_getInstance(), [this.uv_1]), fn(this, NamedFunction_stddev_getInstance(), [this.uv_1]), fn(this, NamedFunction_sum_getInstance(), [this.uv_1])]);
10897
10924
  this.kw_1 = listOf([fn(this, NamedFunction_median_getInstance(), [this.uv_1]), fn(this, NamedFunction_percentileCont_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_stddevPop_getInstance(), [this.uv_1]), fn(this, NamedFunction_stddevSamp_getInstance(), [this.uv_1]), fn(this, NamedFunction_variance_getInstance(), [this.uv_1])]);
10898
- this.lw_1 = listOf([fn(this, NamedFunction_d2_count_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_countIfValue_getInstance(), [this.vv_1, this.uv_1]), fn(this, NamedFunction_d2_daysBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_hasValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_maxValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_minValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_monthsBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_oizp_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_weeksBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_yearsBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_zing_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_zpvc_getInstance(), [this.uv_1.d1e()])]);
10925
+ this.lw_1 = listOf([fn(this, NamedFunction_d2_contains_getInstance(), [this.uv_1, this.uv_1.d1e()]), fn(this, NamedFunction_d2_containsItems_getInstance(), [this.uv_1, this.uv_1.d1e()]), fn(this, NamedFunction_d2_count_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_countIfValue_getInstance(), [this.vv_1, this.uv_1]), fn(this, NamedFunction_d2_daysBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_hasValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_maxValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_minValue_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_monthsBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_oizp_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_weeksBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_yearsBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_zing_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_zpvc_getInstance(), [this.uv_1.d1e()])]);
10899
10926
  this.mw_1 = listOf([fn(this, NamedFunction_d2_addDays_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_ceil_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_concatenate_getInstance(), [this.uv_1.d1e()]), fn(this, NamedFunction_d2_countIfZeroPos_getInstance(), [this.vv_1]), fn(this, NamedFunction_d2_extractDataMatrixValue_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_floor_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_hasUserRole_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_inOrgUnitGroup_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_lastEventDate_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_left_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_length_getInstance(), [this.uv_1]), fn(this, NamedFunction_d2_modulus_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_right_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_round_getInstance(), [this.uv_1, this.qv_1.c1e()]), fn(this, NamedFunction_d2_split_getInstance(), [this.uv_1, this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_substring_getInstance(), [this.uv_1, this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_validatePattern_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_zScoreHFA_getInstance(), [this.uv_1, this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_zScoreWFA_getInstance(), [this.uv_1, this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_zScoreWFH_getInstance(), [this.uv_1, this.uv_1, this.uv_1])]);
10900
10927
  this.nw_1 = listOf([fn(this, NamedFunction_d2_condition_getInstance(), [this.pv_1, this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_countIfCondition_getInstance(), [this.uv_1, this.pv_1]), fn(this, NamedFunction_d2_minutesBetween_getInstance(), [this.uv_1, this.uv_1]), fn(this, NamedFunction_d2_relationshipCount_getInstance(), [this.rv_1.e1e().c1e()])]);
10901
10928
  this.ow_1 = listOf([Companion_instance_19.o1e(NodeType_NULL_getInstance(), 'null'), Companion_instance_19.o1e(NodeType_BOOLEAN_getInstance(), 'true'), Companion_instance_19.o1e(NodeType_BOOLEAN_getInstance(), 'false')]);
@@ -10921,7 +10948,7 @@ function ExpressionGrammar() {
10921
10948
  this.cx_1 = this.ax_1;
10922
10949
  this.dx_1 = concat(this, [this.fw_1, this.gw_1, this.hw_1, this.ow_1, listOf_0(this.rw_1)]);
10923
10950
  this.ex_1 = concat(this, [this.fw_1, this.gw_1, this.hw_1, this.ow_1, this.lw_1, this.jw_1, this.nw_1, listOf([this.pw_1, this.qw_1, this.rw_1, this.xw_1, this.yv_1])]);
10924
- this.fx_1 = concat(this, [this.fw_1, this.ow_1, this.lw_1, this.mw_1, listOf([this.pw_1, this.qw_1, this.rw_1, this.xw_1])]);
10951
+ this.fx_1 = concat(this, [this.ow_1, this.lw_1, this.mw_1, listOf([this.pw_1, this.qw_1, this.rw_1, this.xw_1])]);
10925
10952
  }
10926
10953
  protoOf(ExpressionGrammar).p1e = function (value, args) {
10927
10954
  var symbol = value.c16_1;