@kontur.candy/generator 5.2.0-server-side-calculations.2 → 5.2.0-server-side-calculations.4

package/dist/index.js

@@ -60223,6 +60223,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const getRngSchemaFilename = (formSchemasDirPath, gfv) => {
+  if (!Boolean(Number(gfv))) {
+    return ".rng.xml";
+  }
   const maxSubversion = (0,fs__WEBPACK_IMPORTED_MODULE_0__.readdirSync)(formSchemasDirPath).map(fileName => fileName.includes(".rng.xml") && !fileName.includes("схема.rng.xml")).filter(i => i === true).length - 1;
   if (maxSubversion === undefined || !(0,fs__WEBPACK_IMPORTED_MODULE_0__.existsSync)(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSchemasDirPath, `${gfv}.${maxSubversion}.rng.xml`))) {
     return ".rng.xml";
@@ -60449,6 +60452,7 @@ let PatchFufSteps = /*#__PURE__*/function (PatchFufSteps) {
   PatchFufSteps[PatchFufSteps["SelectFiles"] = 1] = "SelectFiles";
   PatchFufSteps[PatchFufSteps["ErrorMessage"] = 2] = "ErrorMessage";
   PatchFufSteps[PatchFufSteps["LoadToForm"] = 3] = "LoadToForm";
+  PatchFufSteps[PatchFufSteps["ConfirmMerge"] = 4] = "ConfirmMerge";
   return PatchFufSteps;
 }({});
 let TableType = /*#__PURE__*/function (TableType) {
@@ -61715,6 +61719,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "existsKCLangFunction": () => (/* binding */ existsKCLangFunction),
 /* harmony export */   "isSnilsKCLangFunction": () => (/* binding */ isSnilsKCLangFunction),
 /* harmony export */   "isInnKCLangFunction": () => (/* binding */ isInnKCLangFunction),
+/* harmony export */   "arrayKCLangFunction": () => (/* binding */ arrayKCLangFunction),
+/* harmony export */   "firstOrDefaultKCLangFunction": () => (/* binding */ firstOrDefaultKCLangFunction),
+/* harmony export */   "getPicklistValuesKCLangFunction": () => (/* binding */ getPicklistValuesKCLangFunction),
 /* harmony export */   "isValidMirCardNumberKCLangFunction": () => (/* binding */ isValidMirCardNumberKCLangFunction),
 /* harmony export */   "isValidAccountNumberKCLangFunction": () => (/* binding */ isValidAccountNumberKCLangFunction),
 /* harmony export */   "countKCLangFunction": () => (/* binding */ countKCLangFunction),
@@ -61901,13 +61908,68 @@ const isInnKCLangFunction = params => {
   }
   throw new Error("Invalid parameters!");
 };
-const isValidMirCardNumberKCLangFunction = params => {
+const arrayKCLangFunction = params => {
+  const errors = Array.from(validateParams(params, 1));
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+  return {
+    type: "array",
+    items: params.map(x => x.value)
+  };
+};
+const firstOrDefaultKCLangFunction = params => {
   var _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;
+  const expr = (_params$12 = params[0]) === null || _params$12 === void 0 ? void 0 : _params$12.value;
+  if (expr === undefined) {
+    throw new Error("first param in firstOrDefault must be defined");
+  }
+  return {
+    type: "firstOrDefault",
+    expression: expr
+  };
+};
+const getPicklistValuesKCLangFunction = params => {
+  var _params$13, _params$14, _params$15, _params$16;
+  const errors = Array.from(validateParams(params, 4));
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+  const gId = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value;
+  const filterColumnParam = (_params$14 = params[1]) === null || _params$14 === void 0 ? void 0 : _params$14.value;
+  const filterKeyParam = (_params$15 = params[2]) === null || _params$15 === void 0 ? void 0 : _params$15.value;
+  const resultColumn = (_params$16 = params[3]) === null || _params$16 === void 0 ? void 0 : _params$16.value;
+  if ((filterColumnParam === null || filterColumnParam === void 0 ? void 0 : filterColumnParam.type) !== "array") {
+    throw new Error("second param in getPicklistValues must be wrapped in array( ... )");
+  }
+  if ((filterKeyParam === null || filterKeyParam === void 0 ? void 0 : filterKeyParam.type) !== "array") {
+    throw new Error("third param in getPicklistValues must be wrapped in array( ... )");
+  }
+  if ((gId === null || gId === void 0 ? void 0 : gId.type) !== "const") {
+    throw new Error("gid in getPicklistValue must be string");
+  }
+  if ((resultColumn === null || resultColumn === void 0 ? void 0 : resultColumn.type) !== "const") {
+    throw new Error("columns in getPicklistValue must be string");
+  }
+  return {
+    type: "getPicklistValues",
+    gId: gId.value.value,
+    filterColumn: filterColumnParam,
+    filterKey: filterKeyParam,
+    resultColumn: resultColumn.value.value
+  };
+};
+const isValidMirCardNumberKCLangFunction = params => {
+  var _params$17;
+  const errors = Array.from(validateParams(params, 1));
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+  const argumentExpr = (_params$17 = params[0]) === null || _params$17 === void 0 ? void 0 : _params$17.value;
   if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
     const param = argumentExpr.select;
     if (param == undefined) {
@@ -61921,13 +61983,13 @@ const isValidMirCardNumberKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const isValidAccountNumberKCLangFunction = params => {
-  var _params$13, _params$14;
+  var _params$18, _params$19;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const bik = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value;
-  const account = (_params$14 = params[1]) === null || _params$14 === void 0 ? void 0 : _params$14.value;
+  const bik = (_params$18 = params[0]) === null || _params$18 === void 0 ? void 0 : _params$18.value;
+  const account = (_params$19 = params[1]) === null || _params$19 === void 0 ? void 0 : _params$19.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;
@@ -61943,12 +62005,12 @@ const isValidAccountNumberKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const countKCLangFunction = params => {
-  var _params$15;
+  var _params$20;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const expr = (_params$15 = params[0]) === null || _params$15 === void 0 ? void 0 : _params$15.value;
+  const expr = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
   if ((expr === null || expr === void 0 ? void 0 : expr.type) === "argument") {
     const param = expr.select;
     if (param == undefined) {
@@ -61962,12 +62024,12 @@ const countKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const sumKCLangFunction = params => {
-  var _params$16;
+  var _params$21;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$16 = params[0]) === null || _params$16 === void 0 ? void 0 : _params$16.value;
+  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) {
@@ -61991,14 +62053,14 @@ const sumKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const substringKCLangFunction = params => {
-  var _params$17, _params$18, _params$19;
+  var _params$22, _params$23, _params$24;
   const errors = Array.from(validateParams(params, 2, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$17 = params[0]) === null || _params$17 === void 0 ? void 0 : _params$17.value;
-  const startParam = (_params$18 = params[1]) === null || _params$18 === void 0 ? void 0 : _params$18.value;
-  const lengthParam = (_params$19 = params[2]) === null || _params$19 === void 0 ? void 0 : _params$19.value;
+  const exprParam = (_params$22 = params[0]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
+  const startParam = (_params$23 = params[1]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
+  const lengthParam = (_params$24 = params[2]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
   if (exprParam == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -62016,14 +62078,14 @@ const substringKCLangFunction = params => {
   };
 };
 const groupSumKCLangFunction = params => {
-  var _params$20, _params$21, _params$22;
+  var _params$25, _params$26, _params$27;
   const errors = Array.from(validateParams(params, 3));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeyPathParam = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
-  const sourceKeyPathParam = (_params$21 = params[1]) === null || _params$21 === void 0 ? void 0 : _params$21.value;
-  const sourceValuePathParam = (_params$22 = params[2]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
+  const targetKeyPathParam = (_params$25 = params[0]) === null || _params$25 === void 0 ? void 0 : _params$25.value;
+  const sourceKeyPathParam = (_params$26 = params[1]) === null || _params$26 === void 0 ? void 0 : _params$26.value;
+  const sourceValuePathParam = (_params$27 = params[2]) === null || _params$27 === void 0 ? void 0 : _params$27.value;
   if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || (sourceValuePathParam === null || sourceValuePathParam === void 0 ? void 0 : sourceValuePathParam.type) !== "argument") {
     const argumentsValidationError = new ArgumentValidationError("Expected 3 paths as arguments: targetKeyPath, sourceKeyPath, sourceValuePath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -62036,13 +62098,13 @@ const groupSumKCLangFunction = params => {
   };
 };
 const groupCountKCLangFunction = params => {
-  var _params$23, _params$24;
+  var _params$28, _params$29;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeyPathParam = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
-  const sourceKeyPathParam = (_params$24 = params[1]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
+  const targetKeyPathParam = (_params$28 = params[0]) === null || _params$28 === void 0 ? void 0 : _params$28.value;
+  const sourceKeyPathParam = (_params$29 = params[1]) === null || _params$29 === void 0 ? void 0 : _params$29.value;
   if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
     const argumentsValidationError = new ArgumentValidationError("Expected 2 paths as arguments: targetKeyPath, sourceKeyPath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -62117,8 +62179,11 @@ const getKCLangGlobalFunctionBuilders = () => ({
   exists: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.existsKCLangFunction],
   isSnils: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.isSnilsKCLangFunction],
   isInn: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.isInnKCLangFunction],
+  firstOrDefault: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.firstOrDefaultKCLangFunction],
   isValidAccountNumber: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.isValidAccountNumberKCLangFunction],
   isValidMirCardNumber: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.isValidMirCardNumberKCLangFunction],
+  getPicklistValues: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.getPicklistValuesKCLangFunction],
+  array: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.arrayKCLangFunction],
   sum: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.sumKCLangFunction],
   substring: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.substringKCLangFunction],
   count: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.countKCLangFunction],
@@ -62522,6 +62587,36 @@ class KCLangAntlrVisitor {
       type: "argument"
     };
   }
+  visitInterpolate(ctx) {
+    return ctx.interpolationExpression().accept(this);
+  }
+  visitInterpolationExpression(ctx) {
+    return {
+      type: "interpolationExpression",
+      context: ctx.descriptionToken().map(token => token.accept(this))
+    };
+  }
+  visitDescriptionToken(ctx) {
+    const interpolationResult = ctx.interpolation();
+    if (interpolationResult) {
+      // значение внутри - { }
+      return interpolationResult.interpolationContent().accept(this);
+    }
+
+    // текст вокруг
+    return {
+      type: "interpolationDescriptionToken",
+      tokenType: "text",
+      text: ctx.text
+    };
+  }
+  visitInterpolationContent(ctx) {
+    return {
+      type: "interpolationDescriptionToken",
+      tokenType: "path",
+      text: ctx.text
+    };
+  }
   visitIncompletePath(ctx) {
     const path = ctx.relativePath();
     if (path == undefined) {
@@ -69587,6 +69682,15 @@ function traverseKCLangExpression(node, visitor) {
     case "dateNow":
       visitor.visitDateNowKCLangNode(node);
       break;
+    case "getPicklistValues":
+      visitor.visitGetPicklistValuesKCLangNode(node);
+      break;
+    case "array":
+      visitor.visitArrayKCLangNode(node);
+      break;
+    case "firstOrDefault":
+      visitor.visitFirstOrDefaultKCLangNode(node);
+      break;
     default:
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(node);
       break;
@@ -69596,6 +69700,15 @@ class DefaultKCLangExpressionVisitor {
   visitAbsKCLangNode(node) {
     // default empty implementation
   }
+  visitArrayKCLangNode(node) {
+    // default empty implementation
+  }
+  visitFirstOrDefaultKCLangNode(node) {
+    // default empty implementation
+  }
+  visitGetPicklistValuesKCLangNode(node) {
+    // default empty implementation
+  }
   visitAndKCLangNode(node) {
     // default empty implementation
   }
@@ -70020,6 +70133,9 @@ const getGenerateJsExpressionFunc = options => {
       case "count":
       case "groupCount":
       case "groupSum":
+      case "getPicklistValues":
+      case "array":
+      case "firstOrDefault":
         throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
       case "concat":
         throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
@@ -70090,6 +70206,7 @@ function generateKCXmlExpression(expression) {
   switch (expression.type) {
     case "abs":
     case "xabs":
+    case "firstOrDefault":
     case "length":
       return [`<m:${expression.type}>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.expression), 1), `</m:${expression.type}>`].join("\n");
     case "exists":
@@ -70113,6 +70230,10 @@ function generateKCXmlExpression(expression) {
     case "or":
     case "concat":
       return [`<m:${expression.type}>`, ...expression.expressions.map(generateKCXmlExpression).map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:${expression.type}>`].join("\n");
+    case "array":
+      return [`<m:${expression.type}>`, ...expression.items.map(generateKCXmlExpression).map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:${expression.type}>`].join("\n");
+    case "getPicklistValues":
+      return [`<m:${expression.type} gId="${expression.gId}" resultColumn="${expression.resultColumn}">`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(`<m:filtercolumn>`, 1), (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.filterColumn), 2), (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(`</m:filtercolumn>`, 1), (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(`<m:filterkey>`, 1), (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.filterKey), 2), (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(`</m:filterkey>`, 1), `</m:${expression.type}>`].join("\n");
     case "sum":
       return [`<m:sum>`, ...expression.operands.map(operand => {
         if (operand.operator === "+") {
@@ -75497,6 +75618,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "FormulaIsValidMirCardNumberExpression": () => (/* binding */ FormulaIsValidMirCardNumberExpression),
 /* harmony export */   "FormulaIsValidAccountNumberExpression": () => (/* binding */ FormulaIsValidAccountNumberExpression),
 /* harmony export */   "FormulaArgumentExpression": () => (/* binding */ FormulaArgumentExpression),
+/* harmony export */   "FormulaArrayExpression": () => (/* binding */ FormulaArrayExpression),
+/* harmony export */   "FormulaFilterColumnExpression": () => (/* binding */ FormulaFilterColumnExpression),
+/* harmony export */   "FormulaFilterKeyExpression": () => (/* binding */ FormulaFilterKeyExpression),
+/* harmony export */   "FormulaGetPicklistValuesExpression": () => (/* binding */ FormulaGetPicklistValuesExpression),
+/* harmony export */   "FormulaFirstOrDefaultExpression": () => (/* binding */ FormulaFirstOrDefaultExpression),
 /* harmony export */   "FormulaExistsExpression": () => (/* binding */ FormulaExistsExpression),
 /* harmony export */   "FormulaMultySumExpression": () => (/* binding */ FormulaMultySumExpression),
 /* harmony export */   "FormulaCountExpression": () => (/* binding */ FormulaCountExpression),
@@ -75521,7 +75647,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _dec12, _class11, _class12, _descriptor6, _descriptor7, _dec13, _dec14, _class14, _class15, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _dec93, _class114, _class115, _descriptor52, _descriptor53, _dec94, _dec95, _class117, _class118, _descriptor54, _dec96, _class120, _dec97, _dec98, _dec99, _dec100, _class121, _class122, _descriptor55, _descriptor56, _descriptor57, _dec101, _dec102, _class124, _class125, _descriptor58, _dec103, _dec104, _dec105, _dec106, _dec107, _dec108, _class127, _class128, _descriptor59, _descriptor60, _descriptor61, _descriptor62, _descriptor63, _dec109, _dec110, _class130, _class131, _descriptor64, _dec111, _dec112, _dec113, _class133, _class134, _descriptor65, _descriptor66;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _dec12, _class11, _class12, _descriptor6, _descriptor7, _dec13, _dec14, _class14, _class15, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _class114, _class115, _descriptor52, _dec93, _dec94, _dec95, _dec96, _dec97, _class117, _class118, _descriptor53, _descriptor54, _descriptor55, _descriptor56, _dec98, _dec99, _class120, _class121, _descriptor57, _dec100, _dec101, _class123, _class124, _descriptor58, _dec102, _dec103, _class126, _class127, _descriptor59, _dec104, _dec105, _dec106, _class129, _class130, _descriptor60, _descriptor61, _dec107, _dec108, _class132, _class133, _descriptor62, _dec109, _class135, _dec110, _dec111, _dec112, _dec113, _class136, _class137, _descriptor63, _descriptor64, _descriptor65, _dec114, _dec115, _class139, _class140, _descriptor66, _dec116, _dec117, _dec118, _dec119, _dec120, _dec121, _class142, _class143, _descriptor67, _descriptor68, _descriptor69, _descriptor70, _descriptor71, _dec122, _dec123, _class145, _class146, _descriptor72, _dec124, _dec125, _dec126, _class148, _class149, _descriptor73, _descriptor74;
 
 
 
@@ -76079,158 +76205,234 @@ let FormulaArgumentExpression = (_dec84 = (0,_markupGenerator_Serializer_SugarSe
     return "decimal";
   }
 })), _class106)) || _class105);
-let FormulaExistsExpression = (_dec87 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec88 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec87(_class108 = (_class109 = class FormulaExistsExpression extends FormulaExpression {
+let FormulaArrayExpression = (_dec87 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("array", `TODO`), _dec88 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec87(_class108 = (_class109 = class FormulaArrayExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor50, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor50, this);
+  }
+}, (_descriptor50 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class109.prototype, "items", [_dec88], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class109)) || _class108);
+let FormulaFilterColumnExpression = (_dec89 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filtercolumn", `Получить значения пиклиста по фильру`), _dec90 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec89(_class111 = (_class112 = class FormulaFilterColumnExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor51, this);
+  }
+}, (_descriptor51 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "filterColumn", [_dec90], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class112)) || _class111);
+let FormulaFilterKeyExpression = (_dec91 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filterkey", `Получить значения пиклиста по фильру`), _dec92 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec91(_class114 = (_class115 = class FormulaFilterKeyExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor52, this);
+  }
+}, (_descriptor52 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class115.prototype, "filterKey", [_dec92], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class115)) || _class114);
+let FormulaGetPicklistValuesExpression = (_dec93 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getpicklistvalues", `Получить значения пиклиста по фильру. Используется только для генерации FLANG. В калькуляторе не работает`), _dec94 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("gId", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec95 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filtercolumn", [FormulaFilterColumnExpression]), _dec96 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filterkey", [FormulaFilterKeyExpression]), _dec97 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("resultColumn", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec93(_class117 = (_class118 = class FormulaGetPicklistValuesExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gId", _descriptor53, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor54, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor55, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "resultColumn", _descriptor56, this);
+  }
+  getLegacyExpressionTypeForFunctionName() {
+    return "getPicklistValues";
+  }
+}, (_descriptor53 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "gId", [_dec94], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor54 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "filterColumn", [_dec95], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor55 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "filterKey", [_dec96], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "resultColumn", [_dec97], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class118)) || _class117);
+let FormulaFirstOrDefaultExpression = (_dec98 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("firstordefault", `Взять первый элемент массива. Используется только для генерации FLANG. В калькуляторе не работает`), _dec99 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec98(_class120 = (_class121 = class FormulaFirstOrDefaultExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor57, this);
+  }
+}, (_descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class121.prototype, "expression", [_dec99], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class121)) || _class120);
+let FormulaExistsExpression = (_dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec100(_class123 = (_class124 = class FormulaExistsExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor58, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "exists";
   }
-}, (_descriptor50 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class109.prototype, "select", [_dec88], {
+}, (_descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class124.prototype, "select", [_dec101], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class109)) || _class108);
-let FormulaMultySumExpression = (_dec89 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec90 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec89(_class111 = (_class112 = class FormulaMultySumExpression extends FormulaExpression {
+})), _class124)) || _class123);
+let FormulaMultySumExpression = (_dec102 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec103 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec102(_class126 = (_class127 = class FormulaMultySumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor51, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor59, this);
   }
-}, (_descriptor51 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "select", [_dec90], {
+}, (_descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class127.prototype, "select", [_dec103], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class112)) || _class111);
-let FormulaCountExpression = (_dec91 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec92 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec93 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec91(_class114 = (_class115 = class FormulaCountExpression extends FormulaExpression {
+})), _class127)) || _class126);
+let FormulaCountExpression = (_dec104 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec105 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec104(_class129 = (_class130 = class FormulaCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor52, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor53, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor60, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor61, this);
   }
-}, (_descriptor52 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class115.prototype, "select", [_dec92], {
+}, (_descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class130.prototype, "select", [_dec105], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor53 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class115.prototype, "withNullOrEmptyValues", [_dec93], {
+}), _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class130.prototype, "withNullOrEmptyValues", [_dec106], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class115)) || _class114);
-let FormulaConcatExpression = (_dec94 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec95 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec94(_class117 = (_class118 = class FormulaConcatExpression extends FormulaExpression {
+})), _class130)) || _class129);
+let FormulaConcatExpression = (_dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec107(_class132 = (_class133 = class FormulaConcatExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor54, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor62, this);
   }
-}, (_descriptor54 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "arguments", [_dec95], {
+}, (_descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "arguments", [_dec108], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class118)) || _class117);
-let FormulaNewLineExpression = (_dec96 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec96(_class120 = class FormulaNewLineExpression extends FormulaExpression {}) || _class120);
-let Formula = (_dec97 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec98 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec99 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec100 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec97(_class121 = (_class122 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class133)) || _class132);
+let FormulaNewLineExpression = (_dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec109(_class135 = class FormulaNewLineExpression extends FormulaExpression {}) || _class135);
+let Formula = (_dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec110(_class136 = (_class137 = 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", _descriptor55, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor56, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor57, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor63, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor64, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor65, this);
   }
-}, (_descriptor55 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "match", [_dec98], {
+}, (_descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "match", [_dec111], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor56 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "target", [_dec99], {
+}), _descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "target", [_dec112], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor57 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "expression", [_dec100], {
+}), _descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "expression", [_dec113], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class122)) || _class121);
-let Formulas = (_dec101 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec102 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec101(_class124 = (_class125 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class137)) || _class136);
+let Formulas = (_dec114 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec115 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec114(_class139 = (_class140 = 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", _descriptor58, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor66, this);
   }
-}, (_descriptor58 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class125.prototype, "items", [_dec102], {
+}, (_descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class140.prototype, "items", [_dec115], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class125)) || _class124);
-let ConditionNode = (_dec103 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec104 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec105 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec103(_class127 = (_class128 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class140)) || _class139);
+let ConditionNode = (_dec116 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec117 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec118 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec119 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec120 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec121 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec116(_class142 = (_class143 = 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", _descriptor59, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor60, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor61, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor62, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor63, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor67, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor68, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor69, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor70, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor71, this);
   }
-}, (_descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "match", [_dec104], {
+}, (_descriptor67 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "match", [_dec117], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "target", [_dec105], {
+}), _descriptor68 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "target", [_dec118], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "description", [_dec106], {
+}), _descriptor69 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "description", [_dec119], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "errorLevel", [_dec107], {
+}), _descriptor70 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "errorLevel", [_dec120], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class128.prototype, "expression", [_dec108], {
+}), _descriptor71 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "expression", [_dec121], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class128)) || _class127);
-let ConditionsNode = (_dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec109(_class130 = (_class131 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class143)) || _class142);
+let ConditionsNode = (_dec122 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec123 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec122(_class145 = (_class146 = 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", _descriptor64, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor72, this);
   }
-}, (_descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "items", [_dec110], {
+}, (_descriptor72 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class146.prototype, "items", [_dec123], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class131)) || _class130);
-let MathContainer = (_dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec111(_class133 = (_class134 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+})), _class146)) || _class145);
+let MathContainer = (_dec124 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec125 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec126 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec124(_class148 = (_class149 = 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", _descriptor65, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor66, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor73, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor74, this);
   }
-}, (_descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class134.prototype, "formulas", [_dec112], {
+}, (_descriptor73 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "formulas", [_dec125], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class134.prototype, "conditions", [_dec113], {
+}), _descriptor74 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class149.prototype, "conditions", [_dec126], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-})), _class134)) || _class133);
-const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression];
+})), _class149)) || _class148);
+const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaGetPicklistValuesExpression, FormulaArrayExpression, FormulaFirstOrDefaultExpression, FormulaFilterColumnExpression, FormulaFilterKeyExpression];
 
 /***/ }),
 
@@ -78347,6 +78549,19 @@ class KCXmlGeneratorBase {
       const compiledItems = expression.items.expressions.map(item => this.compileExpression(prefix, targetFullPath, item, deps)).join(",");
       return gcf(x => x.oneOf, compiledArgument, `[${compiledItems}]`);
     }
+
+    // -- не работает в рантайм калькуляторе
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGetPicklistValuesExpression) {
+      return "null";
+    }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaFirstOrDefaultExpression) {
+      return "null";
+    }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaArrayExpression) {
+      return "null";
+    }
+    // -----
+
     throw new Error(`Unsupported node type: ${expression.constructor.name}`);
   }
   /* eslint-enable @typescript-eslint/unbound-method */
@@ -78474,6 +78689,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
 /* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
 
 
 
@@ -78521,15 +78738,19 @@ class LazyLoadDeclarationGenerator {
   }
   *processElement(path, element) {
     if (element.lazyLoadMode != undefined) {
-      const currentPath = element.multiple ? path.joinWith(element.name) : path.joinWith(element.name + ".value");
-      const item = {
-        path: this.formSchemaRng.adjustPathMultiplicity(currentPath),
-        lazyLoadMode: element.lazyLoadMode
-      };
-      yield element.lazyLoadingThreshold != undefined ? {
+      const adjustedPath = this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name));
+      const currentPaths = element.multiple ? [element.lazyLoadMode === "deferred" ? adjustedPath : adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each)] : [adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each), this.formSchemaRng.adjustPathMultiplicity(path).joinWith(element.name + ".value")];
+      const items = currentPaths.map(currentPath => {
+        var _element$lazyLoadMode;
+        return {
+          path: currentPath,
+          lazyLoadMode: (_element$lazyLoadMode = element.lazyLoadMode) !== null && _element$lazyLoadMode !== void 0 ? _element$lazyLoadMode : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)()
+        };
+      }).map(item => element.lazyLoadingThreshold != undefined ? {
         ...item,
         thresholdValue: element.lazyLoadingThreshold
-      } : item;
+      } : item);
+      yield* items;
       if (element.multiple) {
         const additionalFields = ["children", "errorsCount", "warningsCount"];
         const additionalItems = additionalFields.map(field => ({
@@ -78704,7 +78925,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function processSugar(formSugarContent, additionalContent, generationOptions) {
   try {
-    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _additionalContent$fo, _additionalContent$fo2, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _generationOptions$re, _sugarRoot$schemaVali3, _sugarRoot$schemaVali4, _additionalContent$fo3, _additionalContent$fo4;
+    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _additionalContent$fo, _additionalContent$fo2, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _generationOptions$re, _sugarRoot$schemaVali3, _sugarRoot$schemaVali4, _sugarRoot$schemaVali5, _additionalContent$fo3, _additionalContent$fo4;
     const sugarAst = (0,_common_SugarXmlParser_SugarParser__WEBPACK_IMPORTED_MODULE_4__.parseSugar)(formSugarContent, additionalContent.preprocessor || {});
     const serializer = (0,_markupGenerator_SugarNodes_DefaultSugarSerializer__WEBPACK_IMPORTED_MODULE_13__.createDefaultSugarSerializer)();
     const sugarRoot = (0,_markupGenerator_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_14__.strictCastNode)(serializer.deserializeFromSugarXmlNode(sugarAst), _markupGenerator_ElementProcessors_FormParts_Form_FormNode__WEBPACK_IMPORTED_MODULE_11__.FormNode);
@@ -78742,14 +78963,14 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const formulaRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_FormulaRulesBuilder__WEBPACK_IMPORTED_MODULE_36__.FormulaRulesBuilder(formSchemaRng, formulas, dataDeclarationHelper, formulaExprConverter);
     const initializationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_InitializationRulesBuilder__WEBPACK_IMPORTED_MODULE_37__.InitializationRulesBuilder(sugarRoot, resourcesHash);
     const lazyLoadingRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_LazyLoadingRulesBuilder__WEBPACK_IMPORTED_MODULE_38__.LazyLoadingRulesBuilder(sugarRoot, lazyLoadGeneratorResult.declaration);
-    const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper);
-    const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false);
+    const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper, typeRegistry, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false);
+    const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali4 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali4 !== void 0 ? _sugarRoot$schemaVali4 : false);
     const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_33__.OptionalSectionRulesBuilder(sugarRoot, dataDeclarationHelper);
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng);
     const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter);
     const formulaAndInitOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_41__.FormulaAndInitOnlyNormalizationRuleGenerator(sugarRulesBuilder, formulaRulesBuilder, optionalSectionRuleBuilder, formSchemaRng);
     const builder = new _FormSourcesBuilder_FormSourcesBuilder__WEBPACK_IMPORTED_MODULE_21__.FormSourcesBuilder(additionalContent.formSourcesPath);
-    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali4 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali4 !== void 0 ? _sugarRoot$schemaVali4 : false);
+    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali5 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali5 !== void 0 ? _sugarRoot$schemaVali5 : false);
     markupGenerator.generate(sugarRoot, builder);
     builder.addResource("settings.js", (0,_markupGenerator_getSettings__WEBPACK_IMPORTED_MODULE_9__.getSettings)(sugarRoot, additionalContent.gfv, additionalSettings, additionalContent.formJsonSettings));
     builder.addResource("requisiteList.js", (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_24__.getRequisiteList)(sugarRoot, fetchFunctions));
@@ -79345,21 +79566,19 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "FLangValidationBuildContext": () => (/* binding */ FLangValidationBuildContext)
 /* harmony export */ });
-/* harmony import */ var _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../common/SchemaRng/FormSchemaRng */ "./Generator/src/common/SchemaRng/FormSchemaRng.ts");
+/* harmony import */ var _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../validationGenerator/Nodes/TypeNode */ "./Generator/src/generators/validationGenerator/Nodes/TypeNode.ts");
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../validationGenerator/Nodes/TypeNode */ "./Generator/src/generators/validationGenerator/Nodes/TypeNode.ts");
-/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
-/* harmony import */ var _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../common/XmlParser/XmlNode */ "./Generator/src/common/XmlParser/XmlNode.ts");
-/* harmony import */ var _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../Common/ModelPath/Set/AbsoluteModelPathSet */ "./Common/ModelPath/Set/AbsoluteModelPathSet.ts");
+/* harmony import */ var _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../common/SchemaRng/FormSchemaRng */ "./Generator/src/common/SchemaRng/FormSchemaRng.ts");
+/* harmony import */ var _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/ModelPath/Set/AbsoluteModelPathSet */ "./Common/ModelPath/Set/AbsoluteModelPathSet.ts");
+/* harmony import */ var _Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../Common/ModelPath/PathSplitHelper */ "./Common/ModelPath/PathSplitHelper.ts");
+/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../common/SchemaRng/StringTypeMessageGenerator */ "./Generator/src/common/SchemaRng/StringTypeMessageGenerator.ts");
+/* harmony import */ var _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader */ "./Generator/src/generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader.ts");
 /* harmony import */ var _common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../common/KCLang/KCLangToXmlTranspiler */ "./Generator/src/common/KCLang/KCLangToXmlTranspiler.ts");
-/* harmony import */ var _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader */ "./Generator/src/generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader.ts");
-/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
-/* harmony import */ var _Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../../../Common/ModelPath/PathSplitHelper */ "./Common/ModelPath/PathSplitHelper.ts");
+/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
+/* harmony import */ var _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../common/SchemaRng/StringTypeMessageGenerator */ "./Generator/src/common/SchemaRng/StringTypeMessageGenerator.ts");
+/* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
 /* harmony import */ var _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./FLang/FLangCodeDom */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FLangCodeDom.ts");
-/* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
-
 
 
 
@@ -79376,20 +79595,18 @@ __webpack_require__.r(__webpack_exports__);
 const makeArrayLiteral = text => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(`["${text}"]`);
 const makeMessage = (constraints, sugarTypeDescription, schemaTypeDescription) => {
   var _ref, _ref2;
-  return makeArrayLiteral((_ref = (_ref2 = sugarTypeDescription !== null && sugarTypeDescription !== void 0 ? sugarTypeDescription : schemaTypeDescription) !== null && _ref2 !== void 0 ? _ref2 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref !== void 0 ? _ref : "Поле должно быть заполнено");
+  return makeArrayLiteral((_ref = (_ref2 = sugarTypeDescription !== null && sugarTypeDescription !== void 0 ? sugarTypeDescription : schemaTypeDescription) !== null && _ref2 !== void 0 ? _ref2 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref !== void 0 ? _ref : "Поле должно быть заполнено");
 };
 class FLangValidationBuildContext {
-  constructor(typesRegistry, schemaRng, useSchemaValidations, formulaExprConverter) {
-    this.typesRegistry = void 0;
-    this.pathsWithValidations = new _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_5__.AbsoluteModelPathSet();
+  constructor(schemaRng, formulaExprConverter, nodeTypeInfoHelper) {
+    this.pathsWithValidations = new _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_3__.AbsoluteModelPathSet();
+    this.nodeTypeInfoHelper = void 0;
     this.formulaExprConverter = void 0;
     this.schemaRng = void 0;
-    this.useSchemaValidations = void 0;
     this.visibilityConditions = [];
+    this.nodeTypeInfoHelper = nodeTypeInfoHelper;
     this.formulaExprConverter = formulaExprConverter;
-    this.useSchemaValidations = useSchemaValidations;
     this.schemaRng = schemaRng;
-    this.typesRegistry = typesRegistry;
   }
   pushVisibilityCondition(condition, path, invertRequired) {
     this.visibilityConditions.push({
@@ -79401,8 +79618,14 @@ class FLangValidationBuildContext {
   popVisibilityCondition() {
     this.visibilityConditions.pop();
   }
-  buildBasicValidations(targetPath, typeNode, schemaTypeNode, optional, highOrderDescription) {
-    var _typeNode$base, _typeNode$description, _typeNode$checkType;
+  getTypeNode(node) {
+    return this.nodeTypeInfoHelper.getTypeNode(node);
+  }
+  getSchemaTypeInfo(targetPath) {
+    return this.nodeTypeInfoHelper.getSchemaTypeInfo(targetPath);
+  }
+  buildBasicValidations(targetPath, typeNode, schemaTypeNode, optional, highOrderDescription, nodeGId) {
+    var _typeNode$base, _typeNode$description;
     const validations = [];
     const valueReference = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(targetPath.toCurrentIteration(), "value");
     const baseName = (_typeNode$base = typeNode === null || typeNode === void 0 ? void 0 : typeNode.base) !== null && _typeNode$base !== void 0 ? _typeNode$base : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.baseType;
@@ -79413,7 +79636,7 @@ class FLangValidationBuildContext {
         validations.push(baseTypeValidation);
       }
     }
-    const typeValidations = this.createTypeValidations(valueReference, typeNode, schemaTypeNode);
+    const typeValidations = this.createTypeValidations(valueReference, typeNode, schemaTypeNode, nodeGId);
     for (const typeValidation of typeValidations) {
       validations.push(typeValidation);
     }
@@ -79421,60 +79644,58 @@ class FLangValidationBuildContext {
       return [];
     }
     this.pathsWithValidations.add(targetPath);
-    let errorExpression = (0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.reverseArray)(validations).reduce((result, [condition, message]) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(condition, message, result), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression());
+    const schemaNode = this.schemaRng.getElementByPath(targetPath);
+    const parentNode = schemaNode != undefined ? this.getFirstAcceptedParent(schemaNode) : undefined;
+    const allChildrenPaths = parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_2__.FormSchemaRngElement ? this.schemaRng.getAllChildren(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_4__.getMatchedAndDifferentModelPaths)(targetPath, x).differentPath.isContainIteration()) : undefined;
+    const restChecks = allChildrenPaths === null || allChildrenPaths === void 0 ? void 0 : allChildrenPaths.map(childPath => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(childPath.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))).reduce(_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.combineByAndFlangExpr, undefined);
+    const errorValidations = validations.filter(x => !x.checkType || x.checkType === "error");
+    const errorExpression = this.createFlangExpression((0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.reverseArray)(errorValidations), targetPath, valueReference, "error", highOrderDescription !== null && highOrderDescription !== void 0 ? highOrderDescription : typeNode === null || typeNode === void 0 ? void 0 : typeNode.requiredDescription, optional, parentNode, restChecks);
+    const result = [];
+    result.push({
+      statement: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(targetPath, "error"), errorExpression),
+      checkType: "error"
+    });
+    const warningValidations = validations.filter(x => x.checkType === "warning");
+    if (warningValidations.length === 0) {
+      return result;
+    }
+    const warningExpression = this.createFlangExpression(warningValidations, targetPath, valueReference, "warning", highOrderDescription !== null && highOrderDescription !== void 0 ? highOrderDescription : typeNode === null || typeNode === void 0 ? void 0 : typeNode.requiredDescription, true, parentNode, restChecks);
+    result.push({
+      statement: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(targetPath, "warning"), warningExpression),
+      checkType: "warning"
+    });
+    return result;
+  }
+  createFlangExpression(validations, targetPath, valueReference, checkType, requiredDescription, optional, parentNode, restChecks) {
+    let expression = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.IterUtils.reduce(validations, (result, {
+      condition,
+      message
+    }) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(condition, message, result), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression());
     if (!optional) {
-      const requiredDescription = highOrderDescription !== null && highOrderDescription !== void 0 ? highOrderDescription : typeNode === null || typeNode === void 0 ? void 0 : typeNode.requiredDescription;
-      const 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_0__.FormSchemaRngElement) {
-            var _parentNode$multiple;
-            if ((_parentNode$multiple = parentNode.multiple) !== null && _parentNode$multiple !== void 0 ? _parentNode$multiple : false) {
-              return undefined;
-            }
-            if (parentNode.isOptional()) {
-              return parentNode;
-            }
-            parentNode = parentNode.parent;
-          } else {
-            return undefined;
-          }
-        }
-        return undefined;
-      };
-      const schemaNode = this.schemaRng.getElementByPath(targetPath);
-      const parentNode = schemaNode != undefined ? getFirstAcceptedParent(schemaNode) : undefined;
-      const requiredExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("[" + JSON.stringify(requiredDescription !== null && requiredDescription !== void 0 ? requiredDescription : "Поле должно быть заполнено") + "]"), errorExpression);
-      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_0__.FormSchemaRngElement) {
+      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_2__.FormSchemaRngElement) {
+        const requiredExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("[" + JSON.stringify(requiredDescription !== null && requiredDescription !== void 0 ? requiredDescription : "Поле должно быть заполнено") + "]"), expression);
         const targetCheck = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("")));
-        const allChildrenPaths = this.schemaRng.getAllChildren(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_11__.getMatchedAndDifferentModelPaths)(targetPath, x).differentPath.isContainIteration());
-        const restChecks = allChildrenPaths.map(childPath => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(childPath.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))).reduce(_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.combineByAndFlangExpr, undefined);
         if (restChecks != undefined) {
           const finalChildrenCondition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(targetCheck, restChecks);
-          errorExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(finalChildrenCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression(), requiredExpression);
+          expression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(finalChildrenCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression(), requiredExpression);
         } else {
-          errorExpression = requiredExpression;
+          expression = requiredExpression;
         }
       } else {
-        errorExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("[" + JSON.stringify(requiredDescription !== null && requiredDescription !== void 0 ? requiredDescription : "Поле должно быть заполнено") + "]"), errorExpression);
+        expression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("[" + JSON.stringify(requiredDescription !== null && requiredDescription !== void 0 ? requiredDescription : "Поле должно быть заполнено") + "]"), expression);
       }
     } else {
-      errorExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression(), errorExpression);
+      expression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression(), expression);
     }
-    const checkType = (_typeNode$checkType = typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _typeNode$checkType !== void 0 ? _typeNode$checkType : "error";
     const visibilityFlangCondition = this.visibilityConditions.map(x => {
       const target = new _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.AbsoluteModelFieldPath(targetPath, checkType);
       const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)(x.path.getPathPartsAsArray().filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken));
-      const flangExpr = this.getFlangExpressionFromKclangCondition(prefix, target, x.condition, x.invertRequired);
+      const flangExpr = this.getFlangExpressionFromKCLangCondition(prefix, target, x.condition, x.invertRequired);
       return flangExpr;
     }).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(acc, current) : current, undefined);
-    const finalExpression = visibilityFlangCondition != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(visibilityFlangCondition, errorExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()) : errorExpression;
-    return [{
-      statement: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(targetPath, checkType), finalExpression),
-      checkType: checkType
-    }];
+    return visibilityFlangCondition != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression(visibilityFlangCondition, expression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()) : expression;
   }
-  getFlangExpressionFromKclangCondition(prefix, target, condition, invertRequired) {
+  getFlangExpressionFromKCLangCondition(prefix, target, condition, invertRequired) {
     const fullKcLangExpr = `
             in ${prefix.toLegacyPath()} {
                 check Test === (${condition}) ? 1 : 0;
@@ -79482,15 +79703,15 @@ class FLangValidationBuildContext {
         `;
     try {
       var _kcLangMathContainer$, _kcLangMathContainer$2, _kcLangMathContainer$3;
-      const formulaReader = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_9__.FormulaReader();
+      const formulaReader = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_7__.FormulaReader();
       const kcLangMathContainer = formulaReader.readFormulas(_common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_8__.KCLangToXmlTranspiler.transpile(fullKcLangExpr));
       const formulaNode = (_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : (_kcLangMathContainer$3 = _kcLangMathContainer$2.items) === null || _kcLangMathContainer$3 === void 0 ? void 0 : _kcLangMathContainer$3[0]) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)();
       const formulaExpr = this.formulaExprConverter.compileExpressionToFlangExpression(formulaNode.expression, prefix, target, value => {
-        throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_10__.NotSupportedError("In contextual KcLang conditions should not be summation.");
+        throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_9__.NotSupportedError("In contextual KcLang conditions should not be summation.");
       });
       const flangExpr = formulaExpr instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ConditionalExpression ? formulaExpr.condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)();
       const getTypeCorrectedExpression = () => {
-        const argExpr = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.castOperandToStringIfNeed)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.tryExtractValueReferenceAsStringFromDecimal)(flangExpr));
+        const argExpr = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToStringIfNeed)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.tryExtractValueReferenceAsStringFromDecimal)(flangExpr));
         return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NotEqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NotEqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("")));
       };
       const correctedFLangExpr = flangExpr.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.BuildInTypeExpression.bool ? flangExpr : getTypeCorrectedExpression();
@@ -79521,7 +79742,7 @@ class FLangValidationBuildContext {
               case "!==":
                 return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NotEqExpression(len, argument);
               default:
-                throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_10__.NotImplementedError();
+                throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_9__.NotImplementedError();
             }
           };
           return invertRequired ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(getOperation()) : getOperation();
@@ -79535,94 +79756,149 @@ class FLangValidationBuildContext {
       return undefined;
     }
   }
-  *createTypeValidations(valueReference, typeNode, schemaTypeNode) {
-    var _typeNode$children$fi, _typeNode$children, _typeNode$children$fi2, _schemaTypeNode$enume, _typeNode$children2, _typeNodeLength$value, _typeNode$children3, _typeNodeMinLength$va, _typeNode$children4, _typeNodeMaxLength$va, _typeNode$children5, _typeNodeMinInclusive, _typeNode$children6, _typeNodeMaxInclusive, _typeNode$children7, _typeNodeTotalDigits$, _typeNode$children$fi3, _typeNode$children8, _schemaTypeNode$patte, _typeNode$children9, _typeNodeInteger$valu, _typeNode$children10, _typeNodeFractional$v;
-    //const baseCheckType = typeNode?.checkType;
-    const typeNodeEnumerations = (_typeNode$children$fi = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children = typeNode.children) === null || _typeNode$children === void 0 ? void 0 : (_typeNode$children$fi2 = _typeNode$children.filter(x => x instanceof _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.EnumerationTypeCheckNode)) === null || _typeNode$children$fi2 === void 0 ? void 0 : _typeNode$children$fi2.map(x => x.value)) !== null && _typeNode$children$fi !== void 0 ? _typeNode$children$fi : [];
+  *createTypeValidations(valueReference, typeNode, schemaTypeNode, nodeGId) {
+    var _typeNode$checkType, _typeNode$children$fi, _typeNode$children, _typeNode$children$fi2, _schemaTypeNode$enume, _digest$gId, _typeNode$children2, _typeNodeLength$value, _typeNode$children3, _typeNodeMinLength$va, _typeNode$children4, _typeNodeMaxLength$va, _typeNode$children5, _typeNodeMinInclusive, _typeNode$children6, _typeNodeMaxInclusive, _typeNode$children7, _typeNodeTotalDigits$, _typeNode$children$fi3, _typeNode$children8, _schemaTypeNode$patte, _typeNode$children9, _typeNodeInteger$valu, _typeNode$children10, _typeNodeFractional$v;
+    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 ? void 0 : (_typeNode$children = typeNode.children) === null || _typeNode$children === void 0 ? void 0 : (_typeNode$children$fi2 = _typeNode$children.filter(x => x instanceof _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.EnumerationTypeCheckNode)) === null || _typeNode$children$fi2 === void 0 ? void 0 : _typeNode$children$fi2.map(x => x.value)) !== null && _typeNode$children$fi !== void 0 ? _typeNode$children$fi : [];
     const enumerationItems = (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.arrayIsNotEmpty)(typeNodeEnumerations) ? typeNodeEnumerations : (_schemaTypeNode$enume = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.enumeration) !== null && _schemaTypeNode$enume !== void 0 ? _schemaTypeNode$enume : [];
     if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.arrayIsNotEmpty)(enumerationItems)) {
       const enumerationRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OneOfExpression(valueReference, enumerationItems.map(item => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(item)));
-      yield [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(enumerationRuleBody), makeMessage({
-        enumerationAllowedValues: enumerationItems
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(enumerationRuleBody),
+        message: makeMessage({
+          enumerationAllowedValues: enumerationItems
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
+    }
+    const digest = typeNode === null || typeNode === void 0 ? void 0 : typeNode.getValidations(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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_6__.isNotNullOrEmpty)(gId) && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.arrayHasLength)(enumerationItems, 0)) {
+      var _ref3, _digest$description, _ref4, _digest$checkType;
+      const ruleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.HasPicklistValueExpression(valueReference, `${gId}[code]`));
+      yield {
+        condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(ruleBody),
+        message: makeArrayLiteral((_ref3 = (_digest$description = digest === null || digest === void 0 ? void 0 : digest.description) !== null && _digest$description !== void 0 ? _digest$description : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref3 !== void 0 ? _ref3 : "Поле заполнено не по справочнику"),
+        checkType: (_ref4 = (_digest$checkType = digest === null || digest === void 0 ? void 0 : digest.checkType) !== null && _digest$checkType !== void 0 ? _digest$checkType : typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _ref4 !== void 0 ? _ref4 : "error"
+      };
     }
-    const typeNodeLength = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children2 = typeNode.children) === null || _typeNode$children2 === void 0 ? void 0 : _typeNode$children2.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.LengthTypeCheckNode));
+    const typeNodeLength = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children2 = typeNode.children) === null || _typeNode$children2 === void 0 ? void 0 : _typeNode$children2.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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) {
       const lengthExprRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(lengthValue)));
-      yield [lengthExprRuleBody, makeMessage({
-        length: lengthValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: lengthExprRuleBody,
+        message: makeMessage({
+          length: lengthValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeMinLength = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children3 = typeNode.children) === null || _typeNode$children3 === void 0 ? void 0 : _typeNode$children3.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.MinlengthTypeCheckNode));
+    const typeNodeMinLength = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children3 = typeNode.children) === null || _typeNode$children3 === void 0 ? void 0 : _typeNode$children3.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 ? void 0 : (_typeNode$children4 = typeNode.children) === null || _typeNode$children4 === void 0 ? void 0 : _typeNode$children4.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.MaxlengthTypeCheckNode));
+    const typeNodeMaxLength = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children4 = typeNode.children) === null || _typeNode$children4 === void 0 ? void 0 : _typeNode$children4.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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) {
       const lengthExprRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.GeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(minLengthValue)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(maxLengthValue))));
-      yield [lengthExprRuleBody, makeMessage({
-        minLength: minLengthValue,
-        maxLength: maxLengthValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: lengthExprRuleBody,
+        message: makeMessage({
+          minLength: minLengthValue,
+          maxLength: maxLengthValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     } else if (minLengthValue != undefined) {
       const lengthExprRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.GeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(minLengthValue)));
-      yield [lengthExprRuleBody, makeMessage({
-        minLength: minLengthValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: lengthExprRuleBody,
+        message: makeMessage({
+          minLength: minLengthValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     } else if (maxLengthValue != undefined) {
       const lengthExprRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(maxLengthValue)));
-      yield [lengthExprRuleBody, makeMessage({
-        maxLength: maxLengthValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: lengthExprRuleBody,
+        message: makeMessage({
+          maxLength: maxLengthValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeMinInclusive = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children5 = typeNode.children) === null || _typeNode$children5 === void 0 ? void 0 : _typeNode$children5.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.MininclusiveTypeCheckNode));
+    const typeNodeMinInclusive = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children5 = typeNode.children) === null || _typeNode$children5 === void 0 ? void 0 : _typeNode$children5.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.GeExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.castOperandToDecimalIfNeed)(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(minInclusiveValue)));
-      yield [minInclusiveRuleBody, makeMessage({
-        minInclusive: minInclusiveValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      const minInclusiveRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.GeExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToDecimalIfNeed)(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(minInclusiveValue)));
+      yield {
+        condition: minInclusiveRuleBody,
+        message: makeMessage({
+          minInclusive: minInclusiveValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeMaxInclusive = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children6 = typeNode.children) === null || _typeNode$children6 === void 0 ? void 0 : _typeNode$children6.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.MaxinclusiveTypeCheckNode));
+    const typeNodeMaxInclusive = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children6 = typeNode.children) === null || _typeNode$children6 === void 0 ? void 0 : _typeNode$children6.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.castOperandToDecimalIfNeed)(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(maxInclusiveValue)));
-      yield [maxInclusiveRuleBody, makeMessage({
-        maxInclusive: maxInclusiveValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      const maxInclusiveRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToDecimalIfNeed)(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(maxInclusiveValue)));
+      yield {
+        condition: maxInclusiveRuleBody,
+        message: makeMessage({
+          maxInclusive: maxInclusiveValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeTotalDigits = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children7 = typeNode.children) === null || _typeNode$children7 === void 0 ? void 0 : _typeNode$children7.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.TotaldigitsTypeCheckNode));
+    const typeNodeTotalDigits = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children7 = typeNode.children) === null || _typeNode$children7 === void 0 ? void 0 : _typeNode$children7.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NumLenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(totalDigitsValue)));
-      yield [totalDigitsRuleBody, makeMessage({
-        totalDigitsMaxCount: totalDigitsValue
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: totalDigitsRuleBody,
+        message: makeMessage({
+          totalDigitsMaxCount: totalDigitsValue
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodePatterns = (_typeNode$children$fi3 = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined)) !== null && _typeNode$children$fi3 !== void 0 ? _typeNode$children$fi3 : [];
+    const typeNodePatterns = (_typeNode$children$fi3 = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined)) !== null && _typeNode$children$fi3 !== void 0 ? _typeNode$children$fi3 : [];
     const stringPatterns = ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.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_6__.isNotNullOrUndefined);
     const patterns = stringPatterns.map(pattern => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(pattern))).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(acc, current) : current, undefined);
     if (patterns != undefined) {
       const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(patterns);
-      yield [totalDigitsRuleBody, makeMessage({
-        patterns: stringPatterns
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      yield {
+        condition: totalDigitsRuleBody,
+        message: makeMessage({
+          patterns: stringPatterns
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeInteger = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children9 = typeNode.children) === null || _typeNode$children9 === void 0 ? void 0 : _typeNode$children9.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.IntegerdigitsTypeCheckNode));
+    const typeNodeInteger = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children9 = typeNode.children) === null || _typeNode$children9 === void 0 ? void 0 : _typeNode$children9.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.MinusBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NumLenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.FractionalLenExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.castOperandToDecimalIfNeed)(valueReference))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(integerDigits)));
-      yield [integerDigitsRuleBody, makeMessage({
-        integerDigitsMaxCount: integerDigits
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      const integerDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.MinusBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NumLenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.FractionalLenExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToDecimalIfNeed)(valueReference))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(integerDigits)));
+      yield {
+        condition: integerDigitsRuleBody,
+        message: makeMessage({
+          integerDigitsMaxCount: integerDigits
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
-    const typeNodeFractional = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children10 = typeNode.children) === null || _typeNode$children10 === void 0 ? void 0 : _typeNode$children10.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_2__.FractiondigitsTypeCheckNode));
+    const typeNodeFractional = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children10 = typeNode.children) === null || _typeNode$children10 === void 0 ? void 0 : _typeNode$children10.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.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 _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.FractionalLenExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.castOperandToDecimalIfNeed)(valueReference)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(fractionalDigits)));
-      yield [fractionalDigitsRuleBody, makeMessage({
-        fractionalDigitsMaxCount: fractionalDigits
-      }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description)];
+      const fractionalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.FractionalLenExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToDecimalIfNeed)(valueReference)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.DecimalLiteralExpression(fractionalDigits)));
+      yield {
+        condition: fractionalDigitsRuleBody,
+        message: makeMessage({
+          fractionalDigitsMaxCount: fractionalDigits
+        }, typeNode === null || typeNode === void 0 ? void 0 : typeNode.description, schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description),
+        checkType: checkType
+      };
     }
   }
   createBaseTypeValidation(valueReference, baseType, baseDescription) {
@@ -79633,51 +79909,64 @@ class FLangValidationBuildContext {
         return undefined;
       case "integer":
         {
-          return [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^-?\\d+$"))), makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))];
+          return {
+            condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^-?\\d+$"))),
+            message: makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))
+          };
         }
       case "decimal":
         {
-          return [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^-?\\d+(([.]\\d+$)|($))"))), makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))];
+          return {
+            condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^-?\\d+(([.]\\d+$)|($))"))),
+            message: makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))
+          };
         }
       case "date":
         {
-          return [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$"))), makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))];
+          return {
+            condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$"))),
+            message: makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))
+          };
         }
       case "gYear":
         {
-          return [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^\\d{4}$"))), makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))];
+          return {
+            condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^\\d{4}$"))),
+            message: makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))
+          };
         }
       case "gMonth":
         {
-          return [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^(--(0[1-9]|1[0-2]))$"))), makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_7__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))];
+          return {
+            condition: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("^(--(0[1-9]|1[0-2]))$"))),
+            message: makeArrayLiteral(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_10__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))
+          };
         }
       default:
         throw new Error(`Unknown base type name: '${baseType}'`);
     }
   }
-  getAllPathsWithValidations() {
-    return this.pathsWithValidations.values();
-  }
-  addErrorCondition(targetPath, errorCondition) {
-    const errorReference = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(targetPath, "error");
-    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.SetStatement(errorReference, errorCondition);
-  }
-  getSchemaTypeInfo(bindingPath) {
-    return this.useSchemaValidations ? this.schemaRng.getTypeNodeByPath(bindingPath) : undefined;
-  }
-  getTypeNode(node) {
-    if (node.anonymousType != undefined) {
-      return node.anonymousType;
-    }
-    if (node.type != undefined) {
-      const result = this.typesRegistry.getByName(node.type);
-      if (result == undefined) {
-        throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_4__.SugarAttributeReadError(`Type with name '${node.type}' not found`, node, "type");
+  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_2__.FormSchemaRngElement) {
+        var _parentNode$multiple;
+        if ((_parentNode$multiple = parentNode.multiple) !== null && _parentNode$multiple !== void 0 ? _parentNode$multiple : false) {
+          return undefined;
+        }
+        if (parentNode.isOptional()) {
+          return parentNode;
+        }
+        parentNode = parentNode.parent;
+      } else {
+        return undefined;
       }
-      return result;
     }
     return undefined;
   }
+  getAllPathsWithValidations() {
+    return this.pathsWithValidations.values();
+  }
 }
 
 /***/ }),
@@ -79754,9 +80043,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "NullLiteralExpression": () => (/* binding */ NullLiteralExpression),
 /* harmony export */   "ConditionalExpression": () => (/* binding */ ConditionalExpression),
 /* harmony export */   "DateNowExpression": () => (/* binding */ DateNowExpression),
+/* harmony export */   "GetPicklistValuesExpression": () => (/* binding */ GetPicklistValuesExpression),
+/* harmony export */   "FirstOrDefaultExpression": () => (/* binding */ FirstOrDefaultExpression),
+/* harmony export */   "ArrayExpression": () => (/* binding */ ArrayExpression),
 /* harmony export */   "NullCoalesceExpression": () => (/* binding */ NullCoalesceExpression),
 /* harmony export */   "OneOfExpression": () => (/* binding */ OneOfExpression),
 /* harmony export */   "NoDepsExpression": () => (/* binding */ NoDepsExpression),
+/* harmony export */   "HasPicklistValueExpression": () => (/* binding */ HasPicklistValueExpression),
+/* harmony export */   "TrimExpression": () => (/* binding */ TrimExpression),
+/* harmony export */   "PrepareNumberExpression": () => (/* binding */ PrepareNumberExpression),
 /* harmony export */   "IncrementalFlagExpression": () => (/* binding */ IncrementalFlagExpression),
 /* harmony export */   "GetOldExpression": () => (/* binding */ GetOldExpression),
 /* harmony export */   "FLangStatement": () => (/* binding */ FLangStatement),
@@ -80038,6 +80333,7 @@ BuildInTypeExpression.bool = new BuildInTypeExpression("bool");
 BuildInTypeExpression.null = new BuildInTypeExpression("null");
 BuildInTypeExpression.datetime = new BuildInTypeExpression("datetime");
 BuildInTypeExpression.int = new BuildInTypeExpression("int");
+BuildInTypeExpression.array = new BuildInTypeExpression("array");
 class ArgumentDeclarationExpression extends FLangExpression {
   constructor(argumentName, typeExpression) {
     super();
@@ -80524,6 +80820,66 @@ class DateNowExpression extends FLangExpression {
     return `dateNow()`;
   }
 }
+class GetPicklistValuesExpression extends FLangExpression {
+  constructor(gid, filterColumn, filterKey, columns) {
+    super();
+    this.gId = void 0;
+    this.filterColumn = void 0;
+    this.filterKey = void 0;
+    this.resultColumn = void 0;
+    this.gId = gid;
+    this.filterColumn = filterColumn;
+    this.filterKey = filterKey;
+    this.resultColumn = columns;
+  }
+  getType() {
+    return BuildInTypeExpression.array;
+  }
+  *getChildNodes() {
+    yield this.gId;
+    yield this.filterColumn;
+    yield this.filterKey;
+    yield this.resultColumn;
+  }
+  convertToString() {
+    return `getPicklistValues(${this.gId.convertToString()}, ${this.filterColumn.convertToString()}, ${this.filterKey.convertToString()}, ${this.resultColumn.convertToString()})`;
+  }
+}
+class FirstOrDefaultExpression extends FLangExpression {
+  constructor(expression) {
+    super();
+    this.expression = void 0;
+    this.expression = expression;
+  }
+  getType() {
+    return BuildInTypeExpression.string;
+  }
+  *getChildNodes() {
+    yield this.expression;
+  }
+  convertToString() {
+    return `firstOrDefault(${this.expression.convertToString()})`;
+  }
+}
+class ArrayExpression extends FLangExpression {
+  constructor(items) {
+    super();
+    this.items = void 0;
+    this.items = items;
+  }
+  getType() {
+    return BuildInTypeExpression.array;
+  }
+  *getChildNodes() {
+    for (const item of this.items) {
+      yield item;
+    }
+  }
+  convertToString() {
+    const items = this.items.map(x => x.convertToString()).join(", ");
+    return `array(${items})`;
+  }
+}
 class NullCoalesceExpression extends FLangExpression {
   constructor(expression, elseExpression) {
     super();
@@ -80583,6 +80939,57 @@ class NoDepsExpression extends FLangExpression {
     return `nodeps(${this.expression.convertToString()})`;
   }
 }
+class HasPicklistValueExpression extends FLangExpression {
+  constructor(expression, gidAndColumns) {
+    super();
+    this.expression = void 0;
+    this.gidExpression = void 0;
+    this.expression = expression;
+    this.gidExpression = new StringLiteralExpression(gidAndColumns);
+  }
+  getType() {
+    return BuildInTypeExpression.bool;
+  }
+  getChildNodes() {
+    return [];
+  }
+  convertToString() {
+    const expression = this.expression.convertToString();
+    return `hasPicklistValue(${expression}, ${this.gidExpression})`;
+  }
+}
+class TrimExpression extends FLangExpression {
+  constructor(expression) {
+    super();
+    this.expression = void 0;
+    this.expression = expression;
+  }
+  *getChildNodes() {
+    yield this.expression;
+  }
+  getType() {
+    return BuildInTypeExpression.string;
+  }
+  convertToString() {
+    return `trim(${this.expression.convertToString()})`;
+  }
+}
+class PrepareNumberExpression extends FLangExpression {
+  constructor(expression) {
+    super();
+    this.expression = void 0;
+    this.expression = expression;
+  }
+  *getChildNodes() {
+    yield this.expression;
+  }
+  getType() {
+    return BuildInTypeExpression.string;
+  }
+  convertToString() {
+    return `prepareNumber(${this.expression.convertToString()})`;
+  }
+}
 class IncrementalFlagExpression extends FLangExpression {
   getChildNodes() {
     return [];
@@ -81097,6 +81504,19 @@ class FormulaExpressionToFlangExpressionConverter {
       const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.IsValidMirCardNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(arg));
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaArrayExpression) {
+      const items = expression.items.map(arg => this.compileExpressionToFlangExpressionInternal(arg, prefix, target, addPrecalculationRule));
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArrayExpression(items);
+    }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaFirstOrDefaultExpression) {
+      const firstOrDefaultExpression = this.compileExpressionToFlangExpressionInternal(expression.expression, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.FirstOrDefaultExpression(firstOrDefaultExpression);
+    }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaGetPicklistValuesExpression) {
+      const filterColumn = this.compileExpressionToFlangExpressionInternal(expression.filterColumn.filterColumn, prefix, target, addPrecalculationRule);
+      const filterKey = this.compileExpressionToFlangExpressionInternal(expression.filterKey.filterKey, prefix, target, addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetPicklistValuesExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.StringLiteralExpression(expression.gId), filterColumn, filterKey, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.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);
@@ -81136,9 +81556,6 @@ class FormulaExpressionToFlangExpressionConverter {
     const secondPartFinalParts = secondPartParts.slice(0, lastStarIndexSecondPart);
     const finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)([...firstPart.getPathParts(), ...secondPartFinalParts]).trimLastStarIfLastToken();
     const reduceExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ReduceCallExpression(finalIterPath, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AddSumExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value"), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression());
-    if (reduceExpression == undefined) {
-      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Target and source must be in different collections! " + "\n" + `Target: ${target}` + "\n" + `SourceKey: ${sourceKeyPath}`);
-    }
     const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(targetKeyPath.toCurrentIteration(), "value"));
     return finalValueExpression;
   }
@@ -81322,6 +81739,48 @@ class FormulaOnlyNormalizationRuleGenerator {
 
 /***/ }),
 
+/***/ "./Generator/src/generators/ServerSideFLangNormalization/NodeTypeInfoHelper.ts":
+/*!*************************************************************************************!*\
+  !*** ./Generator/src/generators/ServerSideFLangNormalization/NodeTypeInfoHelper.ts ***!
+  \*************************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "NodeTypeInfoHelper": () => (/* binding */ NodeTypeInfoHelper)
+/* harmony export */ });
+/* harmony import */ var _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../common/XmlParser/XmlNode */ "./Generator/src/common/XmlParser/XmlNode.ts");
+
+class NodeTypeInfoHelper {
+  constructor(schemaRng, typesRegistry, useSchemaValidations) {
+    this.schemaRng = void 0;
+    this.useSchemaValidations = void 0;
+    this.typesRegistry = void 0;
+    this.useSchemaValidations = useSchemaValidations;
+    this.schemaRng = schemaRng;
+    this.typesRegistry = typesRegistry;
+  }
+  getSchemaTypeInfo(bindingPath) {
+    return this.useSchemaValidations ? this.schemaRng.getTypeNodeByPath(bindingPath) : undefined;
+  }
+  getTypeNode(node) {
+    if (node.anonymousType != undefined) {
+      return node.anonymousType;
+    }
+    if (node.type != undefined) {
+      const result = this.typesRegistry.getByName(node.type);
+      if (result == undefined) {
+        throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_0__.SugarAttributeReadError(`Type with name '${node.type}' not found`, node, "type");
+      }
+      return result;
+    }
+    return undefined;
+  }
+}
+
+/***/ }),
+
 /***/ "./Generator/src/generators/ServerSideFLangNormalization/NormalizationRulesGenerator.ts":
 /*!**********************************************************************************************!*\
   !*** ./Generator/src/generators/ServerSideFLangNormalization/NormalizationRulesGenerator.ts ***!
@@ -81424,7 +81883,7 @@ class FormulaRulesBuilder {
     const getFormulaExpression = targetField => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.wrapWithArgumentsCondition)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.castOperandToStringIfNeed)(this.formulaExprConverter.compileExpressionToFlangExpression(formula.expression, prefix, new _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.AbsoluteModelFieldPath(fullTarget, targetField), x => precalculationRules.push(x)), "G29")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue));
     const result = [];
     if (isTargetAutoField) {
-      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoValue"), getFormulaExpression("autoValue")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false"))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.string), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")))));
+      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoValue"), getFormulaExpression("autoValue")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false"))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.string), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")))));
       if (isDisabled) {
         result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value")));
       }
@@ -81509,7 +81968,7 @@ class LazyLoadingRulesBuilder {
       const thresholdEntryPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(`/${thresholdEntry[0]}`, true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
       const thresholdValue = (_thresholdEntry$1$thr = (_thresholdEntry$ = thresholdEntry[1]) === null || _thresholdEntry$ === void 0 ? void 0 : _thresholdEntry$.thresholdValue) !== null && _thresholdEntry$1$thr !== void 0 ? _thresholdEntry$1$thr : 0;
       const lazyLoadingEnabledRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsolute)(formRoot).joinWith("LazyLoadingEnabled"), "value");
-      const statement = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(lazyLoadingEnabledRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.GeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ReduceCallExpression(thresholdEntryPath.trimLastStarIfLastToken().toCurrentIteration(), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.decimal, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.decimal)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SumBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(1))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(0)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(thresholdValue)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false")));
+      const statement = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(lazyLoadingEnabledRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.GeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ReduceCallExpression(thresholdEntryPath.trimLastStarIfLastToken(), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.decimal, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.decimal)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SumBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(1))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(0)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.DecimalLiteralExpression(thresholdValue)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false")));
       yield statement;
     }
   }
@@ -81641,16 +82100,22 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _markupGenerator_ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../markupGenerator/ElementProcessors/FormParts/Form/FormConverter */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Form/FormConverter.ts");
 /* harmony import */ var _markupGenerator_FLangNormalizationRulesBuilder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../markupGenerator/FLangNormalizationRulesBuilder */ "./Generator/src/generators/markupGenerator/FLangNormalizationRulesBuilder.ts");
 /* harmony import */ var _FetchFunctionToFlangConverter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../FetchFunctionToFlangConverter */ "./Generator/src/generators/ServerSideFLangNormalization/FetchFunctionToFlangConverter.ts");
+/* harmony import */ var _NodeTypeInfoHelper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../NodeTypeInfoHelper */ "./Generator/src/generators/ServerSideFLangNormalization/NodeTypeInfoHelper.ts");
+
 
 
 
 class SugarRulesBuilder {
-  constructor(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper) {
+  constructor(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper, typeRegistry, useSchemaValidations) {
     this.sugarRoot = void 0;
     this.controlCustomizationContext = void 0;
     this.fetchFunctions = void 0;
     this.formSchemaRng = void 0;
     this.dataDeclarationHelper = void 0;
+    this.useSchemaValidations = void 0;
+    this.typeRegistry = void 0;
+    this.useSchemaValidations = useSchemaValidations;
+    this.typeRegistry = typeRegistry;
     this.dataDeclarationHelper = dataDeclarationHelper;
     this.formSchemaRng = formSchemaRng;
     this.fetchFunctions = fetchFunctions;
@@ -81659,7 +82124,7 @@ class SugarRulesBuilder {
   }
   buildRules() {
     const converter = new _markupGenerator_ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_0__.FormConverter(this.sugarRoot);
-    const builder = new _markupGenerator_FLangNormalizationRulesBuilder__WEBPACK_IMPORTED_MODULE_1__.FLangNormalizationRulesBuilder(this.controlCustomizationContext, this.fetchFunctions, new _FetchFunctionToFlangConverter__WEBPACK_IMPORTED_MODULE_2__.FetchFunctionToFlangConverter(), this.dataDeclarationHelper);
+    const builder = new _markupGenerator_FLangNormalizationRulesBuilder__WEBPACK_IMPORTED_MODULE_1__.FLangNormalizationRulesBuilder(this.controlCustomizationContext, this.fetchFunctions, new _FetchFunctionToFlangConverter__WEBPACK_IMPORTED_MODULE_2__.FetchFunctionToFlangConverter(), this.dataDeclarationHelper, this.formSchemaRng, new _NodeTypeInfoHelper__WEBPACK_IMPORTED_MODULE_3__.NodeTypeInfoHelper(this.formSchemaRng, this.typeRegistry, this.useSchemaValidations));
     return converter.buildNormalizeRules(builder, this.formSchemaRng);
   }
 }
@@ -81686,6 +82151,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_EachCurrentCollision__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../../Common/ModelPath/EachCurrentCollision */ "./Common/ModelPath/EachCurrentCollision.ts");
 /* harmony import */ var _DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../DataSchema/DataSchemaUtils */ "./Generator/src/generators/DataSchema/DataSchemaUtils.ts");
 /* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
+/* harmony import */ var _NodeTypeInfoHelper__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../NodeTypeInfoHelper */ "./Generator/src/generators/ServerSideFLangNormalization/NodeTypeInfoHelper.ts");
+
 
 
 
@@ -81745,7 +82212,7 @@ class ValidationRulesBuilder {
   }
   *buildSugarValidationRules() {
     const converter = new _markupGenerator_ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_2__.FormConverter(this.sugarRoot);
-    const context = new _FLangValidationBuildContext__WEBPACK_IMPORTED_MODULE_3__.FLangValidationBuildContext(this.typesRegistry, this.formSchemaRng, this.useSchemaValidations, this.formulaExprConverter);
+    const context = new _FLangValidationBuildContext__WEBPACK_IMPORTED_MODULE_3__.FLangValidationBuildContext(this.formSchemaRng, this.formulaExprConverter, new _NodeTypeInfoHelper__WEBPACK_IMPORTED_MODULE_9__.NodeTypeInfoHelper(this.formSchemaRng, this.typesRegistry, this.useSchemaValidations));
     const sugarRules = Iterator.from(converter.buildFLangValidations(context, this.formSchemaRng)).reduce((ctx, current) => {
       const statement = current.statement;
       if (!(statement instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement)) {
@@ -83142,33 +83609,35 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
-/* harmony import */ var _ButtonNode__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/Button/ButtonNode.ts");
+/* harmony import */ var _Typography_Icon_GetIconName__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../Typography/Icon/GetIconName */ "./Generator/src/generators/markupGenerator/ElementProcessors/Typography/Icon/GetIconName.ts");
+/* harmony import */ var _ButtonNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/Button/ButtonNode.ts");
+
 
 
 
 
 class ButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode;
+    return _ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode;
   }
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode);
+    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode);
     return [(0,_getBindingPath__WEBPACK_IMPORTED_MODULE_2__.getNewBindingPathExpression)(node)];
   }
   doBuildDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode);
+    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode);
     return context.mergeDataDeclaration(context.addVisibilityPathDeclEntryNew(node));
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode);
+    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode);
     return context.processChildrenDataDeclaration(node.children);
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode);
+    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode);
     yield* node.children;
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_3__.ButtonNode);
+    const node = this.getCurrentNodeAs(_ButtonNode__WEBPACK_IMPORTED_MODULE_4__.ButtonNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_0__.componentMarkupBuilder)("Button");
     markupBuilder.prop(x => x.align).set(node.align);
     markupBuilder.prop(x => x.arrow).set(node.arrow);
@@ -83179,6 +83648,7 @@ class ButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__.S
     markupBuilder.prop(x => x.size).set(node.size);
     markupBuilder.prop(x => x.type).set(node.type);
     markupBuilder.prop(x => x.use).set(node.use);
+    markupBuilder.prop(x => x.icon).set((0,_Typography_Icon_GetIconName__WEBPACK_IMPORTED_MODULE_3__.getIconName)(node, node.icon));
     markupBuilder.prop(x => x.width).set(node.width);
     markupBuilder.prop(x => x.onClick).set(context.generateHelperFunctionExpression(node, "onClick", node.onClick));
     markupBuilder.appendChild(context.convertChildNodes(node.children));
@@ -83211,13 +83681,13 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13;
 
 
 
 let ButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("button", `Кнопка
 
-    В приоритете в качестве текста будет взят value из модели по path. Даже если в сахаре указать текст вручную.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Button sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("align", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("center", "end", "justify", "left", "match-parent", "right", "start"), "Выравнивание"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("arrow", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Кнопка со стрелкой"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Всплывающая подсказка при наведении"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, "Disabled"), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("size", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("small", "medium", "large"), "Размер кнопки. По умолчанинию small"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("button", "submit", "reset"), "Тип, влияет на цвет. см. в retail-ui"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "primary", "success", "danger", "pay", "link"), "Вариант использования, влияет на цвет. см. в retail-ui"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.lengthUnit, "Ширина"), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class ButtonNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
+    В приоритете в качестве текста будет взят value из модели по path. Даже если в сахаре указать текст вручную.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Button sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("align", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("center", "end", "justify", "left", "match-parent", "right", "start"), "Выравнивание"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("arrow", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Кнопка со стрелкой"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Всплывающая подсказка при наведении"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, "Disabled"), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("size", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("small", "medium", "large"), "Размер кнопки. По умолчанинию small"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("button", "submit", "reset"), "Тип, влияет на цвет. См. в retail-ui"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "primary", "success", "danger", "pay", "text", "backless", "link"), "Вариант использования, влияет на стиль отображения и цвет. См. в retail-ui"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.lengthUnit, "Ширина"), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Название иконки можно посмотреть по ссылке https://ui.gitlab-pages.kontur.host/docs/#/icons`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class ButtonNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataReference", _descriptor, this);
@@ -83230,8 +83700,9 @@ let ButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor8, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "use", _descriptor9, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "width", _descriptor10, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "onClick", _descriptor11, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "icon", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "onClick", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor13, this);
   }
   getOwnPath() {
     return this.dataReference.getOwnPath();
@@ -83286,12 +83757,17 @@ let ButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "onClick", [_dec12], {
+}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "icon", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec13], {
+}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "onClick", [_dec13], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -83323,11 +83799,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
 
 
 
-let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("menuSeparator", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Элемент разделителя меню`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataReference", _descriptor, this);
@@ -83337,7 +83813,8 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled", _descriptor5, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor6, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "icon", _descriptor7, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "menuSeparator", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor9, this);
   }
   getOwnPath() {
     return this.dataReference.getOwnPath();
@@ -83377,7 +83854,12 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec9], {
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "menuSeparator", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -83709,7 +84191,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
-/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
+/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
+/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
+
 
 
 
@@ -83717,27 +84201,27 @@ __webpack_require__.r(__webpack_exports__);
 
 class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode;
+    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode;
   }
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     return [(0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node)];
   }
   doBuildDataDeclaration(context) {
     return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     return context.mergeDataDeclaration(...node.items.map(item => context.processChildrenDataDeclaration(item.children)));
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     for (const item of node.items) {
       yield* item.children;
     }
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("DropdownButton");
     markupBuilder.prop("data-tid").set(node.tid);
     markupBuilder.prop(x => x.width).set(node.width);
@@ -83749,6 +84233,13 @@ class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
       itemBuilder.prop("data-tid").set(item.tid);
       itemBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(item));
       itemBuilder.prop(x => x.metricName).set(item.metricName);
+      itemBuilder.prop(x => x.menuSeparator).set(item.menuSeparator);
+      if (item.disabled2 != undefined) {
+        itemBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__.buildExpressionPropValue)(item.disabled2));
+        if (this.getLegacyNode().getParent() != undefined) {
+          itemBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
+        }
+      }
       itemBuilder.prop(x => x.onActionClick).set(context.generateHelperFunctionExpression(node, "onClick", item.onClick));
       itemBuilder.appendChild(context.convertChildNodes(item.children));
     }
@@ -84246,7 +84737,7 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11
 
 
 
-let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("link", `Ссылка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Link sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.bindingPath, "Путь в модели"), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("optional", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.UntypedUsage), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("defaultValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Всплывающая подсказка при наведении"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("default", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.InvalidUsage), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("color", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.Removed), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "success", "danger", "grayed"), "Тип, влияет на цвет. см. в retail-ui"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("href", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Ссылка. URL с кириллическими символами так и пишется, например, https://www.kontur-extern.ru/info/38137-zapolnit_razdel_2_efs_1#:~:text=Данные указываются по,проставлять нули (0)."), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Название иконки, можно посмотреть https://ui.gitlab-pages.kontur.host/docs/#/icons`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("stopPropagation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Прекращает дальнейшую передачу собития клика https://developer.mozilla.org/ru/docs/Web/API/Event/stopPropagation`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("metrics-id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Идентификатор ссылки, который будет отправлен вместе с метриками по этой ссылке"), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class LinkNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
+let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("link", `Ссылка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Link sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.bindingPath, "Путь в модели"), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("optional", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.UntypedUsage), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("defaultValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Всплывающая подсказка при наведении"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("default", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.InvalidUsage), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("color", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.Removed), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "success", "danger", "grayed"), "Тип, влияет на цвет. см. в retail-ui"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("href", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Ссылка. URL с кириллическими символами так и пишется, например, https://www.kontur-extern.ru/info/38137-zapolnit_razdel_2_efs_1#:~:text=Данные указываются по,проставлять нули (0)."), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Название иконки можно посмотреть по ссылке https://ui.gitlab-pages.kontur.host/docs/#/icons`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("stopPropagation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Прекращает дальнейшую передачу собития клика https://developer.mozilla.org/ru/docs/Web/API/Event/stopPropagation`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("metrics-id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Идентификатор ссылки, который будет отправлен вместе с метриками по этой ссылке"), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class LinkNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "path", _descriptor, this);
@@ -87048,7 +87539,7 @@ let ModalTitleNode = (_dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_M
   writable: true,
   initializer: null
 })), _class5)) || _class4);
-let FormNode = (_dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("form", `Корневой элемент формы.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Form sync recursive .md$")), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("userpicklist", [_UserPicklist_UserPicklistNode__WEBPACK_IMPORTED_MODULE_10__.UserPicklistNode]), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("tour", [_Tour_TourNode__WEBPACK_IMPORTED_MODULE_9__.TourNode]), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("fetchfunctions", [FetchFunctionsReferenceNode]), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("modalIE8", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("m", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("uf", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("forceNavigate", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hideUnitsAdder", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hasRegionalForms", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.UntypedUsage), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("controls"), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("modalheader", [ModalTitleNode]), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("import", [_SugarNodes_Nodes_ImportNode__WEBPACK_IMPORTED_MODULE_7__.ImportNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("panel", [_Nodes_PanelNode__WEBPACK_IMPORTED_MODULE_13__.PanelNode]), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("zeroreportoptions", [_ZeroReportOptions_ZeroReportOptionsNode__WEBPACK_IMPORTED_MODULE_12__.ZeroReportOptionsNode]), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("page", [_Page_PageNode__WEBPACK_IMPORTED_MODULE_8__.PageNode]), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("simple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("schemaValidations", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("isReadOnly", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отобразить форму в режиме чтения - все редактирование будет отключено (включая интерактивные элементы - валидации, фокус, подсветки тултипы и тд)"), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieDeprecationWarningEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отображать окно с предупреждением, что некоторые функции в ie не работают, с предложением скачать другие браузеры. Не блокирует взаимодействие"), _dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("compactActionPanel", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отображать компактную плашку (без надписей) на панели действий слева"), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("enableCustomizationButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Включить кнопку настройки оформления"), _dec29 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieSizeLimitation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Это флаг включает отображение заглушки для IE, если фуф больше определенного размера`), _dec30 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("templates", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Управляет влючение возможность создавать и применять шаблоны keweb-а (кнопка в меню)`), _dec31 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("__deleteMe__enableIndentToSingleUnit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включить несогласованные с дизайнером отступы, которые использовались для ЕФС`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("plain", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Форма без боковой панели, которая будет содержать один раздел`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("requisite", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Есть подозрение что это свойство не используется`), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("cssWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Более преоритетный чем обычный width, задается как css`), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("buttonSettingsType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType["enum"](_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.Revise, _Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.DigitalWarrant), `Разные настройки кнопок отправить и действий с формой. Сейчас есть только ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.Revise} / ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.DigitalWarrant} который будет делать кнопки в плашке для simple form как у ИОН или Сверке ФСС`), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("validationBeforeSend", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Локальная проверка, которая не даст отправить форму, если есть невалидные поля.\n
+let FormNode = (_dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("form", `Корневой элемент формы.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Form sync recursive .md$")), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("userpicklist", [_UserPicklist_UserPicklistNode__WEBPACK_IMPORTED_MODULE_10__.UserPicklistNode]), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("tour", [_Tour_TourNode__WEBPACK_IMPORTED_MODULE_9__.TourNode]), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("fetchfunctions", [FetchFunctionsReferenceNode]), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("modalIE8", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("m", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("uf", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("forceNavigate", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hideUnitsAdder", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hasRegionalForms", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.UntypedUsage), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("controls"), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("modalheader", [ModalTitleNode]), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("import", [_SugarNodes_Nodes_ImportNode__WEBPACK_IMPORTED_MODULE_7__.ImportNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("panel", [_Nodes_PanelNode__WEBPACK_IMPORTED_MODULE_13__.PanelNode]), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("zeroreportoptions", [_ZeroReportOptions_ZeroReportOptionsNode__WEBPACK_IMPORTED_MODULE_12__.ZeroReportOptionsNode]), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("page", [_Page_PageNode__WEBPACK_IMPORTED_MODULE_8__.PageNode]), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("simple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("schemaValidations", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("isReadOnly", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отобразить форму в режиме чтения - все редактирование будет отключено (включая интерактивные элементы - валидации, фокус, подсветки тултипы и тд)"), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieDeprecationWarningEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отображать окно с предупреждением, что некоторые функции в ie не работают, с предложением скачать другие браузеры. Не блокирует взаимодействие"), _dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("compactActionPanel", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("enableCustomizationButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Включить кнопку настройки оформления"), _dec29 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieSizeLimitation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Это флаг включает отображение заглушки для IE, если фуф больше определенного размера`), _dec30 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("templates", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Управляет влючение возможность создавать и применять шаблоны keweb-а (кнопка в меню)`), _dec31 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("__deleteMe__enableIndentToSingleUnit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включить несогласованные с дизайнером отступы, которые использовались для ЕФС`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("plain", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Форма без боковой панели, которая будет содержать один раздел`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("requisite", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Есть подозрение что это свойство не используется`), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("cssWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Более преоритетный чем обычный width, задается как css`), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("buttonSettingsType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType["enum"](_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.Revise, _Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.DigitalWarrant), `Разные настройки кнопок отправить и действий с формой. Сейчас есть только ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.Revise} / ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_11__.ButtonSettingsTypeEnum.DigitalWarrant} который будет делать кнопки в плашке для simple form как у ИОН или Сверке ФСС`), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("validationBeforeSend", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Локальная проверка, которая не даст отправить форму, если есть невалидные поля.\n
         После проверки фокус падает на невалидное поле, если это возможно. Например на input`), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("padding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.lengthUnit, ``), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("maxunitscount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `По дефолту 15. Если количество разделов превышает \`maxunitscount\`, начинает работать частичный рендеринг. Отрисовывается столько разделов вниз от текущего, сколько задано в настройке, а при скроллинге вниз рендерятся следующие. Используется для больших форм с множественными разделами (напр, ЕНВД, Прибыль), помогает облегчить загрузку редактора`), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("onExternalInitSection", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.helperFunctionName, `Выполнение хелпер функции при вызове keweb-ого лайтбокса от внешних ребят. Когда редактор открывается из Контур Бухагалтерии или ТО. Чтобы вызвать - надо в query params передать initSectionLightbox="Path" где Path - путь до раздела`), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("unitscount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("transferText", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, `Текст в лайтбоксе, который появляется по кнопке "Перенести данные"`), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("navigationLimit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Количество множественных разделов при котором навигация сворачивается (в левой колонке отображаются не все экземпляры), как выглядит можешь посмотреть в ЕНВД при количестве разделов 2 больше 15`), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("uploadFufButtonEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включает кнопку загрузить отчет в "Другие действия" в панели слева.`), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.markupAttr)("fufSizeTooLargeErrorText", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Описание ошибки для большого размера файла`), _dec46 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("uploadFufLightboxHideDemandNameButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Отключает кнопку "Показать имя требования" внутри лайтбокса Загрузки файла.`), _dec47 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("uploadInquiryButtonEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включает кнопку загрузить справки в панели слева. (только для 6ндфл и РСВ)`), _dec48 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultUnitsCountForPaging", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Количество инстансов множественного раздела на котором включается паджинация раздела`), _dec49 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("type", [_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_3__.TypeNode]), _dec50 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("types", [_TypeListNode__WEBPACK_IMPORTED_MODULE_14__.TypeListNode]), _dec6(_class7 = (_class8 = class FormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.SugarNodeBase {
   constructor(...args) {
     super(...args);
@@ -98299,8 +98790,8 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor
 
 
 
-let IconNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("icon", `Иконка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Typography/Icon sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("name", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string.required, `Название иконки, можно посмотреть http://tech.skbkontur.ru/react-ui/#/Icons`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("size", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.number, `Размер иконки 16 | 20 | 24 | 32 | 64`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("color", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Цвет иконки, если почему то вам не нравится тот, что есть, настраивается через обычные hex цвета, которые можно поглядеть в браузере.
-        Например #ea2223`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("weight", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Жирность иконки, на выбор есть 'light' | 'regular' | 'solid' где light - самая тонкая, regular по дефолту, а solid реально пожирнее`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.localizedString, "Всплывающая подсказка по наведению"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_5__.DataBindingMixinNode), _dec(_class = (_class2 = class IconNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_3__.SugarNodeWithLegacyVisibility {
+let IconNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("icon", `Иконка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Typography/Icon sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("name", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string.required, `Название иконки, можно посмотреть https://ui.gitlab-pages.kontur.host/docs/#/icons`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("size", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.number, `Размер иконки 16 | 20 | 24 | 32 | 64`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("color", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Цвет иконки, если почему то вам не нравится тот, что есть, настраивается через обычные hex цвета, которые можно поглядеть в браузере.
+        Например #ea2223`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("weight", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType["enum"]("light", "regular", "solid"), `Жирность иконки, на выбор есть 'light' | 'regular' | 'solid' где light - самая тонкая, regular по дефолту, а solid реально пожирнее`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.markupAttr)("hint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.localizedString, "Всплывающая подсказка по наведению"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_5__.DataBindingMixinNode), _dec(_class = (_class2 = class IconNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_3__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor, this);
@@ -98920,7 +99411,6 @@ class CheckboxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__
     markupBuilder.prop(x => x.checkedValue).set(node.checkedValue);
     markupBuilder.prop("data-tid").set(node.tid);
     markupBuilder.prop(x => x.uncheckedValue).set(node.uncheckedValue);
-    markupBuilder.prop(x => x.otherValue).set(node.otherValue);
     if (node.disabled2 != undefined) {
       markupBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__.buildExpressionPropValue)(node.disabled2));
       if (this.getLegacyNode().getParent() != undefined) {
@@ -98963,7 +99453,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10;
 
 
 
@@ -98972,7 +99462,7 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11
 
 
 
-let CheckboxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.sugarNode)("checkbox", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Checkbox sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_FocusManagementNode__WEBPACK_IMPORTED_MODULE_10__.FocusManagementNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.deprecatedAttr)("width", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__.ValidationInfoNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_TooltipProperties_TooltipSettingsNode__WEBPACK_IMPORTED_MODULE_8__.TooltipSettingsNode), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("checkedValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("uncheckedValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("otherValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.children)(undefined, undefined, ["type"]), _dec(_class = (_class2 = class CheckboxNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_6__.SugarNodeWithLegacyVisibility {
+let CheckboxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.sugarNode)("checkbox", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Checkbox sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_FocusManagementNode__WEBPACK_IMPORTED_MODULE_10__.FocusManagementNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.deprecatedAttr)("width", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__.ValidationInfoNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrMixin)(_CommonNodeProperties_TooltipProperties_TooltipSettingsNode__WEBPACK_IMPORTED_MODULE_8__.TooltipSettingsNode), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("checkedValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("uncheckedValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.children)(undefined, undefined, ["type"]), _dec(_class = (_class2 = class CheckboxNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_6__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataBinding", _descriptor, this);
@@ -98984,8 +99474,7 @@ let CheckboxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODU
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "tooltipSettings", _descriptor7, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "checkedValue", _descriptor8, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "uncheckedValue", _descriptor9, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "otherValue", _descriptor10, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor10, this);
   }
   getOwnPath() {
     return this.dataBinding.getOwnPath();
@@ -99035,12 +99524,7 @@ let CheckboxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODU
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "otherValue", [_dec11], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec12], {
+}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -99116,7 +99600,7 @@ class ComboBoxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__
     if (typeNode == undefined && schemaTypeNode == undefined) {
       return [];
     }
-    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional);
+    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional, undefined, node.gId);
   }
   buildChildrenDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_ComboBoxNode__WEBPACK_IMPORTED_MODULE_8__.ComboBoxNode);
@@ -101337,6 +101821,7 @@ class InputConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Su
     markupBuilder.prop(x => x.mask).set(node.mask);
     markupBuilder.prop(x => x.maskChar).set(node.mask ? (_node$maskChar = node.maskChar) !== null && _node$maskChar !== void 0 ? _node$maskChar : "_" : undefined);
     markupBuilder.prop(x => x.formatChars).set(node.formatChars);
+    markupBuilder.prop(x => x.rejectInvalidByMaskValue).set(node.rejectInvalidByMaskValue);
     markupBuilder.prop(x => x.width).set((_node$width = node.width) !== null && _node$width !== void 0 ? _node$width : "100%");
     (0,_SetCurrencyProps__WEBPACK_IMPORTED_MODULE_9__.setCurrencyProps)(markupBuilder, context, node);
     (0,_CommonNodeProperties_TooltipProperties_SetTooltipSettingsProps__WEBPACK_IMPORTED_MODULE_3__.setTooltipSettingsProps)(markupBuilder, node.tooltipSettings);
@@ -101539,7 +102024,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _dec23, _dec24, _dec25, _dec26, _dec27, _dec28, _dec29, _dec30, _dec31, _dec32, _dec33, _dec34, _dec35, _dec36, _dec37, _dec38, _dec39, _dec40, _dec41, _dec42, _dec43, _dec44, _dec45, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21, _descriptor22, _descriptor23, _descriptor24, _descriptor25, _descriptor26, _descriptor27, _descriptor28, _descriptor29, _descriptor30, _descriptor31, _descriptor32, _descriptor33, _descriptor34, _descriptor35, _descriptor36, _descriptor37, _descriptor38, _descriptor39, _descriptor40, _descriptor41, _descriptor42, _descriptor43, _descriptor44;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _dec23, _dec24, _dec25, _dec26, _dec27, _dec28, _dec29, _dec30, _dec31, _dec32, _dec33, _dec34, _dec35, _dec36, _dec37, _dec38, _dec39, _dec40, _dec41, _dec42, _dec43, _dec44, _dec45, _dec46, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21, _descriptor22, _descriptor23, _descriptor24, _descriptor25, _descriptor26, _descriptor27, _descriptor28, _descriptor29, _descriptor30, _descriptor31, _descriptor32, _descriptor33, _descriptor34, _descriptor35, _descriptor36, _descriptor37, _descriptor38, _descriptor39, _descriptor40, _descriptor41, _descriptor42, _descriptor43, _descriptor44, _descriptor45;
 
 
 
@@ -101597,7 +102082,11 @@ let InputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_
             <input mask="XX XX XX" formatChars={{ X: "." }} />
 
         **Но имейте ввиду, хотя валидации (цифры или буквы) не будет, но данные свыше данной маски справа будут отрезаны!**
-        `), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "Поле ввода становится заблокированным для редактирования"), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("settings", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "'true': всегда первой будет применяться указанная fetchfn, а если она вернет undefined то тогда будет брать из модели - из фуфа/draftinfo (то, что придет с сервера). В противном случае fetchfn сработает только в том случае, когда бекенд ничего не прислал"), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("deprecated-disabled-for-rpn", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "Поле ввода становится заблокированным для редактирования"), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.lengthUnit, "Ширина поля"), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("visible", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного скрытия контрола`), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("align", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType["enum"]("left", "right"), "Выравнивание текста внутри поля ввода (`left` | `right`, default: `left`)"), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("formula", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, "Всплывающая подсказка по авторасчету"), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("suffix", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, `Текст или верстка отображаемая в правой части input-а`), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("prefix", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, `Текст или верстка отображаемая в левой части input-а`), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("help", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.children)("help", [_Helpers_Help_HelpNode__WEBPACK_IMPORTED_MODULE_8__.HelpNode]), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("currency", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, `При включении этого флага значение в поле отображается как денежное: с двумя знаками после запятой и пробелами между тысячами.`), _dec(_class = (_class2 = class InputNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_6__.SugarNodeWithLegacyVisibility {
+        `), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("rejectInvalidByMaskValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, `
+        Отключает использование mask только для валидного по маске значения и при отсутствии ошибки/предупреждения в валидации.
+        По умолчанию включен показ кривых значений после импорта и,
+        после ручного исправления на правильное по маске и валидное значение, редактирование будет доступно уже только в пределах маски.
+        `), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "Поле ввода становится заблокированным для редактирования"), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("settings", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "'true': всегда первой будет применяться указанная fetchfn, а если она вернет undefined то тогда будет брать из модели - из фуфа/draftinfo (то, что придет с сервера). В противном случае fetchfn сработает только в том случае, когда бекенд ничего не прислал"), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("deprecated-disabled-for-rpn", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, "Поле ввода становится заблокированным для редактирования"), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.lengthUnit, "Ширина поля"), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("visible", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_9__.javaScriptExpressionLink)} для условного скрытия контрола`), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("align", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType["enum"]("left", "right"), "Выравнивание текста внутри поля ввода (`left` | `right`, default: `left`)"), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("formula", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, "Всплывающая подсказка по авторасчету"), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("suffix", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, `Текст или верстка отображаемая в правой части input-а`), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.markupAttr)("prefix", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, `Текст или верстка отображаемая в левой части input-а`), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("help", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.string, ``), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.children)("help", [_Helpers_Help_HelpNode__WEBPACK_IMPORTED_MODULE_8__.HelpNode]), _dec46 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attr)("currency", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.attrType.boolean, `При включении этого флага значение в поле отображается как денежное: с двумя знаками после запятой и пробелами между тысячами.`), _dec(_class = (_class2 = class InputNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_6__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "validationInfo", _descriptor, this);
@@ -101633,19 +102122,20 @@ let InputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "mask", _descriptor29, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "maskChar", _descriptor30, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formatChars", _descriptor31, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled", _descriptor32, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor33, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "settings", _descriptor34, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "deprecatedDisabledForRpn", _descriptor35, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "width", _descriptor36, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "visible", _descriptor37, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "align", _descriptor38, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formula", _descriptor39, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "suffix", _descriptor40, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "prefix", _descriptor41, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "help", _descriptor42, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "helpNodes", _descriptor43, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "currency", _descriptor44, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "rejectInvalidByMaskValue", _descriptor32, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled", _descriptor33, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor34, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "settings", _descriptor35, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "deprecatedDisabledForRpn", _descriptor36, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "width", _descriptor37, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "visible", _descriptor38, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "align", _descriptor39, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formula", _descriptor40, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "suffix", _descriptor41, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "prefix", _descriptor42, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "help", _descriptor43, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "helpNodes", _descriptor44, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "currency", _descriptor45, this);
   }
   getOwnPath() {
     return this.dataBinding.getOwnPath();
@@ -101808,67 +102298,72 @@ let InputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor32 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled", [_dec33], {
+}), _descriptor32 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "rejectInvalidByMaskValue", [_dec33], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor33 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled", [_dec34], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor33 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled2", [_dec34], {
+}), _descriptor34 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled2", [_dec35], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor34 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "settings", [_dec35], {
+}), _descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "settings", [_dec36], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "deprecatedDisabledForRpn", [_dec36], {
+}), _descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "deprecatedDisabledForRpn", [_dec37], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "width", [_dec37], {
+}), _descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "width", [_dec38], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "visible", [_dec38], {
+}), _descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "visible", [_dec39], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "align", [_dec39], {
+}), _descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "align", [_dec40], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "formula", [_dec40], {
+}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "formula", [_dec41], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "suffix", [_dec41], {
+}), _descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "suffix", [_dec42], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "prefix", [_dec42], {
+}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "prefix", [_dec43], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "help", [_dec43], {
+}), _descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "help", [_dec44], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "helpNodes", [_dec44], {
+}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "helpNodes", [_dec45], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "currency", [_dec45], {
+}), _descriptor45 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "currency", [_dec46], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -102285,7 +102780,7 @@ class PicklistConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__
     if (typeNode == undefined && schemaTypeNode == undefined) {
       return [];
     }
-    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional);
+    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional, undefined, node.gId);
   }
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_PicklistNode__WEBPACK_IMPORTED_MODULE_6__.PicklistNode);
@@ -103255,7 +103750,7 @@ class SelectConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.S
     if (typeNode == undefined && schemaTypeNode == undefined) {
       return [];
     }
