@kontur.candy/generator 5.74.0-forminform.22 → 5.74.0-forminform.24

package/dist/index.js

@@ -46436,6 +46436,18 @@ class KCLangRuntimeUtils {
     const result = _Engine_src_Engine_ValidationHelper__WEBPACK_IMPORTED_MODULE_1__.ValidationHelper.isInn(normalizedSnils);
     return result;
   }
+  isOgrn(valueSelector, path) {
+    if (valueSelector == undefined) {
+      return undefined;
+    }
+    const value = valueSelector(path);
+    const normalizedOgrn = value === null || value === void 0 ? void 0 : value.replace(/[^0-9]/g, "");
+    if ((0,_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNullOrWhiteSpace)(normalizedOgrn)) {
+      return false;
+    }
+    const result = _Engine_src_Engine_ValidationHelper__WEBPACK_IMPORTED_MODULE_1__.ValidationHelper.isOgrn(normalizedOgrn);
+    return result;
+  }
   isValidAccountNumber(valueSelector, bik, account) {
     if (valueSelector == undefined) {
       return undefined;
@@ -48290,6 +48302,26 @@ class ValidationHelper {
     }
     return false;
   }
+  static isOgrn(value) {
+    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNullOrWhiteSpace)(value)) {
+      return false;
+    }
+    const hasAppropriateLength = [PHYS_OGRN_LENGTH, IP_OGRN_LENGTH].includes(value.length);
+    if (!hasAppropriateLength) {
+      return false;
+    }
+    const matchingPattern = ogrnPattern.test(value);
+    if (!matchingPattern) {
+      return false;
+    }
+    const lastCharIndex = value.length - 1;
+    const divisible = Number(value.slice(0, lastCharIndex));
+    const divider = lastCharIndex - 1;
+    const checkingDigit = divisible % divider % 10;
+    const lastDigit = Number(value[lastCharIndex]);
+    const isOgrn = checkingDigit == lastDigit;
+    return isOgrn;
+  }
   static isValidAccountNumber(bik, accountNumber) {
     if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNullOrWhiteSpace)(bik) || (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNullOrWhiteSpace)(accountNumber)) {
       return false;
@@ -48410,6 +48442,9 @@ class ValidationHelper {
     return totalCheckSum % 10 === 0;
   }
 }
+const PHYS_OGRN_LENGTH = 13;
+const IP_OGRN_LENGTH = 15;
+const ogrnPattern = /^\d+$/;
 
 /***/ }),
 
@@ -49491,6 +49526,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   instanceCountKCLangFunction: () => (/* binding */ instanceCountKCLangFunction),
 /* harmony export */   isDateInMonthKCLangFunction: () => (/* binding */ isDateInMonthKCLangFunction),
 /* harmony export */   isInnKCLangFunction: () => (/* binding */ isInnKCLangFunction),
+/* harmony export */   isOgrnKCLangFunction: () => (/* binding */ isOgrnKCLangFunction),
 /* harmony export */   isRegNumSfrKCLangFunction: () => (/* binding */ isRegNumSfrKCLangFunction),
 /* harmony export */   isSnilsKCLangFunction: () => (/* binding */ isSnilsKCLangFunction),
 /* harmony export */   isValidAccountNumberKCLangFunction: () => (/* binding */ isValidAccountNumberKCLangFunction),
@@ -49701,6 +49737,25 @@ const isInnKCLangFunction = params => {
   }
   throw new Error("Invalid parameters!");
 };
