@kontur.candy/generator 4.290.0-errorlogapi.13 → 4.290.0-errorlogapi.14

package/dist/index.js

@@ -115269,6 +115269,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "sumKCLangFunction": () => (/* binding */ sumKCLangFunction),
 /* harmony export */   "substringKCLangFunction": () => (/* binding */ substringKCLangFunction),
 /* harmony export */   "groupSumKCLangFunction": () => (/* binding */ groupSumKCLangFunction),
+/* harmony export */   "groupCountKCLangFunction": () => (/* binding */ groupCountKCLangFunction),
 /* harmony export */   "concatKCLangFunction": () => (/* binding */ concatKCLangFunction),
 /* harmony export */   "newlineKCLangFunction": () => (/* binding */ newlineKCLangFunction),
 /* harmony export */   "dateNowKCLangFunction": () => (/* binding */ dateNowKCLangFunction)
@@ -115562,6 +115563,29 @@ const groupSumKCLangFunction = params => {
     sourceValuePath: sourceValuePathParam.select
   };
 };
+const groupCountKCLangFunction = params => {
+  var _params$18, _params$19;
+
+  const errors = Array.from(validateParams(params, 2));
+
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+
+  const targetKeyPathParam = (_params$18 = params[0]) === null || _params$18 === void 0 ? void 0 : _params$18.value;
+  const sourceKeyPathParam = (_params$19 = params[1]) === null || _params$19 === void 0 ? void 0 : _params$19.value;
+
+  if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
+    const argumentsValidationError = new ArgumentValidationError("Expected 2 paths as arguments: targetKeyPath, sourceKeyPath");
+    return new FunctionValidationErrorCollection([argumentsValidationError]);
+  }
+
+  return {
+    type: "groupCount",
+    targetKeyPath: targetKeyPathParam.select,
+    sourceKeyPath: sourceKeyPathParam.select
+  };
+};
 const concatKCLangFunction = params => {
   const errors = Array.from(validateParams(params, 2, Infinity));
 
@@ -115635,6 +115659,7 @@ const getKCLangGlobalFunctionBuilders = () => ({
   substring: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.substringKCLangFunction],
   count: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.countKCLangFunction],
   groupSum: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.groupSumKCLangFunction],
+  groupCount: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.groupCountKCLangFunction],
   concat: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.concatKCLangFunction],
   newline: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.newlineKCLangFunction],
   dateNow: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.dateNowKCLangFunction]
