@kontur.candy/generator 5.102.0 → 5.103.0-remove-kclang-target-infer.1

package/dist/index.js

@@ -50670,80 +50670,52 @@ const existsKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const isSnilsKCLangFunction = params => {
-  var _params$10;
+  var _params$0$value, _params$10;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$10 = params[0]) === null || _params$10 === void 0 ? void 0 : _params$10.value;
-  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
-    const param = argumentExpr.select;
-    if (param == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isSnils",
-      select: param
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const argumentExpr = (_params$0$value = (_params$10 = params[0]) === null || _params$10 === void 0 ? void 0 : _params$10.value) !== null && _params$0$value !== void 0 ? _params$0$value : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isSnils",
+    expression: argumentExpr
+  };
 };
 const isRegNumSfrKCLangFunction = params => {
-  var _params$11;
+  var _params$0$value2, _params$11;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$11 = params[0]) === null || _params$11 === void 0 ? void 0 : _params$11.value;
-  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
-    const param = argumentExpr.select;
-    if (param == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isRegNumSfr",
-      select: param
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const argumentExpr = (_params$0$value2 = (_params$11 = params[0]) === null || _params$11 === void 0 ? void 0 : _params$11.value) !== null && _params$0$value2 !== void 0 ? _params$0$value2 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isRegNumSfr",
+    expression: argumentExpr
+  };
 };
 const isInnKCLangFunction = params => {
-  var _params$12;
+  var _params$0$value3, _params$12;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$12 = params[0]) === null || _params$12 === void 0 ? void 0 : _params$12.value;
-  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
-    const param = argumentExpr.select;
-    if (param == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isInn",
-      select: param
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const argumentExpr = (_params$0$value3 = (_params$12 = params[0]) === null || _params$12 === void 0 ? void 0 : _params$12.value) !== null && _params$0$value3 !== void 0 ? _params$0$value3 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isInn",
+    expression: argumentExpr
+  };
 };
 const isOgrnKCLangFunction = params => {
-  var _params$13;
+  var _params$0$value4, _params$13;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value;
-  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
-    const param = argumentExpr.select;
-    if (param == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isOgrn",
-      select: param
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const argumentExpr = (_params$0$value4 = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value) !== null && _params$0$value4 !== void 0 ? _params$0$value4 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isOgrn",
+    expression: argumentExpr
+  };
 };
 const arrayKCLangFunction = params => {
   const errors = Array.from(validateParams(params, 0, Infinity));
@@ -50831,45 +50803,30 @@ const getPicklistValuesKCLangFunction = params => {
   };
 };
 const isValidMirCardNumberKCLangFunction = params => {
-  var _params$21;
+  var _params$0$value5, _params$21;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$21 = params[0]) === null || _params$21 === void 0 ? void 0 : _params$21.value;
-  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
-    const param = argumentExpr.select;
-    if (param == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isValidMirCardNumber",
-      select: param
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const argumentExpr = (_params$0$value5 = (_params$21 = params[0]) === null || _params$21 === void 0 ? void 0 : _params$21.value) !== null && _params$0$value5 !== void 0 ? _params$0$value5 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isValidMirCardNumber",
+    expression: argumentExpr
+  };
 };
 const isValidAccountNumberKCLangFunction = params => {
-  var _params$22, _params$23;
+  var _params$0$value6, _params$22, _params$1$value, _params$23;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const bik = (_params$22 = params[0]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
-  const account = (_params$23 = params[1]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
-  if ((bik === null || bik === void 0 ? void 0 : bik.type) === "argument" && (account === null || account === void 0 ? void 0 : account.type) === "argument") {
-    const bikValue = bik.select;
-    const accountValue = account.select;
-    if (accountValue == undefined || bikValue == undefined) {
-      throw new Error("Unexpected error!");
-    }
-    return {
-      type: "isValidAccountNumber",
-      bik: bikValue,
-      account: accountValue
-    };
-  }
-  throw new Error("Invalid parameters!");
+  const bik = (_params$0$value6 = (_params$22 = params[0]) === null || _params$22 === void 0 ? void 0 : _params$22.value) !== null && _params$0$value6 !== void 0 ? _params$0$value6 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  const account = (_params$1$value = (_params$23 = params[1]) === null || _params$23 === void 0 ? void 0 : _params$23.value) !== null && _params$1$value !== void 0 ? _params$1$value : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)();
+  return {
+    type: "isValidAccountNumber",
+    bik: bik,
+    account: account
+  };
 };
 const countKCLangFunction = params => {
   var _params$24;
@@ -61681,37 +61638,37 @@ const getGenerateJsExpressionFunc = options => {
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isSnilsFnName = gn(x => x.isSnils);
-          return `${utilsName}.${isSnilsFnName}(${pathFnName}, "${expression.select}")`;
+          return `${utilsName}.${isSnilsFnName}(${pathFnName}, "${generateJsExpression(expression.expression)}")`;
         }
       case "isRegNumSfr":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isValidRegNumSfrFnName = gn(x => x.isRegNumSfr);
-          return `${utilsName}.${isValidRegNumSfrFnName}(${pathFnName}, "${expression.select}")`;
+          return `${utilsName}.${isValidRegNumSfrFnName}(${pathFnName}, "${generateJsExpression(expression.expression)}")`;
         }
       case "isInn":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isInnFnName = gn(x => x.isInn);
-          return `${utilsName}.${isInnFnName}(${pathFnName}, "${expression.select}")`;
+          return `${utilsName}.${isInnFnName}(${pathFnName}, "${generateJsExpression(expression.expression)}")`;
         }
       case "isOgrn":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isOgrnFnName = gn(x => x.isOgrn);
-          return `${utilsName}.${isOgrnFnName}(${pathFnName}, "${expression.select}")`;
+          return `${utilsName}.${isOgrnFnName}(${pathFnName}, "${generateJsExpression(expression.expression)}")`;
         }
       case "isValidMirCardNumber":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isValidMirCardNumberFnName = gn(x => x.isValidMirCardNumber);
-          return `${utilsName}.${isValidMirCardNumberFnName}(${pathFnName}, "${expression.select}")`;
+          return `${utilsName}.${isValidMirCardNumberFnName}(${pathFnName}, "${generateJsExpression(expression.expression)}")`;
         }
       case "isValidAccountNumber":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
           const isValidAccountNumberFnName = gn(x => x.isValidAccountNumber);
-          return `${utilsName}.${isValidAccountNumberFnName}(${pathFnName}, "${expression.bik}", "${expression.account}")`;
+          return `${utilsName}.${isValidAccountNumberFnName}(${pathFnName}, "${generateJsExpression(expression.bik)}", "${generateJsExpression(expression.account)}")`;
         }
       case "const":
         {
@@ -61892,16 +61849,17 @@ function generateKCXmlExpression(expression, prefixPath = "") {
     case "hashSet":
     case "length":
       return [`<m:${expression.type}>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.expression, prefixPath), 1), `</m:${expression.type}>`].join("\n");
-    case "exists":
     case "isSnils":
     case "isInn":
     case "isOgrn":
     case "isRegNumSfr":
     case "isValidMirCardNumber":
+      return [`<m:${expression.type}>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.expression, prefixPath), 1), `</m:${expression.type}>`].join("\n");
+    case "exists":
     case "multySum":
       return `<m:${expression.type} select="${expression.select}" />`;
     case "isValidAccountNumber":
-      return `<m:${expression.type} bik="${expression.bik}" account="${expression.account}" />`;
+      return [`<m:${expression.type}>`, `<m:isvalidaccountnumberbik>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.bik, prefixPath), 1), `</m:isvalidaccountnumberbik>`, `<m:isvalidaccountnumberaccount>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.account, prefixPath), 1), `</m:isvalidaccountnumberaccount>`, `</m:${expression.type}>`].join("\n");
     case "makeDict":
       return [`<m:${expression.type} sourceKeyPath="${expression.sourceKeyPath}">`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.sourceValueExpression, prefixPath), 1), `</m:${expression.type}>`].join("\n");
     case "getSumByKeys":
@@ -62079,6 +62037,15 @@ function generateBlockKCXmlFormulas(block, parents) {
   }
   return result.join("\n");
 }