-    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional);
+    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional, undefined, node.gId);
   }
   doBuildNormalizeRules(builder) {
     const node = this.getCurrentNodeAs(_SelectNode__WEBPACK_IMPORTED_MODULE_6__.SelectNode);
@@ -103600,7 +104095,7 @@ class TaxRebateConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3_
     if (typeNode == undefined && schemaTypeNode == undefined) {
       return [];
     }
-    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional);
+    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional, undefined, node.gId);
   }
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_TaxRebateNode__WEBPACK_IMPORTED_MODULE_7__.TaxRebateNode);
@@ -105545,17 +106040,23 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
+/* harmony import */ var _ElementProcessors_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ElementProcessors/CommonNodeProperties/ValidationInfoNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/CommonNodeProperties/ValidationInfoNode.ts");
+
 
 
 
 
 class FLangNormalizationRulesBuilder {
-  constructor(controlCustomizationContext, fetchFunctions, fetchFuncToFlangConverter, dataDeclarationHelper) {
+  constructor(controlCustomizationContext, fetchFunctions, fetchFuncToFlangConverter, dataDeclarationHelper, schemaRng, nodeTypeInfoHelper) {
     this.controlCustomizationContext = void 0;
     this.fetchFunctions = void 0;
+    this.schemaRng = void 0;
+    this.nodeTypeInfoHelper = void 0;
     this.fetchFuncToFlangConverter = void 0;
     this.dataDeclarationHelper = void 0;
     this.dataDeclarationHelper = dataDeclarationHelper;
+    this.nodeTypeInfoHelper = nodeTypeInfoHelper;
+    this.schemaRng = schemaRng;
     this.fetchFuncToFlangConverter = fetchFuncToFlangConverter;
     this.fetchFunctions = fetchFunctions;
     this.controlCustomizationContext = controlCustomizationContext;
@@ -105571,30 +106072,31 @@ class FLangNormalizationRulesBuilder {
   valueInitializer(node, dataBinding, disabled, pathSuffix, fetchFunctionSuffix) {
     var _dataBinding$defaultV;
     const targetPathReference = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getResolvedBindingPath)(node), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each).joinWith((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(pathSuffix) ? (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(pathSuffix, false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each) : (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.emptyModelPath)());
-    const currentValueReference = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "value"));
+    const originalValueReference = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "value"));
+    const sourceValueReference = this.getSourceValueReferenceWithCorrection(node, targetPathReference);
     const defaultValue = (_dataBinding$defaultV = dataBinding.defaultValue) !== null && _dataBinding$defaultV !== void 0 ? _dataBinding$defaultV : "";
     if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(dataBinding.fetchfn)) {
       try {
         var _this$fetchFunctions$, _this$fetchFunctions$2;
         const fetchFnText = (_this$fetchFunctions$ = (_this$fetchFunctions$2 = this.fetchFunctions.getFetchFunction(dataBinding.fetchfn + (fetchFunctionSuffix !== null && fetchFunctionSuffix !== void 0 ? fetchFunctionSuffix : ""))) === null || _this$fetchFunctions$2 === void 0 ? void 0 : _this$fetchFunctions$2.toString()) !== null && _this$fetchFunctions$ !== void 0 ? _this$fetchFunctions$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)();
         const flangExpression = this.fetchFuncToFlangConverter.convert(`const x = ${fetchFnText}`);
-        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(currentValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), currentValueReference, flangExpression), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue)));
+        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), sourceValueReference, flangExpression), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue)));
       } catch (e) {
         // eslint-disable-next-line no-console
         console.error(`fetchfn = "${dataBinding.fetchfn}". Не удалось преобразовать fetch-функцию во FLANG-выражение!`);
         // eslint-disable-next-line no-console
         console.error(e instanceof Error ? e.message : e);
-        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), currentValueReference);
+        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), sourceValueReference);
       }
     }
     let valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue);
     if (dataBinding.settings) {
-      valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(currentValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), valueExpression, currentValueReference);
+      valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), valueExpression, sourceValueReference);
     }
     if (!disabled && !dataBinding.settings) {
-      valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(currentValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), valueExpression, currentValueReference);
+      valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), valueExpression, sourceValueReference);
     }