@@ -115738,7 +115763,7 @@ class KCLangAntlrVisitor {
   }
 
   visitCheck(ctx) {
-    var _ctx$formula;
+    var _ctx$formula, _withBlocks$descripti;
 
     const node = (_ctx$formula = ctx.formula()) !== null && _ctx$formula !== void 0 ? _ctx$formula : ctx.expression();
 
@@ -115748,26 +115773,13 @@ class KCLangAntlrVisitor {
 
     const formula = ctx.formula();
     const expression = ctx.expression();
-    const withBlocks = ctx.withBlock().map(i => i.accept(this));
-    let description = "";
-    let errorLevel = undefined;
-
-    for (const withBlock of withBlocks) {
-      if (withBlock) {
-        switch (withBlock.name) {
-          case "description":
-            description = withBlock.value;
-            break;
-
-          case "errorLevel":
-            errorLevel = withBlock.value;
-            break;
-
-          default:
-            break;
-        }
-      }
-    }
+    const withBlocks = ctx.withBlock().map(i => i.accept(this)).reduce((result, currentBlock) => {
+      result[currentBlock.name] = currentBlock.value;
+      return result;
+    }, {});
+    const description = (_withBlocks$descripti = withBlocks["description"]) !== null && _withBlocks$descripti !== void 0 ? _withBlocks$descripti : "";
+    const errorLevel = withBlocks["errorLevel"];
+    const target = withBlocks["target"];
 
     if (formula) {
       let formulaValue = [formula.accept(this)];
@@ -115783,6 +115795,7 @@ class KCLangAntlrVisitor {
     } else if (expression) {
       const expressionValue = {
         expression: expression.accept(this),
+        target: target,
         type: "ensure",
         level: errorLevel
       };
@@ -121400,6 +121413,10 @@ function traverseKCLangExpression(node, visitor) {
       visitor.visitGroupSumKCLangNode(node);
       break;
 
+    case "groupCount":
+      visitor.visitGroupCountKCLangNode(node);
+      break;
+
     case "substring":
       traverseKCLangExpression(node.expression, visitor);
       visitor.visitSubstringKCLangNode(node);
@@ -121471,6 +121488,9 @@ class DefaultKCLangExpressionVisitor {
   visitGroupSumKCLangNode(node) {// default empty implementation
   }
 
+  visitGroupCountKCLangNode(node) {// default empty implementation
+  }
+
   visitNotKCLangNode(node) {// default empty implementation
   }
 
@@ -121870,6 +121890,7 @@ const getGenerateJsExpressionFunc = options => {
         }
 
       case "count":
+      case "groupCount":
       case "groupSum":
         throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
 
@@ -121960,6 +121981,9 @@ function generateKCXmlExpression(expression) {
     case "groupSum":
       return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" sourceValuePath="${expression.sourceValuePath}" />`;
 
+    case "groupCount":
+      return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" />`;
+
     case "cast":
       if (expression.expression.type === "argument") {
         return `<m:argument select="${expression.expression.select}" type="${expression.targetType}" />`;
@@ -122138,9 +122162,11 @@ function guessConditionTarget(condition) {
 }
 
 function generateKCXmlCondition(ast, matchPath, parentConditions, describe) {
+  var _ast$target;
+
   const levelAttr = ast.level === undefined ? "" : ` errorLevel="${(0,_StringUtils__WEBPACK_IMPORTED_MODULE_3__.capitalizeFirstLetter)(ast.level)}"`;
   const descriptionAttr = describe != undefined ? ` description="${formatDescribeStatement(ast, matchPath, describe)}"` : "";
-  const guessedTarget = guessConditionTarget(ast);
+  const guessedTarget = (_ast$target = ast.target) !== null && _ast$target !== void 0 ? _ast$target : guessConditionTarget(ast);
   const targetAttr = guessedTarget != undefined ? ` target="${guessedTarget}"` : "";
 
   if (parentConditions != undefined && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.arrayIsNotEmpty)(parentConditions)) {
@@ -127040,6 +127066,10 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
   }
 
   compileAllItemsIsEmptyCheckBlock(innerExpression, deps) {
+    if (deps.length === 0) {
+      return innerExpression;
+    }
+
     const compiledArgumentsCondition = deps.map(x => x.toLegacyPath()).map(x => `(expression.argument("${x}") === "" || expression.argument("${x}") == undefined)`).join(" && ");
     const compiledBlock = `(${compiledArgumentsCondition} ? undefined : ${innerExpression})`;
     return compiledBlock;
@@ -127054,9 +127084,12 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const autoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(target.toLegacyPath());
     const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
     const compiledTarget = this.modelPathInstance(target);
-    const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(x) ? x : x.modelPath).filter(x => !x.isEquals(target)), x => x.toLegacyPath()));
-    const compiledDeps = dependencyModelPaths.map(x => x.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
-    const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths);
+    const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => ({
+      path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(x) ? x : (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isAggregationDependencyModelPath)(x) ? x.modelPath : x.path,
+      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
+    })).filter(x => !x.path.isEquals(target)), x => x.path.toLegacyPath()));
+    const compiledDeps = dependencyModelPaths.map(x => x.path.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
+    const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths.filter(x => !x.isIgnoreForChecks).map(x => x.path));
     const compiledDelegate = `context => KCCalculation.execute(context, expression => ${compiledExpressionWithCheck}, "${defaultValue}")`;
     return {
       compiledFunction: `new CalculationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate}, ${autoField}, ${disabled})`,
@@ -128100,6 +128133,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "DummyContent": () => (/* binding */ DummyContent),
 /* harmony export */   "FormulaSumExpression": () => (/* binding */ FormulaSumExpression),
 /* harmony export */   "FormulaGroupSumExpression": () => (/* binding */ FormulaGroupSumExpression),
+/* harmony export */   "FormulaGroupCountExpression": () => (/* binding */ FormulaGroupCountExpression),
 /* harmony export */   "FormulaAndExpression": () => (/* binding */ FormulaAndExpression),
 /* harmony export */   "FormulaOrExpression": () => (/* binding */ FormulaOrExpression),
 /* harmony export */   "FormulaGtExpression": () => (/* binding */ FormulaGtExpression),
@@ -128153,7 +128187,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _class11, _class12, _descriptor6, _dec12, _dec13, _class14, _class15, _descriptor7, _dec14, _dec15, _class17, _class18, _descriptor8, _dec16, _dec17, _class20, _class21, _descriptor9, _dec18, _dec19, _dec20, _class23, _class24, _descriptor10, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _class29, _class30, _descriptor14, _dec26, _dec27, _class32, _class33, _descriptor15, _dec28, _dec29, _class35, _class36, _descriptor16, _dec30, _dec31, _class38, _class39, _descriptor17, _dec32, _dec33, _class41, _class42, _descriptor18, _dec34, _dec35, _class44, _class45, _descriptor19, _dec36, _dec37, _class47, _class48, _descriptor20, _dec38, _dec39, _class50, _class51, _descriptor21, _dec40, _dec41, _class53, _class54, _descriptor22, _dec42, _dec43, _dec44, _dec45, _class56, _class57, _descriptor23, _descriptor24, _descriptor25, _dec46, _dec47, _class59, _class60, _descriptor26, _dec48, _dec49, _class62, _class63, _descriptor27, _dec50, _dec51, _dec52, _class65, _class66, _descriptor28, _descriptor29, _dec53, _dec54, _class68, _class69, _descriptor30, _dec55, _dec56, _class71, _class72, _descriptor31, _dec57, _dec58, _class74, _class75, _descriptor32, _dec59, _dec60, _class77, _class78, _descriptor33, _dec61, _dec62, _dec63, _class80, _class81, _descriptor34, _descriptor35, _dec64, _dec65, _dec66, _dec67, _class83, _class84, _descriptor36, _descriptor37, _descriptor38, _dec68, _dec69, _dec70, _class86, _class87, _descriptor39, _descriptor40, _dec71, _class89, _dec72, _dec73, _dec74, _class90, _class91, _descriptor41, _descriptor42, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _dec81, _class99, _class100, _descriptor45, _descriptor46, _dec82, _dec83, _class102, _class103, _descriptor47, _dec84, _class105, _dec85, _dec86, _dec87, _dec88, _class106, _class107, _descriptor48, _descriptor49, _descriptor50, _dec89, _dec90, _class109, _class110, _descriptor51, _dec91, _dec92, _dec93, _dec94, _dec95, _dec96, _class112, _class113, _descriptor52, _descriptor53, _descriptor54, _descriptor55, _descriptor56, _dec97, _dec98, _class115, _class116, _descriptor57, _dec99, _dec100, _dec101, _class118, _class119, _descriptor58, _descriptor59;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _dec12, _class11, _class12, _descriptor6, _descriptor7, _dec13, _dec14, _class14, _class15, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _dec77, _class93, _class94, _descriptor43, _descriptor44, _dec78, _dec79, _class96, _class97, _descriptor45, _dec80, _dec81, _class99, _class100, _descriptor46, _dec82, _dec83, _dec84, _class102, _class103, _descriptor47, _descriptor48, _dec85, _dec86, _class105, _class106, _descriptor49, _dec87, _class108, _dec88, _dec89, _dec90, _dec91, _class109, _class110, _descriptor50, _descriptor51, _descriptor52, _dec92, _dec93, _class112, _class113, _descriptor53, _dec94, _dec95, _dec96, _dec97, _dec98, _dec99, _class115, _class116, _descriptor54, _descriptor55, _descriptor56, _descriptor57, _descriptor58, _dec100, _dec101, _class118, _class119, _descriptor59, _dec102, _dec103, _dec104, _class121, _class122, _descriptor60, _descriptor61;
 
 
 
@@ -128233,679 +128267,699 @@ let FormulaGroupSumExpression = (_dec6 = (0,_markupGenerator_Serializer_SugarSer
   writable: true,
   initializer: null
 })), _class9)) || _class8);