+function extractSelectPathOrUndefined(expression) {
+  if (expression.type == "argument") {
+    return expression.select;
+  }
+  if (expression.type == "cast" && expression.expression.type == "argument") {
+    return expression.expression.select;
+  }
+  return undefined;
+}
 function guessConditionTarget(condition) {
   let result;
   class GuessConditionTargetVisitor extends _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.DefaultKCLangExpressionVisitor {
@@ -62089,32 +62056,32 @@ function guessConditionTarget(condition) {
     }
     visitIsSnilsKCLangNode(node) {
       if (result == undefined) {
-        result = node.select;
+        result = extractSelectPathOrUndefined(node.expression);
       }
     }
     visitIsRegNumSfrKCLangNode(node) {
       if (result == undefined) {
-        result = node.select;
+        result = extractSelectPathOrUndefined(node.expression);
       }
     }
     visitIsInnKCLangNode(node) {
       if (result == undefined) {
-        result = node.select;
+        result = extractSelectPathOrUndefined(node.expression);
       }
     }
     visitIsOgrnKCLangNode(node) {
       if (result == undefined) {
-        result = node.select;
+        result = extractSelectPathOrUndefined(node.expression);
       }
     }
     visitIsValidMirCardNumberNode(node) {
       if (result == undefined) {
-        result = node.select;
+        result = extractSelectPathOrUndefined(node.expression);
       }
     }
     visitIsValidAccountNumberNode(node) {
       if (result == undefined) {
-        result = node.account;
+        result = extractSelectPathOrUndefined(node.account);
       }
     }
     visitArgumentKCLangNode(node) {
@@ -62141,82 +62108,12 @@ function guessConditionTarget(condition) {
   (0,_IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.traverseKCLangExpression)(condition.expression, new GuessConditionTargetVisitor());
   return result;
 }
-function inferConditionTarget(condition, targetValue) {
-  let result;
-  if (targetValue == undefined) {
-    return undefined;
-  }
-  class InferConditionTargetVisitor extends _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.DefaultKCLangExpressionVisitor {
-    constructor(path) {
-      super();
-      this.path = void 0;
-      this.path = path;
-    }
-    visitExistsKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsSnilsKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsRegNumSfrKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsInnKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsOgrnKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsValidMirCardNumberNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsValidAccountNumberNode(node) {
-      if (result == undefined && node.account.endsWith(this.path)) {
-        result = node.account;
-      }
-    }
-    visitArgumentKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitCountKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitInstanceCountKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-    visitIsEqualToAutoCalculatedKCLangNode(node) {
-      if (result == undefined && node.select.endsWith(this.path)) {
-        result = node.select;
-      }
-    }
-  }
-  (0,_IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.traverseKCLangExpression)(condition.expression, new InferConditionTargetVisitor(targetValue));
-  return result;
-}
 function generateKCXmlCondition(ast, parentContexts, describe) {
-  var _ref, _inferConditionTarget;
+  var _ast$target;
   const matchPath = joinPaths([...parentContexts.filter(isPathPrefix).map(x => x.path)]);
   const levelAttr = ast.level === undefined ? "" : ` errorLevel="${(0,_StringUtils__WEBPACK_IMPORTED_MODULE_3__.capitalizeFirstLetter)(ast.level)}"`;
   const descriptionAttr = describe != undefined ? ` description="${escapeHtmlCharacters(formatDescribeStatement(describe))}"` : "";
-  const guessedTarget = (_ref = (_inferConditionTarget = inferConditionTarget(ast, ast.target)) !== null && _inferConditionTarget !== void 0 ? _inferConditionTarget : ast.target) !== null && _ref !== void 0 ? _ref : guessConditionTarget(ast);
+  const guessedTarget = (_ast$target = ast.target) !== null && _ast$target !== void 0 ? _ast$target : guessConditionTarget(ast);
   const targetAttr = guessedTarget != undefined ? ` target="${guessedTarget}"` : "";
   const conditions = [];
   const pathPrefixContexts = [];
@@ -67846,7 +67743,8 @@ class FormulaProcessor {
     if (this.isStringExpression(leftExpression) && this.isStringExpression(rightExpression)) {
       this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.binaryExpression("===", leftExpression, rightExpression));
     } else {
-      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightExpression]));
+      const rightArgument = _babel_types__WEBPACK_IMPORTED_MODULE_0__.isStringLiteral(rightExpression) ? _babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("wrapDecimalOperand"), [rightExpression]) : rightExpression;
+      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightArgument]));
     }
   }
   beforeChooseExpression() {
@@ -68234,6 +68132,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   FormulaIsOgrnExpression: () => (/* binding */ FormulaIsOgrnExpression),
 /* harmony export */   FormulaIsRegNumSfrExpression: () => (/* binding */ FormulaIsRegNumSfrExpression),
 /* harmony export */   FormulaIsSnilsExpression: () => (/* binding */ FormulaIsSnilsExpression),
+/* harmony export */   FormulaIsValidAccountNumberAccountExpression: () => (/* binding */ FormulaIsValidAccountNumberAccountExpression),
+/* harmony export */   FormulaIsValidAccountNumberBikExpression: () => (/* binding */ FormulaIsValidAccountNumberBikExpression),
 /* harmony export */   FormulaIsValidAccountNumberExpression: () => (/* binding */ FormulaIsValidAccountNumberExpression),
 /* harmony export */   FormulaIsValidMirCardNumberExpression: () => (/* binding */ FormulaIsValidMirCardNumberExpression),
 /* harmony export */   FormulaJoinExpression: () => (/* binding */ FormulaJoinExpression),
@@ -68274,7 +68174,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class3, _dec4, _dec5, _class4, _class5, _descriptor2, _dec6, _dec7, _class6, _class7, _descriptor3, _dec8, _dec9, _class8, _class9, _descriptor4, _dec10, _dec11, _class10, _class11, _descriptor5, _dec12, _dec13, _class12, _class13, _descriptor6, _dec14, _dec15, _dec16, _class14, _class15, _descriptor7, _descriptor8, _dec17, _dec18, _dec19, _class16, _class17, _descriptor9, _descriptor10, _dec20, _dec21, _class18, _class19, _descriptor11, _dec22, _dec23, _class20, _class21, _descriptor12, _dec24, _dec25, _class22, _class23, _descriptor13, _dec26, _dec27, _class24, _class25, _descriptor14, _dec28, _dec29, _class26, _class27, _descriptor15, _dec30, _dec31, _class28, _class29, _descriptor16, _dec32, _dec33, _class30, _class31, _descriptor17, _dec34, _dec35, _class32, _class33, _descriptor18, _dec36, _dec37, _class34, _class35, _descriptor19, _dec38, _dec39, _dec40, _dec41, _class36, _class37, _descriptor20, _descriptor21, _descriptor22, _dec42, _dec43, _class38, _class39, _descriptor23, _dec44, _dec45, _class40, _class41, _descriptor24, _dec46, _dec47, _dec48, _class42, _class43, _descriptor25, _descriptor26, _dec49, _dec50, _class44, _class45, _descriptor27, _dec51, _dec52, _class46, _class47, _descriptor28, _dec53, _dec54, _class48, _class49, _descriptor29, _dec55, _dec56, _class50, _class51, _descriptor30, _dec57, _dec58, _dec59, _class52, _class53, _descriptor31, _descriptor32, _dec60, _dec61, _dec62, _dec63, _class54, _class55, _descriptor33, _descriptor34, _descriptor35, _dec64, _dec65, _dec66, _class56, _class57, _descriptor36, _descriptor37, _dec67, _class58, _dec68, _dec69, _class59, _class60, _descriptor38, _dec70, _dec71, _class61, _class62, _descriptor39, _dec72, _dec73, _class63, _class64, _descriptor40, _dec74, _dec75, _class65, _class66, _descriptor41, _dec76, _dec77, _class67, _class68, _descriptor42, _dec78, _dec79, _class69, _class70, _descriptor43, _dec80, _dec81, _class71, _class72, _descriptor44, _dec82, _dec83, _class73, _class74, _descriptor45, _dec84, _dec85, _dec86, _class75, _class76, _descriptor46, _descriptor47, _dec87, _dec88, _dec89, _class77, _class78, _descriptor48, _descriptor49, _dec90, _dec91, _dec92, _class79, _class80, _descriptor50, _descriptor51, _dec93, _dec94, _dec95, _class81, _class82, _descriptor52, _descriptor53, _dec96, _dec97, _class83, _class84, _descriptor54, _dec98, _dec99, _class85, _class86, _descriptor55, _dec100, _dec101, _class87, _class88, _descriptor56, _dec102, _dec103, _class89, _class90, _descriptor57, _dec104, _dec105, _class91, _class92, _descriptor58, _dec106, _dec107, _class93, _class94, _descriptor59, _dec108, _dec109, _class95, _class96, _descriptor60, _dec110, _dec111, _dec112, _class97, _class98, _descriptor61, _descriptor62, _dec113, _dec114, _dec115, _class99, _class100, _descriptor63, _descriptor64, _dec116, _dec117, _class101, _class102, _descriptor65, _dec118, _dec119, _class103, _class104, _descriptor66, _dec120, _dec121, _class105, _class106, _descriptor67, _dec122, _dec123, _dec124, _dec125, _dec126, _class107, _class108, _descriptor68, _descriptor69, _descriptor70, _descriptor71, _dec127, _dec128, _class109, _class110, _descriptor72, _dec129, _dec130, _class111, _class112, _descriptor73, _dec131, _dec132, _class113, _class114, _descriptor74, _dec133, _dec134, _class115, _class116, _descriptor75, _dec135, _dec136, _dec137, _class117, _class118, _descriptor76, _descriptor77, _dec138, _dec139, _class119, _class120, _descriptor78, _dec140, _dec141, _dec142, _class121, _class122, _descriptor79, _descriptor80, _dec143, _dec144, _class123, _class124, _descriptor81, _dec145, _dec146, _class125, _class126, _descriptor82, _dec147, _dec148, _class127, _class128, _descriptor83, _dec149, _class129, _dec150, _dec151, _dec152, _dec153, _class130, _class131, _descriptor84, _descriptor85, _descriptor86, _dec154, _dec155, _class132, _class133, _descriptor87, _dec156, _dec157, _class134, _class135, _descriptor88, _dec158, _dec159, _dec160, _dec161, _dec162, _dec163, _class136, _class137, _descriptor89, _descriptor90, _descriptor91, _descriptor92, _descriptor93, _dec164, _dec165, _class138, _class139, _descriptor94, _dec166, _dec167, _dec168, _class140, _class141, _descriptor95, _descriptor96, _dec169, _dec170, _dec171, _class142, _class143, _descriptor97, _descriptor98, _dec172, _dec173, _dec174, _class144, _class145, _descriptor99, _descriptor100, _dec175, _dec176, _dec177, _dec178, _class146, _class147, _descriptor101, _descriptor102, _descriptor103, _dec179, _dec180, _dec181, _class148, _class149, _descriptor104, _descriptor105;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class3, _dec4, _dec5, _class4, _class5, _descriptor2, _dec6, _dec7, _class6, _class7, _descriptor3, _dec8, _dec9, _class8, _class9, _descriptor4, _dec10, _dec11, _class10, _class11, _descriptor5, _dec12, _dec13, _class12, _class13, _descriptor6, _dec14, _dec15, _dec16, _class14, _class15, _descriptor7, _descriptor8, _dec17, _dec18, _dec19, _class16, _class17, _descriptor9, _descriptor10, _dec20, _dec21, _class18, _class19, _descriptor11, _dec22, _dec23, _class20, _class21, _descriptor12, _dec24, _dec25, _class22, _class23, _descriptor13, _dec26, _dec27, _class24, _class25, _descriptor14, _dec28, _dec29, _class26, _class27, _descriptor15, _dec30, _dec31, _class28, _class29, _descriptor16, _dec32, _dec33, _class30, _class31, _descriptor17, _dec34, _dec35, _class32, _class33, _descriptor18, _dec36, _dec37, _class34, _class35, _descriptor19, _dec38, _dec39, _dec40, _dec41, _class36, _class37, _descriptor20, _descriptor21, _descriptor22, _dec42, _dec43, _class38, _class39, _descriptor23, _dec44, _dec45, _class40, _class41, _descriptor24, _dec46, _dec47, _dec48, _class42, _class43, _descriptor25, _descriptor26, _dec49, _dec50, _class44, _class45, _descriptor27, _dec51, _dec52, _class46, _class47, _descriptor28, _dec53, _dec54, _class48, _class49, _descriptor29, _dec55, _dec56, _class50, _class51, _descriptor30, _dec57, _dec58, _dec59, _class52, _class53, _descriptor31, _descriptor32, _dec60, _dec61, _dec62, _dec63, _class54, _class55, _descriptor33, _descriptor34, _descriptor35, _dec64, _dec65, _dec66, _class56, _class57, _descriptor36, _descriptor37, _dec67, _class58, _dec68, _dec69, _class59, _class60, _descriptor38, _dec70, _dec71, _class61, _class62, _descriptor39, _dec72, _dec73, _class63, _class64, _descriptor40, _dec74, _dec75, _class65, _class66, _descriptor41, _dec76, _dec77, _class67, _class68, _descriptor42, _dec78, _dec79, _class69, _class70, _descriptor43, _dec80, _dec81, _class71, _class72, _descriptor44, _dec82, _dec83, _class73, _class74, _descriptor45, _dec84, _dec85, _dec86, _class75, _class76, _descriptor46, _descriptor47, _dec87, _dec88, _dec89, _class77, _class78, _descriptor48, _descriptor49, _dec90, _dec91, _dec92, _class79, _class80, _descriptor50, _descriptor51, _dec93, _dec94, _dec95, _class81, _class82, _descriptor52, _descriptor53, _dec96, _dec97, _class83, _class84, _descriptor54, _dec98, _dec99, _class85, _class86, _descriptor55, _dec100, _dec101, _class87, _class88, _descriptor56, _dec102, _dec103, _class89, _class90, _descriptor57, _dec104, _dec105, _class91, _class92, _descriptor58, _dec106, _dec107, _class93, _class94, _descriptor59, _dec108, _dec109, _class95, _class96, _descriptor60, _dec110, _dec111, _class97, _class98, _descriptor61, _dec112, _dec113, _class99, _class100, _descriptor62, _dec114, _dec115, _dec116, _class101, _class102, _descriptor63, _descriptor64, _dec117, _dec118, _dec119, _class103, _class104, _descriptor65, _descriptor66, _dec120, _dec121, _class105, _class106, _descriptor67, _dec122, _dec123, _class107, _class108, _descriptor68, _dec124, _dec125, _class109, _class110, _descriptor69, _dec126, _dec127, _dec128, _dec129, _dec130, _class111, _class112, _descriptor70, _descriptor71, _descriptor72, _descriptor73, _dec131, _dec132, _class113, _class114, _descriptor74, _dec133, _dec134, _class115, _class116, _descriptor75, _dec135, _dec136, _class117, _class118, _descriptor76, _dec137, _dec138, _class119, _class120, _descriptor77, _dec139, _dec140, _dec141, _class121, _class122, _descriptor78, _descriptor79, _dec142, _dec143, _class123, _class124, _descriptor80, _dec144, _dec145, _dec146, _class125, _class126, _descriptor81, _descriptor82, _dec147, _dec148, _class127, _class128, _descriptor83, _dec149, _dec150, _class129, _class130, _descriptor84, _dec151, _dec152, _class131, _class132, _descriptor85, _dec153, _class133, _dec154, _dec155, _dec156, _dec157, _class134, _class135, _descriptor86, _descriptor87, _descriptor88, _dec158, _dec159, _class136, _class137, _descriptor89, _dec160, _dec161, _class138, _class139, _descriptor90, _dec162, _dec163, _dec164, _dec165, _dec166, _dec167, _class140, _class141, _descriptor91, _descriptor92, _descriptor93, _descriptor94, _descriptor95, _dec168, _dec169, _class142, _class143, _descriptor96, _dec170, _dec171, _dec172, _class144, _class145, _descriptor97, _descriptor98, _dec173, _dec174, _dec175, _class146, _class147, _descriptor99, _descriptor100, _dec176, _dec177, _dec178, _class148, _class149, _descriptor101, _descriptor102, _dec179, _dec180, _dec181, _dec182, _class150, _class151, _descriptor103, _descriptor104, _descriptor105, _dec183, _dec184, _dec185, _class152, _class153, _descriptor106, _descriptor107;
 
 
 
@@ -68895,488 +68795,516 @@ let FormulaSumOfDayWeightsExpression = (_dec98 = (0,_markupGenerator_Serializer_
   writable: true,
   initializer: null
 }), _class86)) || _class85);
-let FormulaIsSnilsExpression = (_dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("issnils", `Проверка на валидность снилса`), _dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec100(_class87 = (_class88 = class FormulaIsSnilsExpression extends FormulaExpression {
+let FormulaIsSnilsExpression = (_dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("issnils", `Проверка на валидность снилса`), _dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec100(_class87 = (_class88 = class FormulaIsSnilsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor56, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor56, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isSnils";
   }
-}, _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class88.prototype, "select", [_dec101], {
+}, _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class88.prototype, "expression", [_dec101], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class88)) || _class87);
-let FormulaIsRegNumSfrExpression = (_dec102 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isregnumsfr", `Проверка на валидность рег-номера СФР`), _dec103 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec102(_class89 = (_class90 = class FormulaIsRegNumSfrExpression extends FormulaExpression {
+let FormulaIsRegNumSfrExpression = (_dec102 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isregnumsfr", `Проверка на валидность рег-номера СФР`), _dec103 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec102(_class89 = (_class90 = class FormulaIsRegNumSfrExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor57, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor57, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isRegNumSfr";
   }
-}, _descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class90.prototype, "select", [_dec103], {
+}, _descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class90.prototype, "expression", [_dec103], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class90)) || _class89);
-let FormulaIsInnExpression = (_dec104 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isinn", `Проверка на валидность ИИН`), _dec105 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec104(_class91 = (_class92 = class FormulaIsInnExpression extends FormulaExpression {
+let FormulaIsInnExpression = (_dec104 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isinn", `Проверка на валидность ИИН`), _dec105 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec104(_class91 = (_class92 = class FormulaIsInnExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor58, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor58, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isInn";
   }
-}, _descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class92.prototype, "select", [_dec105], {
+}, _descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class92.prototype, "expression", [_dec105], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class92)) || _class91);
-let FormulaIsOgrnExpression = (_dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isogrn", `Проверка на валидность ОГРН`), _dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec106(_class93 = (_class94 = class FormulaIsOgrnExpression extends FormulaExpression {
+let FormulaIsOgrnExpression = (_dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isogrn", `Проверка на валидность ОГРН`), _dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec106(_class93 = (_class94 = class FormulaIsOgrnExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor59, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor59, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isOgrn";
   }
-}, _descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "select", [_dec107], {
+}, _descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "expression", [_dec107], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class94)) || _class93);
-let FormulaIsValidMirCardNumberExpression = (_dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidmircardnumber", `Проверка на валидность карты МИР`), _dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec108(_class95 = (_class96 = class FormulaIsValidMirCardNumberExpression extends FormulaExpression {
+let FormulaIsValidMirCardNumberExpression = (_dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidmircardnumber", `Проверка на валидность карты МИР`), _dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec108(_class95 = (_class96 = class FormulaIsValidMirCardNumberExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor60, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor60, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isValidMirCardNumber";
   }
-}, _descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class96.prototype, "select", [_dec109], {
+}, _descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class96.prototype, "expression", [_dec109], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class96)) || _class95);
-let FormulaIsValidAccountNumberExpression = (_dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumber", `Проверка на валидность карты МИР`), _dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("bik", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("account", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec110(_class97 = (_class98 = class FormulaIsValidAccountNumberExpression extends FormulaExpression {
+let FormulaIsValidAccountNumberBikExpression = (_dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumberbik", `Проверка на валидность карты МИР`), _dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec110(_class97 = (_class98 = class FormulaIsValidAccountNumberBikExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "bik", _descriptor61, this);
+  }
+  getLegacyExpressionTypeForFunctionName() {
+    return "isValidAccountNumberBik";
+  }
+}, _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "bik", [_dec111], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class98)) || _class97);
+let FormulaIsValidAccountNumberAccountExpression = (_dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumberaccount", `Проверка на валидность карты МИР`), _dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec112(_class99 = (_class100 = class FormulaIsValidAccountNumberAccountExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "account", _descriptor62, this);
   }