+const isOgrnKCLangFunction = params => {
+  var _params$13;
+  const errors = Array.from(validateParams(params, 1));
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+  const argumentExpr = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value;
+  if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
+    const param = argumentExpr.select;
+    if (param == undefined) {
+      throw new Error("Unexpected error!");
+    }
+    return {
+      type: "isOgrn",
+      select: param
+    };
+  }
+  throw new Error("Invalid parameters!");
+};
 const arrayKCLangFunction = params => {
   const errors = Array.from(validateParams(params, 0, Infinity));
   if (errors.length > 0) {
@@ -49712,12 +49767,12 @@ const arrayKCLangFunction = params => {
   };
 };
 const firstOrDefaultKCLangFunction = params => {
-  var _params$13;
+  var _params$14;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const expr = (_params$13 = params[0]) === null || _params$13 === void 0 ? void 0 : _params$13.value;
+  const expr = (_params$14 = params[0]) === null || _params$14 === void 0 ? void 0 : _params$14.value;
   if (expr === undefined) {
     throw new Error("first param in firstOrDefault must be defined");
   }
@@ -49727,12 +49782,12 @@ const firstOrDefaultKCLangFunction = params => {
   };
 };
 const hashSetKCLangFunction = params => {
-  var _params$14;
+  var _params$15;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const expr = (_params$14 = params[0]) === null || _params$14 === void 0 ? void 0 : _params$14.value;
+  const expr = (_params$15 = params[0]) === null || _params$15 === void 0 ? void 0 : _params$15.value;
   if (expr === undefined) {
     throw new Error("Parameter in hashSet() must be defined");
   }
@@ -49742,12 +49797,12 @@ const hashSetKCLangFunction = params => {
   };
 };
 const noDepsKCLangFunction = params => {
-  var _params$15;
+  var _params$16;
   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$16 = params[0]) === null || _params$16 === void 0 ? void 0 : _params$16.value;
   if (expr === undefined) {
     throw new Error("first param in nodeps must be defined");
   }
@@ -49757,15 +49812,15 @@ const noDepsKCLangFunction = params => {
   };
 };
 const getPicklistValuesKCLangFunction = params => {
-  var _params$16, _params$17, _params$18, _params$19;
+  var _params$17, _params$18, _params$19, _params$20;
   const errors = Array.from(validateParams(params, 4));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const gId = (_params$16 = params[0]) === null || _params$16 === void 0 ? void 0 : _params$16.value;
-  const filterColumnParam = (_params$17 = params[1]) === null || _params$17 === void 0 ? void 0 : _params$17.value;
-  const filterKeyParam = (_params$18 = params[2]) === null || _params$18 === void 0 ? void 0 : _params$18.value;
-  const resultColumn = (_params$19 = params[3]) === null || _params$19 === void 0 ? void 0 : _params$19.value;
+  const gId = (_params$17 = params[0]) === null || _params$17 === void 0 ? void 0 : _params$17.value;
+  const filterColumnParam = (_params$18 = params[1]) === null || _params$18 === void 0 ? void 0 : _params$18.value;
+  const filterKeyParam = (_params$19 = params[2]) === null || _params$19 === void 0 ? void 0 : _params$19.value;
+  const resultColumn = (_params$20 = params[3]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
   if ((filterColumnParam === null || filterColumnParam === void 0 ? void 0 : filterColumnParam.type) !== "array") {
     throw new Error("second param in getPicklistValues must be wrapped in array( ... )");
   }
@@ -49787,12 +49842,12 @@ const getPicklistValuesKCLangFunction = params => {
   };
 };
 const isValidMirCardNumberKCLangFunction = params => {
-  var _params$20;
+  var _params$21;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.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) {
@@ -49806,13 +49861,13 @@ const isValidMirCardNumberKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const isValidAccountNumberKCLangFunction = params => {
-  var _params$21, _params$22;
+  var _params$22, _params$23;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const bik = (_params$21 = params[0]) === null || _params$21 === void 0 ? void 0 : _params$21.value;
-  const account = (_params$22 = params[1]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
+  const bik = (_params$22 = params[0]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
+  const account = (_params$23 = params[1]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
   if ((bik === null || bik === void 0 ? void 0 : bik.type) === "argument" && (account === null || account === void 0 ? void 0 : account.type) === "argument") {
     const bikValue = bik.select;
     const accountValue = account.select;
@@ -49828,12 +49883,12 @@ const isValidAccountNumberKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const countKCLangFunction = params => {
-  var _params$23;
+  var _params$24;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const expr = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
+  const expr = (_params$24 = params[0]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
   if ((expr === null || expr === void 0 ? void 0 : expr.type) === "argument") {
     const param = expr.select;
     if (param == undefined) {
@@ -49847,12 +49902,12 @@ const countKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const instanceCountKCLangFunction = params => {
-  var _params$24;
+  var _params$25;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const expr = (_params$24 = params[0]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
+  const expr = (_params$25 = params[0]) === null || _params$25 === void 0 ? void 0 : _params$25.value;
   if ((expr === null || expr === void 0 ? void 0 : expr.type) === "argument") {
     const param = expr.select;
     if (param == undefined) {
@@ -49866,12 +49921,12 @@ const instanceCountKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const sumKCLangFunction = params => {
-  var _params$25;
+  var _params$26;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const argumentExpr = (_params$25 = params[0]) === null || _params$25 === void 0 ? void 0 : _params$25.value;
+  const argumentExpr = (_params$26 = params[0]) === null || _params$26 === void 0 ? void 0 : _params$26.value;
   if ((argumentExpr === null || argumentExpr === void 0 ? void 0 : argumentExpr.type) === "argument") {
     const param = argumentExpr.select;
     if (param == undefined) {
@@ -49895,14 +49950,14 @@ const sumKCLangFunction = params => {
   throw new Error("Invalid parameters!");
 };
 const substringKCLangFunction = params => {
-  var _params$26, _params$27, _params$28;
+  var _params$27, _params$28, _params$29;
   const errors = Array.from(validateParams(params, 2, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$26 = params[0]) === null || _params$26 === void 0 ? void 0 : _params$26.value;
-  const startParam = (_params$27 = params[1]) === null || _params$27 === void 0 ? void 0 : _params$27.value;
-  const lengthParam = (_params$28 = params[2]) === null || _params$28 === void 0 ? void 0 : _params$28.value;
+  const exprParam = (_params$27 = params[0]) === null || _params$27 === void 0 ? void 0 : _params$27.value;
+  const startParam = (_params$28 = params[1]) === null || _params$28 === void 0 ? void 0 : _params$28.value;
+  const lengthParam = (_params$29 = params[2]) === null || _params$29 === void 0 ? void 0 : _params$29.value;
   if (exprParam == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -49920,14 +49975,14 @@ const substringKCLangFunction = params => {
   };
 };
 const groupSumKCLangFunction = params => {
-  var _params$29, _params$30, _params$31;
+  var _params$30, _params$31, _params$32;
   const errors = Array.from(validateParams(params, 3));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeysParam = (_params$29 = params[0]) === null || _params$29 === void 0 ? void 0 : _params$29.value;
-  const sourceKeyPathParam = (_params$30 = params[1]) === null || _params$30 === void 0 ? void 0 : _params$30.value;
-  const sourceValuePathParam = (_params$31 = params[2]) === null || _params$31 === void 0 ? void 0 : _params$31.value;
+  const targetKeysParam = (_params$30 = params[0]) === null || _params$30 === void 0 ? void 0 : _params$30.value;
+  const sourceKeyPathParam = (_params$31 = params[1]) === null || _params$31 === void 0 ? void 0 : _params$31.value;
+  const sourceValuePathParam = (_params$32 = params[2]) === null || _params$32 === void 0 ? void 0 : _params$32.value;
   if (targetKeysParam == undefined || (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: targetKeys, sourceKeyPath, sourceValuePath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -49944,13 +49999,13 @@ const groupSumKCLangFunction = params => {
   };
 };
 const groupCountKCLangFunction = params => {
-  var _params$32, _params$33;
+  var _params$33, _params$34;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeysParam = (_params$32 = params[0]) === null || _params$32 === void 0 ? void 0 : _params$32.value;
-  const sourceKeyPathParam = (_params$33 = params[1]) === null || _params$33 === void 0 ? void 0 : _params$33.value;
+  const targetKeysParam = (_params$33 = params[0]) === null || _params$33 === void 0 ? void 0 : _params$33.value;
+  const sourceKeyPathParam = (_params$34 = params[1]) === null || _params$34 === void 0 ? void 0 : _params$34.value;
   if (targetKeysParam == undefined || (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]);
@@ -49994,12 +50049,12 @@ const dateNowKCLangFunction = params => {
   };
 };
 const getDaysInMonthKCLangFunction = params => {
-  var _params$34;
+  var _params$35;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$34 = params[0]) === null || _params$34 === void 0 ? void 0 : _params$34.value;
+  const param = (_params$35 = params[0]) === null || _params$35 === void 0 ? void 0 : _params$35.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50009,12 +50064,12 @@ const getDaysInMonthKCLangFunction = params => {
   };
 };
 const getDayKCLangFunction = params => {
-  var _params$35;
+  var _params$36;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$35 = params[0]) === null || _params$35 === void 0 ? void 0 : _params$35.value;
+  const param = (_params$36 = params[0]) === null || _params$36 === void 0 ? void 0 : _params$36.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50024,12 +50079,12 @@ const getDayKCLangFunction = params => {
   };
 };
 const getMonthKCLangFunction = params => {
-  var _params$36;
+  var _params$37;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$36 = params[0]) === null || _params$36 === void 0 ? void 0 : _params$36.value;
+  const param = (_params$37 = params[0]) === null || _params$37 === void 0 ? void 0 : _params$37.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50039,12 +50094,12 @@ const getMonthKCLangFunction = params => {
   };
 };
 const getYearKCLangFunction = params => {
-  var _params$37;
+  var _params$38;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$37 = params[0]) === null || _params$37 === void 0 ? void 0 : _params$37.value;
+  const param = (_params$38 = params[0]) === null || _params$38 === void 0 ? void 0 : _params$38.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50054,12 +50109,12 @@ const getYearKCLangFunction = params => {
   };
 };
 const isDateInMonthKCLangFunction = params => {
-  var _params$38;
+  var _params$39;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$38 = params[0]) === null || _params$38 === void 0 ? void 0 : _params$38.value;
+  const param = (_params$39 = params[0]) === null || _params$39 === void 0 ? void 0 : _params$39.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50099,13 +50154,13 @@ const sumOfDayWeightsKCLangFunction = params => {
   };
 };
 const addDaysKCLangFunction = params => {
-  var _params$39, _params$40;
+  var _params$40, _params$41;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$39 = params[0]) === null || _params$39 === void 0 ? void 0 : _params$39.value;
-  const amountParam = (_params$40 = params[1]) === null || _params$40 === void 0 ? void 0 : _params$40.value;
+  const exprParam = (_params$40 = params[0]) === null || _params$40 === void 0 ? void 0 : _params$40.value;
+  const amountParam = (_params$41 = params[1]) === null || _params$41 === void 0 ? void 0 : _params$41.value;
   if (exprParam == undefined) {
     throw new Error("Expected expression for addDays().");
   }
@@ -50121,13 +50176,13 @@ const addDaysKCLangFunction = params => {
   };
 };
 const addMonthsKCLangFunction = params => {
-  var _params$41, _params$42;
+  var _params$42, _params$43;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$41 = params[0]) === null || _params$41 === void 0 ? void 0 : _params$41.value;
-  const amountParam = (_params$42 = params[1]) === null || _params$42 === void 0 ? void 0 : _params$42.value;
+  const exprParam = (_params$42 = params[0]) === null || _params$42 === void 0 ? void 0 : _params$42.value;
+  const amountParam = (_params$43 = params[1]) === null || _params$43 === void 0 ? void 0 : _params$43.value;
   if (exprParam == undefined) {
     throw new Error("Expected expression for addMonths().");
   }
@@ -50143,13 +50198,13 @@ const addMonthsKCLangFunction = params => {
   };
 };
 const addYearsKCLangFunction = params => {
-  var _params$43, _params$44;
+  var _params$44, _params$45;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$43 = params[0]) === null || _params$43 === void 0 ? void 0 : _params$43.value;
-  const amountParam = (_params$44 = params[1]) === null || _params$44 === void 0 ? void 0 : _params$44.value;
+  const exprParam = (_params$44 = params[0]) === null || _params$44 === void 0 ? void 0 : _params$44.value;
+  const amountParam = (_params$45 = params[1]) === null || _params$45 === void 0 ? void 0 : _params$45.value;
   if (exprParam == undefined) {
     throw new Error("Expected expression for addYears().");
   }
@@ -50165,13 +50220,13 @@ const addYearsKCLangFunction = params => {
   };
 };
 const dateToStringKCLangFunction = params => {
-  var _params$45, _params$46;
+  var _params$46, _params$47;
   const errors = Array.from(validateParams(params, 1, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const exprParam = (_params$45 = params[0]) === null || _params$45 === void 0 ? void 0 : _params$45.value;
-  const formatParam = (_params$46 = params[1]) === null || _params$46 === void 0 ? void 0 : _params$46.value;
+  const exprParam = (_params$46 = params[0]) === null || _params$46 === void 0 ? void 0 : _params$46.value;
+  const formatParam = (_params$47 = params[1]) === null || _params$47 === void 0 ? void 0 : _params$47.value;
   if (exprParam == undefined) {
     throw new Error("Expected expression for dateToString().");
   }
@@ -50186,12 +50241,12 @@ const dateToStringKCLangFunction = params => {
   };
 };
 const dateTimeKCLangFunction = params => {
-  var _params$47;
+  var _params$48;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$47 = params[0]) === null || _params$47 === void 0 ? void 0 : _params$47.value;
+  const param = (_params$48 = params[0]) === null || _params$48 === void 0 ? void 0 : _params$48.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50201,12 +50256,12 @@ const dateTimeKCLangFunction = params => {
   };
 };
 const hasAutoFlagKCLangFunction = params => {
-  var _params$48;
+  var _params$49;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const param = (_params$48 = params[0]) === null || _params$48 === void 0 ? void 0 : _params$48.value;
+  const param = (_params$49 = params[0]) === null || _params$49 === void 0 ? void 0 : _params$49.value;
   if (param == undefined) {
     throw new Error("Unexpected error!");
   }
@@ -50216,13 +50271,13 @@ const hasAutoFlagKCLangFunction = params => {
   };
 };
 const makeDictKCLangFunction = params => {
-  var _params$49, _params$50;
+  var _params$50, _params$51;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const sourceKeyPathParam = (_params$49 = params[0]) === null || _params$49 === void 0 ? void 0 : _params$49.value;
-  const sourceValuePathParam = (_params$50 = params[1]) === null || _params$50 === void 0 ? void 0 : _params$50.value;
+  const sourceKeyPathParam = (_params$50 = params[0]) === null || _params$50 === void 0 ? void 0 : _params$50.value;
+  const sourceValuePathParam = (_params$51 = params[1]) === null || _params$51 === void 0 ? void 0 : _params$51.value;
   if ((sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || sourceValuePathParam == undefined) {
     const argumentsValidationError = new ArgumentValidationError("Invalid argument sourceKeyPath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -50234,13 +50289,13 @@ const makeDictKCLangFunction = params => {
   };
 };
 const getSumByKeysKCLangFunction = params => {
-  var _params$51, _params$52;
+  var _params$52, _params$53;
   const errors = Array.from(validateParams(params, 2));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const dictPathParam = (_params$51 = params[0]) === null || _params$51 === void 0 ? void 0 : _params$51.value;
-  const targetKeysParam = (_params$52 = params[1]) === null || _params$52 === void 0 ? void 0 : _params$52.value;
+  const dictPathParam = (_params$52 = params[0]) === null || _params$52 === void 0 ? void 0 : _params$52.value;
+  const targetKeysParam = (_params$53 = params[1]) === null || _params$53 === void 0 ? void 0 : _params$53.value;
   if (targetKeysParam == undefined || (dictPathParam === null || dictPathParam === void 0 ? void 0 : dictPathParam.type) !== "argument") {
     const argumentsValidationError = new ArgumentValidationError("Invalid arguments dictPathParam, targetKeysParam");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -50256,12 +50311,12 @@ const getSumByKeysKCLangFunction = params => {
   };
 };
 const joinKCLangFunction = params => {
-  var _params$53;
+  var _params$54;
   const errors = Array.from(validateParams(params, 1));
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const arrayParam = (_params$53 = params[0]) === null || _params$53 === void 0 ? void 0 : _params$53.value;
+  const arrayParam = (_params$54 = params[0]) === null || _params$54 === void 0 ? void 0 : _params$54.value;
   if (arrayParam == undefined) {
     const argumentsValidationError = new ArgumentValidationError("Invalid arguments arrayParam");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
@@ -50314,6 +50369,7 @@ const getKCLangGlobalFunctionBuilders = () => ({
   isSnils: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.isSnilsKCLangFunction],
   isRegNumSfr: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.isRegNumSfrKCLangFunction],
   isInn: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.isInnKCLangFunction],
+  isOgrn: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.isOgrnKCLangFunction],
   firstOrDefault: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.firstOrDefaultKCLangFunction],
   nodeps: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.noDepsKCLangFunction],
   hashSet: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_7__.hashSetKCLangFunction],
@@ -60009,6 +60065,9 @@ function traverseKCLangExpression(node, visitor) {
     case "isInn":
       visitor.visitIsInnKCLangNode(node);
       break;
+    case "isOgrn":
+      visitor.visitIsOgrnKCLangNode(node);
+      break;
     case "length":
       traverseKCLangExpression(node.expression, visitor);
       visitor.visitLengthKCLangNode(node);
@@ -60233,6 +60292,9 @@ class DefaultKCLangExpressionVisitor {
   visitIsInnKCLangNode(node) {
     // default empty implementation
   }
+  visitIsOgrnKCLangNode(node) {
+    // default empty implementation
+  }
   visitIsValidAccountNumberNode(node) {
     // default empty implementation
   }
@@ -60601,6 +60663,12 @@ const getGenerateJsExpressionFunc = options => {
           const isInnFnName = gn(x => x.isInn);
           return `${utilsName}.${isInnFnName}(${pathFnName}, "${expression.select}")`;
         }
+      case "isOgrn":
+        {
+          // eslint-disable-next-line @typescript-eslint/unbound-method
+          const isOgrnFnName = gn(x => x.isOgrn);
+          return `${utilsName}.${isOgrnFnName}(${pathFnName}, "${expression.select}")`;
+        }
       case "isValidMirCardNumber":
         {
           // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -60798,6 +60866,7 @@ function generateKCXmlExpression(expression, prefixPath = "") {
     case "exists":
     case "isSnils":
     case "isInn":
+    case "isOgrn":
     case "isRegNumSfr":
     case "isValidMirCardNumber":
     case "multySum":
@@ -61004,6 +61073,11 @@ function guessConditionTarget(condition) {
         result = node.select;
       }
     }
+    visitIsOgrnKCLangNode(node) {
+      if (result == undefined) {
+        result = node.select;
+      }
+    }
     visitIsValidMirCardNumberNode(node) {
       if (result == undefined) {
         result = node.select;
@@ -61064,6 +61138,11 @@ function inferConditionTarget(condition, targetValue) {
         result = node.select;
       }
     }
+    visitIsOgrnKCLangNode(node) {
+      if (result == undefined && node.select.endsWith(this.path)) {
+        result = node.select;
+      }
+    }
     visitIsValidMirCardNumberNode(node) {
       if (result == undefined && node.select.endsWith(this.path)) {
         result = node.select;
@@ -67044,6 +67123,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   FormulaInstanceCountExpression: () => (/* binding */ FormulaInstanceCountExpression),
 /* harmony export */   FormulaIsDateExpression: () => (/* binding */ FormulaIsDateExpression),
 /* harmony export */   FormulaIsInnExpression: () => (/* binding */ FormulaIsInnExpression),
+/* harmony export */   FormulaIsOgrnExpression: () => (/* binding */ FormulaIsOgrnExpression),
 /* harmony export */   FormulaIsRegNumSfrExpression: () => (/* binding */ FormulaIsRegNumSfrExpression),
 /* harmony export */   FormulaIsSnilsExpression: () => (/* binding */ FormulaIsSnilsExpression),
 /* harmony export */   FormulaIsValidAccountNumberExpression: () => (/* binding */ FormulaIsValidAccountNumberExpression),
@@ -67086,7 +67166,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class3, _dec4, _dec5, _class4, _class5, _descriptor2, _dec6, _dec7, _class6, _class7, _descriptor3, _dec8, _dec9, _class8, _class9, _descriptor4, _dec10, _dec11, _class10, _class11, _descriptor5, _dec12, _dec13, _class12, _class13, _descriptor6, _dec14, _dec15, _dec16, _class14, _class15, _descriptor7, _descriptor8, _dec17, _dec18, _dec19, _class16, _class17, _descriptor9, _descriptor10, _dec20, _dec21, _class18, _class19, _descriptor11, _dec22, _dec23, _class20, _class21, _descriptor12, _dec24, _dec25, _class22, _class23, _descriptor13, _dec26, _dec27, _class24, _class25, _descriptor14, _dec28, _dec29, _class26, _class27, _descriptor15, _dec30, _dec31, _class28, _class29, _descriptor16, _dec32, _dec33, _class30, _class31, _descriptor17, _dec34, _dec35, _class32, _class33, _descriptor18, _dec36, _dec37, _class34, _class35, _descriptor19, _dec38, _dec39, _dec40, _dec41, _class36, _class37, _descriptor20, _descriptor21, _descriptor22, _dec42, _dec43, _class38, _class39, _descriptor23, _dec44, _dec45, _class40, _class41, _descriptor24, _dec46, _dec47, _dec48, _class42, _class43, _descriptor25, _descriptor26, _dec49, _dec50, _class44, _class45, _descriptor27, _dec51, _dec52, _class46, _class47, _descriptor28, _dec53, _dec54, _class48, _class49, _descriptor29, _dec55, _dec56, _class50, _class51, _descriptor30, _dec57, _dec58, _dec59, _class52, _class53, _descriptor31, _descriptor32, _dec60, _dec61, _dec62, _dec63, _class54, _class55, _descriptor33, _descriptor34, _descriptor35, _dec64, _dec65, _dec66, _class56, _class57, _descriptor36, _descriptor37, _dec67, _class58, _dec68, _dec69, _class59, _class60, _descriptor38, _dec70, _dec71, _class61, _class62, _descriptor39, _dec72, _dec73, _class63, _class64, _descriptor40, _dec74, _dec75, _class65, _class66, _descriptor41, _dec76, _dec77, _class67, _class68, _descriptor42, _dec78, _dec79, _class69, _class70, _descriptor43, _dec80, _dec81, _class71, _class72, _descriptor44, _dec82, _dec83, _class73, _class74, _descriptor45, _dec84, _dec85, _dec86, _class75, _class76, _descriptor46, _descriptor47, _dec87, _dec88, _dec89, _class77, _class78, _descriptor48, _descriptor49, _dec90, _dec91, _dec92, _class79, _class80, _descriptor50, _descriptor51, _dec93, _dec94, _dec95, _class81, _class82, _descriptor52, _descriptor53, _dec96, _dec97, _class83, _class84, _descriptor54, _dec98, _dec99, _class85, _class86, _descriptor55, _dec100, _dec101, _class87, _class88, _descriptor56, _dec102, _dec103, _class89, _class90, _descriptor57, _dec104, _dec105, _class91, _class92, _descriptor58, _dec106, _dec107, _class93, _class94, _descriptor59, _dec108, _dec109, _dec110, _class95, _class96, _descriptor60, _descriptor61, _dec111, _dec112, _dec113, _class97, _class98, _descriptor62, _descriptor63, _dec114, _dec115, _class99, _class100, _descriptor64, _dec116, _dec117, _class101, _class102, _descriptor65, _dec118, _dec119, _class103, _class104, _descriptor66, _dec120, _dec121, _dec122, _dec123, _dec124, _class105, _class106, _descriptor67, _descriptor68, _descriptor69, _descriptor70, _dec125, _dec126, _class107, _class108, _descriptor71, _dec127, _dec128, _class109, _class110, _descriptor72, _dec129, _dec130, _class111, _class112, _descriptor73, _dec131, _dec132, _class113, _class114, _descriptor74, _dec133, _dec134, _dec135, _class115, _class116, _descriptor75, _descriptor76, _dec136, _dec137, _class117, _class118, _descriptor77, _dec138, _dec139, _class119, _class120, _descriptor78, _dec140, _dec141, _class121, _class122, _descriptor79, _dec142, _dec143, _class123, _class124, _descriptor80, _dec144, _class125, _dec145, _dec146, _dec147, _dec148, _class126, _class127, _descriptor81, _descriptor82, _descriptor83, _dec149, _dec150, _class128, _class129, _descriptor84, _dec151, _dec152, _class130, _class131, _descriptor85, _dec153, _dec154, _dec155, _dec156, _dec157, _dec158, _class132, _class133, _descriptor86, _descriptor87, _descriptor88, _descriptor89, _descriptor90, _dec159, _dec160, _class134, _class135, _descriptor91, _dec161, _dec162, _dec163, _class136, _class137, _descriptor92, _descriptor93, _dec164, _dec165, _dec166, _class138, _class139, _descriptor94, _descriptor95, _dec167, _dec168, _dec169, _class140, _class141, _descriptor96, _descriptor97, _dec170, _dec171, _dec172, _dec173, _class142, _class143, _descriptor98, _descriptor99, _descriptor100, _dec174, _dec175, _dec176, _class144, _class145, _descriptor101, _descriptor102;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class3, _dec4, _dec5, _class4, _class5, _descriptor2, _dec6, _dec7, _class6, _class7, _descriptor3, _dec8, _dec9, _class8, _class9, _descriptor4, _dec10, _dec11, _class10, _class11, _descriptor5, _dec12, _dec13, _class12, _class13, _descriptor6, _dec14, _dec15, _dec16, _class14, _class15, _descriptor7, _descriptor8, _dec17, _dec18, _dec19, _class16, _class17, _descriptor9, _descriptor10, _dec20, _dec21, _class18, _class19, _descriptor11, _dec22, _dec23, _class20, _class21, _descriptor12, _dec24, _dec25, _class22, _class23, _descriptor13, _dec26, _dec27, _class24, _class25, _descriptor14, _dec28, _dec29, _class26, _class27, _descriptor15, _dec30, _dec31, _class28, _class29, _descriptor16, _dec32, _dec33, _class30, _class31, _descriptor17, _dec34, _dec35, _class32, _class33, _descriptor18, _dec36, _dec37, _class34, _class35, _descriptor19, _dec38, _dec39, _dec40, _dec41, _class36, _class37, _descriptor20, _descriptor21, _descriptor22, _dec42, _dec43, _class38, _class39, _descriptor23, _dec44, _dec45, _class40, _class41, _descriptor24, _dec46, _dec47, _dec48, _class42, _class43, _descriptor25, _descriptor26, _dec49, _dec50, _class44, _class45, _descriptor27, _dec51, _dec52, _class46, _class47, _descriptor28, _dec53, _dec54, _class48, _class49, _descriptor29, _dec55, _dec56, _class50, _class51, _descriptor30, _dec57, _dec58, _dec59, _class52, _class53, _descriptor31, _descriptor32, _dec60, _dec61, _dec62, _dec63, _class54, _class55, _descriptor33, _descriptor34, _descriptor35, _dec64, _dec65, _dec66, _class56, _class57, _descriptor36, _descriptor37, _dec67, _class58, _dec68, _dec69, _class59, _class60, _descriptor38, _dec70, _dec71, _class61, _class62, _descriptor39, _dec72, _dec73, _class63, _class64, _descriptor40, _dec74, _dec75, _class65, _class66, _descriptor41, _dec76, _dec77, _class67, _class68, _descriptor42, _dec78, _dec79, _class69, _class70, _descriptor43, _dec80, _dec81, _class71, _class72, _descriptor44, _dec82, _dec83, _class73, _class74, _descriptor45, _dec84, _dec85, _dec86, _class75, _class76, _descriptor46, _descriptor47, _dec87, _dec88, _dec89, _class77, _class78, _descriptor48, _descriptor49, _dec90, _dec91, _dec92, _class79, _class80, _descriptor50, _descriptor51, _dec93, _dec94, _dec95, _class81, _class82, _descriptor52, _descriptor53, _dec96, _dec97, _class83, _class84, _descriptor54, _dec98, _dec99, _class85, _class86, _descriptor55, _dec100, _dec101, _class87, _class88, _descriptor56, _dec102, _dec103, _class89, _class90, _descriptor57, _dec104, _dec105, _class91, _class92, _descriptor58, _dec106, _dec107, _class93, _class94, _descriptor59, _dec108, _dec109, _class95, _class96, _descriptor60, _dec110, _dec111, _dec112, _class97, _class98, _descriptor61, _descriptor62, _dec113, _dec114, _dec115, _class99, _class100, _descriptor63, _descriptor64, _dec116, _dec117, _class101, _class102, _descriptor65, _dec118, _dec119, _class103, _class104, _descriptor66, _dec120, _dec121, _class105, _class106, _descriptor67, _dec122, _dec123, _dec124, _dec125, _dec126, _class107, _class108, _descriptor68, _descriptor69, _descriptor70, _descriptor71, _dec127, _dec128, _class109, _class110, _descriptor72, _dec129, _dec130, _class111, _class112, _descriptor73, _dec131, _dec132, _class113, _class114, _descriptor74, _dec133, _dec134, _class115, _class116, _descriptor75, _dec135, _dec136, _dec137, _class117, _class118, _descriptor76, _descriptor77, _dec138, _dec139, _class119, _class120, _descriptor78, _dec140, _dec141, _class121, _class122, _descriptor79, _dec142, _dec143, _class123, _class124, _descriptor80, _dec144, _dec145, _class125, _class126, _descriptor81, _dec146, _class127, _dec147, _dec148, _dec149, _dec150, _class128, _class129, _descriptor82, _descriptor83, _descriptor84, _dec151, _dec152, _class130, _class131, _descriptor85, _dec153, _dec154, _class132, _class133, _descriptor86, _dec155, _dec156, _dec157, _dec158, _dec159, _dec160, _class134, _class135, _descriptor87, _descriptor88, _descriptor89, _descriptor90, _descriptor91, _dec161, _dec162, _class136, _class137, _descriptor92, _dec163, _dec164, _dec165, _class138, _class139, _descriptor93, _descriptor94, _dec166, _dec167, _dec168, _class140, _class141, _descriptor95, _descriptor96, _dec169, _dec170, _dec171, _class142, _class143, _descriptor97, _descriptor98, _dec172, _dec173, _dec174, _dec175, _class144, _class145, _descriptor99, _descriptor100, _descriptor101, _dec176, _dec177, _dec178, _class146, _class147, _descriptor102, _descriptor103;
 
 
 
@@ -67748,13 +67828,13 @@ let FormulaIsInnExpression = (_dec104 = (0,_markupGenerator_Serializer_SugarSeri
   writable: true,
   initializer: null
 }), _class92)) || _class91);
-let FormulaIsValidMirCardNumberExpression = (_dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidmircardnumber", `Проверка на валидность карты МИР`), _dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec106(_class93 = (_class94 = class FormulaIsValidMirCardNumberExpression extends FormulaExpression {
+let FormulaIsOgrnExpression = (_dec106 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isogrn", `Проверка на валидность ОГРН`), _dec107 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec106(_class93 = (_class94 = class FormulaIsOgrnExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor59, this);
   }
   getLegacyExpressionTypeForFunctionName() {
-    return "isValidMirCardNumber";
+    return "isOgrn";
   }
 }, _descriptor59 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "select", [_dec107], {
   configurable: true,
@@ -67762,122 +67842,125 @@ let FormulaIsValidMirCardNumberExpression = (_dec106 = (0,_markupGenerator_Seria
   writable: true,
   initializer: null
 }), _class94)) || _class93);
-let FormulaIsValidAccountNumberExpression = (_dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumber", `Проверка на валидность карты МИР`), _dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("bik", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("account", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec108(_class95 = (_class96 = class FormulaIsValidAccountNumberExpression extends FormulaExpression {
+let FormulaIsValidMirCardNumberExpression = (_dec108 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidmircardnumber", `Проверка на валидность карты МИР`), _dec109 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec108(_class95 = (_class96 = class FormulaIsValidMirCardNumberExpression extends FormulaExpression {
+  constructor(...args) {
+    super(...args);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor60, this);
+  }
+  getLegacyExpressionTypeForFunctionName() {
+    return "isValidMirCardNumber";
+  }
+}, _descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class96.prototype, "select", [_dec109], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class96)) || _class95);
+let FormulaIsValidAccountNumberExpression = (_dec110 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("isvalidaccountnumber", `Проверка на валидность карты МИР`), _dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("bik", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("account", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec110(_class97 = (_class98 = class FormulaIsValidAccountNumberExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "bik", _descriptor60, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "account", _descriptor61, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "bik", _descriptor61, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "account", _descriptor62, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "isValidAccountNumber";
   }
-}, _descriptor60 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class96.prototype, "bik", [_dec109], {
+}, _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "bik", [_dec111], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor61 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class96.prototype, "account", [_dec110], {
+}), _descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "account", [_dec112], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class96)) || _class95);
-let FormulaArgumentExpression = (_dec111 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec112 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec111(_class97 = (_class98 = class FormulaArgumentExpression extends FormulaExpression {
+}), _class98)) || _class97);
+let FormulaArgumentExpression = (_dec113 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec114 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec115 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec113(_class99 = (_class100 = class FormulaArgumentExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor62, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor63, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor63, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor64, this);
   }
-}, _descriptor62 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "select", [_dec112], {
+}, _descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "select", [_dec114], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor63 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class98.prototype, "type", [_dec113], {
+}), _descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "type", [_dec115], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "decimal";
   }
-}), _class98)) || _class97);
-let FormulaArrayExpression = (_dec114 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("array", `TODO`), _dec115 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec114(_class99 = (_class100 = class FormulaArrayExpression extends FormulaExpression {
+}), _class100)) || _class99);
+let FormulaArrayExpression = (_dec116 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("array", `TODO`), _dec117 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec116(_class101 = (_class102 = class FormulaArrayExpression extends FormulaExpression {
   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", _descriptor65, this);
   }
-}, _descriptor64 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "items", [_dec115], {
+}, _descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class102.prototype, "items", [_dec117], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class100)) || _class99);
-let FormulaFilterColumnExpression = (_dec116 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filtercolumn", `Получить значения пиклиста по фильру`), _dec117 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec116(_class101 = (_class102 = class FormulaFilterColumnExpression extends FormulaExpression {
+}), _class102)) || _class101);
+let FormulaFilterColumnExpression = (_dec118 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filtercolumn", `Получить значения пиклиста по фильру`), _dec119 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec118(_class103 = (_class104 = class FormulaFilterColumnExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor65, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor66, this);
   }