-let FormulaAndExpression = (_dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec10(_class11 = (_class12 = class FormulaAndExpression extends FormulaExpression {
+let FormulaGroupCountExpression = (_dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("targetKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в целевой множественности`), _dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec10(_class11 = (_class12 = class FormulaGroupCountExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeyPath", _descriptor6, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor7, this);
+  }
+
+}, (_descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "targetKeyPath", [_dec11], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceKeyPath", [_dec12], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class12)) || _class11);
+let FormulaAndExpression = (_dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec13(_class14 = (_class15 = class FormulaAndExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor6, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor8, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "and";
   }
 
-}, (_descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "arguments", [_dec11], {
+}, (_descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "arguments", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class12)) || _class11);
-let FormulaOrExpression = (_dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec12(_class14 = (_class15 = class FormulaOrExpression extends FormulaExpression {
+})), _class15)) || _class14);
+let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec15(_class17 = (_class18 = class FormulaOrExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor7, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor9, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "or";
   }
 
-}, (_descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "arguments", [_dec13], {
+}, (_descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class18.prototype, "arguments", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class15)) || _class14);
-let FormulaGtExpression = (_dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec14(_class17 = (_class18 = class FormulaGtExpression extends FormulaExpression {
+})), _class18)) || _class17);
+let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec17(_class20 = (_class21 = class FormulaGtExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor10, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "gt";
   }
 
-}, (_descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class18.prototype, "arguments", [_dec15], {
+}, (_descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class21.prototype, "arguments", [_dec18], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class18)) || _class17);
-let FormulaOneOfItemsExpression = (_dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec16(_class20 = (_class21 = class FormulaOneOfItemsExpression extends FormulaExpression {
+})), _class21)) || _class20);
+let FormulaOneOfItemsExpression = (_dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec19(_class23 = (_class24 = class FormulaOneOfItemsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor9, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor11, this);
   }
 
-}, (_descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class21.prototype, "expressions", [_dec17], {
+}, (_descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "expressions", [_dec20], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class21)) || _class20);
-let FormulaOneOfExpression = (_dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneof", `TODO`), _dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec18(_class23 = (_class24 = class FormulaOneOfExpression extends FormulaExpression {
+})), _class24)) || _class23);
+let FormulaOneOfExpression = (_dec21 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneof", `TODO`), _dec22 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec23 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec21(_class26 = (_class27 = class FormulaOneOfExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor10, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor12, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor13, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "oneof";
   }
 