+  getLegacyExpressionTypeForFunctionName() {
+    return "isValidAccountNumberAccount";
+  }
+}, _descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "account", [_dec113], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class100)) || _class99);
+let FormulaIsValidAccountNumberExpression = (_dec114 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumber", `Проверка на валидность карты МИР`), _dec115 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("isvalidaccountnumberbik", [FormulaIsValidAccountNumberBikExpression]), _dec116 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("isvalidaccountnumberaccount", [FormulaIsValidAccountNumberAccountExpression]), _dec114(_class101 = (_class102 = class FormulaIsValidAccountNumberExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "bik", _descriptor63, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "account", _descriptor64, this);
+  }
   getLegacyExpressionTypeForFunctionName() {
     return "isValidAccountNumber";
   }
-}, _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "bik", [_dec111], {
+}, _descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class102.prototype, "bik", [_dec115], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "account", [_dec112], {
+}), _descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class102.prototype, "account", [_dec116], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class98)) || _class97);
-let FormulaArgumentExpression = (_dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec114 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec115 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec113(_class99 = (_class100 = class FormulaArgumentExpression extends FormulaExpression {
+}), _class102)) || _class101);
+let FormulaArgumentExpression = (_dec117 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec118 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec119 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec117(_class103 = (_class104 = class FormulaArgumentExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor63, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor64, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor65, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor66, this);
   }
-}, _descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "select", [_dec114], {
+}, _descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class104.prototype, "select", [_dec118], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "type", [_dec115], {
+}), _descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class104.prototype, "type", [_dec119], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "decimal";
   }
-}), _class100)) || _class99);
-let FormulaArrayExpression = (_dec116 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("array", `TODO`), _dec117 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec116(_class101 = (_class102 = class FormulaArrayExpression extends FormulaExpression {
+}), _class104)) || _class103);
+let FormulaArrayExpression = (_dec120 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("array", `TODO`), _dec121 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec120(_class105 = (_class106 = class FormulaArrayExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor65, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor67, this);
   }
-}, _descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class102.prototype, "items", [_dec117], {
+}, _descriptor67 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "items", [_dec121], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class102)) || _class101);
-let FormulaFilterColumnExpression = (_dec118 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filtercolumn", `Получить значения пиклиста по фильру`), _dec119 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec118(_class103 = (_class104 = class FormulaFilterColumnExpression extends FormulaExpression {
+}), _class106)) || _class105);
+let FormulaFilterColumnExpression = (_dec122 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filtercolumn", `Получить значения пиклиста по фильру`), _dec123 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec122(_class107 = (_class108 = class FormulaFilterColumnExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor66, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor68, this);
   }
-}, _descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class104.prototype, "filterColumn", [_dec119], {
+}, _descriptor68 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "filterColumn", [_dec123], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class104)) || _class103);
-let FormulaFilterKeyExpression = (_dec120 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filterkey", `Получить значения пиклиста по фильру`), _dec121 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec120(_class105 = (_class106 = class FormulaFilterKeyExpression extends FormulaExpression {
+}), _class108)) || _class107);
+let FormulaFilterKeyExpression = (_dec124 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filterkey", `Получить значения пиклиста по фильру`), _dec125 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec124(_class109 = (_class110 = class FormulaFilterKeyExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor67, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor69, this);
   }
-}, _descriptor67 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "filterKey", [_dec121], {
+}, _descriptor69 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "filterKey", [_dec125], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class106)) || _class105);
-let FormulaGetPicklistValuesExpression = (_dec122 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getpicklistvalues", `Получить значения пиклиста по фильру. Используется только для генерации FLANG. В калькуляторе не работает`), _dec123 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("gId", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec124 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filtercolumn", [FormulaFilterColumnExpression]), _dec125 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filterkey", [FormulaFilterKeyExpression]), _dec126 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("resultColumn", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec122(_class107 = (_class108 = class FormulaGetPicklistValuesExpression extends FormulaExpression {
+}), _class110)) || _class109);
+let FormulaGetPicklistValuesExpression = (_dec126 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getpicklistvalues", `Получить значения пиклиста по фильру. Используется только для генерации FLANG. В калькуляторе не работает`), _dec127 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("gId", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec128 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filtercolumn", [FormulaFilterColumnExpression]), _dec129 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filterkey", [FormulaFilterKeyExpression]), _dec130 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("resultColumn", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec126(_class111 = (_class112 = class FormulaGetPicklistValuesExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gId", _descriptor68, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor69, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor70, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "resultColumn", _descriptor71, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gId", _descriptor70, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor71, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor72, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "resultColumn", _descriptor73, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "getPicklistValues";
   }
-}, _descriptor68 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "gId", [_dec123], {
+}, _descriptor70 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "gId", [_dec127], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor69 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "filterColumn", [_dec124], {
+}), _descriptor71 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "filterColumn", [_dec128], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor70 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "filterKey", [_dec125], {
+}), _descriptor72 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "filterKey", [_dec129], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor71 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "resultColumn", [_dec126], {
+}), _descriptor73 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "resultColumn", [_dec130], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class108)) || _class107);
-let FormulaFirstOrDefaultExpression = (_dec127 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("firstordefault", `Взять первый элемент массива. Используется только для генерации FLANG. В калькуляторе не работает`), _dec128 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec127(_class109 = (_class110 = class FormulaFirstOrDefaultExpression extends FormulaExpression {
+}), _class112)) || _class111);
+let FormulaFirstOrDefaultExpression = (_dec131 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("firstordefault", `Взять первый элемент массива. Используется только для генерации FLANG. В калькуляторе не работает`), _dec132 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec131(_class113 = (_class114 = class FormulaFirstOrDefaultExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor72, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor74, this);
   }
-}, _descriptor72 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class110.prototype, "expression", [_dec128], {
+}, _descriptor74 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class114.prototype, "expression", [_dec132], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class110)) || _class109);
-let FormulaHashSetExpression = (_dec129 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("hashset", `Оставить только уникальные значения в массиве. Используется только для генерации FLANG. В калькуляторе не работает`), _dec130 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec129(_class111 = (_class112 = class FormulaHashSetExpression extends FormulaExpression {
+}), _class114)) || _class113);
+let FormulaHashSetExpression = (_dec133 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("hashset", `Оставить только уникальные значения в массиве. Используется только для генерации FLANG. В калькуляторе не работает`), _dec134 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec133(_class115 = (_class116 = class FormulaHashSetExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor73, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor75, this);
   }
-}, _descriptor73 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "expression", [_dec130], {
+}, _descriptor75 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "expression", [_dec134], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class112)) || _class111);
-let FormulaExistsExpression = (_dec131 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec132 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec131(_class113 = (_class114 = class FormulaExistsExpression extends FormulaExpression {
+}), _class116)) || _class115);
+let FormulaExistsExpression = (_dec135 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec136 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec135(_class117 = (_class118 = class FormulaExistsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor74, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor76, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "exists";
   }
-}, _descriptor74 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class114.prototype, "select", [_dec132], {
+}, _descriptor76 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "select", [_dec136], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class114)) || _class113);
-let FormulaMultySumExpression = (_dec133 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec134 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec133(_class115 = (_class116 = class FormulaMultySumExpression extends FormulaExpression {
+}), _class118)) || _class117);
+let FormulaMultySumExpression = (_dec137 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec138 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec137(_class119 = (_class120 = class FormulaMultySumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor75, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor77, this);
   }
-}, _descriptor75 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "select", [_dec134], {
+}, _descriptor77 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class120.prototype, "select", [_dec138], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class116)) || _class115);
-let FormulaCountExpression = (_dec135 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec136 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec137 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec135(_class117 = (_class118 = class FormulaCountExpression extends FormulaExpression {
+}), _class120)) || _class119);
+let FormulaCountExpression = (_dec139 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec140 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec141 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec139(_class121 = (_class122 = class FormulaCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor76, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor77, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor78, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor79, this);
   }
-}, _descriptor76 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "select", [_dec136], {
+}, _descriptor78 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "select", [_dec140], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor77 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "withNullOrEmptyValues", [_dec137], {
+}), _descriptor79 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "withNullOrEmptyValues", [_dec141], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class118)) || _class117);
-let FormulaInstanceCountExpression = (_dec138 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("instancecount", `TODO`), _dec139 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec138(_class119 = (_class120 = class FormulaInstanceCountExpression extends FormulaExpression {
+}), _class122)) || _class121);
+let FormulaInstanceCountExpression = (_dec142 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("instancecount", `TODO`), _dec143 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec142(_class123 = (_class124 = class FormulaInstanceCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor78, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor80, this);
   }
-}, _descriptor78 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class120.prototype, "select", [_dec139], {
+}, _descriptor80 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class124.prototype, "select", [_dec143], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class120)) || _class119);
-let FormulaIsEqualToAutoCalculatedExpression = (_dec140 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isequaltoautocalculated", `TODO`), _dec141 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec142 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("decimal", "string"), ``), _dec140(_class121 = (_class122 = class FormulaIsEqualToAutoCalculatedExpression extends FormulaExpression {
+}), _class124)) || _class123);
+let FormulaIsEqualToAutoCalculatedExpression = (_dec144 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isequaltoautocalculated", `TODO`), _dec145 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec146 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("decimal", "string"), ``), _dec144(_class125 = (_class126 = class FormulaIsEqualToAutoCalculatedExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor79, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor80, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor81, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor82, this);
   }