-}, _descriptor65 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class102.prototype, "filterColumn", [_dec117], {
+}, _descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class104.prototype, "filterColumn", [_dec119], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class102)) || _class101);
-let FormulaFilterKeyExpression = (_dec118 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filterkey", `Получить значения пиклиста по фильру`), _dec119 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec118(_class103 = (_class104 = class FormulaFilterKeyExpression extends FormulaExpression {
+}), _class104)) || _class103);
+let FormulaFilterKeyExpression = (_dec120 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("filterkey", `Получить значения пиклиста по фильру`), _dec121 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec120(_class105 = (_class106 = class FormulaFilterKeyExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor66, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor67, this);
   }
-}, _descriptor66 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class104.prototype, "filterKey", [_dec119], {
+}, _descriptor67 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "filterKey", [_dec121], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class104)) || _class103);
-let FormulaGetPicklistValuesExpression = (_dec120 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getpicklistvalues", `Получить значения пиклиста по фильру. Используется только для генерации FLANG. В калькуляторе не работает`), _dec121 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("gId", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec122 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filtercolumn", [FormulaFilterColumnExpression]), _dec123 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filterkey", [FormulaFilterKeyExpression]), _dec124 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("resultColumn", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec120(_class105 = (_class106 = class FormulaGetPicklistValuesExpression extends FormulaExpression {
+}), _class106)) || _class105);
+let FormulaGetPicklistValuesExpression = (_dec122 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getpicklistvalues", `Получить значения пиклиста по фильру. Используется только для генерации FLANG. В калькуляторе не работает`), _dec123 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("gId", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec124 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filtercolumn", [FormulaFilterColumnExpression]), _dec125 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("filterkey", [FormulaFilterKeyExpression]), _dec126 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("resultColumn", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec122(_class107 = (_class108 = class FormulaGetPicklistValuesExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gId", _descriptor67, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor68, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor69, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "resultColumn", _descriptor70, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gId", _descriptor68, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterColumn", _descriptor69, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filterKey", _descriptor70, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "resultColumn", _descriptor71, this);
   }
   getLegacyExpressionTypeForFunctionName() {
     return "getPicklistValues";
   }
-}, _descriptor67 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "gId", [_dec121], {
+}, _descriptor68 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "gId", [_dec123], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor68 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "filterColumn", [_dec122], {
+}), _descriptor69 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "filterColumn", [_dec124], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor69 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "filterKey", [_dec123], {
+}), _descriptor70 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "filterKey", [_dec125], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor70 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class106.prototype, "resultColumn", [_dec124], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class106)) || _class105);
-let FormulaFirstOrDefaultExpression = (_dec125 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("firstordefault", `Взять первый элемент массива. Используется только для генерации FLANG. В калькуляторе не работает`), _dec126 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec125(_class107 = (_class108 = class FormulaFirstOrDefaultExpression extends FormulaExpression {
-  constructor(...args) {
-    super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor71, this);
-  }
-}, _descriptor71 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "expression", [_dec126], {
+}), _descriptor71 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class108.prototype, "resultColumn", [_dec126], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class108)) || _class107);
-let FormulaHashSetExpression = (_dec127 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("hashset", `Оставить только уникальные значения в массиве. Используется только для генерации FLANG. В калькуляторе не работает`), _dec128 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec127(_class109 = (_class110 = class FormulaHashSetExpression extends FormulaExpression {
+let FormulaFirstOrDefaultExpression = (_dec127 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("firstordefault", `Взять первый элемент массива. Используется только для генерации FLANG. В калькуляторе не работает`), _dec128 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec127(_class109 = (_class110 = class FormulaFirstOrDefaultExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor72, this);
@@ -67888,276 +67971,287 @@ let FormulaHashSetExpression = (_dec127 = (0,_markupGenerator_Serializer_SugarSe
   writable: true,
   initializer: null
 }), _class110)) || _class109);
-let FormulaExistsExpression = (_dec129 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec130 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec129(_class111 = (_class112 = class FormulaExistsExpression extends FormulaExpression {
+let FormulaHashSetExpression = (_dec129 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("hashset", `Оставить только уникальные значения в массиве. Используется только для генерации FLANG. В калькуляторе не работает`), _dec130 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec129(_class111 = (_class112 = class FormulaHashSetExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor73, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor73, this);
   }
-  getLegacyExpressionTypeForFunctionName() {
-    return "exists";
-  }
-}, _descriptor73 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "select", [_dec130], {
+}, _descriptor73 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class112.prototype, "expression", [_dec130], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class112)) || _class111);
-let FormulaMultySumExpression = (_dec131 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec132 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec131(_class113 = (_class114 = class FormulaMultySumExpression extends FormulaExpression {
+let FormulaExistsExpression = (_dec131 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec132 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec131(_class113 = (_class114 = class FormulaExistsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor74, this);
   }
+  getLegacyExpressionTypeForFunctionName() {
+    return "exists";
+  }
 }, _descriptor74 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class114.prototype, "select", [_dec132], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class114)) || _class113);
-let FormulaCountExpression = (_dec133 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec134 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec135 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec133(_class115 = (_class116 = class FormulaCountExpression extends FormulaExpression {
+let FormulaMultySumExpression = (_dec133 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec134 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec133(_class115 = (_class116 = class FormulaMultySumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor75, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor76, this);
   }
 }, _descriptor75 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "select", [_dec134], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor76 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class116.prototype, "withNullOrEmptyValues", [_dec135], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
 }), _class116)) || _class115);
-let FormulaInstanceCountExpression = (_dec136 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("instancecount", `TODO`), _dec137 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec136(_class117 = (_class118 = class FormulaInstanceCountExpression extends FormulaExpression {
+let FormulaCountExpression = (_dec135 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec136 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec137 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("withNullOrEmptyValues", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `брать в расчет незаполненные экземпляры`), _dec135(_class117 = (_class118 = class FormulaCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor77, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor76, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "withNullOrEmptyValues", _descriptor77, this);
   }
-}, _descriptor77 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "select", [_dec137], {
+}, _descriptor76 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "select", [_dec136], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor77 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class118.prototype, "withNullOrEmptyValues", [_dec137], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class118)) || _class117);
-let FormulaJoinExpression = (_dec138 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("join", `TODO`), _dec139 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec138(_class119 = (_class120 = class FormulaJoinExpression extends FormulaExpression {
+let FormulaInstanceCountExpression = (_dec138 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("instancecount", `TODO`), _dec139 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec138(_class119 = (_class120 = class FormulaInstanceCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "array", _descriptor78, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor78, this);
   }
-}, _descriptor78 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class120.prototype, "array", [_dec139], {
+}, _descriptor78 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class120.prototype, "select", [_dec139], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class120)) || _class119);
-let FormulaPropertyByNameExpression = (_dec140 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("property", `TODO`), _dec141 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("name", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec140(_class121 = (_class122 = class FormulaPropertyByNameExpression extends FormulaExpression {
+let FormulaJoinExpression = (_dec140 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("join", `TODO`), _dec141 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec140(_class121 = (_class122 = class FormulaJoinExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor79, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "array", _descriptor79, this);
   }
-}, _descriptor79 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "name", [_dec141], {
+}, _descriptor79 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class122.prototype, "array", [_dec141], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class122)) || _class121);
-let FormulaConcatExpression = (_dec142 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec143 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec142(_class123 = (_class124 = class FormulaConcatExpression extends FormulaExpression {
+let FormulaPropertyByNameExpression = (_dec142 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("property", `TODO`), _dec143 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("name", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec142(_class123 = (_class124 = class FormulaPropertyByNameExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor80, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor80, this);
   }
-}, _descriptor80 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class124.prototype, "arguments", [_dec143], {
+}, _descriptor80 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class124.prototype, "name", [_dec143], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class124)) || _class123);
-let FormulaNewLineExpression = (_dec144 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec144(_class125 = class FormulaNewLineExpression extends FormulaExpression {}) || _class125);
-let Formula = (_dec145 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec146 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec147 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec148 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec145(_class126 = (_class127 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let FormulaConcatExpression = (_dec144 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("concat", `Конкатенация строк`), _dec145 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec144(_class125 = (_class126 = class FormulaConcatExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor81, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor82, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor83, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor81, this);
+  }
+}, _descriptor81 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class126.prototype, "arguments", [_dec145], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class126)) || _class125);
+let FormulaNewLineExpression = (_dec146 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("newline", `Перевод на новую строку`), _dec146(_class127 = class FormulaNewLineExpression extends FormulaExpression {}) || _class127);
+let Formula = (_dec147 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec148 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec149 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec150 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec147(_class128 = (_class129 = 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", _descriptor82, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor83, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor84, this);
   }
-}, _descriptor81 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class127.prototype, "match", [_dec146], {
+}, _descriptor82 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class129.prototype, "match", [_dec148], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor82 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class127.prototype, "target", [_dec147], {
+}), _descriptor83 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class129.prototype, "target", [_dec149], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor83 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class127.prototype, "expression", [_dec148], {
+}), _descriptor84 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class129.prototype, "expression", [_dec150], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class127)) || _class126);
-let FormulaNoDepsNode = (_dec149 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("nodeps", `Замыкает цикл пробега по зависимостям на элементе, что исключает бесконечную зацикленность. Только для серверной нормализации`), _dec150 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec149(_class128 = (_class129 = class FormulaNoDepsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class129)) || _class128);
+let FormulaNoDepsNode = (_dec151 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("nodeps", `Замыкает цикл пробега по зависимостям на элементе, что исключает бесконечную зацикленность. Только для серверной нормализации`), _dec152 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec151(_class130 = (_class131 = class FormulaNoDepsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor84, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor85, this);
   }
-}, _descriptor84 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class129.prototype, "expression", [_dec150], {
+}, _descriptor85 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "expression", [_dec152], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class129)) || _class128);
-let Formulas = (_dec151 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec152 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec151(_class130 = (_class131 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class131)) || _class130);
+let Formulas = (_dec153 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec154 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec153(_class132 = (_class133 = 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", _descriptor85, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor86, this);
   }
-}, _descriptor85 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class131.prototype, "items", [_dec152], {
+}, _descriptor86 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "items", [_dec154], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class131)) || _class130);
-let ConditionNode = (_dec153 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec154 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec155 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec156 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec157 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec158 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec153(_class132 = (_class133 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class133)) || _class132);
+let ConditionNode = (_dec155 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec156 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec157 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec158 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec159 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.enum("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec160 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec155(_class134 = (_class135 = 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", _descriptor86, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor87, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor88, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor89, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor90, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor87, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor88, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor89, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor90, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor91, this);
   }
-}, _descriptor86 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "match", [_dec154], {
+}, _descriptor87 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "match", [_dec156], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor87 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "target", [_dec155], {
+}), _descriptor88 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "target", [_dec157], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor88 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "description", [_dec156], {
+}), _descriptor89 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "description", [_dec158], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor89 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "errorLevel", [_dec157], {
+}), _descriptor90 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "errorLevel", [_dec159], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor90 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class133.prototype, "expression", [_dec158], {
+}), _descriptor91 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "expression", [_dec160], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class133)) || _class132);
-let ConditionsNode = (_dec159 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec160 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec159(_class134 = (_class135 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class135)) || _class134);
+let ConditionsNode = (_dec161 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec162 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec161(_class136 = (_class137 = 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", _descriptor91, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor92, this);
   }
-}, _descriptor91 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class135.prototype, "items", [_dec160], {
+}, _descriptor92 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "items", [_dec162], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class135)) || _class134);
-let MathContainer = (_dec161 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec162 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec163 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec161(_class136 = (_class137 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+}), _class137)) || _class136);
+let MathContainer = (_dec163 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec164 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec165 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec163(_class138 = (_class139 = 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", _descriptor92, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor93, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor93, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor94, this);
   }
-}, _descriptor92 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "formulas", [_dec162], {
+}, _descriptor93 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "formulas", [_dec164], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor93 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class137.prototype, "conditions", [_dec163], {
+}), _descriptor94 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "conditions", [_dec165], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class137)) || _class136);
-let FormulaMakeDictExpression = (_dec164 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("makedict", `Получение словаря по ключу-значению из иннера`), _dec165 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ`), _dec166 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(undefined, [FormulaArgumentExpression, FormulaConstExpression, FormulaCastExpression], `Путь откуда брать значение или константа`), _dec164(_class138 = (_class139 = class FormulaMakeDictExpression extends FormulaExpression {
+}), _class139)) || _class138);
+let FormulaMakeDictExpression = (_dec166 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("makedict", `Получение словаря по ключу-значению из иннера`), _dec167 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ`), _dec168 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(undefined, [FormulaArgumentExpression, FormulaConstExpression, FormulaCastExpression], `Путь откуда брать значение или константа`), _dec166(_class140 = (_class141 = class FormulaMakeDictExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor94, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValueExpression", _descriptor95, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor95, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValueExpression", _descriptor96, this);
   }