-}, (_descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "argument", [_dec19], {
+}, (_descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class27.prototype, "argument", [_dec22], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "items", [_dec20], {
+}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class27.prototype, "items", [_dec23], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class24)) || _class23);
-let FormulaRegexMatchExpression = (_dec21 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("regexmatch", `TODO`), _dec22 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec23 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("pattern", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `TODO`), _dec21(_class26 = (_class27 = class FormulaRegexMatchExpression extends FormulaExpression {
+})), _class27)) || _class26);
+let FormulaRegexMatchExpression = (_dec24 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("regexmatch", `TODO`), _dec25 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec26 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("pattern", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `TODO`), _dec24(_class29 = (_class30 = class FormulaRegexMatchExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor14, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "pattern", _descriptor13, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "pattern", _descriptor15, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "regexMatch";
   }
 
-}, (_descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class27.prototype, "argument", [_dec22], {
+}, (_descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class30.prototype, "argument", [_dec25], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class27.prototype, "pattern", [_dec23], {
+}), _descriptor15 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class30.prototype, "pattern", [_dec26], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class27)) || _class26);
-let FormulaLengthExpression = (_dec24 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("length", `TODO`), _dec25 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec24(_class29 = (_class30 = class FormulaLengthExpression extends FormulaExpression {
+})), _class30)) || _class29);
+let FormulaLengthExpression = (_dec27 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("length", `TODO`), _dec28 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec27(_class32 = (_class33 = class FormulaLengthExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor14, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor16, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "length";
   }
 
-}, (_descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class30.prototype, "argument", [_dec25], {
+}, (_descriptor16 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class33.prototype, "argument", [_dec28], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class30)) || _class29);
-let FormulaLtExpression = (_dec26 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("lt", `TODO`), _dec27 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec26(_class32 = (_class33 = class FormulaLtExpression extends FormulaExpression {
+})), _class33)) || _class32);
+let FormulaLtExpression = (_dec29 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("lt", `TODO`), _dec30 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec29(_class35 = (_class36 = class FormulaLtExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor15, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor17, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "lt";
   }
 
-}, (_descriptor15 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class33.prototype, "arguments", [_dec27], {
+}, (_descriptor17 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class36.prototype, "arguments", [_dec30], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class33)) || _class32);
-let FormulaGeExpression = (_dec28 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("ge", `TODO`), _dec29 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec28(_class35 = (_class36 = class FormulaGeExpression extends FormulaExpression {
+})), _class36)) || _class35);
+let FormulaGeExpression = (_dec31 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("ge", `TODO`), _dec32 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec31(_class38 = (_class39 = class FormulaGeExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor16, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor18, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "ge";
   }
 
-}, (_descriptor16 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class36.prototype, "arguments", [_dec29], {
+}, (_descriptor18 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class39.prototype, "arguments", [_dec32], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class36)) || _class35);
-let FormulaLeExpression = (_dec30 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("le", `TODO`), _dec31 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec30(_class38 = (_class39 = class FormulaLeExpression extends FormulaExpression {
+})), _class39)) || _class38);
+let FormulaLeExpression = (_dec33 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("le", `TODO`), _dec34 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec33(_class41 = (_class42 = class FormulaLeExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor17, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor19, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "le";
   }
 
-}, (_descriptor17 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class39.prototype, "arguments", [_dec31], {
+}, (_descriptor19 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class42.prototype, "arguments", [_dec34], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class39)) || _class38);
-let FormulaNotExpression = (_dec32 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("not", `TODO`), _dec33 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec32(_class41 = (_class42 = class FormulaNotExpression extends FormulaExpression {
+})), _class42)) || _class41);
+let FormulaNotExpression = (_dec35 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("not", `TODO`), _dec36 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec35(_class44 = (_class45 = class FormulaNotExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor18, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "argument", _descriptor20, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "not";
   }
 
-}, (_descriptor18 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class42.prototype, "argument", [_dec33], {
+}, (_descriptor20 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class45.prototype, "argument", [_dec36], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class42)) || _class41);
-let FormulaEqExpression = (_dec34 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("eq", `TODO`), _dec35 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec34(_class44 = (_class45 = class FormulaEqExpression extends FormulaExpression {
+})), _class45)) || _class44);
+let FormulaEqExpression = (_dec37 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("eq", `TODO`), _dec38 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec37(_class47 = (_class48 = class FormulaEqExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor19, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor21, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "eq";
   }
 
-}, (_descriptor19 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class45.prototype, "arguments", [_dec35], {
+}, (_descriptor21 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class48.prototype, "arguments", [_dec38], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class45)) || _class44);
-let FormulaChooseIfExpression = (_dec36 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("if", `TODO`), _dec37 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec36(_class47 = (_class48 = class FormulaChooseIfExpression extends FormulaExpression {
+})), _class48)) || _class47);
+let FormulaChooseIfExpression = (_dec39 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("if", `TODO`), _dec40 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec39(_class50 = (_class51 = class FormulaChooseIfExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "condition", _descriptor20, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "condition", _descriptor22, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "if";
   }
 
-}, (_descriptor20 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class48.prototype, "condition", [_dec37], {
+}, (_descriptor22 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class51.prototype, "condition", [_dec40], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class48)) || _class47);
-let FormulaChooseThenExpression = (_dec38 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("then", `TODO`), _dec39 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec38(_class50 = (_class51 = class FormulaChooseThenExpression extends FormulaExpression {
+})), _class51)) || _class50);
+let FormulaChooseThenExpression = (_dec41 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("then", `TODO`), _dec42 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec41(_class53 = (_class54 = class FormulaChooseThenExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor21, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor23, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "then";
   }
 
-}, (_descriptor21 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class51.prototype, "expression", [_dec39], {
+}, (_descriptor23 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class54.prototype, "expression", [_dec42], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class51)) || _class50);
-let FormulaChooseElseExpression = (_dec40 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("else", `TODO`), _dec41 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec40(_class53 = (_class54 = class FormulaChooseElseExpression extends FormulaExpression {
+})), _class54)) || _class53);
+let FormulaChooseElseExpression = (_dec43 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("else", `TODO`), _dec44 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec43(_class56 = (_class57 = class FormulaChooseElseExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor22, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor24, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "else";
   }
 
-}, (_descriptor22 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class54.prototype, "expression", [_dec41], {
+}, (_descriptor24 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class57.prototype, "expression", [_dec44], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class54)) || _class53);
-let FormulaChooseExpression = (_dec42 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("choose", `TODO`), _dec43 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("if", [FormulaChooseIfExpression]), _dec44 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("then", [FormulaChooseThenExpression]), _dec45 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("else", [FormulaChooseElseExpression]), _dec42(_class56 = (_class57 = class FormulaChooseExpression extends FormulaExpression {
+})), _class57)) || _class56);
+let FormulaChooseExpression = (_dec45 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("choose", `TODO`), _dec46 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("if", [FormulaChooseIfExpression]), _dec47 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("then", [FormulaChooseThenExpression]), _dec48 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("else", [FormulaChooseElseExpression]), _dec45(_class59 = (_class60 = class FormulaChooseExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "ifNode", _descriptor23, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "ifNode", _descriptor25, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "thenNode", _descriptor24, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "thenNode", _descriptor26, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "elseNode", _descriptor25, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "elseNode", _descriptor27, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "choose";
   }
 
-}, (_descriptor23 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class57.prototype, "ifNode", [_dec43], {
+}, (_descriptor25 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class60.prototype, "ifNode", [_dec46], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor24 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class57.prototype, "thenNode", [_dec44], {
+}), _descriptor26 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class60.prototype, "thenNode", [_dec47], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor25 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class57.prototype, "elseNode", [_dec45], {
+}), _descriptor27 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class60.prototype, "elseNode", [_dec48], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class57)) || _class56);
-let FormulaDivisionExpression = (_dec46 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("division", `TODO`), _dec47 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec46(_class59 = (_class60 = class FormulaDivisionExpression extends FormulaExpression {
+})), _class60)) || _class59);
+let FormulaDivisionExpression = (_dec49 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("division", `TODO`), _dec50 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec49(_class62 = (_class63 = class FormulaDivisionExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor26, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor28, this);
   }
 
-}, (_descriptor26 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class60.prototype, "arguments", [_dec47], {
+}, (_descriptor28 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class63.prototype, "arguments", [_dec50], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class60)) || _class59);
-let FormulaMultiplyExpression = (_dec48 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multiply", `TODO`), _dec49 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec48(_class62 = (_class63 = class FormulaMultiplyExpression extends FormulaExpression {
+})), _class63)) || _class62);
+let FormulaMultiplyExpression = (_dec51 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multiply", `TODO`), _dec52 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec51(_class65 = (_class66 = class FormulaMultiplyExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor27, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor29, this);
   }
 
