@dhis2/expression-parser 1.1.2 → 1.1.4

package/expression-parser.js

@@ -1971,6 +1971,8 @@
   var NamedFunction_d2_ceil_instance;
   var NamedFunction_d2_concatenate_instance;
   var NamedFunction_d2_condition_instance;
+  var NamedFunction_d2_contains_instance;
+  var NamedFunction_d2_containsItems_instance;
   var NamedFunction_d2_count_instance;
   var NamedFunction_d2_countIfCondition_instance;
   var NamedFunction_d2_countIfValue_instance;
@@ -2034,7 +2036,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_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()];
+    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()];
   }
   function get_entries_1() {
     if ($ENTRIES_1 == null)
@@ -2079,38 +2081,40 @@
     NamedFunction_d2_ceil_instance = NamedFunction_init_$Create$('d2_ceil', 30, 'd2:ceil', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
     NamedFunction_d2_concatenate_instance = new NamedFunction('d2_concatenate', 31, 'd2:concatenate', ValueType_STRING_getInstance(), true, [ValueType_STRING_getInstance()]);
     NamedFunction_d2_condition_instance = NamedFunction_init_$Create$('d2_condition', 32, 'd2:condition', ValueType_SAME_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_SAME_getInstance(), ValueType_SAME_getInstance()]);
-    NamedFunction_d2_count_instance = NamedFunction_init_$Create$('d2_count', 33, 'd2:count', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_countIfCondition_instance = NamedFunction_init_$Create$('d2_countIfCondition', 34, 'd2:countIfCondition', ValueType_NUMBER_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_countIfValue_instance = NamedFunction_init_$Create$('d2_countIfValue', 35, 'd2:countIfValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance(), ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_countIfZeroPos_instance = NamedFunction_init_$Create$('d2_countIfZeroPos', 36, 'd2:countIfZeroPos', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_daysBetween_instance = NamedFunction_init_$Create$('d2_daysBetween', 37, 'd2:daysBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_extractDataMatrixValue_instance = NamedFunction_init_$Create$('d2_extractDataMatrixValue', 38, 'd2:extractDataMatrixValue', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_floor_instance = NamedFunction_init_$Create$('d2_floor', 39, 'd2:floor', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_hasUserRole_instance = NamedFunction_init_$Create$('d2_hasUserRole', 40, 'd2:hasUserRole', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 41, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 42, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 43, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 44, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 45, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 46, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 47, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 48, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
-    NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 49, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 50, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 51, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 52, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
-    NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 53, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 54, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 55, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 56, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 57, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 58, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 59, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
-    NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 60, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 61, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
-    NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 62, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 63, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
-    NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 64, 'd2:zScoreWFH', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_contains_instance = new NamedFunction('d2_contains', 33, 'd2:contains', ValueType_BOOLEAN_getInstance(), true, [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_containsItems_instance = new NamedFunction('d2_containsItems', 34, 'd2:containsItems', ValueType_BOOLEAN_getInstance(), true, [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_count_instance = NamedFunction_init_$Create$('d2_count', 35, 'd2:count', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_countIfCondition_instance = NamedFunction_init_$Create$('d2_countIfCondition', 36, 'd2:countIfCondition', ValueType_NUMBER_getInstance(), [ValueType_BOOLEAN_getInstance(), ValueType_MIXED_getInstance()]);
+    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_hasValue_instance = NamedFunction_init_$Create$('d2_hasValue', 43, 'd2:hasValue', ValueType_BOOLEAN_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_inOrgUnitGroup_instance = NamedFunction_init_$Create$('d2_inOrgUnitGroup', 44, 'd2:inOrgUnitGroup', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_lastEventDate_instance = NamedFunction_init_$Create$('d2_lastEventDate', 45, 'd2:lastEventDate', ValueType_DATE_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_left_instance = NamedFunction_init_$Create$('d2_left', 46, 'd2:left', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_length_instance = NamedFunction_init_$Create$('d2_length', 47, 'd2:length', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_maxValue_instance = NamedFunction_init_$Create$('d2_maxValue', 48, 'd2:maxValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_minutesBetween_instance = NamedFunction_init_$Create$('d2_minutesBetween', 49, 'd2:minutesBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_minValue_instance = NamedFunction_init_$Create$('d2_minValue', 50, 'd2:minValue', ValueType_NUMBER_getInstance(), [ValueType_MIXED_getInstance()]);
+    NamedFunction_d2_modulus_instance = NamedFunction_init_$Create$('d2_modulus', 51, 'd2:modulus', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_monthsBetween_instance = NamedFunction_init_$Create$('d2_monthsBetween', 52, 'd2:monthsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_oizp_instance = NamedFunction_init_$Create$('d2_oizp', 53, 'd2:oizp', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_relationshipCount_instance = NamedFunction_init_$Create$('d2_relationshipCount', 54, 'd2:relationshipCount', ValueType_NUMBER_getInstance(), [ValueType_STRING_getInstance()]);
+    NamedFunction_d2_right_instance = NamedFunction_init_$Create$('d2_right', 55, 'd2:right', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_round_instance = NamedFunction_init_$Create$('d2_round', 56, 'd2:round', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_split_instance = NamedFunction_init_$Create$('d2_split', 57, 'd2:split', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_substring_instance = NamedFunction_init_$Create$('d2_substring', 58, 'd2:substring', ValueType_STRING_getInstance(), [ValueType_STRING_getInstance(), ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_validatePattern_instance = NamedFunction_init_$Create$('d2_validatePattern', 59, 'd2:validatePattern', ValueType_BOOLEAN_getInstance(), [ValueType_STRING_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_weeksBetween_instance = NamedFunction_init_$Create$('d2_weeksBetween', 60, 'd2:weeksBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_yearsBetween_instance = NamedFunction_init_$Create$('d2_yearsBetween', 61, 'd2:yearsBetween', ValueType_NUMBER_getInstance(), [ValueType_DATE_getInstance(), ValueType_DATE_getInstance()]);
+    NamedFunction_d2_zing_instance = NamedFunction_init_$Create$('d2_zing', 62, 'd2:zing', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_zpvc_instance = new NamedFunction('d2_zpvc', 63, 'd2:zpvc', ValueType_NUMBER_getInstance(), true, [ValueType_NUMBER_getInstance()]);
+    NamedFunction_d2_zScoreHFA_instance = NamedFunction_init_$Create$('d2_zScoreHFA', 64, 'd2:zScoreHFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_zScoreWFA_instance = NamedFunction_init_$Create$('d2_zScoreWFA', 65, 'd2:zScoreWFA', ValueType_NUMBER_getInstance(), [ValueType_NUMBER_getInstance(), ValueType_NUMBER_getInstance(), ValueType_STRING_getInstance()]);
+    NamedFunction_d2_zScoreWFH_instance = NamedFunction_init_$Create$('d2_zScoreWFH', 66, '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) {
@@ -2264,6 +2268,14 @@
     NamedFunction_initEntries();
     return NamedFunction_d2_condition_instance;
   }
+  function NamedFunction_d2_contains_getInstance() {
+    NamedFunction_initEntries();
+    return NamedFunction_d2_contains_instance;
+  }
+  function NamedFunction_d2_containsItems_getInstance() {
+    NamedFunction_initEntries();
+    return NamedFunction_d2_containsItems_instance;
+  }
   function NamedFunction_d2_count_getInstance() {
     NamedFunction_initEntries();
     return NamedFunction_d2_count_instance;
@@ -4186,6 +4198,15 @@
     var rVal = eval_0(right);
     return op(lVal, rVal);
   }
+  function evalBinaryLogicOperatorShortCircuit($this, op, operator, eval_0, shortCircuitOn) {
+    var left = operator.mz(0);
+    var right = operator.mz(1);
+    var lVal = eval_0(left);
+    if (!(lVal == null) ? lVal === shortCircuitOn : false)
+      return shortCircuitOn;
+    var rVal = eval_0(right);
+    return op(lVal, rVal);
+  }
   function evalBinaryOperator($this, op, operator, eval_0) {
     var left = operator.mz(0);
     var right = operator.mz(1);
@@ -4638,12 +4659,12 @@
       case 12:
         var tmp_4 = Companion_instance_10;
         var tmp_5 = BinaryOperator$Companion$and$ref(Companion_getInstance_4());
-        tmp = evalBinaryOperator(tmp_4, tmp_5, operator, Calculator$evalToBoolean$ref(this));
+        tmp = evalBinaryLogicOperatorShortCircuit(tmp_4, tmp_5, operator, Calculator$evalToBoolean$ref(this), false);
         break;
       case 13:
         var tmp_6 = Companion_instance_10;
         var tmp_7 = BinaryOperator$Companion$or$ref(Companion_getInstance_4());
-        tmp = evalBinaryOperator(tmp_6, tmp_7, operator, Calculator$evalToBoolean$ref_0(this));
+        tmp = evalBinaryLogicOperatorShortCircuit(tmp_6, tmp_7, operator, Calculator$evalToBoolean$ref_0(this), true);
         break;
       case 6:
         var tmp_8 = Companion_instance_10;
@@ -4773,93 +4794,99 @@
           tmp = this.b17_1.zs(evalToStrings(this, fn.pz()));
           break;
         case 33:
-          tmp = this.b17_1.at(evalToVar(this, fn.mz(0)));
+          tmp = this.b17_1.zr(this.g17(fn.mz(0)), drop(evalToStrings(this, fn.pz()), 1));
+          break;
+        case 34:
+          tmp = this.b17_1.as(this.g17(fn.mz(0)), drop(evalToStrings(this, fn.pz()), 1));
           break;
         case 35:
+          tmp = this.b17_1.at(evalToVar(this, fn.mz(0)));
+          break;
+        case 37:
           tmp = this.b17_1.bt(evalToVar(this, fn.mz(0)), this.g17(fn.mz(1)));
           break;
-        case 36:
+        case 38:
           tmp = this.b17_1.ct(evalToVar(this, fn.mz(0)));
           break;
-        case 37:
+        case 39:
           tmp = this.b17_1.dt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
           break;
-        case 38:
+        case 40:
           tmp = this.b17_1.et(this.g17(fn.mz(0)), this.g17(fn.mz(1)));
           break;
-        case 39:
+        case 41:
           tmp = this.b17_1.ft(this.e17(fn.mz(0)));
           break;
-        case 40:
+        case 42:
           tmp = this.b17_1.gt(this.g17(fn.mz(0)), this.c17_1.ev_1.c2('USER'));
           break;
-        case 41:
+        case 43:
           tmp = this.b17_1.ht(evalToVar(this, fn.mz(0)));
           break;
-        case 42:
+        case 44:
           tmp = this.b17_1.it(this.g17(fn.mz(0)), this.c17_1.cv_1.c2('org_unit'), this.c17_1.ev_1);
           break;
-        case 43:
+        case 45:
           tmp = this.b17_1.jt(evalToVar(this, fn.mz(0)));
           break;
-        case 44:
+        case 46:
           tmp = this.b17_1.kt(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)));
           break;
-        case 45:
+        case 47:
           tmp = this.b17_1.lt(this.g17(fn.mz(0)));
           break;
-        case 46:
+        case 48:
           tmp = this.b17_1.mt(evalToVar(this, fn.mz(0)));
           break;
-        case 47:
+        case 49:
           tmp = this.b17_1.nt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
           break;
-        case 48:
+        case 50:
           tmp = this.b17_1.ot(evalToVar(this, fn.mz(0)));
           break;
-        case 49:
+        case 51:
           tmp = this.b17_1.pt(this.e17(fn.mz(0)), this.e17(fn.mz(1)));
           break;
-        case 50:
+        case 52:
           tmp = this.b17_1.qt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
           break;
-        case 51:
+        case 53:
           tmp = this.b17_1.rt(this.e17(fn.mz(0)));
           break;
-        case 53:
+        case 55:
           tmp = this.b17_1.st(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)));
           break;
-        case 54:
+        case 56:
           tmp = this.b17_1.tt(this.e17(fn.mz(0)), fn.lz() <= 1 ? 0 : evalToInteger(this, fn.mz(1)));
           break;
-        case 55:
+        case 57:
           tmp = this.b17_1.ut(this.g17(fn.mz(0)), this.g17(fn.mz(1)), evalToInteger(this, fn.mz(2)));
           break;
-        case 56:
+        case 58:
           tmp = this.b17_1.vt(this.g17(fn.mz(0)), evalToInteger(this, fn.mz(1)), evalToInteger(this, fn.mz(2)));
           break;
-        case 57:
+        case 59:
           tmp = this.b17_1.wt(this.g17(fn.mz(0)), this.g17(fn.mz(1)));
           break;
-        case 58:
+        case 60:
           tmp = this.b17_1.xt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
           break;
-        case 59:
+        case 61:
           tmp = this.b17_1.yt(this.k17(fn.mz(0)), this.k17(fn.mz(1)));
           break;
-        case 60:
+        case 62:
           tmp = this.b17_1.zt(this.e17(fn.mz(0)));
           break;
-        case 61:
+        case 63:
           tmp = this.b17_1.au(evalToNumbers(this, fn.pz()));
           break;
-        case 62:
+        case 64:
           tmp = this.b17_1.bu(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
           break;
-        case 63:
+        case 65:
           tmp = this.b17_1.cu(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
           break;
-        case 64:
+        case 66:
           tmp = this.b17_1.du(this.e17(fn.mz(0)), this.e17(fn.mz(1)), this.g17(fn.mz(2)));
           break;
         case 27:
@@ -10891,7 +10918,7 @@
     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()])]);
     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])]);
     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])]);
-    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()])]);
+    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()])]);
     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])]);
     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()])]);
     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')]);
@@ -10917,7 +10944,7 @@
     this.cx_1 = this.ax_1;
     this.dx_1 = concat(this, [this.fw_1, this.gw_1, this.hw_1, this.ow_1, listOf_0(this.rw_1)]);
     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])]);
-    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])]);
+    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])]);
   }
   protoOf(ExpressionGrammar).p1e = function (value, args) {
     var symbol = value.c16_1;