-}, _descriptor79 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "select", [_dec141], {
+}, _descriptor81 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class126.prototype, "select", [_dec145], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor80 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "type", [_dec142], {
+}), _descriptor82 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class126.prototype, "type", [_dec146], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class122)) || _class121);
-let FormulaJoinExpression = (_dec143 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("join", `TODO`), _dec144 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec143(_class123 = (_class124 = class FormulaJoinExpression extends FormulaExpression {
+}), _class126)) || _class125);
+let FormulaJoinExpression = (_dec147 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("join", `TODO`), _dec148 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec147(_class127 = (_class128 = class FormulaJoinExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "array", _descriptor81, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "array", _descriptor83, this);
   }
-}, _descriptor81 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class124.prototype, "array", [_dec144], {
+}, _descriptor83 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "array", [_dec148], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class124)) || _class123);
-let FormulaPropertyByNameExpression = (_dec145 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("property", `TODO`), _dec146 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("name", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec145(_class125 = (_class126 = class FormulaPropertyByNameExpression extends FormulaExpression {
+}), _class128)) || _class127);
+let FormulaPropertyByNameExpression = (_dec149 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("property", `TODO`), _dec150 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("name", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec149(_class129 = (_class130 = class FormulaPropertyByNameExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor82, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor84, this);
   }
-}, _descriptor82 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class126.prototype, "name", [_dec146], {
+}, _descriptor84 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class130.prototype, "name", [_dec150], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class126)) || _class125);
-let FormulaConcatExpression = (_dec147 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec148 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec147(_class127 = (_class128 = class FormulaConcatExpression extends FormulaExpression {
+}), _class130)) || _class129);
+let FormulaConcatExpression = (_dec151 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec152 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec151(_class131 = (_class132 = class FormulaConcatExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor83, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor85, this);
   }
-}, _descriptor83 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "arguments", [_dec148], {
+}, _descriptor85 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class132.prototype, "arguments", [_dec152], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class128)) || _class127);
-let FormulaNewLineExpression = (_dec149 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec149(_class129 = class FormulaNewLineExpression extends FormulaExpression {}) || _class129);
-let Formula = (_dec150 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec151 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec152 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec153 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec150(_class130 = (_class131 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class132)) || _class131);
+let FormulaNewLineExpression = (_dec153 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec153(_class133 = class FormulaNewLineExpression extends FormulaExpression {}) || _class133);
+let Formula = (_dec154 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec155 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec156 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec157 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec154(_class134 = (_class135 = 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", _descriptor84, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor85, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor86, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor86, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor87, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor88, this);
   }
-}, _descriptor84 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "match", [_dec151], {
+}, _descriptor86 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "match", [_dec155], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor85 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "target", [_dec152], {
+}), _descriptor87 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "target", [_dec156], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor86 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "expression", [_dec153], {
+}), _descriptor88 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "expression", [_dec157], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class131)) || _class130);
-let FormulaNoDepsNode = (_dec154 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("nodeps", `Замыкает цикл пробега по зависимостям на элементе, что исключает бесконечную зацикленность. Только для серверной нормализации`), _dec155 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec154(_class132 = (_class133 = class FormulaNoDepsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class135)) || _class134);
+let FormulaNoDepsNode = (_dec158 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("nodeps", `Замыкает цикл пробега по зависимостям на элементе, что исключает бесконечную зацикленность. Только для серверной нормализации`), _dec159 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec158(_class136 = (_class137 = class FormulaNoDepsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor87, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor89, this);
   }
-}, _descriptor87 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "expression", [_dec155], {
+}, _descriptor89 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "expression", [_dec159], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class133)) || _class132);
-let Formulas = (_dec156 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec157 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec156(_class134 = (_class135 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class137)) || _class136);
+let Formulas = (_dec160 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec161 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec160(_class138 = (_class139 = 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", _descriptor88, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor90, this);
   }
-}, _descriptor88 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "items", [_dec157], {
+}, _descriptor90 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "items", [_dec161], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class135)) || _class134);
-let ConditionNode = (_dec158 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec159 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec160 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec161 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec162 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec163 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec158(_class136 = (_class137 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class139)) || _class138);
+let ConditionNode = (_dec162 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec163 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec164 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec165 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec166 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec167 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec162(_class140 = (_class141 = 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", _descriptor89, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor90, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor91, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor92, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor93, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor91, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor92, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor93, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor94, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor95, this);
   }
-}, _descriptor89 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "match", [_dec159], {
+}, _descriptor91 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "match", [_dec163], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor90 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "target", [_dec160], {
+}), _descriptor92 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "target", [_dec164], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor91 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "description", [_dec161], {
+}), _descriptor93 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "description", [_dec165], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor92 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "errorLevel", [_dec162], {
+}), _descriptor94 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "errorLevel", [_dec166], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor93 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "expression", [_dec163], {
+}), _descriptor95 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "expression", [_dec167], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class137)) || _class136);
-let ConditionsNode = (_dec164 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec165 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec164(_class138 = (_class139 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class141)) || _class140);
+let ConditionsNode = (_dec168 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec169 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec168(_class142 = (_class143 = 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", _descriptor94, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor96, this);
   }
-}, _descriptor94 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "items", [_dec165], {
+}, _descriptor96 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "items", [_dec169], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class139)) || _class138);
-let MathContainer = (_dec166 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec167 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec168 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec166(_class140 = (_class141 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class143)) || _class142);
+let MathContainer = (_dec170 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec171 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec172 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec170(_class144 = (_class145 = 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", _descriptor95, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor96, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor97, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor98, this);
   }
-}, _descriptor95 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "formulas", [_dec167], {
+}, _descriptor97 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "formulas", [_dec171], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor96 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "conditions", [_dec168], {
+}), _descriptor98 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "conditions", [_dec172], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class141)) || _class140);
-let FormulaMakeDictExpression = (_dec169 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("makedict", `Получение словаря по ключу-значению из иннера`), _dec170 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ`), _dec171 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(undefined, [FormulaArgumentExpression, FormulaConstExpression, FormulaCastExpression], `Путь откуда брать значение или константа`), _dec169(_class142 = (_class143 = class FormulaMakeDictExpression extends FormulaExpression {
+}), _class145)) || _class144);
+let FormulaMakeDictExpression = (_dec173 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("makedict", `Получение словаря по ключу-значению из иннера`), _dec174 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ`), _dec175 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(undefined, [FormulaArgumentExpression, FormulaConstExpression, FormulaCastExpression], `Путь откуда брать значение или константа`), _dec173(_class146 = (_class147 = class FormulaMakeDictExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor97, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValueExpression", _descriptor98, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor99, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValueExpression", _descriptor100, this);
   }
-}, _descriptor97 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "sourceKeyPath", [_dec170], {
+}, _descriptor99 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "sourceKeyPath", [_dec174], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor98 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "sourceValueExpression", [_dec171], {
+}), _descriptor100 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "sourceValueExpression", [_dec175], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class143)) || _class142);
-let FormulaGetSumByKeysExpression = (_dec172 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getsumbykeys", `Вычисление суммы с группировкой в разных множественностях`), _dec173 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("dictPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь к словарю`), _dec174 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec172(_class144 = (_class145 = class FormulaGetSumByKeysExpression extends FormulaExpression {
+}), _class147)) || _class146);
+let FormulaGetSumByKeysExpression = (_dec176 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getsumbykeys", `Вычисление суммы с группировкой в разных множественностях`), _dec177 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("dictPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь к словарю`), _dec178 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec176(_class148 = (_class149 = class FormulaGetSumByKeysExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dictPath", _descriptor99, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor100, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dictPath", _descriptor101, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor102, this);
   }
-}, _descriptor99 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "dictPath", [_dec173], {
+}, _descriptor101 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "dictPath", [_dec177], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor100 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "targetKeys", [_dec174], {
+}), _descriptor102 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "targetKeys", [_dec178], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class145)) || _class144);
-let FormulaGroupSumExpression = (_dec175 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec176 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec177 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec178 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec175(_class146 = (_class147 = class FormulaGroupSumExpression extends FormulaExpression {
+}), _class149)) || _class148);
+let FormulaGroupSumExpression = (_dec179 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec180 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec181 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec182 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec179(_class150 = (_class151 = class FormulaGroupSumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor101, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor102, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor103, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor103, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor104, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor105, this);
   }
-}, _descriptor101 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "targetKeys", [_dec176], {
+}, _descriptor103 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class151.prototype, "targetKeys", [_dec180], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor102 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "sourceKeyPath", [_dec177], {
+}), _descriptor104 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class151.prototype, "sourceKeyPath", [_dec181], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor103 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "sourceValuePath", [_dec178], {
+}), _descriptor105 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class151.prototype, "sourceValuePath", [_dec182], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class147)) || _class146);
-let FormulaGroupCountExpression = (_dec179 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec180 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec181 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec179(_class148 = (_class149 = class FormulaGroupCountExpression extends FormulaExpression {
+}), _class151)) || _class150);
+let FormulaGroupCountExpression = (_dec183 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec184 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec185 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec183(_class152 = (_class153 = class FormulaGroupCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor104, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor105, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor106, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor107, this);
   }
-}, _descriptor104 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "targetKeys", [_dec180], {
+}, _descriptor106 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class153.prototype, "targetKeys", [_dec184], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor105 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "sourceKeyPath", [_dec181], {
+}), _descriptor107 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class153.prototype, "sourceKeyPath", [_dec185], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class149)) || _class148);
+}), _class153)) || _class152);
 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, FormulaInstanceCountExpression, FormulaIsEqualToAutoCalculatedExpression, FormulaDateNowExpression, FormulaGetDaysInMonthExpression, FormulaGetDayExpression, FormulaGetMonthExpression, FormulaGetYearExpression, FormulaIsDateExpression, FormulaDifferenceInMonthsExpression, FormulaDifferenceInDaysExpression, FormulaAddDaysExpression, FormulaAddMonthsExpression, FormulaAddYearsExpression, FormulaDateToStringExpression, FormulaDateTimeExpression, FormulaSumOfDayWeightsExpression, FormulaIsSnilsExpression, FormulaIsRegNumSfrExpression, FormulaIsInnExpression, FormulaIsOgrnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaGetPicklistValuesExpression, FormulaArrayExpression, FormulaFirstOrDefaultExpression, FormulaHashSetExpression, FormulaFilterColumnExpression, FormulaFilterKeyExpression, FormulaNoDepsNode, FormulaHasAutoFlagExpression, FormulaMakeDictExpression, FormulaGetSumByKeysExpression, FormulaJoinExpression, FormulaPropertyByNameExpression];
 
 /***/ }),
@@ -71797,36 +71725,29 @@ class KCXmlGeneratorBase {
       return gcf(x => x.exists, `"${modelPath.toLegacyPath()}"`);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsSnilsExpression) {
-      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
-      return gcf(x => x.isSnils, `"${modelPath.toLegacyPath()}"`);
+      const value = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return gcf(x => x.isSnils, value);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsRegNumSfrExpression) {
-      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
-      return gcf(x => x.isRegNumSfr, `"${modelPath.toLegacyPath()}"`);
+      const value = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return gcf(x => x.isRegNumSfr, value);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsInnExpression) {
-      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
-      return gcf(x => x.isInn, `"${modelPath.toLegacyPath()}"`);
+      const value = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return gcf(x => x.isInn, value);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsOgrnExpression) {
-      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
-      return gcf(x => x.isOgrn, `"${modelPath.toLegacyPath()}"`);
+      const value = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return gcf(x => x.isOgrn, value);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsValidMirCardNumberExpression) {
-      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
-      return gcf(x => x.isValidMirCardNumber, `"${modelPath.toLegacyPath()}"`);
+      const value = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return gcf(x => x.isValidMirCardNumber, value);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsValidAccountNumberExpression) {
-      const bikPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.bik)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      const accountPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.account)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(bikPath));
-      deps.push(new RegularDependency(accountPath));
-      return gcf(x => x.isValidAccountNumber, `"${bikPath.toLegacyPath()}"`, `"${accountPath.toLegacyPath()}"`);
+      const bikValue = this.compileExpression(prefix, targetFullPath, expression.bik.bik, deps);
+      const accountValue = this.compileExpression(prefix, targetFullPath, expression.account.account, deps);
+      return gcf(x => x.isValidAccountNumber, bikValue, accountValue);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaCountExpression) {
       var _expression$withNullO;
@@ -72065,6 +71986,10 @@ class KCXmlGeneratorBase {
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaPropertyByNameExpression) {
       return gcf(x => x.getProperty, JSON.stringify(expression.name));
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaCastExpression) {
+      const compiledExpression = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return compiledExpression;
+    }
     // -- не работает в рантайм калькуляторе
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaFirstOrDefaultExpression) {
       return "null";
@@ -72830,12 +72755,17 @@ async function readFormSources(formSourcesPath, farmDirectory) {
     const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
     sugarReferences.fetchFunctionFiles = (await readdirAsync(legacyfetchfunctionsDirectory)).map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(legacyfetchfunctionsDirectory, x));
   }
+  const additionalNormalizers = await readAdditionalNormalizersFiles(formSourcesPath);
+  const formJsonSettings = (_JSON$parse$settings = JSON.parse(await readFileSource(formSourcesPath, "form.json", "{}"))["settings"]) !== null && _JSON$parse$settings !== void 0 ? _JSON$parse$settings : {};
+  if (additionalNormalizers.length > 0 && !formJsonSettings.useServerSideFLangNormalization) {
+    throw new Error("[ERROR] Не проставлен флаг useServerSideFLangNormalization, но папка normalizers не пустая");
+  }
   const result = {
     sugarContent: sugarContent,
     resources: {
       gfv: gfv,
       formSourcesPath: formSourcesPath,
-      formJsonSettings: (_JSON$parse$settings = JSON.parse(await readFileSource(formSourcesPath, "form.json", "{}"))["settings"]) !== null && _JSON$parse$settings !== void 0 ? _JSON$parse$settings : {},
+      formJsonSettings: formJsonSettings,
       additionalSettings: await readFileSource(formSourcesPath, "settings.json", "{}"),
       autocalcsContent: await readAutoCalcFiles(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc")),
       helpersContent: await readJavaScriptFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "helpers")),
@@ -72850,7 +72780,7 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       fetchFunctionSources: await readFiles(sugarReferences.fetchFunctionFiles.map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x))),
       localization: await connectJSFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "localization")),
       importedFiles: await readImportedFiles(formSourcesPath),