-    const finalExpression = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(targetPathReference) ? new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "autoFlag")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "autoValue"), valueExpression) : valueExpression;
+    const finalExpression = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(targetPathReference) ? new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "autoFlag")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "autoValue")), valueExpression) : valueExpression;
     return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), finalExpression);
   }
   *specialFieldsInitializer(node, options) {
@@ -105603,6 +106105,24 @@ class FLangNormalizationRulesBuilder {
       yield new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "disabled"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true"));
     }
   }
+  wrapExpressionWithCorrectionExpression(baseType, expr) {
+    switch (baseType) {
+      case "decimal":
+      case "integer":
+        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.PrepareNumberExpression(expr);
+      default:
+        return expr;
+    }
+  }
+  getSourceValueReferenceWithCorrection(node, targetPathReference) {
+    var _typeNode$base, _this$schemaRng$getTy;
+    // eslint-disable-next-line
+    const validationInfoSource = node === null || node === void 0 ? void 0 : node.validationInfo;
+    const typeNode = validationInfoSource instanceof _ElementProcessors_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__.ValidationInfoNode ? this.nodeTypeInfoHelper.getTypeNode(validationInfoSource) : undefined;
+    const baseType = (_typeNode$base = typeNode === null || typeNode === void 0 ? void 0 : typeNode.base) !== null && _typeNode$base !== void 0 ? _typeNode$base : (_this$schemaRng$getTy = this.schemaRng.getTypeNodeByPath(targetPathReference)) === null || _this$schemaRng$getTy === void 0 ? void 0 : _this$schemaRng$getTy.baseType;
+    const sourceValueReference = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "value"));
+    return baseType != undefined ? this.wrapExpressionWithCorrectionExpression(baseType, sourceValueReference) : sourceValueReference;
+  }
 }
 
 /***/ }),