-}, _descriptor94 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "sourceKeyPath", [_dec165], {
+}, _descriptor95 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "sourceKeyPath", [_dec167], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor95 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class139.prototype, "sourceValueExpression", [_dec166], {
+}), _descriptor96 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "sourceValueExpression", [_dec168], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class139)) || _class138);
-let FormulaGetSumByKeysExpression = (_dec167 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getsumbykeys", `Вычисление суммы с группировкой в разных множественностях`), _dec168 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("dictPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь к словарю`), _dec169 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec167(_class140 = (_class141 = class FormulaGetSumByKeysExpression extends FormulaExpression {
+}), _class141)) || _class140);
+let FormulaGetSumByKeysExpression = (_dec169 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("getsumbykeys", `Вычисление суммы с группировкой в разных множественностях`), _dec170 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("dictPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь к словарю`), _dec171 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec169(_class142 = (_class143 = class FormulaGetSumByKeysExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dictPath", _descriptor96, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor97, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dictPath", _descriptor97, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor98, this);
   }
-}, _descriptor96 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "dictPath", [_dec168], {
+}, _descriptor97 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "dictPath", [_dec170], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor97 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class141.prototype, "targetKeys", [_dec169], {
+}), _descriptor98 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "targetKeys", [_dec171], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class141)) || _class140);
-let FormulaGroupSumExpression = (_dec170 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec171 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec172 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec173 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec170(_class142 = (_class143 = class FormulaGroupSumExpression extends FormulaExpression {
+}), _class143)) || _class142);
+let FormulaGroupSumExpression = (_dec172 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec173 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec174 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec175 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec172(_class144 = (_class145 = class FormulaGroupSumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor98, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor99, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor100, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor99, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor100, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor101, this);
   }
-}, _descriptor98 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "targetKeys", [_dec171], {
+}, _descriptor99 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "targetKeys", [_dec173], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor99 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "sourceKeyPath", [_dec172], {
+}), _descriptor100 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "sourceKeyPath", [_dec174], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor100 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class143.prototype, "sourceValuePath", [_dec173], {
+}), _descriptor101 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "sourceValuePath", [_dec175], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class143)) || _class142);
-let FormulaGroupCountExpression = (_dec174 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec175 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec176 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec174(_class144 = (_class145 = class FormulaGroupCountExpression extends FormulaExpression {
+}), _class145)) || _class144);
+let FormulaGroupCountExpression = (_dec176 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec177 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("array", [FormulaArrayExpression]), _dec178 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec176(_class146 = (_class147 = class FormulaGroupCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor101, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor102, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor102, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor103, this);
   }
-}, _descriptor101 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "targetKeys", [_dec175], {
+}, _descriptor102 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "targetKeys", [_dec177], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor102 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class145.prototype, "sourceKeyPath", [_dec176], {
+}), _descriptor103 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class147.prototype, "sourceKeyPath", [_dec178], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class145)) || _class144);
-const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaInstanceCountExpression, FormulaDateNowExpression, FormulaGetDaysInMonthExpression, FormulaGetDayExpression, FormulaGetMonthExpression, FormulaGetYearExpression, FormulaIsDateExpression, FormulaDifferenceInMonthsExpression, FormulaDifferenceInDaysExpression, FormulaAddDaysExpression, FormulaAddMonthsExpression, FormulaAddYearsExpression, FormulaDateToStringExpression, FormulaDateTimeExpression, FormulaSumOfDayWeightsExpression, FormulaIsSnilsExpression, FormulaIsRegNumSfrExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaGetPicklistValuesExpression, FormulaArrayExpression, FormulaFirstOrDefaultExpression, FormulaHashSetExpression, FormulaFilterColumnExpression, FormulaFilterKeyExpression, FormulaNoDepsNode, FormulaHasAutoFlagExpression, FormulaMakeDictExpression, FormulaGetSumByKeysExpression, FormulaJoinExpression, FormulaPropertyByNameExpression];
+}), _class147)) || _class146);
+const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaInstanceCountExpression, FormulaDateNowExpression, FormulaGetDaysInMonthExpression, FormulaGetDayExpression, FormulaGetMonthExpression, FormulaGetYearExpression, FormulaIsDateExpression, FormulaDifferenceInMonthsExpression, FormulaDifferenceInDaysExpression, FormulaAddDaysExpression, FormulaAddMonthsExpression, FormulaAddYearsExpression, FormulaDateToStringExpression, FormulaDateTimeExpression, FormulaSumOfDayWeightsExpression, FormulaIsSnilsExpression, FormulaIsRegNumSfrExpression, FormulaIsInnExpression, FormulaIsOgrnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaGetPicklistValuesExpression, FormulaArrayExpression, FormulaFirstOrDefaultExpression, FormulaHashSetExpression, FormulaFilterColumnExpression, FormulaFilterKeyExpression, FormulaNoDepsNode, FormulaHasAutoFlagExpression, FormulaMakeDictExpression, FormulaGetSumByKeysExpression, FormulaJoinExpression, FormulaPropertyByNameExpression];
 
 /***/ }),
 