-      additionalNormalizers: await readAdditionalNormalizersFiles(formSourcesPath)
+      additionalNormalizers: additionalNormalizers
     }
   };
   if (gfv.startsWith("4")) {
@@ -73326,9 +73256,11 @@ __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 _Common_hashUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../../Common/hashUtils */ "./Common/hashUtils.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 var _BuildInTypeExpression;
 
 
+
 class FLangNode {
   toString() {
     return this.convertToString();
@@ -73606,6 +73538,33 @@ class BuildInTypeExpression extends TypeReferenceExpression {
   convertToString() {
     return this.buildInTypeName;
   }
+  static getByName(typeName) {
+    switch (typeName) {
+      case "string":
+        return BuildInTypeExpression.string;
+      case "decimal":
+        return BuildInTypeExpression.decimal;
+      case "dict":
+        return BuildInTypeExpression.dict;
+      case "bool":
+        return BuildInTypeExpression.bool;
+      case "null":
+        return BuildInTypeExpression.null;
+      case "dateTime":
+        return BuildInTypeExpression.dateTime;
+      case "int":
+        return BuildInTypeExpression.int;
+      case "array":
+        return BuildInTypeExpression.array;
+      case "hashSet":
+        return BuildInTypeExpression.hashSet;
+      case "object":
+        return BuildInTypeExpression.object;
+      default:
+        (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureNever)(typeName);
+        return (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)();
+    }
+  }
 }
 _BuildInTypeExpression = BuildInTypeExpression;
 BuildInTypeExpression.object = new _BuildInTypeExpression("object");
@@ -74734,7 +74693,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   dictFieldNameSuffix: () => (/* binding */ dictFieldNameSuffix),
 /* harmony export */   ensureCorrectFieldNameByExpressionType: () => (/* binding */ ensureCorrectFieldNameByExpressionType),
 /* harmony export */   ensureOperandsOfTypeOrNull: () => (/* binding */ ensureOperandsOfTypeOrNull),
+/* harmony export */   extractOriginalStringValueOrCastToStringIfNeeded: () => (/* binding */ extractOriginalStringValueOrCastToStringIfNeeded),
 /* harmony export */   extractValueReferenceFromCast: () => (/* binding */ extractValueReferenceFromCast),
+/* harmony export */   extractValueReferenceFromCastSafe: () => (/* binding */ extractValueReferenceFromCastSafe),
 /* harmony export */   getAllExpressionChildren: () => (/* binding */ getAllExpressionChildren),
 /* harmony export */   getSelectorIdFromRule: () => (/* binding */ getSelectorIdFromRule),
 /* harmony export */   hashSetFieldNameSuffix: () => (/* binding */ hashSetFieldNameSuffix),
@@ -74945,6 +74906,26 @@ function extractValueReferenceFromCast(expression) {
   }
   return (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)(`Cannot extract ValueReferenceExpression! ${(0,util__WEBPACK_IMPORTED_MODULE_0__.inspect)(expression)}`);
 }
+function extractValueReferenceFromCastSafe(expression) {
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression];
+  }
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.CastExpression && expression.targetExpression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression.targetExpression];
+  }
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.CastExpression && expression.targetExpression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NoDepsExpression && expression.targetExpression.expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression.targetExpression.expression];
+  }
+  return [false];
+}
+function extractOriginalStringValueOrCastToStringIfNeeded(expression) {
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.DecimalLiteralExpression) {
+    return new _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(expression.value.toString());
+  }
+  const [success, extractedExpr] = extractValueReferenceFromCastSafe(expression);
+  const exprToCast = success ? extractedExpr : expression;
+  return castOperandToStringIfNeed(exprToCast);
+}
 function ensureCorrectFieldNameByExpressionType(statement) {
   if (statement instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.SetStatement) {
     const lastPart = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(statement.left.modePath.getPathParts());
@@ -75375,24 +75356,24 @@ class FormulaExpressionToFlangExpressionConverter {
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.SumOfDayWeightsExpression(expressions);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsSnilsExpression) {
-      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsSnilsExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+      const arg = this.compileExpressionToFlangExpression(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsSnilsExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(arg));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsRegNumSfrExpression) {
-      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsRegNumSfrExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+      const arg = this.compileExpressionToFlangExpression(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsRegNumSfrExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(arg));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsInnExpression) {
-      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsInnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+      const arg = this.compileExpressionToFlangExpression(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsInnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(arg));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsOgrnExpression) {
-      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsOgrnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+      const arg = this.compileExpressionToFlangExpression(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsOgrnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(arg));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsValidMirCardNumberExpression) {
-      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsValidMirCardNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+      const arg = this.compileExpressionToFlangExpression(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsValidMirCardNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(arg));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaArrayExpression) {
       const items = expression.items.map(arg => this.compileEnumerationItem(arg, prefix, target, addPrecalculationRule));
@@ -75414,9 +75395,9 @@ class FormulaExpressionToFlangExpressionConverter {
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.GetPicklistValuesExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.StringLiteralExpression(expression.gId), filterColumn, filterKey, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.StringLiteralExpression(expression.resultColumn));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsValidAccountNumberExpression) {
-      const bik = this.compiledArgumentExpression(prefix, target, expression.bik, "string", addPrecalculationRule);
-      const account = this.compiledArgumentExpression(prefix, target, expression.account, "string", addPrecalculationRule);
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsValidAccountNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(bik), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(account));
+      const bik = this.compileExpressionToFlangExpressionInternal(expression.bik, prefix, target, addPrecalculationRule);
+      const account = this.compileExpressionToFlangExpressionInternal(expression.account, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsValidAccountNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(bik), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(account));
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaGroupSumExpression) {
       return this.compileGroupSumExpression(prefix, target, expression, addPrecalculationRule);
@@ -75431,8 +75412,8 @@ class FormulaExpressionToFlangExpressionConverter {
       return this.compileGetSumByKeysExpression(prefix, target, expression, addPrecalculationRule);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaOneOfExpression) {
-      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(expression.argument, prefix, target, addPrecalculationRule));
-      const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
+      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(this.compileExpressionToFlangExpressionInternal(expression.argument, prefix, target, addPrecalculationRule));
+      const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.OneOfExpression(arg, items);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaHasAutoFlagExpression) {
@@ -75468,6 +75449,11 @@ class FormulaExpressionToFlangExpressionConverter {
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaPropertyByNameExpression) {
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.StringLiteralExpression("");
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaCastExpression) {
+      const targetType = _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.BuildInTypeExpression.getByName(expression.type);
+      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(expression.expression, prefix, target, addPrecalculationRule));
+      return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandIfNeed)(arg, targetType);
+    }
     throw new Error(`Unsupported type of node: ${expression.constructor.name}, ${expression.sourceXmlNode.name}`);
   }
   castOperandForComparisonExpression(formulaExpression, flangExpression) {
@@ -104593,45 +104579,43 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   combineByAndKCLangExpr: () => (/* binding */ combineByAndKCLangExpr)
 /* harmony export */ });
 /* harmony import */ var _Common_AutoValidationUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/AutoValidationUtils */ "./Common/AutoValidationUtils.ts");