-}, (_descriptor27 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class63.prototype, "arguments", [_dec49], {
+}, (_descriptor29 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class66.prototype, "arguments", [_dec52], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class63)) || _class62);
-let FormulaRoundExpression = (_dec50 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("round", `TODO`), _dec51 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec52 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("fractionalDigits", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `TODO`), _dec50(_class65 = (_class66 = class FormulaRoundExpression extends FormulaExpression {
+})), _class66)) || _class65);
+let FormulaRoundExpression = (_dec53 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("round", `TODO`), _dec54 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec55 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("fractionalDigits", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `TODO`), _dec53(_class68 = (_class69 = class FormulaRoundExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor28, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor30, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "fractionalDigits", _descriptor29, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "fractionalDigits", _descriptor31, this);
   }
 
-}, (_descriptor28 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class66.prototype, "expression", [_dec51], {
+}, (_descriptor30 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class69.prototype, "expression", [_dec54], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor29 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class66.prototype, "fractionalDigits", [_dec52], {
+}), _descriptor31 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class69.prototype, "fractionalDigits", [_dec55], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class66)) || _class65);
-let FormulaFloorExpression = (_dec53 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("floor", `Округление числа в меньшую сторону`), _dec54 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec53(_class68 = (_class69 = class FormulaFloorExpression extends FormulaExpression {
+})), _class69)) || _class68);
+let FormulaFloorExpression = (_dec56 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("floor", `Округление числа в меньшую сторону`), _dec57 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec56(_class71 = (_class72 = class FormulaFloorExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor30, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor32, this);
   }
 
-}, (_descriptor30 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class69.prototype, "expression", [_dec54], {
+}, (_descriptor32 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class72.prototype, "expression", [_dec57], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class69)) || _class68);
-let FormulaAbsExpression = (_dec55 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("abs", `TODO`), _dec56 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec55(_class71 = (_class72 = class FormulaAbsExpression extends FormulaExpression {
+})), _class72)) || _class71);
+let FormulaAbsExpression = (_dec58 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("abs", `TODO`), _dec59 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec58(_class74 = (_class75 = class FormulaAbsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor31, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor33, this);
   }
 
-}, (_descriptor31 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class72.prototype, "expression", [_dec56], {
+}, (_descriptor33 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class75.prototype, "expression", [_dec59], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class72)) || _class71);
-let FormulaXAbsExpression = (_dec57 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("xabs", `TODO`), _dec58 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec57(_class74 = (_class75 = class FormulaXAbsExpression extends FormulaExpression {
+})), _class75)) || _class74);
+let FormulaXAbsExpression = (_dec60 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("xabs", `TODO`), _dec61 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec60(_class77 = (_class78 = class FormulaXAbsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor32, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor34, this);
   }
 
-}, (_descriptor32 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class75.prototype, "expression", [_dec58], {
+}, (_descriptor34 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class78.prototype, "expression", [_dec61], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class75)) || _class74);
-let FormulaMinusExpression = (_dec59 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("minus", `TODO`), _dec60 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec59(_class77 = (_class78 = class FormulaMinusExpression extends FormulaExpression {
+})), _class78)) || _class77);
+let FormulaMinusExpression = (_dec62 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("minus", `TODO`), _dec63 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec62(_class80 = (_class81 = class FormulaMinusExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor33, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor35, this);
   }
 
-}, (_descriptor33 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class78.prototype, "expression", [_dec60], {
+}, (_descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class81.prototype, "expression", [_dec63], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class78)) || _class77);
-let FormulaConstExpression = (_dec61 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("const", `TODO`), _dec62 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("value", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec63 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип константы: string или decimal (по умолчанию)`), _dec61(_class80 = (_class81 = class FormulaConstExpression extends FormulaExpression {
+})), _class81)) || _class80);
+let FormulaConstExpression = (_dec64 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("const", `TODO`), _dec65 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("value", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec66 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип константы: string или decimal (по умолчанию)`), _dec64(_class83 = (_class84 = class FormulaConstExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "value", _descriptor34, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "value", _descriptor36, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor35, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor37, this);
   }
 
-}, (_descriptor34 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class81.prototype, "value", [_dec62], {
+}, (_descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class84.prototype, "value", [_dec65], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class81.prototype, "type", [_dec63], {
+}), _descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class84.prototype, "type", [_dec66], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "decimal";
   }