@@ -70541,6 +70635,11 @@ class KCXmlGeneratorBase {
       deps.push(new RegularDependency(modelPath));
       return gcf(x => x.isInn, `"${modelPath.toLegacyPath()}"`);
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsOgrnExpression) {
+      const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
+      deps.push(new RegularDependency(modelPath));
+      return gcf(x => x.isOgrn, `"${modelPath.toLegacyPath()}"`);
+    }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsValidMirCardNumberExpression) {
       const modelPath = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_7__.adjustPathMultiplicity)(this.schema, this.extendedSchemaInfo, prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
       deps.push(new RegularDependency(modelPath));
@@ -72025,6 +72124,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   IsDateExpression: () => (/* binding */ IsDateExpression),
 /* harmony export */   IsEqualsBinaryExpression: () => (/* binding */ IsEqualsBinaryExpression),
 /* harmony export */   IsInnExpression: () => (/* binding */ IsInnExpression),
+/* harmony export */   IsOgrnExpression: () => (/* binding */ IsOgrnExpression),
 /* harmony export */   IsRegNumSfrExpression: () => (/* binding */ IsRegNumSfrExpression),
 /* harmony export */   IsSnilsExpression: () => (/* binding */ IsSnilsExpression),
 /* harmony export */   IsValidAccountNumberExpression: () => (/* binding */ IsValidAccountNumberExpression),
@@ -72868,6 +72968,19 @@ class IsInnExpression extends FLangBoolExpression {
     return `isInn(${this.expression.convertToString()})`;
   }
 }