-/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/ModelPath/PathSplitHelper */ "./Common/ModelPath/PathSplitHelper.ts");
-/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/AndExpression */ "./Generator/src/common/KCLang/CodeDom/AndExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/CastExpression */ "./Generator/src/common/KCLang/CodeDom/CastExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/CheckStatement */ "./Generator/src/common/KCLang/CodeDom/CheckStatement.ts");
-/* harmony import */ var _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/DecimalConstExpression */ "./Generator/src/common/KCLang/CodeDom/DecimalConstExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/DescriptionText */ "./Generator/src/common/KCLang/CodeDom/DescriptionText.ts");
-/* harmony import */ var _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/EqExpression */ "./Generator/src/common/KCLang/CodeDom/EqExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/ExistsFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/ExistsFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_GetPicklistValuesFunctionCall__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/GetPicklistValuesFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/GetPicklistValuesFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_JoinFunctionCall__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/JoinFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/JoinFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/LengthFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/LengthFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/RegexMatchFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/RegexMatchFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/GeExpression */ "./Generator/src/common/KCLang/CodeDom/GeExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/IfStatement */ "./Generator/src/common/KCLang/CodeDom/IfStatement.ts");
-/* harmony import */ var _common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangPath */ "./Generator/src/common/KCLang/CodeDom/KCLangPath.ts");
-/* harmony import */ var _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangType */ "./Generator/src/common/KCLang/CodeDom/KCLangType.ts");
-/* harmony import */ var _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/LeExpression */ "./Generator/src/common/KCLang/CodeDom/LeExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/NotEqExpression */ "./Generator/src/common/KCLang/CodeDom/NotEqExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/NotExpression */ "./Generator/src/common/KCLang/CodeDom/NotExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_OneOfExpression__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/OneOfExpression */ "./Generator/src/common/KCLang/CodeDom/OneOfExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/OrExpression */ "./Generator/src/common/KCLang/CodeDom/OrExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/StringArrayConstExpression */ "./Generator/src/common/KCLang/CodeDom/StringArrayConstExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/StringConstExpression */ "./Generator/src/common/KCLang/CodeDom/StringConstExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/ValueReferenceExpression */ "./Generator/src/common/KCLang/CodeDom/ValueReferenceExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/WithBlock */ "./Generator/src/common/KCLang/CodeDom/WithBlock.ts");
-/* harmony import */ var _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../../common/SchemaRng/FormSchemaRng */ "./Generator/src/common/SchemaRng/FormSchemaRng.ts");
-/* harmony import */ var _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../../common/SchemaRng/Nodes/SchemaRngRoot */ "./Generator/src/common/SchemaRng/Nodes/SchemaRngRoot.ts");
-/* harmony import */ var _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../../common/SchemaRng/StringTypeMessageGenerator */ "./Generator/src/common/SchemaRng/StringTypeMessageGenerator.ts");
-/* harmony import */ var _validationGenerator_MaxOptionalChildrenLimit__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../validationGenerator/MaxOptionalChildrenLimit */ "./Generator/src/generators/validationGenerator/MaxOptionalChildrenLimit.ts");
-/* harmony import */ var _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../validationGenerator/Nodes/TypeNode */ "./Generator/src/generators/validationGenerator/Nodes/TypeNode.ts");
-/* harmony import */ var _common_KCLang_CodeDom_Functions_IsEqualToAutoCalculatedFunctionCall__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/IsEqualToAutoCalculatedFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/IsEqualToAutoCalculatedFunctionCall.ts");
-/* harmony import */ var _common_KCLang_CodeDom_KCLangRawStringExpression__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangRawStringExpression */ "./Generator/src/common/KCLang/CodeDom/KCLangRawStringExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_GtExpression__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/GtExpression */ "./Generator/src/common/KCLang/CodeDom/GtExpression.ts");
-/* harmony import */ var _common_KCLang_CodeDom_LtExpression__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/LtExpression */ "./Generator/src/common/KCLang/CodeDom/LtExpression.ts");
-/* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
-
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/ModelPath/PathSplitHelper */ "./Common/ModelPath/PathSplitHelper.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/AndExpression */ "./Generator/src/common/KCLang/CodeDom/AndExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/CastExpression */ "./Generator/src/common/KCLang/CodeDom/CastExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/CheckStatement */ "./Generator/src/common/KCLang/CodeDom/CheckStatement.ts");
+/* harmony import */ var _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/DecimalConstExpression */ "./Generator/src/common/KCLang/CodeDom/DecimalConstExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/DescriptionText */ "./Generator/src/common/KCLang/CodeDom/DescriptionText.ts");
+/* harmony import */ var _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/EqExpression */ "./Generator/src/common/KCLang/CodeDom/EqExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/ExistsFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/ExistsFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_GetPicklistValuesFunctionCall__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/GetPicklistValuesFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/GetPicklistValuesFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_JoinFunctionCall__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/JoinFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/JoinFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/LengthFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/LengthFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/RegexMatchFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/RegexMatchFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/GeExpression */ "./Generator/src/common/KCLang/CodeDom/GeExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/IfStatement */ "./Generator/src/common/KCLang/CodeDom/IfStatement.ts");
+/* harmony import */ var _common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangPath */ "./Generator/src/common/KCLang/CodeDom/KCLangPath.ts");
+/* harmony import */ var _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangType */ "./Generator/src/common/KCLang/CodeDom/KCLangType.ts");
+/* harmony import */ var _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/LeExpression */ "./Generator/src/common/KCLang/CodeDom/LeExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/NotEqExpression */ "./Generator/src/common/KCLang/CodeDom/NotEqExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/NotExpression */ "./Generator/src/common/KCLang/CodeDom/NotExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_OneOfExpression__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/OneOfExpression */ "./Generator/src/common/KCLang/CodeDom/OneOfExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/OrExpression */ "./Generator/src/common/KCLang/CodeDom/OrExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/StringArrayConstExpression */ "./Generator/src/common/KCLang/CodeDom/StringArrayConstExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/StringConstExpression */ "./Generator/src/common/KCLang/CodeDom/StringConstExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/ValueReferenceExpression */ "./Generator/src/common/KCLang/CodeDom/ValueReferenceExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/WithBlock */ "./Generator/src/common/KCLang/CodeDom/WithBlock.ts");
+/* harmony import */ var _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../../common/SchemaRng/FormSchemaRng */ "./Generator/src/common/SchemaRng/FormSchemaRng.ts");
+/* harmony import */ var _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../../common/SchemaRng/Nodes/SchemaRngRoot */ "./Generator/src/common/SchemaRng/Nodes/SchemaRngRoot.ts");
+/* harmony import */ var _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../../common/SchemaRng/StringTypeMessageGenerator */ "./Generator/src/common/SchemaRng/StringTypeMessageGenerator.ts");
+/* harmony import */ var _validationGenerator_MaxOptionalChildrenLimit__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../validationGenerator/MaxOptionalChildrenLimit */ "./Generator/src/generators/validationGenerator/MaxOptionalChildrenLimit.ts");
+/* harmony import */ var _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../validationGenerator/Nodes/TypeNode */ "./Generator/src/generators/validationGenerator/Nodes/TypeNode.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_IsEqualToAutoCalculatedFunctionCall__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/IsEqualToAutoCalculatedFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/IsEqualToAutoCalculatedFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_KCLangRawStringExpression__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/KCLangRawStringExpression */ "./Generator/src/common/KCLang/CodeDom/KCLangRawStringExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_GtExpression__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/GtExpression */ "./Generator/src/common/KCLang/CodeDom/GtExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_LtExpression__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/LtExpression */ "./Generator/src/common/KCLang/CodeDom/LtExpression.ts");
+/* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ./Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
 
 
 
@@ -104689,32 +104673,32 @@ class KCLangCalculationsBuildContext {
     const baseDescription = (_typeNode$description = typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _typeNode$description !== void 0 ? _typeNode$description : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description;
     const valueChecks = [];
     if (baseName != undefined) {
-      valueChecks.push(...Iterator.from(this.createBaseTypeValidation(targetPath, baseName, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(baseDescription))).toArray());
+      valueChecks.push(...Iterator.from(this.createBaseTypeValidation(targetPath, baseName, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)(baseDescription))).toArray());
     }
     valueChecks.push(...Iterator.from(this.createTypeValidations(targetPath, typeNode, schemaTypeNode, nodeGId)).toArray());
     const schemaNode = this.schemaRng.getElementByPath(targetFullPath);
     if (!optional) {
-      var _ref, _ref2, _ref3, _ref4, _allChildrenPaths$len, _allChildrenPaths, _allChildrenPaths2, _IterUtils$last;
+      var _ref, _ref2, _ref3, _ref4, _allChildrenPaths$len, _allChildrenPaths, _allChildrenPaths2;
       const requiredDescription = (_ref = (_ref2 = (_ref3 = (_ref4 = highOrderDescription !== null && highOrderDescription !== void 0 ? highOrderDescription : typeNode === null || typeNode === void 0 ? void 0 : typeNode.requiredDescription) !== null && _ref4 !== void 0 ? _ref4 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.requiredDescription) !== null && _ref3 !== void 0 ? _ref3 : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref2 !== void 0 ? _ref2 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description) !== null && _ref !== void 0 ? _ref : "Поле должно быть заполнено";
       const parentNode = schemaNode != undefined ? this.getFirstAcceptedParent(schemaNode) : undefined;
-      let allChildrenPaths = parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_29__.FormSchemaRngElement ? this.schemaRng.getAllChildValueNodes(parentNode).map(x => this.schemaRng.getPath(x, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.PathTokens.each)).filter(x => !(0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_3__.getMatchedAndDifferentModelPaths)(targetFullPath, x).differentPath.isContainIteration()) : undefined;
-      if (((_allChildrenPaths$len = (_allChildrenPaths = allChildrenPaths) === null || _allChildrenPaths === void 0 ? void 0 : _allChildrenPaths.length) !== null && _allChildrenPaths$len !== void 0 ? _allChildrenPaths$len : 0) > _validationGenerator_MaxOptionalChildrenLimit__WEBPACK_IMPORTED_MODULE_32__.maxOptionalChildrenLimit) {
+      let allChildrenPaths = parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__.FormSchemaRngElement ? this.schemaRng.getAllChildValueNodes(parentNode).map(x => this.schemaRng.getPath(x, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).filter(x => !(0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_2__.getMatchedAndDifferentModelPaths)(targetFullPath, x).differentPath.isContainIteration()) : undefined;
+      if (((_allChildrenPaths$len = (_allChildrenPaths = allChildrenPaths) === null || _allChildrenPaths === void 0 ? void 0 : _allChildrenPaths.length) !== null && _allChildrenPaths$len !== void 0 ? _allChildrenPaths$len : 0) > _validationGenerator_MaxOptionalChildrenLimit__WEBPACK_IMPORTED_MODULE_31__.maxOptionalChildrenLimit) {
         allChildrenPaths = undefined;
       }
-      const restChecks = (_allChildrenPaths2 = allChildrenPaths) === null || _allChildrenPaths2 === void 0 ? void 0 : _allChildrenPaths2.map(childPath => new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_5__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_11__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(childPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_21__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(childPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("")))).reduce(combineByAndKCLangExpr, undefined);
-      const checkRequiredStatement = new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_5__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_11__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_21__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression(""))), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(requiredDescription))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.PathTokens.isSimpleToken))) !== null && _IterUtils$last !== void 0 ? _IterUtils$last : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+      const restChecks = (_allChildrenPaths2 = allChildrenPaths) === null || _allChildrenPaths2 === void 0 ? void 0 : _allChildrenPaths2.map(childPath => new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(childPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(childPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")))).reduce(combineByAndKCLangExpr, undefined);
+      const checkRequiredStatement = new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)(requiredDescription))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken).toArray()).toString()))]);
       if (restChecks != undefined) {
-        yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(restChecks, [checkRequiredStatement]);
+        yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(restChecks, [checkRequiredStatement]);
       } else {
         yield checkRequiredStatement;
       }
     }
-    yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_5__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_11__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_21__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression(""))), valueChecks);
+    yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), valueChecks);
   }
   getFirstAcceptedParent(schemaNode) {
     let parentNode = schemaNode === null || schemaNode === void 0 ? void 0 : schemaNode.parent;
     while (parentNode != undefined) {
-      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_29__.FormSchemaRngElement) {
+      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__.FormSchemaRngElement) {
         var _parentNode$multiple;
         if ((_parentNode$multiple = parentNode.multiple) !== null && _parentNode$multiple !== void 0 ? _parentNode$multiple : false) {
           return parentNode;
@@ -104730,175 +104714,173 @@ class KCLangCalculationsBuildContext {
     return undefined;
   }
   createCheck(targetPath, condition, message, checkType) {
-    var _IterUtils$last2;
-    const withBlocks = [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(message.replace(/\[/gi, "\\[").replace(/]/gi, "\\]"))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last2 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(Iterator.from(targetPath.getPathParts()).filter(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.PathTokens.isSimpleToken(x) && !_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.PathTokens.isInstanceToken(x)))) !== null && _IterUtils$last2 !== void 0 ? _IterUtils$last2 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))];
+    const withBlocks = [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(message.replace(/\[/gi, "\\[").replace(/]/gi, "\\]"))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken).toArray()).toString()))];
     if (checkType == "warning") {
-      withBlocks.push(new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("errorLevel", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText("Warning")));
+      withBlocks.push(new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("errorLevel", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText("Warning")));
     }
-    return new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(condition, withBlocks);
+    return new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(condition, withBlocks);
   }
   *createTypeValidations(targetPath, typeNode, schemaTypeNode, nodeGId) {
     var _typeNode$checkType, _typeNode$children$fi, _typeNode$children, _schemaTypeNode$enume, _digest$gId, _typeNode$children2, _typeNodeLength$value, _typeNode$children3, _typeNodeMinLength$va, _typeNode$children4, _typeNodeMaxLength$va, _typeNode$children5, _typeNodeMinInclusive, _typeNode$children6, _typeNodeMinExclusive, _typeNode$children7, _typeNodeMaxInclusive, _typeNode$children8, _typeNodeMaxExclusive, _typeNode$children9, _typeNodeTotalDigits$, _typeNode$children$fi2, _typeNode$children10, _typeNode$children11, _typeNode$children$fi3, _typeNode$children12, _schemaTypeNode$patte, _typeNode$children13, _typeNodeInteger$valu, _typeNode$children14, _typeNodeFractional$v, _ref10, _typeNode$children$fi4, _typeNode$children15, _typeNode$children16, _typeNode$base2;
     const checkType = (_typeNode$checkType = typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _typeNode$checkType !== void 0 ? _typeNode$checkType : "error";
-    const typeNodeEnumerations = (_typeNode$children$fi = typeNode === null || typeNode === void 0 || (_typeNode$children = typeNode.children) === null || _typeNode$children === void 0 || (_typeNode$children = _typeNode$children.filter(x => x instanceof _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.EnumerationTypeCheckNode)) === null || _typeNode$children === void 0 ? void 0 : _typeNode$children.map(x => x.value)) !== null && _typeNode$children$fi !== void 0 ? _typeNode$children$fi : [];
-    const enumerationItems = (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.arrayIsNotEmpty)(typeNodeEnumerations) ? typeNodeEnumerations : (_schemaTypeNode$enume = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.enumeration) !== null && _schemaTypeNode$enume !== void 0 ? _schemaTypeNode$enume : [];
+    const typeNodeEnumerations = (_typeNode$children$fi = typeNode === null || typeNode === void 0 || (_typeNode$children = typeNode.children) === null || _typeNode$children === void 0 || (_typeNode$children = _typeNode$children.filter(x => x instanceof _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.EnumerationTypeCheckNode)) === null || _typeNode$children === void 0 ? void 0 : _typeNode$children.map(x => x.value)) !== null && _typeNode$children$fi !== void 0 ? _typeNode$children$fi : [];
+    const enumerationItems = (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.arrayIsNotEmpty)(typeNodeEnumerations) ? typeNodeEnumerations : (_schemaTypeNode$enume = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.enumeration) !== null && _schemaTypeNode$enume !== void 0 ? _schemaTypeNode$enume : [];
     const makeMessage = (constraints, sugarTypeCheckDescription, sugarTypeDescription, schemaTypeDescription) => {
       var _ref5, _ref6, _ref7, _omitLocalization;
-      return (_ref5 = (_ref6 = (_ref7 = (_omitLocalization = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(sugarTypeCheckDescription)) !== null && _omitLocalization !== void 0 ? _omitLocalization : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(sugarTypeDescription)) !== null && _ref7 !== void 0 ? _ref7 : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(schemaTypeDescription)) !== null && _ref6 !== void 0 ? _ref6 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref5 !== void 0 ? _ref5 : "Поле должно быть заполнено";
+      return (_ref5 = (_ref6 = (_ref7 = (_omitLocalization = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)(sugarTypeCheckDescription)) !== null && _omitLocalization !== void 0 ? _omitLocalization : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)(sugarTypeDescription)) !== null && _ref7 !== void 0 ? _ref7 : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)(schemaTypeDescription)) !== null && _ref6 !== void 0 ? _ref6 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref5 !== void 0 ? _ref5 : "Поле должно быть заполнено";
     };
-    const valueReferenceExpression = new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true));
-    const stringValueReference = new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default);
-    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.arrayIsNotEmpty)(enumerationItems)) {
-      yield this.createCheck(targetPath, new _common_KCLang_CodeDom_OneOfExpression__WEBPACK_IMPORTED_MODULE_23__.OneOfExpression(stringValueReference, enumerationItems.map(item => new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression(item))), makeMessage({
+    const valueReferenceExpression = new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true));
+    const stringValueReference = new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default);
+    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.arrayIsNotEmpty)(enumerationItems)) {
+      yield this.createCheck(targetPath, new _common_KCLang_CodeDom_OneOfExpression__WEBPACK_IMPORTED_MODULE_22__.OneOfExpression(stringValueReference, enumerationItems.map(item => new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(item))), makeMessage({
         enumerationAllowedValues: enumerationItems
       }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const digest = typeNode === null || typeNode === void 0 ? void 0 : typeNode.getValidations(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.DigestcheckTypeCheckNode).find(x => x);
+    const digest = typeNode === null || typeNode === void 0 ? void 0 : typeNode.getValidations(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.DigestcheckTypeCheckNode).find(x => x);
     const gId = (_digest$gId = digest === null || digest === void 0 ? void 0 : digest.gId) !== null && _digest$gId !== void 0 ? _digest$gId : nodeGId;
-    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrEmpty)(gId) && digest != undefined) {
+    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.isNotNullOrEmpty)(gId) && digest != undefined) {
       var _digest$keyColumnName, _digest$keyColumnName2, _ref8, _digest$description, _ref9, _digest$checkType;
       // const isIgnoreCase = typeNode?.isCaseIndependentValid ?? false;
-      const ruleBody = new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_24__.OrExpression(new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_24__.OrExpression(new _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_22__.NotExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_11__.ExistsFunctionCall(valueReferenceExpression)), new _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_10__.EqExpression(stringValueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression(""))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_21__.NotEqExpression(new _common_KCLang_CodeDom_Functions_JoinFunctionCall__WEBPACK_IMPORTED_MODULE_13__.JoinFunctionCall(new _common_KCLang_CodeDom_Functions_GetPicklistValuesFunctionCall__WEBPACK_IMPORTED_MODULE_12__.GetPicklistValuesFunctionCall(gId, [(_digest$keyColumnName = digest.keyColumnName) !== null && _digest$keyColumnName !== void 0 ? _digest$keyColumnName : "code"], new _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringArrayConstExpression([stringValueReference]), (_digest$keyColumnName2 = digest.keyColumnName) !== null && _digest$keyColumnName2 !== void 0 ? _digest$keyColumnName2 : "code")), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("")));
-      yield this.createCheck(targetPath, ruleBody, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)((_ref8 = (_digest$description = digest.description) !== null && _digest$description !== void 0 ? _digest$description : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref8 !== void 0 ? _ref8 : "Поле заполнено не по справочнику"), (_ref9 = (_digest$checkType = digest.checkType) !== null && _digest$checkType !== void 0 ? _digest$checkType : typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _ref9 !== void 0 ? _ref9 : "error");
+      const ruleBody = new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(new _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_21__.NotExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(valueReferenceExpression)), new _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_9__.EqExpression(stringValueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_Functions_JoinFunctionCall__WEBPACK_IMPORTED_MODULE_12__.JoinFunctionCall(new _common_KCLang_CodeDom_Functions_GetPicklistValuesFunctionCall__WEBPACK_IMPORTED_MODULE_11__.GetPicklistValuesFunctionCall(gId, [(_digest$keyColumnName = digest.keyColumnName) !== null && _digest$keyColumnName !== void 0 ? _digest$keyColumnName : "code"], new _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_24__.StringArrayConstExpression([stringValueReference]), (_digest$keyColumnName2 = digest.keyColumnName) !== null && _digest$keyColumnName2 !== void 0 ? _digest$keyColumnName2 : "code")), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")));
+      yield this.createCheck(targetPath, ruleBody, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_37__.omitLocalization)((_ref8 = (_digest$description = digest.description) !== null && _digest$description !== void 0 ? _digest$description : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref8 !== void 0 ? _ref8 : "Поле заполнено не по справочнику"), (_ref9 = (_digest$checkType = digest.checkType) !== null && _digest$checkType !== void 0 ? _digest$checkType : typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _ref9 !== void 0 ? _ref9 : "error");
     }
-    const typeNodeLength = typeNode === null || typeNode === void 0 || (_typeNode$children2 = typeNode.children) === null || _typeNode$children2 === void 0 ? void 0 : _typeNode$children2.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.LengthTypeCheckNode));
+    const typeNodeLength = typeNode === null || typeNode === void 0 || (_typeNode$children2 = typeNode.children) === null || _typeNode$children2 === void 0 ? void 0 : _typeNode$children2.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.LengthTypeCheckNode));
     const lengthValue = (_typeNodeLength$value = typeNodeLength === null || typeNodeLength === void 0 ? void 0 : typeNodeLength.value) !== null && _typeNodeLength$value !== void 0 ? _typeNodeLength$value : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.length;
     if (lengthValue != undefined) {
       var _typeNodeLength$check;
-      yield this.createCheck(targetPath, new _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_10__.EqExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__.LengthFunctionCall(stringValueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(lengthValue)), makeMessage({
+      yield this.createCheck(targetPath, new _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_9__.EqExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__.LengthFunctionCall(stringValueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(lengthValue)), makeMessage({
         length: lengthValue
       }, typeNodeLength === null || typeNodeLength === void 0 ? void 0 : typeNodeLength.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), (_typeNodeLength$check = typeNodeLength === null || typeNodeLength === void 0 ? void 0 : typeNodeLength.checkType) !== null && _typeNodeLength$check !== void 0 ? _typeNodeLength$check : checkType);
     }
     const valueReference = stringValueReference;
     const decimalValueReference = valueReferenceExpression;
-    const typeNodeMinLength = typeNode === null || typeNode === void 0 || (_typeNode$children3 = typeNode.children) === null || _typeNode$children3 === void 0 ? void 0 : _typeNode$children3.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MinlengthTypeCheckNode));
+    const typeNodeMinLength = typeNode === null || typeNode === void 0 || (_typeNode$children3 = typeNode.children) === null || _typeNode$children3 === void 0 ? void 0 : _typeNode$children3.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MinlengthTypeCheckNode));
     const minLengthValue = (_typeNodeMinLength$va = typeNodeMinLength === null || typeNodeMinLength === void 0 ? void 0 : typeNodeMinLength.value) !== null && _typeNodeMinLength$va !== void 0 ? _typeNodeMinLength$va : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.minLength;
-    const typeNodeMaxLength = typeNode === null || typeNode === void 0 || (_typeNode$children4 = typeNode.children) === null || _typeNode$children4 === void 0 ? void 0 : _typeNode$children4.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MaxlengthTypeCheckNode));
+    const typeNodeMaxLength = typeNode === null || typeNode === void 0 || (_typeNode$children4 = typeNode.children) === null || _typeNode$children4 === void 0 ? void 0 : _typeNode$children4.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MaxlengthTypeCheckNode));
     const maxLengthValue = (_typeNodeMaxLength$va = typeNodeMaxLength === null || typeNodeMaxLength === void 0 ? void 0 : typeNodeMaxLength.value) !== null && _typeNodeMaxLength$va !== void 0 ? _typeNodeMaxLength$va : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.maxLength;
     if (minLengthValue != undefined && maxLengthValue != undefined) {
       var _typeNodeMinLength$de;
-      const lengthExprRuleBody = new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_5__.AndExpression(new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_16__.GeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(minLengthValue)), new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_20__.LeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(maxLengthValue)));
+      const lengthExprRuleBody = new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_15__.GeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(minLengthValue)), new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_19__.LeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(maxLengthValue)));
       yield this.createCheck(targetPath, lengthExprRuleBody, makeMessage({
         minLength: minLengthValue,
         maxLength: maxLengthValue
       }, (_typeNodeMinLength$de = typeNodeMinLength === null || typeNodeMinLength === void 0 ? void 0 : typeNodeMinLength.description) !== null && _typeNodeMinLength$de !== void 0 ? _typeNodeMinLength$de : typeNodeMaxLength === null || typeNodeMaxLength === void 0 ? void 0 : typeNodeMaxLength.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     } else if (minLengthValue != undefined) {
-      const lengthExprRuleBody = new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_16__.GeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(minLengthValue));
+      const lengthExprRuleBody = new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_15__.GeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(minLengthValue));
       yield this.createCheck(targetPath, lengthExprRuleBody, makeMessage({
         minLength: minLengthValue
       }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     } else if (maxLengthValue != undefined) {
-      const lengthExprRuleBody = new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_20__.LeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_14__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(maxLengthValue));
+      const lengthExprRuleBody = new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_19__.LeExpression(new _common_KCLang_CodeDom_Functions_LengthFunctionCall__WEBPACK_IMPORTED_MODULE_13__.LengthFunctionCall(valueReference), new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(maxLengthValue));
       yield this.createCheck(targetPath, lengthExprRuleBody, makeMessage({
         maxLength: maxLengthValue
       }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const typeNodeMinInclusive = typeNode === null || typeNode === void 0 || (_typeNode$children5 = typeNode.children) === null || _typeNode$children5 === void 0 ? void 0 : _typeNode$children5.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MininclusiveTypeCheckNode));
+    const typeNodeMinInclusive = typeNode === null || typeNode === void 0 || (_typeNode$children5 = typeNode.children) === null || _typeNode$children5 === void 0 ? void 0 : _typeNode$children5.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MininclusiveTypeCheckNode));
     const minInclusiveValue = (_typeNodeMinInclusive = typeNodeMinInclusive === null || typeNodeMinInclusive === void 0 ? void 0 : typeNodeMinInclusive.value) !== null && _typeNodeMinInclusive !== void 0 ? _typeNodeMinInclusive : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.minInclusive;
     if (minInclusiveValue != undefined) {
-      const minInclusiveRuleBody = new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_16__.GeExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(minInclusiveValue));
+      const minInclusiveRuleBody = new _common_KCLang_CodeDom_GeExpression__WEBPACK_IMPORTED_MODULE_15__.GeExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(minInclusiveValue));
       yield this.createCheck(targetPath, minInclusiveRuleBody, makeMessage({
         minInclusive: minInclusiveValue
       }, typeNodeMinInclusive === null || typeNodeMinInclusive === void 0 ? void 0 : typeNodeMinInclusive.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const typeNodeMinExclusive = typeNode === null || typeNode === void 0 || (_typeNode$children6 = typeNode.children) === null || _typeNode$children6 === void 0 ? void 0 : _typeNode$children6.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MinExclusiveTypeCheckNode));
+    const typeNodeMinExclusive = typeNode === null || typeNode === void 0 || (_typeNode$children6 = typeNode.children) === null || _typeNode$children6 === void 0 ? void 0 : _typeNode$children6.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MinExclusiveTypeCheckNode));
     const minExclusiveValue = (_typeNodeMinExclusive = typeNodeMinExclusive === null || typeNodeMinExclusive === void 0 ? void 0 : typeNodeMinExclusive.value) !== null && _typeNodeMinExclusive !== void 0 ? _typeNodeMinExclusive : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.minExclusive;
     if (minExclusiveValue != undefined) {
-      const minExclusiveRuleBody = new _common_KCLang_CodeDom_GtExpression__WEBPACK_IMPORTED_MODULE_36__.GtExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(minExclusiveValue));
+      const minExclusiveRuleBody = new _common_KCLang_CodeDom_GtExpression__WEBPACK_IMPORTED_MODULE_35__.GtExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(minExclusiveValue));
       yield this.createCheck(targetPath, minExclusiveRuleBody, makeMessage({
         minExclusive: minExclusiveValue
       }, typeNodeMinExclusive === null || typeNodeMinExclusive === void 0 ? void 0 : typeNodeMinExclusive.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const typeNodeMaxInclusive = typeNode === null || typeNode === void 0 || (_typeNode$children7 = typeNode.children) === null || _typeNode$children7 === void 0 ? void 0 : _typeNode$children7.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MaxinclusiveTypeCheckNode));
+    const typeNodeMaxInclusive = typeNode === null || typeNode === void 0 || (_typeNode$children7 = typeNode.children) === null || _typeNode$children7 === void 0 ? void 0 : _typeNode$children7.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MaxinclusiveTypeCheckNode));
     const maxInclusiveValue = (_typeNodeMaxInclusive = typeNodeMaxInclusive === null || typeNodeMaxInclusive === void 0 ? void 0 : typeNodeMaxInclusive.value) !== null && _typeNodeMaxInclusive !== void 0 ? _typeNodeMaxInclusive : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.maxInclusive;
     if (maxInclusiveValue != undefined) {
-      const maxInclusiveRuleBody = new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_20__.LeExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(maxInclusiveValue));
+      const maxInclusiveRuleBody = new _common_KCLang_CodeDom_LeExpression__WEBPACK_IMPORTED_MODULE_19__.LeExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(maxInclusiveValue));
       yield this.createCheck(targetPath, maxInclusiveRuleBody, makeMessage({
         maxInclusive: maxInclusiveValue
       }, typeNodeMaxInclusive === null || typeNodeMaxInclusive === void 0 ? void 0 : typeNodeMaxInclusive.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const typeNodeMaxExclusive = typeNode === null || typeNode === void 0 || (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.MaxExclusiveTypeCheckNode));
+    const typeNodeMaxExclusive = typeNode === null || typeNode === void 0 || (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.MaxExclusiveTypeCheckNode));
     const maxExclusiveValue = (_typeNodeMaxExclusive = typeNodeMaxExclusive === null || typeNodeMaxExclusive === void 0 ? void 0 : typeNodeMaxExclusive.value) !== null && _typeNodeMaxExclusive !== void 0 ? _typeNodeMaxExclusive : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.maxExclusive;
     if (maxExclusiveValue != undefined) {
-      const maxExclusiveRuleBody = new _common_KCLang_CodeDom_LtExpression__WEBPACK_IMPORTED_MODULE_37__.LtExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_8__.DecimalConstExpression(maxExclusiveValue));
+      const maxExclusiveRuleBody = new _common_KCLang_CodeDom_LtExpression__WEBPACK_IMPORTED_MODULE_36__.LtExpression(decimalValueReference, new _common_KCLang_CodeDom_DecimalConstExpression__WEBPACK_IMPORTED_MODULE_7__.DecimalConstExpression(maxExclusiveValue));
       yield this.createCheck(targetPath, maxExclusiveRuleBody, makeMessage({
         maxExclusive: maxExclusiveValue
       }, typeNodeMaxExclusive === null || typeNodeMaxExclusive === void 0 ? void 0 : typeNodeMaxExclusive.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType);
     }
-    const isDecimalCondition = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?\\d+(([.]\\d+$)|($))"));
-    const typeNodeTotalDigits = typeNode === null || typeNode === void 0 || (_typeNode$children9 = typeNode.children) === null || _typeNode$children9 === void 0 ? void 0 : _typeNode$children9.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.TotaldigitsTypeCheckNode));
+    const isDecimalCondition = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?\\d+(([.]\\d+$)|($))"));
+    const typeNodeTotalDigits = typeNode === null || typeNode === void 0 || (_typeNode$children9 = typeNode.children) === null || _typeNode$children9 === void 0 ? void 0 : _typeNode$children9.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.TotaldigitsTypeCheckNode));
     const totalDigitsValue = (_typeNodeTotalDigits$ = typeNodeTotalDigits === null || typeNodeTotalDigits === void 0 ? void 0 : typeNodeTotalDigits.value) !== null && _typeNodeTotalDigits$ !== void 0 ? _typeNodeTotalDigits$ : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.totalDigits;
     if (totalDigitsValue != undefined) {
-      const totalDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?(\\.?\\d){0," + totalDigitsValue.toString() + "}$"));
-      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, totalDigitsRuleBody, makeMessage({
+      const totalDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?(\\.?\\d){0," + totalDigitsValue.toString() + "}$"));
+      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, totalDigitsRuleBody, makeMessage({
         totalDigitsMaxCount: totalDigitsValue
       }, typeNodeTotalDigits === null || typeNodeTotalDigits === void 0 ? void 0 : typeNodeTotalDigits.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType)]);
     }
-    const typeNodePatterns = (_typeNode$children$fi2 = typeNode === null || typeNode === void 0 || (_typeNode$children10 = typeNode.children) === null || _typeNode$children10 === void 0 ? void 0 : _typeNode$children10.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)) !== null && _typeNode$children$fi2 !== void 0 ? _typeNode$children$fi2 : [];
-    const firstItemDescription = typeNode === null || typeNode === void 0 || (_typeNode$children11 = typeNode.children) === null || _typeNode$children11 === void 0 || (_typeNode$children11 = _typeNode$children11.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.PatternTypeCheckNode)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)) === null || _typeNode$children11 === void 0 || (_typeNode$children11 = _typeNode$children11[0]) === null || _typeNode$children11 === void 0 ? void 0 : _typeNode$children11.description;
-    const firstItemCheckType = (_typeNode$children$fi3 = typeNode === null || typeNode === void 0 || (_typeNode$children12 = typeNode.children) === null || _typeNode$children12 === void 0 || (_typeNode$children12 = _typeNode$children12.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.PatternTypeCheckNode)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)) === null || _typeNode$children12 === void 0 || (_typeNode$children12 = _typeNode$children12[0]) === null || _typeNode$children12 === void 0 ? void 0 : _typeNode$children12.checkType) !== null && _typeNode$children$fi3 !== void 0 ? _typeNode$children$fi3 : checkType;
-    const stringPatterns = ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.arrayIsNotEmpty)(typeNodePatterns) ? typeNodePatterns : (_schemaTypeNode$patte = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.patterns) !== null && _schemaTypeNode$patte !== void 0 ? _schemaTypeNode$patte : []).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined);
-    const patterns = stringPatterns.map(pattern => new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression(pattern))).reduce((acc, current) => acc != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_24__.OrExpression(acc, current) : current, undefined);
+    const typeNodePatterns = (_typeNode$children$fi2 = typeNode === null || typeNode === void 0 || (_typeNode$children10 = typeNode.children) === null || _typeNode$children10 === void 0 ? void 0 : _typeNode$children10.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.isNotNullOrUndefined)) !== null && _typeNode$children$fi2 !== void 0 ? _typeNode$children$fi2 : [];
+    const firstItemDescription = typeNode === null || typeNode === void 0 || (_typeNode$children11 = typeNode.children) === null || _typeNode$children11 === void 0 || (_typeNode$children11 = _typeNode$children11.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.PatternTypeCheckNode)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.isNotNullOrUndefined)) === null || _typeNode$children11 === void 0 || (_typeNode$children11 = _typeNode$children11[0]) === null || _typeNode$children11 === void 0 ? void 0 : _typeNode$children11.description;
+    const firstItemCheckType = (_typeNode$children$fi3 = typeNode === null || typeNode === void 0 || (_typeNode$children12 = typeNode.children) === null || _typeNode$children12 === void 0 || (_typeNode$children12 = _typeNode$children12.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.PatternTypeCheckNode)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.isNotNullOrUndefined)) === null || _typeNode$children12 === void 0 || (_typeNode$children12 = _typeNode$children12[0]) === null || _typeNode$children12 === void 0 ? void 0 : _typeNode$children12.checkType) !== null && _typeNode$children$fi3 !== void 0 ? _typeNode$children$fi3 : checkType;
+    const stringPatterns = ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.arrayIsNotEmpty)(typeNodePatterns) ? typeNodePatterns : (_schemaTypeNode$patte = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.patterns) !== null && _schemaTypeNode$patte !== void 0 ? _schemaTypeNode$patte : []).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.isNotNullOrUndefined);
+    const patterns = stringPatterns.map(pattern => new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(pattern))).reduce((acc, current) => acc != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(acc, current) : current, undefined);
     if (patterns != undefined) {
       const stringPatternsRuleBody = patterns;
       yield this.createCheck(targetPath, stringPatternsRuleBody, makeMessage({
         patterns: stringPatterns
       }, firstItemDescription, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), firstItemCheckType);
     }
-    const typeNodeInteger = typeNode === null || typeNode === void 0 || (_typeNode$children13 = typeNode.children) === null || _typeNode$children13 === void 0 ? void 0 : _typeNode$children13.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.IntegerdigitsTypeCheckNode));
+    const typeNodeInteger = typeNode === null || typeNode === void 0 || (_typeNode$children13 = typeNode.children) === null || _typeNode$children13 === void 0 ? void 0 : _typeNode$children13.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.IntegerdigitsTypeCheckNode));
     const integerDigits = (_typeNodeInteger$valu = typeNodeInteger === null || typeNodeInteger === void 0 ? void 0 : typeNodeInteger.value) !== null && _typeNodeInteger$valu !== void 0 ? _typeNodeInteger$valu : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.integerDigits;
     if (integerDigits != undefined) {
-      const integerDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?\\d{0," + integerDigits.toString() + "}(([.]\\d+$)|($))"));
-      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, integerDigitsRuleBody, makeMessage({
+      const integerDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?\\d{0," + integerDigits.toString() + "}(([.]\\d+$)|($))"));
+      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, integerDigitsRuleBody, makeMessage({
         integerDigitsMaxCount: integerDigits
       }, typeNodeInteger === null || typeNodeInteger === void 0 ? void 0 : typeNodeInteger.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType)]);
     }
-    const typeNodeFractional = typeNode === null || typeNode === void 0 || (_typeNode$children14 = typeNode.children) === null || _typeNode$children14 === void 0 ? void 0 : _typeNode$children14.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.FractiondigitsTypeCheckNode));
+    const typeNodeFractional = typeNode === null || typeNode === void 0 || (_typeNode$children14 = typeNode.children) === null || _typeNode$children14 === void 0 ? void 0 : _typeNode$children14.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.FractiondigitsTypeCheckNode));
     const fractionalDigits = (_typeNodeFractional$v = typeNodeFractional === null || typeNodeFractional === void 0 ? void 0 : typeNodeFractional.value) !== null && _typeNodeFractional$v !== void 0 ? _typeNodeFractional$v : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.fractionDigits;
     if (fractionalDigits != undefined) {
-      const fractionalDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?\\d+(([.]\\d{0," + fractionalDigits.toString() + "}$)|($))"));
-      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, fractionalDigitsRuleBody, makeMessage({
+      const fractionalDigitsRuleBody = new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(valueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?\\d+(([.]\\d{0," + fractionalDigits.toString() + "}$)|($))"));
+      yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(isDecimalCondition, [this.createCheck(targetPath, fractionalDigitsRuleBody, makeMessage({
         fractionalDigitsMaxCount: fractionalDigits
       }, typeNodeFractional === null || typeNodeFractional === void 0 ? void 0 : typeNodeFractional.description, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description), checkType)]);
     }
-    const valueEqlAutoValueErrorLevel = (_ref10 = (_typeNode$children$fi4 = typeNode === null || typeNode === void 0 || (_typeNode$children15 = typeNode.children) === null || _typeNode$children15 === void 0 || (_typeNode$children15 = _typeNode$children15.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_30__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children15 === void 0 ? void 0 : _typeNode$children15.level) !== null && _typeNode$children$fi4 !== void 0 ? _typeNode$children$fi4 : typeNode === null || typeNode === void 0 || (_typeNode$children16 = typeNode.children) === null || _typeNode$children16 === void 0 || (_typeNode$children16 = _typeNode$children16.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children16 === void 0 ? void 0 : _typeNode$children16.level) !== null && _ref10 !== void 0 ? _ref10 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.valueEqlAutoValue;
+    const valueEqlAutoValueErrorLevel = (_ref10 = (_typeNode$children$fi4 = typeNode === null || typeNode === void 0 || (_typeNode$children15 = typeNode.children) === null || _typeNode$children15 === void 0 || (_typeNode$children15 = _typeNode$children15.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_29__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children15 === void 0 ? void 0 : _typeNode$children15.level) !== null && _typeNode$children$fi4 !== void 0 ? _typeNode$children$fi4 : typeNode === null || typeNode === void 0 || (_typeNode$children16 = typeNode.children) === null || _typeNode$children16 === void 0 || (_typeNode$children16 = _typeNode$children16.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children16 === void 0 ? void 0 : _typeNode$children16.level) !== null && _ref10 !== void 0 ? _ref10 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.valueEqlAutoValue;
     const baseName = (_typeNode$base2 = typeNode === null || typeNode === void 0 ? void 0 : typeNode.base) !== null && _typeNode$base2 !== void 0 ? _typeNode$base2 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.baseType;
     if (valueEqlAutoValueErrorLevel != undefined) {
       var _typeNode$children$fi5, _typeNode$children17, _typeNode$children18, _typeNode$children$fi6, _typeNode$children19, _typeNode$children20;
       const isDecimal = baseName == "decimal";
       // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-      (_typeNode$children$fi5 = typeNode === null || typeNode === void 0 || (_typeNode$children17 = typeNode.children) === null || _typeNode$children17 === void 0 || (_typeNode$children17 = _typeNode$children17.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_30__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children17 === void 0 ? void 0 : _typeNode$children17.condition) !== null && _typeNode$children$fi5 !== void 0 ? _typeNode$children$fi5 : typeNode === null || typeNode === void 0 || (_typeNode$children18 = typeNode.children) === null || _typeNode$children18 === void 0 || (_typeNode$children18 = _typeNode$children18.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children18 === void 0 ? void 0 : _typeNode$children18.condition;
-      const validationCondition = (_typeNode$children$fi6 = typeNode === null || typeNode === void 0 || (_typeNode$children19 = typeNode.children) === null || _typeNode$children19 === void 0 || (_typeNode$children19 = _typeNode$children19.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_30__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children19 === void 0 ? void 0 : _typeNode$children19.condition) !== null && _typeNode$children$fi6 !== void 0 ? _typeNode$children$fi6 : typeNode === null || typeNode === void 0 || (_typeNode$children20 = typeNode.children) === null || _typeNode$children20 === void 0 || (_typeNode$children20 = _typeNode$children20.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_33__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children20 === void 0 ? void 0 : _typeNode$children20.condition;
-      let result = this.createCheck(targetPath, new _common_KCLang_CodeDom_Functions_IsEqualToAutoCalculatedFunctionCall__WEBPACK_IMPORTED_MODULE_34__.IsEqualToAutoCalculatedFunctionCall(isDecimal ? new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.DecimalType.default) : new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default)), _Common_AutoValidationUtils__WEBPACK_IMPORTED_MODULE_0__.AutoValidationMessage, valueEqlAutoValueErrorLevel !== null && valueEqlAutoValueErrorLevel !== void 0 ? valueEqlAutoValueErrorLevel : checkType);
+      (_typeNode$children$fi5 = typeNode === null || typeNode === void 0 || (_typeNode$children17 = typeNode.children) === null || _typeNode$children17 === void 0 || (_typeNode$children17 = _typeNode$children17.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_29__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children17 === void 0 ? void 0 : _typeNode$children17.condition) !== null && _typeNode$children$fi5 !== void 0 ? _typeNode$children$fi5 : typeNode === null || typeNode === void 0 || (_typeNode$children18 = typeNode.children) === null || _typeNode$children18 === void 0 || (_typeNode$children18 = _typeNode$children18.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children18 === void 0 ? void 0 : _typeNode$children18.condition;
+      const validationCondition = (_typeNode$children$fi6 = typeNode === null || typeNode === void 0 || (_typeNode$children19 = typeNode.children) === null || _typeNode$children19 === void 0 || (_typeNode$children19 = _typeNode$children19.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_29__.ValueEqlAutoValueTypeCheck))) === null || _typeNode$children19 === void 0 ? void 0 : _typeNode$children19.condition) !== null && _typeNode$children$fi6 !== void 0 ? _typeNode$children$fi6 : typeNode === null || typeNode === void 0 || (_typeNode$children20 = typeNode.children) === null || _typeNode$children20 === void 0 || (_typeNode$children20 = _typeNode$children20.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ValueEqlAutoValueTypeCheckNode))) === null || _typeNode$children20 === void 0 ? void 0 : _typeNode$children20.condition;
+      let result = this.createCheck(targetPath, new _common_KCLang_CodeDom_Functions_IsEqualToAutoCalculatedFunctionCall__WEBPACK_IMPORTED_MODULE_33__.IsEqualToAutoCalculatedFunctionCall(isDecimal ? new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.DecimalType.default) : new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default)), _Common_AutoValidationUtils__WEBPACK_IMPORTED_MODULE_0__.AutoValidationMessage, valueEqlAutoValueErrorLevel !== null && valueEqlAutoValueErrorLevel !== void 0 ? valueEqlAutoValueErrorLevel : checkType);
       if (validationCondition != undefined) {
-        result = new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_17__.IfStatement(new _common_KCLang_CodeDom_KCLangRawStringExpression__WEBPACK_IMPORTED_MODULE_35__.KCLangRawStringExpression(validationCondition, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.BoolType.default), [result]);
+        result = new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(new _common_KCLang_CodeDom_KCLangRawStringExpression__WEBPACK_IMPORTED_MODULE_34__.KCLangRawStringExpression(validationCondition, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.BoolType.default), [result]);
       }
       yield result;
     }
   }
   *createBaseTypeValidation(targetPath, baseType, baseDescription) {
-    var _IterUtils$last3, _IterUtils$last4, _IterUtils$last5, _IterUtils$last6, _IterUtils$last7;
-    const targetAttributeName = Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.PathTokens.isSimpleToken);
-    const path = _common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_18__.KCLangPath.fromModelPath(targetPath, true);
+    const checkTargetValue = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken).toArray()).toString();
+    const path = _common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true);
     switch (baseType) {
       case "string":
       case "pattern":
       case "boolean":
         return;
       case "integer":
-        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?\\d+$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last3 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(targetAttributeName)) !== null && _IterUtils$last3 !== void 0 ? _IterUtils$last3 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?\\d+$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
         break;
       case "decimal":
-        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^-?\\d+(([.]\\d+$)|($))")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last4 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(targetAttributeName)) !== null && _IterUtils$last4 !== void 0 ? _IterUtils$last4 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^-?\\d+(([.]\\d+$)|($))")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
         break;
       case "date":
-        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last5 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(targetAttributeName)) !== null && _IterUtils$last5 !== void 0 ? _IterUtils$last5 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
         break;
       case "gYear":
-        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^\\d{4}$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last6 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(targetAttributeName)) !== null && _IterUtils$last6 !== void 0 ? _IterUtils$last6 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^\\d{4}$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
         break;
       case "gMonth":
-        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_7__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_15__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_6__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_27__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_19__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_26__.StringConstExpression("^(--(0[1-9]|1[0-2]))$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_31__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_28__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_9__.DescriptionText((_IterUtils$last7 = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(targetAttributeName)) !== null && _IterUtils$last7 !== void 0 ? _IterUtils$last7 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.reject)()))]);
+        yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(--(0[1-9]|1[0-2]))$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
         break;
       default:
         throw new Error(`Unknown base type name: '${baseType}'`);
@@ -104907,7 +104889,7 @@ class KCLangCalculationsBuildContext {
   }
 }
 function combineByAndKCLangExpr(acc, current) {
-  return acc != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_24__.OrExpression(acc, current) : current;
+  return acc != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(acc, current) : current;
 }
 
 /***/ }),