-})), _class81)) || _class80);
-let FormulaSubstringExpression = (_dec64 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("substring", `TODO`), _dec65 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec66 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("start", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number.required, `TODO`), _dec67 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("length", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `TODO`), _dec64(_class83 = (_class84 = class FormulaSubstringExpression extends FormulaExpression {
+})), _class84)) || _class83);
+let FormulaSubstringExpression = (_dec67 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("substring", `TODO`), _dec68 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec69 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("start", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number.required, `TODO`), _dec70 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("length", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `TODO`), _dec67(_class86 = (_class87 = class FormulaSubstringExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor36, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor38, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "start", _descriptor37, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "start", _descriptor39, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "length", _descriptor38, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "length", _descriptor40, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "substring";
   }
 
-}, (_descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class84.prototype, "expression", [_dec65], {
+}, (_descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class87.prototype, "expression", [_dec68], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class84.prototype, "start", [_dec66], {
+}), _descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class87.prototype, "start", [_dec69], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class84.prototype, "length", [_dec67], {
+}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class87.prototype, "length", [_dec70], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class84)) || _class83);
-let FormulaCastExpression = (_dec68 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("cast", `TODO`), _dec69 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec70 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser.required, `TODO`), _dec68(_class86 = (_class87 = class FormulaCastExpression extends FormulaExpression {
+})), _class87)) || _class86);
+let FormulaCastExpression = (_dec71 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("cast", `TODO`), _dec72 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec73 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser.required, `TODO`), _dec71(_class89 = (_class90 = class FormulaCastExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor39, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor41, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor40, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor42, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "cast";
   }
 
-}, (_descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class87.prototype, "expression", [_dec69], {
+}, (_descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class90.prototype, "expression", [_dec72], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class87.prototype, "type", [_dec70], {
+}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class90.prototype, "type", [_dec73], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class87)) || _class86);
-let FormulaDateNowExpression = (_dec71 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("datenow", `Дата в формате: {dd/mm/yyyy}`), _dec71(_class89 = class FormulaDateNowExpression extends FormulaExpression {}) || _class89);
-let FormulaArgumentExpression = (_dec72 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec73 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec74 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec72(_class90 = (_class91 = class FormulaArgumentExpression extends FormulaExpression {
+})), _class90)) || _class89);
+let FormulaDateNowExpression = (_dec74 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("datenow", `Дата в формате: {dd/mm/yyyy}`), _dec74(_class92 = class FormulaDateNowExpression extends FormulaExpression {}) || _class92);
+let FormulaArgumentExpression = (_dec75 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec76 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec77 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec75(_class93 = (_class94 = class FormulaArgumentExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor41, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor43, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor42, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor44, this);
   }
 
-}, (_descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "select", [_dec73], {
+}, (_descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "select", [_dec76], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "type", [_dec74], {
+}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "type", [_dec77], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "decimal";
   }
-})), _class91)) || _class90);
-let FormulaExistsExpression = (_dec75 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec76 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec75(_class93 = (_class94 = class FormulaExistsExpression extends FormulaExpression {
+})), _class94)) || _class93);
+let FormulaExistsExpression = (_dec78 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec79 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec78(_class96 = (_class97 = class FormulaExistsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor43, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor45, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "exists";
   }
 
-}, (_descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "select", [_dec76], {
+}, (_descriptor45 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "select", [_dec79], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class94)) || _class93);
-let FormulaMultySumExpression = (_dec77 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec78 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec77(_class96 = (_class97 = class FormulaMultySumExpression extends FormulaExpression {
+})), _class97)) || _class96);
+let FormulaMultySumExpression = (_dec80 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec81 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec80(_class99 = (_class100 = class FormulaMultySumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor44, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor46, this);
   }
 
-}, (_descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "select", [_dec78], {
+}, (_descriptor46 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "select", [_dec81], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class97)) || _class96);
-let FormulaCountExpression = (_dec79 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec80 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec81 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec79(_class99 = (_class100 = class FormulaCountExpression extends FormulaExpression {
+})), _class100)) || _class99);
+let FormulaCountExpression = (_dec82 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec83 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec84 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec82(_class102 = (_class103 = class FormulaCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor45, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor47, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor46, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor48, this);
   }
 
-}, (_descriptor45 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "select", [_dec80], {
+}, (_descriptor47 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "select", [_dec83], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor46 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "withNullOrEmptyValues", [_dec81], {
+}), _descriptor48 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "withNullOrEmptyValues", [_dec84], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class100)) || _class99);
-let FormulaConcatExpression = (_dec82 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec83 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec82(_class102 = (_class103 = class FormulaConcatExpression extends FormulaExpression {
+})), _class103)) || _class102);
+let FormulaConcatExpression = (_dec85 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec86 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec85(_class105 = (_class106 = class FormulaConcatExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor47, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor49, this);
   }
 
-}, (_descriptor47 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "arguments", [_dec83], {
+}, (_descriptor49 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "arguments", [_dec86], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class103)) || _class102);
-let FormulaNewLineExpression = (_dec84 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec84(_class105 = class FormulaNewLineExpression extends FormulaExpression {}) || _class105);
-let Formula = (_dec85 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec86 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec87 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec88 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec85(_class106 = (_class107 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class106)) || _class105);
+let FormulaNewLineExpression = (_dec87 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec87(_class108 = class FormulaNewLineExpression extends FormulaExpression {}) || _class108);
+let Formula = (_dec88 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec89 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec90 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec91 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec88(_class109 = (_class110 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor48, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor50, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor49, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor51, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor50, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor52, this);
   }
 
-}, (_descriptor48 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class107.prototype, "match", [_dec86], {
+}, (_descriptor50 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "match", [_dec89], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor49 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class107.prototype, "target", [_dec87], {
+}), _descriptor51 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "target", [_dec90], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor50 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class107.prototype, "expression", [_dec88], {
+}), _descriptor52 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "expression", [_dec91], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class107)) || _class106);
-let Formulas = (_dec89 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec90 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec89(_class109 = (_class110 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class110)) || _class109);
+let Formulas = (_dec92 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec93 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec92(_class112 = (_class113 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor51, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor53, this);
   }
 
-}, (_descriptor51 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "items", [_dec90], {
+}, (_descriptor53 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "items", [_dec93], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class110)) || _class109);
-let ConditionNode = (_dec91 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec92 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec93 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec94 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec95 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec96 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec91(_class112 = (_class113 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class113)) || _class112);
+let ConditionNode = (_dec94 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec95 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec96 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec97 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec98 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec99 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec94(_class115 = (_class116 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor52, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor54, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor53, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor55, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor54, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor56, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor55, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor57, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor56, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor58, this);
   }
 
-}, (_descriptor52 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "match", [_dec92], {
+}, (_descriptor54 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "match", [_dec95], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor53 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "target", [_dec93], {
+}), _descriptor55 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "target", [_dec96], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor54 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "description", [_dec94], {
+}), _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "description", [_dec97], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor55 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "errorLevel", [_dec95], {
+}), _descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "errorLevel", [_dec98], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class113.prototype, "expression", [_dec96], {
+}), _descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "expression", [_dec99], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class113)) || _class112);
-let ConditionsNode = (_dec97 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec98 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec97(_class115 = (_class116 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class116)) || _class115);
+let ConditionsNode = (_dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec100(_class118 = (_class119 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor57, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor59, this);
   }
 
-}, (_descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "items", [_dec98], {
+}, (_descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class119.prototype, "items", [_dec101], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class116)) || _class115);
-let MathContainer = (_dec99 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec99(_class118 = (_class119 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class119)) || _class118);
+let MathContainer = (_dec102 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec103 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec104 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec102(_class121 = (_class122 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor58, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor60, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor59, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor61, this);
   }
 
-}, (_descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class119.prototype, "formulas", [_dec100], {
+}, (_descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "formulas", [_dec103], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class119.prototype, "conditions", [_dec101], {
+}), _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "conditions", [_dec104], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class119)) || _class118);
-const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaNewLineExpression, FormulaOneOfExpression];
+})), _class122)) || _class121);
+const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression];
 
 /***/ }),
 