+class IsOgrnExpression extends FLangBoolExpression {
+  constructor(expression) {
+    super();
+    this.expression = void 0;
+    this.expression = expression;
+  }
+  *getChildNodes() {
+    yield this.expression;
+  }
+  convertToString() {
+    return `isOgrn(${this.expression.convertToString()})`;
+  }
+}
 class IsValidMirCardNumberExpression extends FLangBoolExpression {
   constructor(expression) {
     super();
@@ -74074,6 +74187,10 @@ class FormulaExpressionToFlangExpressionConverter {
       const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsInnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsOgrnExpression) {
+      const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsOgrnExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
+    }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaIsValidMirCardNumberExpression) {
       const arg = this.compiledArgumentExpression(prefix, target, expression.select, "string", addPrecalculationRule);
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.IsValidMirCardNumberExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(arg));
@@ -81106,8 +81223,6 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
       unitItemBuilder.prop(x => x.pages).set([]);
       unitItemBuilder.prop(x => x.clearConfirmationSettings).set({});
       unitItemBuilder.prop(x => x.hasAttachment).set(true);
-      //unitItemBuilder.prop(x => x.maxOccurs).set(attachmentForm.maxOccurs ?? context.getPathMaxOccurs(page.getFullPath()));
-
       if (attachmentForm.path != undefined) {
         unitItemBuilder.prop(x => x.unitPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentForm));
       }