@@ -107554,7 +108074,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "createDefaultSugarSerializer": () => (/* binding */ createDefaultSugarSerializer),
 /* harmony export */   "getAllSugarValidationNodeClasses": () => (/* binding */ getAllSugarValidationNodeClasses),
-/* harmony export */   "getAllSugarNodeClasses": () => (/* binding */ getAllSugarNodeClasses)
+/* harmony export */   "getAllSugarNodeClasses": () => (/* binding */ getAllSugarNodeClasses),
+/* harmony export */   "getAllSchemaRngNodeClasses": () => (/* binding */ getAllSchemaRngNodeClasses)
 /* harmony export */ });
 /* harmony import */ var _ElementProcessors_ValueEditors_Fias_FiasNode__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../ElementProcessors/ValueEditors/Fias/FiasNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Fias/FiasNode.ts");
 /* harmony import */ var _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../validationGenerator/Nodes/TypeNode */ "./Generator/src/generators/validationGenerator/Nodes/TypeNode.ts");
@@ -107677,6 +108198,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ElementProcessors_Action_Kebab_KebabNode__WEBPACK_IMPORTED_MODULE_118__ = __webpack_require__(/*! ../ElementProcessors/Action/Kebab/KebabNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/Kebab/KebabNode.ts");
 /* harmony import */ var _ElementProcessors_Helpers_Clue_InfoBlockNode__WEBPACK_IMPORTED_MODULE_119__ = __webpack_require__(/*! ../ElementProcessors/Helpers/Clue/InfoBlockNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Helpers/Clue/InfoBlockNode.ts");
 /* harmony import */ var _ElementProcessors_ValueEditors_SelectAllCheckbox_SelectAllCheckboxNode__WEBPACK_IMPORTED_MODULE_120__ = __webpack_require__(/*! ../ElementProcessors/ValueEditors/SelectAllCheckbox/SelectAllCheckboxNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/SelectAllCheckbox/SelectAllCheckboxNode.ts");
+/* harmony import */ var _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__ = __webpack_require__(/*! ../../../common/SchemaRng/Nodes/SchemaRngRoot */ "./Generator/src/common/SchemaRng/Nodes/SchemaRngRoot.ts");
+
 
 
 
@@ -107923,6 +108446,9 @@ function getAllSugarValidationNodeClasses() {
 function getAllSugarNodeClasses() {
   return [_ElementProcessors_ValueViewers_Text_TextNode__WEBPACK_IMPORTED_MODULE_95__.TextNode, _ElementProcessors_ControlFlow_Switch_SwitchNode__WEBPACK_IMPORTED_MODULE_90__.SwitchNode, _ElementProcessors_ControlFlow_Switch_SwitchNode__WEBPACK_IMPORTED_MODULE_90__.SwitchDefaultNode, _ElementProcessors_ControlFlow_Switch_SwitchNode__WEBPACK_IMPORTED_MODULE_90__.SwitchCaseNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_AddButtonNode__WEBPACK_IMPORTED_MODULE_31__.AddButtonNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_AddLineNode__WEBPACK_IMPORTED_MODULE_32__.AddLineNode, _ElementProcessors_FormParts_AddPageButton_AddPageButtonNode__WEBPACK_IMPORTED_MODULE_10__.AddPageButtonNode, _ElementProcessors_MultiControls_AddRowButton_AddRowButtonNode__WEBPACK_IMPORTED_MODULE_11__.AddRowButtonNode, _ElementProcessors_Layout_Block_BlockNode__WEBPACK_IMPORTED_MODULE_12__.BlockNode, _ElementProcessors_Layout_Minitour_MinitourNode__WEBPACK_IMPORTED_MODULE_13__.MinitourNode, _ElementProcessors_Modal_Body_BodyNode__WEBPACK_IMPORTED_MODULE_14__.BodyNode, _ElementProcessors_Typography_Bold_BoldNode__WEBPACK_IMPORTED_MODULE_15__.BoldNode, _ElementProcessors_Layout_Br_BrNode__WEBPACK_IMPORTED_MODULE_16__.BrNode, _ElementProcessors_Action_Button_ButtonNode__WEBPACK_IMPORTED_MODULE_17__.ButtonNode, _ElementProcessors_Action_DownloadExcelButton_DownloadExcelButtonNode__WEBPACK_IMPORTED_MODULE_18__.DownloadExcelButtonNode, _ElementProcessors_Action_DropDownButtonLoadExcel_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_19__.DropDownButtonLoadExcelNode, _ElementProcessors_FormParts_Caption_CaptionNode__WEBPACK_IMPORTED_MODULE_20__.CaptionNode, _ElementProcessors_ValueEditors_Checkbox_CheckboxNode__WEBPACK_IMPORTED_MODULE_21__.CheckboxNode, _ElementProcessors_ControlFlow_Choice_ChoiceNode__WEBPACK_IMPORTED_MODULE_22__.ChoiceNode, _ElementProcessors_ValueEditors_Combobox_ComboBoxNode__WEBPACK_IMPORTED_MODULE_23__.ComboBoxNode, _ElementProcessors_FormParts_Content_ContentNode__WEBPACK_IMPORTED_MODULE_24__.ContentNode, _ElementProcessors_MultiControls_CrossfitTable_CrossfitTableNode__WEBPACK_IMPORTED_MODULE_91__.CrossfitTableNode, _ElementProcessors_FormParts_Cross_CrossNode__WEBPACK_IMPORTED_MODULE_25__.CrossNode, _ElementProcessors_ValueEditors_Date_DateNode__WEBPACK_IMPORTED_MODULE_26__.DateNode, _ElementProcessors_ValueEditors_DiadocSuggestComboBox_DiadocSuggestComboBoxNode__WEBPACK_IMPORTED_MODULE_28__.DiadocSuggestComboBoxNode, _ElementProcessors_Typography_Entity_EntityNode__WEBPACK_IMPORTED_MODULE_29__.EntityNode, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteNode__WEBPACK_IMPORTED_MODULE_30__.ExpertNoteNode, _ElementProcessors_ValueEditors_FileLoader_FileLoaderNode__WEBPACK_IMPORTED_MODULE_38__.FileLoaderNode, _ElementProcessors_MultiControls_FilterDateRange_FilterDateRangeNode__WEBPACK_IMPORTED_MODULE_39__.FilterDateRangeNode, _ElementProcessors_MultiControls_FilterInput_FilterInputNode__WEBPACK_IMPORTED_MODULE_40__.FilterInputNode, _ElementProcessors_MultiControls_FilterList_FilterListNode__WEBPACK_IMPORTED_MODULE_41__.FilterListNode, _ElementProcessors_ValueViewers_FIO_FIONode__WEBPACK_IMPORTED_MODULE_42__.FIONode, _ElementProcessors_Layout_Flexbox_FlexboxNode__WEBPACK_IMPORTED_MODULE_43__.FlexboxNode, _ElementProcessors_Modal_Footer_FooterNode__WEBPACK_IMPORTED_MODULE_44__.FooterNode, _ElementProcessors_FormParts_FormInfo_FormInfoNode__WEBPACK_IMPORTED_MODULE_49__.FormInfoNode, _ElementProcessors_FormParts_Form_FormNode__WEBPACK_IMPORTED_MODULE_45__.FormNode, _ElementProcessors_Typography_Gray_GrayNode__WEBPACK_IMPORTED_MODULE_50__.GrayNode, _ElementProcessors_Layout_GridCol_GridColNode__WEBPACK_IMPORTED_MODULE_51__.GridColNode, _ElementProcessors_Layout_GridRow_GridRowNode__WEBPACK_IMPORTED_MODULE_52__.GridRowNode, _ElementProcessors_MultiControls_HeaderMenu_HeaderMenuNode__WEBPACK_IMPORTED_MODULE_54__.HeaderMenuNode, _ElementProcessors_FormParts_Header_HeaderNode__WEBPACK_IMPORTED_MODULE_53__.HeaderNode, _ElementProcessors_Helpers_Helpinfo_HelpInfoNode__WEBPACK_IMPORTED_MODULE_56__.HelpInfoNode, _ElementProcessors_Helpers_Help_HelpNode__WEBPACK_IMPORTED_MODULE_55__.HelpNode, _ElementProcessors_Typography_Highlight_HighlightNode__WEBPACK_IMPORTED_MODULE_57__.HighlightNode, _ElementProcessors_Layout_Hr_HrNode__WEBPACK_IMPORTED_MODULE_58__.HrNode, _ElementProcessors_Typography_Icon_IconNode__WEBPACK_IMPORTED_MODULE_59__.IconNode, _ElementProcessors_Layout_Img_ImgNode__WEBPACK_IMPORTED_MODULE_61__.ImgNode, _ElementProcessors_Layout_InnerText_InnertextNode__WEBPACK_IMPORTED_MODULE_9__.InnertextNode, _ElementProcessors_ValueEditors_INN_INNNode__WEBPACK_IMPORTED_MODULE_62__.INNNode, _ElementProcessors_ValueEditors_Input_InputNode__WEBPACK_IMPORTED_MODULE_63__.InputNode, _ElementProcessors_Typography_Italic_ItalicNode__WEBPACK_IMPORTED_MODULE_64__.ItalicNode, _ElementProcessors_ValueEditors_Kladr_KladrNode__WEBPACK_IMPORTED_MODULE_66__.KladrNode, _ElementProcessors_Action_Link_LinkNode__WEBPACK_IMPORTED_MODULE_68__.LinkNode, _ElementProcessors_Layout_ListItem_ListItemNode__WEBPACK_IMPORTED_MODULE_65__.ListItemNode, _ElementProcessors_Layout_List_ListNode__WEBPACK_IMPORTED_MODULE_69__.ListNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_MenuNode__WEBPACK_IMPORTED_MODULE_33__.MenuNode, _ElementProcessors_Modal_ModalFormCancel_ModalFormCancelNode__WEBPACK_IMPORTED_MODULE_71__.ModalFormCancelNode, _ElementProcessors_Modal_ModalFormConfirm_ModalFormConfirmNode__WEBPACK_IMPORTED_MODULE_72__.ModalFormConfirmNode, _ElementProcessors_Modal_ModalFormLabel_ModalFormLabelNode__WEBPACK_IMPORTED_MODULE_73__.ModalFormLabelNode, _ElementProcessors_Modal_ModalForm_ModalFormNode__WEBPACK_IMPORTED_MODULE_70__.ModalFormNode, _ElementProcessors_MultiControls_Multilinefield_MultilineFieldNode__WEBPACK_IMPORTED_MODULE_74__.MultilineFieldNode, _ElementProcessors_Helpers_Normativehelp_NormativeHelpNode__WEBPACK_IMPORTED_MODULE_75__.NormativeHelpNode, _ElementProcessors_ControlFlow_Otherwise_OtherwiseNode__WEBPACK_IMPORTED_MODULE_76__.OtherwiseNode, _ElementProcessors_FormParts_Page_PageNode__WEBPACK_IMPORTED_MODULE_77__.PageNode, _ElementProcessors_FormParts_Form_Nodes_PanelNode__WEBPACK_IMPORTED_MODULE_48__.PanelNode, _ElementProcessors_Layout_Pencil_PencilNode__WEBPACK_IMPORTED_MODULE_78__.PencilNode, _ElementProcessors_ValueEditors_Picklist_PicklistNode__WEBPACK_IMPORTED_MODULE_79__.PicklistNode, _ElementProcessors_ValueEditors_radio_RadioNode__WEBPACK_IMPORTED_MODULE_80__.RadioNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_RemoveButtonNode__WEBPACK_IMPORTED_MODULE_34__.RemoveButtonNode, _ElementProcessors_MultiControls_RemoveRowButton_RemoveRowButtonNode__WEBPACK_IMPORTED_MODULE_82__.RemoveRowButtonNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_ReplaceButtonNode__WEBPACK_IMPORTED_MODULE_35__.ReplaceButtonNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_ReplaceLineNode__WEBPACK_IMPORTED_MODULE_36__.ReplaceLineNode, _ElementProcessors_ValueEditors_Select_SelectNode__WEBPACK_IMPORTED_MODULE_83__.SelectNode, _ElementProcessors_Layout_SimpleTable_SimpleTableNode__WEBPACK_IMPORTED_MODULE_92__.SimpleTableNode, _ElementProcessors_MultiControls_SortRadioGroup_SortRadioGroupNode__WEBPACK_IMPORTED_MODULE_84__.SortRadioGroupNode, _ElementProcessors_ValueEditors_RadioGroup_RadioGroupNode__WEBPACK_IMPORTED_MODULE_81__.RadioGroupNode, _ElementProcessors_Layout_Spoiler_SpoilerNode__WEBPACK_IMPORTED_MODULE_85__.SpoilerNode, _ElementProcessors_MultiControls_StickyTable_StickyTableNode__WEBPACK_IMPORTED_MODULE_93__.StickyTableNode, _ElementProcessors_Typography_Strong_StrongNode__WEBPACK_IMPORTED_MODULE_86__.StrongNode, _ElementProcessors_Layout_Subheader_SubheaderNode__WEBPACK_IMPORTED_MODULE_88__.SubheaderNode, _ElementProcessors_Typography_Sub_SubNode__WEBPACK_IMPORTED_MODULE_87__.SubNode, _ElementProcessors_Typography_Sup_SupNode__WEBPACK_IMPORTED_MODULE_89__.SupNode, _ElementProcessors_ValueEditors_Textarea_TextAreaNode__WEBPACK_IMPORTED_MODULE_96__.TextAreaNode, _ElementProcessors_ValueEditors_popupTextArea_PopupTextAreaNode__WEBPACK_IMPORTED_MODULE_103__.PopupTextAreaNode, _ElementProcessors_FormParts_UnitItem_UnitItemNode__WEBPACK_IMPORTED_MODULE_97__.UnitItemNode, _ElementProcessors_FormParts_UnitList_UnitListNode__WEBPACK_IMPORTED_MODULE_98__.UnitListNode, _ElementProcessors_ValueViewers_ValueLength_ValueLengthNode__WEBPACK_IMPORTED_MODULE_99__.ValueLengthNode, _ElementProcessors_ValueEditors_FileLoader_FileLoader_ViewFileNode__WEBPACK_IMPORTED_MODULE_37__.ViewFileNode, _ElementProcessors_ControlFlow_VisibilityBlock_VisibilityBlockNode__WEBPACK_IMPORTED_MODULE_100__.VisibilityBlockNode, _ElementProcessors_Layout_Warning_WarningNode__WEBPACK_IMPORTED_MODULE_101__.WarningNode, _ElementProcessors_ControlFlow_When_WhenNode__WEBPACK_IMPORTED_MODULE_102__.WhenNode, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteNode__WEBPACK_IMPORTED_MODULE_30__.ExpertNoteNode, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteNode__WEBPACK_IMPORTED_MODULE_30__.MessageBoxNode, _ElementProcessors_Action_Link_LinkNode__WEBPACK_IMPORTED_MODULE_68__.LinkNode, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteNode__WEBPACK_IMPORTED_MODULE_30__.NameNode, _ElementProcessors_ValueViewers_Linetext_LineTextNode__WEBPACK_IMPORTED_MODULE_67__.LineTextNode, _ElementProcessors_ControlFlow_Captions_Short_ShortNode__WEBPACK_IMPORTED_MODULE_114__.ShortNode, _ElementProcessors_ControlFlow_Captions_Long_LongNode__WEBPACK_IMPORTED_MODULE_113__.LongNode, _ElementProcessors_ControlFlow_Captions_FillHint_FillHintNode__WEBPACK_IMPORTED_MODULE_115__.FillHintNode, _ElementProcessors_ControlFlow_If_IfNode__WEBPACK_IMPORTED_MODULE_60__.IfNode, _ElementProcessors_ControlFlow_If_IfNode__WEBPACK_IMPORTED_MODULE_60__.ElseNode, _ElementProcessors_ControlFlow_If_IfNode__WEBPACK_IMPORTED_MODULE_60__.ThenNode, _ElementProcessors_Layout_SimpleTable_SimpleTableNode__WEBPACK_IMPORTED_MODULE_92__.SimpleTableRowNode, _ElementProcessors_Layout_SimpleTable_SimpleTableNode__WEBPACK_IMPORTED_MODULE_92__.SimpleTableColumnNode, _ElementProcessors_Layout_Stack_StackNode__WEBPACK_IMPORTED_MODULE_4__.StackNode, _ElementProcessors_Layout_Grid_GridNode__WEBPACK_IMPORTED_MODULE_3__.GridNode, _ElementProcessors_MultiControls_StickyTable_StickyTableNode__WEBPACK_IMPORTED_MODULE_93__.StickyTableMultilineNode, _ElementProcessors_UnitParts_HeaderPanel_HeaderPanelNode__WEBPACK_IMPORTED_MODULE_8__.HeaderPanelNode, _ElementProcessors_Action_DropdownButton_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_2__.DropdownButtonNode, _ElementProcessors_Action_Common_ActionNode__WEBPACK_IMPORTED_MODULE_117__.ActionNode, _ElementProcessors_MultiControls_Tabs_TabsNode__WEBPACK_IMPORTED_MODULE_7__.TabsNode, _ElementProcessors_ValueEditors_Fias_FiasNode__WEBPACK_IMPORTED_MODULE_0__.FiasNode, _ElementProcessors_MultiControls_FilterSelect_FilterSelectNode__WEBPACK_IMPORTED_MODULE_5__.FilterSelectNode, _ElementProcessors_MultiControls_Table2_Table2Node__WEBPACK_IMPORTED_MODULE_6__.Table2Node, _ElementProcessors_Layout_FixedTabs_FixedTabsNode__WEBPACK_IMPORTED_MODULE_106__.FixedTabsNode, _ElementProcessors_Layout_FixedTabs_FixedTabsNode__WEBPACK_IMPORTED_MODULE_106__.FixedTabNode, _ElementProcessors_MultiControls_Multiple_MultipleNode__WEBPACK_IMPORTED_MODULE_107__.MultipleNode, _ElementProcessors_Action_ExcelPastePanel_ExcelPastePanelNode__WEBPACK_IMPORTED_MODULE_108__.ExcelPastePanelNode, _ElementProcessors_ValueEditors_ReferencedFields_ReferencedFieldsNode__WEBPACK_IMPORTED_MODULE_109__.ReferencedFieldsNode, _ElementProcessors_FormParts_UserPicklist_UserPicklistNode__WEBPACK_IMPORTED_MODULE_110__.UserPicklistNode, _ElementProcessors_ValueEditors_TaxRebate_TaxRebateNode__WEBPACK_IMPORTED_MODULE_111__.TaxRebateNode, _ElementProcessors_FormParts_Banner_BannerNode__WEBPACK_IMPORTED_MODULE_112__.BannerNode, _ElementProcessors_ValueViewers_DateView_DateViewNode__WEBPACK_IMPORTED_MODULE_116__.DateViewNode, _ElementProcessors_Action_Kebab_KebabNode__WEBPACK_IMPORTED_MODULE_118__.KebabNode, _ElementProcessors_Helpers_Clue_InfoBlockNode__WEBPACK_IMPORTED_MODULE_119__.InfoBlockNode, _ElementProcessors_ValueEditors_SelectAllCheckbox_SelectAllCheckboxNode__WEBPACK_IMPORTED_MODULE_120__.SelectAllCheckboxNode];
 }
+function getAllSchemaRngNodeClasses() {
+  return [_common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.SchemaRngElement, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.SchemaRngElementChoiceElement, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.SchemaRngInnerText, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.SchemaRngAttribute, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.SchemaRngType, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.MaxinclusiveTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.MininclusiveTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.FractiondigitsTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.IntegerdigitsTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.TotaldigitsTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.MaxlengthTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.MinlengthTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.LengthTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.EnumerationTypeCheck, _common_SchemaRng_Nodes_SchemaRngRoot__WEBPACK_IMPORTED_MODULE_121__.PatternTypeCheck];
+}
 
 /***/ }),
 
@@ -108394,13 +108920,13 @@ function getSettings(sugarRoot, gfv, additionalSettings, formJsonSettings) {
     useExtendedErrorLog: false,
     regions: [],
     ieDeprecationWarningEnabled: sugarRoot.ieDeprecationWarningEnabled,
-    compactActionPanel: sugarRoot.compactActionPanel,
     enableCustomizationButton: sugarRoot.enableCustomizationButton,
     __deleteMe__enableIndentToSingleUnit: sugarRoot.__deleteMe__enableIndentToSingleUnit,
     isReadOnly: (_sugarRoot$isReadOnly = sugarRoot.isReadOnly) !== null && _sugarRoot$isReadOnly !== void 0 ? _sugarRoot$isReadOnly : false,
     gfv: gfv,
     ...additionalSettings,
-    useServerSideFLangNormalization: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.useServerSideFLangNormalization
+    useServerSideFLangNormalization: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.useServerSideFLangNormalization,
+    useServerSideCalculations: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.useServerSideCalculations
   };
   return `module.exports = ${JSON.stringify(settings, undefined, 2)}`;
 }