@@ -130946,7 +131000,10 @@ const statementsToCode = statements => {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "AggregationDependencyModelPath": () => (/* binding */ AggregationDependencyModelPath),
+/* harmony export */   "DependencyWithoutChecks": () => (/* binding */ DependencyWithoutChecks),
 /* harmony export */   "isAggregationDependencyModelPath": () => (/* binding */ isAggregationDependencyModelPath),
+/* harmony export */   "isDependencyWithoutChecks": () => (/* binding */ isDependencyWithoutChecks),
 /* harmony export */   "KCXmlGeneratorBase": () => (/* binding */ KCXmlGeneratorBase)
 /* harmony export */ });
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
@@ -130963,8 +131020,31 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+class AggregationDependencyModelPath {
+  constructor(type, modelPath, prefixModelPath, restModelPath) {
+    this.type = void 0;
+    this.modelPath = void 0;
+    this.prefixModelPath = void 0;
+    this.restModelPath = void 0;
+    this.type = type;
+    this.modelPath = modelPath;
+    this.prefixModelPath = prefixModelPath;
+    this.restModelPath = restModelPath;
+  }
+
+}
+class DependencyWithoutChecks {
+  constructor(path) {
+    this.path = void 0;
+    this.path = path;
+  }
+
+}
 function isAggregationDependencyModelPath(path) {
-  return !(0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(path);
+  return path instanceof AggregationDependencyModelPath;
+}
+function isDependencyWithoutChecks(path) {
+  return path instanceof DependencyWithoutChecks;
 }
 class KCXmlGeneratorBase {
   constructor(schema) {
@@ -130985,12 +131065,7 @@ class KCXmlGeneratorBase {
   getArgumentDeps(targetFullPath, selectFullPath, aggregationType) {
     const pathDiffInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetFullPath, selectFullPath);
     const restPath = pathDiffInfo.differentPath;
-    return !restPath.isContainIteration() ? selectFullPath : {
-      type: aggregationType,
-      modelPath: pathDiffInfo.matchedPath.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([...restPath.getPathPartsAsArray().filter(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isSimpleToken(x)), aggregationType])),
-      prefixModelPath: pathDiffInfo.matchedPath,
-      restModelPath: restPath
-    };
+    return !restPath.isContainIteration() ? selectFullPath : new AggregationDependencyModelPath(aggregationType, pathDiffInfo.matchedPath.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([...restPath.getPathPartsAsArray().filter(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isSimpleToken(x)), aggregationType])), pathDiffInfo.matchedPath, restPath);
   }
 
   getAggregationPathsRecursively(currentParts, restParts) {
@@ -131063,7 +131138,7 @@ class KCXmlGeneratorBase {
       const modelPath = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeMultiplicity(this.removeAttributePrefix(expression.select)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
       const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Sum");
       deps.push(argumentDependency);
-      const finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : argumentDependency.modelPath;
+      const finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : isAggregationDependencyModelPath(argumentDependency) ? argumentDependency.modelPath : argumentDependency.path;
       return gcf(x => x.argument, `"${finalPath.toLegacyPath()}"`);
     }
 
@@ -131082,7 +131157,7 @@ class KCXmlGeneratorBase {
       if (targetFullPath.isContainIteration()) {
         const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Count");
         deps.push(argumentDependency);
-        finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : argumentDependency.modelPath;
+        finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : isAggregationDependencyModelPath(argumentDependency) ? argumentDependency.modelPath : argumentDependency.path;
       } else {
         deps.push(modelPath);
       }
@@ -131225,14 +131300,22 @@ class KCXmlGeneratorBase {
 
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupSumExpression) {
       const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
-      deps.push(targetKeyPath);
+      deps.push(new DependencyWithoutChecks(targetKeyPath));
       const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
-      deps.push(sourceKeyPath);
+      deps.push(new DependencyWithoutChecks(sourceKeyPath));
       const sourceValuePath = this.getModelPath(prefix, expression.sourceValuePath);
-      deps.push(sourceValuePath);
+      deps.push(new DependencyWithoutChecks(sourceValuePath));
       return gcf(x => x.groupSum, `"${targetKeyPath}", "${sourceKeyPath}", "${sourceValuePath}"`);
     }
 
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupCountExpression) {
+      const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
+      deps.push(new DependencyWithoutChecks(targetKeyPath));
+      const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
+      deps.push(new DependencyWithoutChecks(sourceKeyPath));
+      return gcf(x => x.groupCount, `"${targetKeyPath}", "${sourceKeyPath}"`);
+    }
+
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaConcatExpression) {
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureArrayLengthGreaterThenOrEqual)(expression.arguments, 2);
       const compiledExpressions = expression.arguments.map(arg => this.compileExpression(prefix, targetFullPath, arg, deps)).join(",");
@@ -131297,6 +131380,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../KCXmlGenerator/KCXmlGeneratorBase */ "./Generator/src/generators/KCXmlGenerator/KCXmlGeneratorBase.ts");
+/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
+
 
 
 const emptyResult = `
@@ -131326,7 +131411,11 @@ class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPA
     const deps = [];
     const compiledExpression = this.compileExpression(prefix, target, condition.expression, deps);
     const compiledTarget = this.modelPathInstance(target);
-    const compiledDeps = deps.map(x => x.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
+    const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(deps.map(x => ({
+      path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(x) ? x : (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isAggregationDependencyModelPath)(x) ? x.modelPath : x.path,
+      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
+    })).filter(x => !x.path.isEquals(target)), x => x.path.toLegacyPath()));
+    const compiledDeps = dependencyModelPaths.map(x => x.path.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
     const compiledDescription = (_condition$descriptio = condition.description) !== null && _condition$descriptio !== void 0 ? _condition$descriptio : "Error Message";
     const compiledDelegate = `context => KCCondition.execute(context, expression => ${compiledExpression}, ` + `() => "${compiledDescription}", "${(_condition$errorLevel = condition.errorLevel) !== null && _condition$errorLevel !== void 0 ? _condition$errorLevel : "Error"}")`;
     return `new ValidationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate})`;
@@ -134270,6 +134359,10 @@ class FormulaExpressionToFlangExpressionConverter {
       return this.compileGroupSumExpression(prefix, target, expression, addPrecalculationRule);
     }
 
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaGroupCountExpression) {
+      return this.compileGroupCountExpression(prefix, target, expression, addPrecalculationRule);
+    }
+
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaOneOfExpression) {
       const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(expression.argument, prefix, target, addPrecalculationRule));
       const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
@@ -134291,12 +134384,9 @@ class FormulaExpressionToFlangExpressionConverter {
     return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(left), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(right));
   }
 
-  compileGroupSumExpression(prefix, target, expression, addPrecalculationRule) {
-    const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
-    const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
-    const sourceValuePath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceValuePath);
+  compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
     const iterationEntries = [...(0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.reverseArray)((0,_Common_ModelPath_BuildIterationSequence__WEBPACK_IMPORTED_MODULE_4__.buildIterationSequence)(sourceKeyPath))];
-    const finalAnonymousFunction = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AddSumExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value"), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceValuePath.toCurrentIteration(), "value"))));
+    const finalAnonymousFunction = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AddSumExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value"), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression)));
 
     const getWrapReduceFunction = innerReduceCall => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], innerReduceCall);
 
@@ -134320,6 +134410,21 @@ class FormulaExpressionToFlangExpressionConverter {
     return finalValueExpression;
   }
 
+  compileGroupSumExpression(prefix, target, expression, addPrecalculationRule) {
+    const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
+    const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
+    const sourceValuePath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceValuePath);
+    const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceValuePath.toCurrentIteration(), "value");
+    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
+  }
+
+  compileGroupCountExpression(prefix, target, expression, addPrecalculationRule) {
+    const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
+    const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
+    const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DecimalLiteralExpression(1);
+    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
+  }
+
   compiledArgumentExpression(prefix, target, selectPath, selectType, addPrecalculationRule, aggregationFunction = "Sum") {
     const adjustedSelectPath = this.preparePathAndAdjustMultiplicity(prefix, selectPath);
     const splitInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, adjustedSelectPath);
@@ -148511,7 +148616,16 @@ let CrossfitTableRowNode = (_dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMP
   initializer: null
 })), _class5)) || _class4);
 let MultilineNode = (_dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("multiline", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/CrossfitTable sync recursive .md$")), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingScopeMixinNode), _dec29 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("optional", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec30 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("maxOccurs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.javascriptExpression, `Масмальное возможное количество элементов в заданном множественном элементе. Может быть ${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.javaScriptExpressionLink)}.`), _dec31 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("filteredUniqKey", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Уникальный ключ фильтрации multiline, используется, для фильтраций одних и тех же путей иннера 
-        разными фильтрами. Задается произвольной строкой. Фильтры с одинаковым ключем фильтрации получают одинаковый результат фильтрации`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("debounceDisable", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Позволяет управлять задержкой до рендеринга`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultChildren", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.arrayLiteral(), ``), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("focusByHotkey", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.InvalidUsage), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("instancesPerPage", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("pageStep", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.InvalidUsage), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("removebutton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `false - чтобы слева от раздела не было кнопки "Удалить"`), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("rowmenu", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("row", [CrossfitTableRowNode]), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("addbutton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, `Название кнопки при добавлении множественности`), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("addType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType["enum"]("button", "link"), `Добавить строку м.б. как кнопка "button" или ссылка "link"`), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("usepager", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `false - без пейджера (1-11, 12-22 - этого нет внизу страницы)`), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("onRowClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике по строке"), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("storeFilters", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Будут ли сохраняться фильтры для этого мультилайна между обнолениями страницы. По умолчанию -- нет`), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("disableScroll", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Возможность отключить скролл в мультилайне`), _dec46 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultFilter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.objectLiteral(), `Дает возможность изначально фильтровать мультилайн, по определенному выражению`), _dec27(_class7 = (_class8 = class MultilineNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_5__.SugarNodeWithLegacyVisibility {
+        разными фильтрами. Задается произвольной строкой. Фильтры с одинаковым ключем фильтрации получают одинаковый результат фильтрации`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("debounceDisable", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Это хитрая опция, если вы прочитали все ниже, но не особо поняли, лучше уточните у @candy_fe_duty. 
+        Вот как все устроено:
+        Если на мультилайне есть defaultFilter, в таком случае, этот фильтр накапливает в себе изменения
+        которые происходят в таблице, т.е человек меняет фильтр в выпадающем списке, а потом вводит в текстовом фильтре
+        Чтобы дважды не делать фильтрацию (это очень дорого), мы ждем какое то время (1 сек), и начинаем действовать. 
+        Это помогает здорово сэкономить время в среднем, не сильно пугая людей "неотзывчивым" интерфейсом. 
+        Однако, ежели у вас однозначно небольшие данные, в которых не будет развесистой логики, и огромных объемов, вы можете 
+        применить debounceDisable. Это позволит отключить данную задержку, и повысить отзывчивость интерфейса. 
+        Платой за эту опцию, может быть тормознутый интерфейс, пересчитывающий все фильтры на каждый чих. 
+        Обязательно проверьте, как себя ведет интерфейс на "средних" данных, когда резко меняете фильтры. (в инпуте добавляйте и стирайте значения например).`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultChildren", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.arrayLiteral(), ``), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("focusByHotkey", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.InvalidUsage), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("instancesPerPage", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("pageStep", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.InvalidUsage), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("removebutton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `false - чтобы слева от раздела не было кнопки "Удалить"`), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("rowmenu", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("row", [CrossfitTableRowNode]), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("addbutton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, `Название кнопки при добавлении множественности`), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("addType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType["enum"]("button", "link"), `Добавить строку м.б. как кнопка "button" или ссылка "link"`), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("usepager", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `false - без пейджера (1-11, 12-22 - этого нет внизу страницы)`), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("onRowClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике по строке"), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("storeFilters", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Будут ли сохраняться фильтры для этого мультилайна между обнолениями страницы. По умолчанию -- нет`), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("disableScroll", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Возможность отключить скролл в мультилайне`), _dec46 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultFilter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.objectLiteral(), `Дает возможность изначально фильтровать мультилайн, по определенному выражению`), _dec27(_class7 = (_class8 = class MultilineNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_5__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);