@@ -97783,6 +97898,7 @@ class RelativesComboBoxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_M
     markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node));
     markupBuilder.prop(x => x.onAdd).set(context.generateHelperFunctionExpression(node, "onAdd", node.onAdd));
     markupBuilder.prop(x => x.onSelect).set(context.generateHelperFunctionExpression(node, "onSelect", node.onSelect));
+    markupBuilder.prop(x => x.queryFilter).set(node.queryFilter);
     return markupBuilder.buildConverterResult();
   }
   buildChildrenDataDeclaration(context) {
@@ -97821,11 +97937,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
 
 
 
-let RelativesComboBoxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("relativescombobox", "Комбобокс для выбора ребенка/родственника.", __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/RelativesComboBox sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_5__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("employeeIdPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, `Путь до поля, в котором лежит employeeId. Нужно для запроса в сервис сотрудников.`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onAdd", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при добавлении родственника"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onSelect", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при выборе родственника"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedLastNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до фамилии выбранного родственника"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedFirstNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до имени выбранного родственника"), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedMiddleNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до отчества выбранного родственника"), _dec(_class = (_class2 = class RelativesComboBoxNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
+let RelativesComboBoxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("relativescombobox", "Комбобокс для выбора ребенка/родственника.", __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/RelativesComboBox sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_5__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("employeeIdPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, `Путь до поля, в котором лежит employeeId. Нужно для запроса в сервис сотрудников.`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onAdd", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при добавлении родственника"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onSelect", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при выборе родственника"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedLastNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до фамилии выбранного родственника"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedFirstNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до имени выбранного родственника"), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("selectedMiddleNamePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, "Путь до отчества выбранного родственника"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.markupAttr)("queryFilter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.modelPath, `Фильтр для запроса в СС. Например: relationship in ["4","3","23","24","25"]`), _dec(_class = (_class2 = class RelativesComboBoxNode 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);
@@ -97835,6 +97951,7 @@ let RelativesComboBoxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPO
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "selectedLastNamePath", _descriptor5, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "selectedFirstNamePath", _descriptor6, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "selectedMiddleNamePath", _descriptor7, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "queryFilter", _descriptor8, this);
   }
   getOwnPath() {
     return this.dataReference.getOwnPath();
@@ -97874,6 +97991,11 @@ let RelativesComboBoxNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPO
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "queryFilter", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 }), _class2)) || _class);
 
 /***/ }),