@kontur.candy/generator 4.247.0 → 4.248.0-fiasfssvalidations.0

package/dist/index.js

@@ -111822,23 +111822,6 @@ class IterUtils {
     return true;
   }
 
-  static groupBy(iterable, selectKey) {
-    const result = new Map();
-
-    for (const item of iterable) {
-      const key = selectKey(item);
-      const keyList = result.get(key);
-
-      if (keyList == undefined) {
-        result.set(key, [item]);
-      } else {
-        keyList.push(item);
-      }
-    }
-
-    return result;
-  }
-
   static sortBy(items, selector) {
     const result = [...items];
     result.sort((aItem, bItem) => {
@@ -128804,7 +128787,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const referencedFetchFunctions = additionalContent.fetchFunctionSources != undefined ? getReferencedFetchFunctions(additionalContent.fetchFunctionSources) : {};
     const fetchFunctions = new _common_FetchFunctions__WEBPACK_IMPORTED_MODULE_2__.FetchFunctions(referencedFetchFunctions); // tslint:disable-next-line no-unsafe-any
 
-    const additionalSettings = typeof additionalContent.additionalSettings === "string" ? JSON.parse(additionalContent.additionalSettings || "{}") : additionalContent.additionalSettings;
+    const additionalSettings = JSON.parse(additionalContent.additionalSettings || "{}");
     const dataDeclarationGenerator = new _DataDeclarationGenerator_DataDeclarationGenerator__WEBPACK_IMPORTED_MODULE_18__.DataDeclarationGenerator(sugarRoot, new _DataDeclarationGenerator_DataDeclarationInitSourceSequenceFactory__WEBPACK_IMPORTED_MODULE_19__.DataDeclarationInitSourceSequenceFactory(fetchFunctions), controlCustomizationContext, typeRegistry);
     const {
       dataDeclarationContent,
@@ -129218,13 +129201,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "getRequisiteList": () => (/* binding */ getRequisiteList),
 /* harmony export */   "getRequisitesFromEvaluablePropValue": () => (/* binding */ getRequisitesFromEvaluablePropValue),
-/* harmony export */   "getPathsFromEvaluablePropValue": () => (/* binding */ getPathsFromEvaluablePropValue),
 /* harmony export */   "getRequisitesFromEvaluableProps": () => (/* binding */ getRequisitesFromEvaluableProps)
 /* harmony export */ });
 /* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-
 
 
 function getRequisiteList(sugarAst, fetchFunctions) {
@@ -129253,21 +129233,6 @@ function getRequisitesFromEvaluablePropValue(filter) {
 
   return (_filter$match$map$fil = (_filter$match = filter.match(/path([^)]+)/g)) === null || _filter$match === void 0 ? void 0 : _filter$match.map(path => path.slice(6, -1)).filter(path => path.startsWith("@clientInfo") || path.startsWith("@formsClientInfo")).map(path => `${path}.value`)) !== null && _filter$match$map$fil !== void 0 ? _filter$match$map$fil : [];
 }
-function getPathsFromEvaluablePropValue(evaluableProp) {
-  const result = [];
-  const pathRegex = /(?<=path\((?:'|")).*?(?=(?:'|"))/g;
-  const pathList = [...evaluableProp.matchAll(pathRegex)];
-
-  if (pathList.length > 0) {
-    result.push(...pathList.map(x => {
-      var _x$;
-
-      return _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.ModelPath.createFromString((_x$ = x[0]) !== null && _x$ !== void 0 ? _x$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)("Path regexp parse error - unexpected undefined"), "auto");
-    }));
-  }
-
-  return result;
-}
 function getRequisitesFromEvaluableProps(...evaluablePropValues) {
   return evaluablePropValues.filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined).flatMap(getRequisitesFromEvaluablePropValue);
 }
@@ -130502,7 +130467,7 @@ __webpack_require__.r(__webpack_exports__);
 let convertersFromNodeClassMap;
 
 function buildConvertersFromNodeClassMap() {
-  const converters = [_ElementProcessors_FormParts_AddPageButton_AddPageButtonConverter__WEBPACK_IMPORTED_MODULE_11__.AddPageButtonConverter, _ElementProcessors_MultiControls_AddRowButton_AddRowButtonConverter__WEBPACK_IMPORTED_MODULE_12__.AddRowButtonConverter, _ElementProcessors_Layout_Block_BlockConverter__WEBPACK_IMPORTED_MODULE_13__.BlockConverter, _ElementProcessors_Typography_Bold_BoldConverter__WEBPACK_IMPORTED_MODULE_15__.BoldConverter, _ElementProcessors_Layout_Br_BrConverter__WEBPACK_IMPORTED_MODULE_16__.BrConverter, _ElementProcessors_FormParts_Caption_CaptionConverter__WEBPACK_IMPORTED_MODULE_18__.CaptionConverter, _ElementProcessors_ValueEditors_Checkbox_CheckboxConverter__WEBPACK_IMPORTED_MODULE_19__.CheckboxConverter, _ElementProcessors_ControlFlow_Choice_ChoiceConverter__WEBPACK_IMPORTED_MODULE_20__.ChoiceConverter, _ElementProcessors_MultiControls_TableCell_TableCellConverter__WEBPACK_IMPORTED_MODULE_85__.TableCellConverter, _ElementProcessors_ValueEditors_Combobox_ComboBoxConverter__WEBPACK_IMPORTED_MODULE_21__.ComboBoxConverter, _ElementProcessors_FormParts_Content_ContentConverter__WEBPACK_IMPORTED_MODULE_22__.ContentConverter, _ElementProcessors_FormParts_Cross_CrossConverter__WEBPACK_IMPORTED_MODULE_23__.CrossConverter, _ElementProcessors_MultiControls_ColgroupButton_ColgroupButtonConverter__WEBPACK_IMPORTED_MODULE_96__.ColgroupButtonConverter, _ElementProcessors_ValueEditors_Date_DateConverter__WEBPACK_IMPORTED_MODULE_24__.DateConverter, _ElementProcessors_FormParts_DefaultContent_DefaultContentConverter__WEBPACK_IMPORTED_MODULE_25__.DefaultContentConverter, _ElementProcessors_ValueEditors_DiadocSuggestComboBox_DiadocSuggestComboBoxConverter__WEBPACK_IMPORTED_MODULE_26__.DiadocSuggestComboBoxConverter, _ElementProcessors_Typography_Entity_EntityConverter__WEBPACK_IMPORTED_MODULE_27__.EntityConverter, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteConverter__WEBPACK_IMPORTED_MODULE_28__.ExpertNoteConverter, _ElementProcessors_ValueEditors_FileLoader_FileLoaderConverter__WEBPACK_IMPORTED_MODULE_29__.FileLoaderConverter, _ElementProcessors_MultiControls_FilterDateRange_FilterDateRangeConverter__WEBPACK_IMPORTED_MODULE_30__.FilterDateRangeConverter, _ElementProcessors_MultiControls_FilterInput_FilterInputConverter__WEBPACK_IMPORTED_MODULE_31__.FilterInputConverter, _ElementProcessors_MultiControls_FilterList_FilterListConverter__WEBPACK_IMPORTED_MODULE_32__.FilterListConverter, _ElementProcessors_ValueViewers_FIO_FIOConverter__WEBPACK_IMPORTED_MODULE_33__.FIOConverter, _ElementProcessors_Layout_Flexbox_FlexboxConverter__WEBPACK_IMPORTED_MODULE_34__.FlexboxConverter, _ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_36__.FormConverter, _ElementProcessors_FormParts_FormInfo_FormInfoConverter__WEBPACK_IMPORTED_MODULE_37__.FormInfoConverter, _ElementProcessors_Typography_Gray_GrayConverter__WEBPACK_IMPORTED_MODULE_38__.GrayConverter, _ElementProcessors_Layout_GridCol_GridColConverter__WEBPACK_IMPORTED_MODULE_39__.GridColConverter, _ElementProcessors_Layout_GridRow_GridRowConverter__WEBPACK_IMPORTED_MODULE_40__.GridRowConverter, _ElementProcessors_FormParts_Header_HeaderConverter__WEBPACK_IMPORTED_MODULE_41__.HeaderConverter, _ElementProcessors_MultiControls_HeaderMenu_HeaderMenuConverter__WEBPACK_IMPORTED_MODULE_42__.HeaderMenuConverter, _ElementProcessors_Helpers_Help_HelpConverter__WEBPACK_IMPORTED_MODULE_43__.HelpConverter, _ElementProcessors_Helpers_Helpinfo_HelpInfoConverter__WEBPACK_IMPORTED_MODULE_44__.HelpInfoConverter, _ElementProcessors_Typography_Highlight_HighlightConverter__WEBPACK_IMPORTED_MODULE_45__.HighlightConverter, _ElementProcessors_Layout_Hr_HrConverter__WEBPACK_IMPORTED_MODULE_46__.HrConverter, _ElementProcessors_Typography_Icon_IconConverter__WEBPACK_IMPORTED_MODULE_47__.IconConverter, _ElementProcessors_ControlFlow_If_IfConverter__WEBPACK_IMPORTED_MODULE_48__.IfConverter, _ElementProcessors_Layout_Img_ImgConverter__WEBPACK_IMPORTED_MODULE_49__.ImgConverter, _ElementProcessors_ValueEditors_INN_INNConverter__WEBPACK_IMPORTED_MODULE_50__.INNConverter, _ElementProcessors_ValueEditors_Input_InputConverter__WEBPACK_IMPORTED_MODULE_51__.InputConverter, _ElementProcessors_Typography_Italic_ItalicConverter__WEBPACK_IMPORTED_MODULE_52__.ItalicConverter, _ElementProcessors_Layout_ListItem_ListItemConverter__WEBPACK_IMPORTED_MODULE_53__.ListItemConverter, _ElementProcessors_ValueEditors_Kladr_KladrConverter__WEBPACK_IMPORTED_MODULE_54__.KladrConverter, _ElementProcessors_ValueViewers_Linetext_LinetextConverter__WEBPACK_IMPORTED_MODULE_55__.LinetextConverter, _ElementProcessors_Action_Link_LinkConverter__WEBPACK_IMPORTED_MODULE_56__.LinkConverter, _ElementProcessors_Layout_List_ListConverter__WEBPACK_IMPORTED_MODULE_57__.ListConverter, _ElementProcessors_Modal_ModalForm_ModalFormConverter__WEBPACK_IMPORTED_MODULE_58__.ModalFormConverter, _ElementProcessors_Modal_ModalFormLabel_ModalFormLabelConverter__WEBPACK_IMPORTED_MODULE_61__.ModalFormLabelConverter, _ElementProcessors_MultiControls_Multilinefield_MultilineFieldConverter__WEBPACK_IMPORTED_MODULE_62__.MultilineFieldConverter, _ElementProcessors_Helpers_Normativehelp_NormativeHelpConverter__WEBPACK_IMPORTED_MODULE_63__.NormativeHelpConverter, _ElementProcessors_FormParts_Page_PageConverter__WEBPACK_IMPORTED_MODULE_65__.PageConverter, _ElementProcessors_Layout_Pencil_PencilConverter__WEBPACK_IMPORTED_MODULE_66__.PencilConverter, _ElementProcessors_ValueEditors_Picklist_PicklistConverter__WEBPACK_IMPORTED_MODULE_67__.PicklistConverter, _ElementProcessors_ValueEditors_radio_RadioConverter__WEBPACK_IMPORTED_MODULE_68__.RadioConverter, _ElementProcessors_ValueEditors_RadioGroup_RadioGroupConverter__WEBPACK_IMPORTED_MODULE_69__.RadioGroupConverter, _ElementProcessors_MultiControls_RemoveRowButton_RemoveRowButtonConverter__WEBPACK_IMPORTED_MODULE_70__.RemoveRowButtonConverter, _ElementProcessors_ValueEditors_Select_SelectConverter__WEBPACK_IMPORTED_MODULE_71__.SelectConverter, _ElementProcessors_MultiControls_SortRadioGroup_SortRadioGroupConverter__WEBPACK_IMPORTED_MODULE_72__.SortRadioGroupConverter, _ElementProcessors_Layout_Spoiler_SpoilerConverter__WEBPACK_IMPORTED_MODULE_73__.SpoilerConverter, _ElementProcessors_Typography_Strong_StrongConverter__WEBPACK_IMPORTED_MODULE_74__.StrongConverter, _ElementProcessors_Typography_Sub_SubConverter__WEBPACK_IMPORTED_MODULE_75__.SubConverter, _ElementProcessors_Layout_Subheader_SubheaderConverter__WEBPACK_IMPORTED_MODULE_76__.SubheaderConverter, _ElementProcessors_Typography_Sup_SupConverter__WEBPACK_IMPORTED_MODULE_77__.SupConverter, _ElementProcessors_ValueViewers_Text_TextConverter__WEBPACK_IMPORTED_MODULE_86__.TextConverter, _ElementProcessors_ValueEditors_Textarea_TextAreaConverter__WEBPACK_IMPORTED_MODULE_87__.TextAreaConverter, _ElementProcessors_ValueEditors_popupTextArea_PopupTextAreaConverter__WEBPACK_IMPORTED_MODULE_95__.PopupTextAreaConverter, _ElementProcessors_ValueViewers_ValueLength_ValueLengthConverter__WEBPACK_IMPORTED_MODULE_91__.ValueLengthConverter, _ElementProcessors_ControlFlow_VisibilityBlock_VisibilityBlockConverter__WEBPACK_IMPORTED_MODULE_92__.VisibilityBlockConverter, _ElementProcessors_Layout_Warning_WarningConverter__WEBPACK_IMPORTED_MODULE_93__.WarningConverter, _ElementProcessors_Layout_InnerText_InnertextConverter__WEBPACK_IMPORTED_MODULE_10__.InnertextConverter, _ElementProcessors_ControlFlow_Otherwise_OtherwiseConverter__WEBPACK_IMPORTED_MODULE_64__.OtherwiseConverter, _ElementProcessors_ControlFlow_When_WhenConverter__WEBPACK_IMPORTED_MODULE_94__.WhenConverter, _ElementProcessors_FormParts_UnitList_UnitListConverter__WEBPACK_IMPORTED_MODULE_90__.UnitListConverter, _ElementProcessors_FormParts_UnitItem_UnitItemConverter__WEBPACK_IMPORTED_MODULE_89__.UnitItemConverter, _ElementProcessors_Modal_Body_BodyConverter__WEBPACK_IMPORTED_MODULE_14__.BodyConverter, _ElementProcessors_Modal_Footer_FooterConverter__WEBPACK_IMPORTED_MODULE_35__.FooterConverter, _ElementProcessors_Modal_ModalFormConfirm_ModalFormConfirmConverter__WEBPACK_IMPORTED_MODULE_60__.ModalFormConfirmConverter, _ElementProcessors_Modal_ModalFormCancel_ModalFormCancelConverter__WEBPACK_IMPORTED_MODULE_59__.ModalFormCancelConverter, _ElementProcessors_Action_Button_ButtonConverter__WEBPACK_IMPORTED_MODULE_17__.ButtonConverter, _ElementProcessors_FormParts_Tour_TourConverter__WEBPACK_IMPORTED_MODULE_88__.TourConverter, _ElementProcessors_ControlFlow_Switch_SwitchConverter__WEBPACK_IMPORTED_MODULE_78__.SwitchConverter, _ElementProcessors_MultiControls_StickyTable_StickyTableColumnConverter__WEBPACK_IMPORTED_MODULE_83__.StickyTableColumnConverter, _ElementProcessors_MultiControls_CrossfitTable_CrossfitTableColumnConverter__WEBPACK_IMPORTED_MODULE_79__.CrossfitTableColumnConverter, _ElementProcessors_Layout_SimpleTable_SimpleTableColumnConverter__WEBPACK_IMPORTED_MODULE_81__.SimpleTableColumnConverter, _ElementProcessors_MultiControls_CrossfitTable_CrossfitTableConverter__WEBPACK_IMPORTED_MODULE_80__.CrossfitTableConverter, _ElementProcessors_Layout_SimpleTable_SimpleTableConverter__WEBPACK_IMPORTED_MODULE_82__.SimpleTableConverter, _ElementProcessors_MultiControls_StickyTable_StickyTableWithMultilineConverter__WEBPACK_IMPORTED_MODULE_84__.StickyTableWithMultilineConverter, _ElementProcessors_Layout_Stack_StackConverter__WEBPACK_IMPORTED_MODULE_5__.StackConverter, _ElementProcessors_Layout_Grid_GridConverter__WEBPACK_IMPORTED_MODULE_4__.GridConverter, _ElementProcessors_UnitParts_HeaderPanel_HeaderPanelConverter__WEBPACK_IMPORTED_MODULE_9__.HeaderPanelConverter, _ElementProcessors_MultiControls_Tabs_TabsConverter__WEBPACK_IMPORTED_MODULE_8__.TabsConverter, _ElementProcessors_Action_DropdownButton_DropdownButtonConverter__WEBPACK_IMPORTED_MODULE_100__.DropdownButtonConverter, _ElementProcessors_ValueEditors_FiasMvd_FiasMvdConverter__WEBPACK_IMPORTED_MODULE_3__.FiasMvdConverter, _ElementProcessors_ValueEditors_FiasFns_FiasFnsConverter__WEBPACK_IMPORTED_MODULE_0__.FiasFnsConverter, _ElementProcessors_ValueEditors_FiasPfr_FiasPfrConverter__WEBPACK_IMPORTED_MODULE_2__.FiasPfrConverter, _ElementProcessors_ValueEditors_FiasFss_FiasFssConverter__WEBPACK_IMPORTED_MODULE_1__.FiasFssConverter, _ElementProcessors_MultiControls_FilterSelect_FilterSelectConverter__WEBPACK_IMPORTED_MODULE_6__.FilterSelectConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2Converter, _ElementProcessors_MultiControls_Table2_Table2RowConverter__WEBPACK_IMPORTED_MODULE_99__.Table2RowConverter, _ElementProcessors_MultiControls_Table2_Table2MultirowConverter__WEBPACK_IMPORTED_MODULE_98__.Table2MultirowConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2ColumnConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2VerticalColumnConverter, _ElementProcessors_Layout_FixedTabs_FixedTabsConverter__WEBPACK_IMPORTED_MODULE_102__.FixedTabsConverter, _ElementProcessors_Layout_FixedTabs_FixedTabConverter__WEBPACK_IMPORTED_MODULE_101__.FixedTabConverter, _ElementProcessors_MultiControls_Multiple_MultipleConverter__WEBPACK_IMPORTED_MODULE_103__.MultipleConverter, _ElementProcessors_Action_ExcelPastePanel_ExcelPastePanelConverter__WEBPACK_IMPORTED_MODULE_104__.ExcelPastePanelConverter, _ElementProcessors_ValueEditors_ReferencedFields_ReferencedFieldsConverter__WEBPACK_IMPORTED_MODULE_105__.ReferencedFieldsConverter, _ElementProcessors_FormParts_UserPicklist_UserPicklistConverter__WEBPACK_IMPORTED_MODULE_106__.UserPicklistConverter, _ElementProcessors_ValueEditors_TaxRebate_TaxRebateConverter__WEBPACK_IMPORTED_MODULE_107__.TaxRebateConverter];
+  const converters = [_ElementProcessors_FormParts_AddPageButton_AddPageButtonConverter__WEBPACK_IMPORTED_MODULE_11__.AddPageButtonConverter, _ElementProcessors_MultiControls_AddRowButton_AddRowButtonConverter__WEBPACK_IMPORTED_MODULE_12__.AddRowButtonConverter, _ElementProcessors_Layout_Block_BlockConverter__WEBPACK_IMPORTED_MODULE_13__.BlockConverter, _ElementProcessors_Typography_Bold_BoldConverter__WEBPACK_IMPORTED_MODULE_15__.BoldConverter, _ElementProcessors_Layout_Br_BrConverter__WEBPACK_IMPORTED_MODULE_16__.BrConverter, _ElementProcessors_FormParts_Caption_CaptionConverter__WEBPACK_IMPORTED_MODULE_18__.CaptionConverter, _ElementProcessors_ValueEditors_Checkbox_CheckboxConverter__WEBPACK_IMPORTED_MODULE_19__.CheckboxConverter, _ElementProcessors_ControlFlow_Choice_ChoiceConverter__WEBPACK_IMPORTED_MODULE_20__.ChoiceConverter, _ElementProcessors_MultiControls_TableCell_TableCellConverter__WEBPACK_IMPORTED_MODULE_85__.TableCellConverter, _ElementProcessors_ValueEditors_Combobox_ComboBoxConverter__WEBPACK_IMPORTED_MODULE_21__.ComboBoxConverter, _ElementProcessors_FormParts_Content_ContentConverter__WEBPACK_IMPORTED_MODULE_22__.ContentConverter, _ElementProcessors_FormParts_Cross_CrossConverter__WEBPACK_IMPORTED_MODULE_23__.CrossConverter, _ElementProcessors_MultiControls_ColgroupButton_ColgroupButtonConverter__WEBPACK_IMPORTED_MODULE_96__.ColgroupButtonConverter, _ElementProcessors_ValueEditors_Date_DateConverter__WEBPACK_IMPORTED_MODULE_24__.DateConverter, _ElementProcessors_FormParts_DefaultContent_DefaultContentConverter__WEBPACK_IMPORTED_MODULE_25__.DefaultContentConverter, _ElementProcessors_ValueEditors_DiadocSuggestComboBox_DiadocSuggestComboBoxConverter__WEBPACK_IMPORTED_MODULE_26__.DiadocSuggestComboBoxConverter, _ElementProcessors_Typography_Entity_EntityConverter__WEBPACK_IMPORTED_MODULE_27__.EntityConverter, _ElementProcessors_ValueEditors_ExpertNote_ExpertNoteConverter__WEBPACK_IMPORTED_MODULE_28__.ExpertNoteConverter, _ElementProcessors_ValueEditors_FileLoader_FileLoaderConverter__WEBPACK_IMPORTED_MODULE_29__.FileLoaderConverter, _ElementProcessors_MultiControls_FilterDateRange_FilterDateRangeConverter__WEBPACK_IMPORTED_MODULE_30__.FilterDateRangeConverter, _ElementProcessors_MultiControls_FilterInput_FilterInputConverter__WEBPACK_IMPORTED_MODULE_31__.FilterInputConverter, _ElementProcessors_MultiControls_FilterList_FilterListConverter__WEBPACK_IMPORTED_MODULE_32__.FilterListConverter, _ElementProcessors_ValueViewers_FIO_FIOConverter__WEBPACK_IMPORTED_MODULE_33__.FIOConverter, _ElementProcessors_Layout_Flexbox_FlexboxConverter__WEBPACK_IMPORTED_MODULE_34__.FlexboxConverter, _ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_36__.FormConverter, _ElementProcessors_FormParts_FormInfo_FormInfoConverter__WEBPACK_IMPORTED_MODULE_37__.FormInfoConverter, _ElementProcessors_Typography_Gray_GrayConverter__WEBPACK_IMPORTED_MODULE_38__.GrayConverter, _ElementProcessors_Layout_GridCol_GridColConverter__WEBPACK_IMPORTED_MODULE_39__.GridColConverter, _ElementProcessors_Layout_GridRow_GridRowConverter__WEBPACK_IMPORTED_MODULE_40__.GridRowConverter, _ElementProcessors_FormParts_Header_HeaderConverter__WEBPACK_IMPORTED_MODULE_41__.HeaderConverter, _ElementProcessors_MultiControls_HeaderMenu_HeaderMenuConverter__WEBPACK_IMPORTED_MODULE_42__.HeaderMenuConverter, _ElementProcessors_Helpers_Help_HelpConverter__WEBPACK_IMPORTED_MODULE_43__.HelpConverter, _ElementProcessors_Helpers_Helpinfo_HelpInfoConverter__WEBPACK_IMPORTED_MODULE_44__.HelpInfoConverter, _ElementProcessors_Typography_Highlight_HighlightConverter__WEBPACK_IMPORTED_MODULE_45__.HighlightConverter, _ElementProcessors_Layout_Hr_HrConverter__WEBPACK_IMPORTED_MODULE_46__.HrConverter, _ElementProcessors_Typography_Icon_IconConverter__WEBPACK_IMPORTED_MODULE_47__.IconConverter, _ElementProcessors_ControlFlow_If_IfConverter__WEBPACK_IMPORTED_MODULE_48__.IfConverter, _ElementProcessors_Layout_Img_ImgConverter__WEBPACK_IMPORTED_MODULE_49__.ImgConverter, _ElementProcessors_ValueEditors_INN_INNConverter__WEBPACK_IMPORTED_MODULE_50__.INNConverter, _ElementProcessors_ValueEditors_Input_InputConverter__WEBPACK_IMPORTED_MODULE_51__.InputConverter, _ElementProcessors_Typography_Italic_ItalicConverter__WEBPACK_IMPORTED_MODULE_52__.ItalicConverter, _ElementProcessors_Layout_ListItem_ListItemConverter__WEBPACK_IMPORTED_MODULE_53__.ListItemConverter, _ElementProcessors_ValueEditors_Kladr_KladrConverter__WEBPACK_IMPORTED_MODULE_54__.KladrConverter, _ElementProcessors_ValueViewers_Linetext_LinetextConverter__WEBPACK_IMPORTED_MODULE_55__.LinetextConverter, _ElementProcessors_Action_Link_LinkConverter__WEBPACK_IMPORTED_MODULE_56__.LinkConverter, _ElementProcessors_Layout_List_ListConverter__WEBPACK_IMPORTED_MODULE_57__.ListConverter, _ElementProcessors_Modal_ModalForm_ModalFormConverter__WEBPACK_IMPORTED_MODULE_58__.ModalFormConverter, _ElementProcessors_Modal_ModalFormLabel_ModalFormLabelConverter__WEBPACK_IMPORTED_MODULE_61__.ModalFormLabelConverter, _ElementProcessors_MultiControls_Multilinefield_MultilineFieldConverter__WEBPACK_IMPORTED_MODULE_62__.MultilineFieldConverter, _ElementProcessors_Helpers_Normativehelp_NormativeHelpConverter__WEBPACK_IMPORTED_MODULE_63__.NormativeHelpConverter, _ElementProcessors_FormParts_Page_PageConverter__WEBPACK_IMPORTED_MODULE_65__.PageConverter, _ElementProcessors_Layout_Pencil_PencilConverter__WEBPACK_IMPORTED_MODULE_66__.PencilConverter, _ElementProcessors_ValueEditors_Picklist_PicklistConverter__WEBPACK_IMPORTED_MODULE_67__.PicklistConverter, _ElementProcessors_ValueEditors_radio_RadioConverter__WEBPACK_IMPORTED_MODULE_68__.RadioConverter, _ElementProcessors_ValueEditors_RadioGroup_RadioGroupConverter__WEBPACK_IMPORTED_MODULE_69__.RadioGroupConverter, _ElementProcessors_MultiControls_RemoveRowButton_RemoveRowButtonConverter__WEBPACK_IMPORTED_MODULE_70__.RemoveRowButtonConverter, _ElementProcessors_ValueEditors_Select_SelectConverter__WEBPACK_IMPORTED_MODULE_71__.SelectConverter, _ElementProcessors_MultiControls_SortRadioGroup_SortRadioGroupConverter__WEBPACK_IMPORTED_MODULE_72__.SortRadioGroupConverter, _ElementProcessors_Layout_Spoiler_SpoilerConverter__WEBPACK_IMPORTED_MODULE_73__.SpoilerConverter, _ElementProcessors_Typography_Strong_StrongConverter__WEBPACK_IMPORTED_MODULE_74__.StrongConverter, _ElementProcessors_Typography_Sub_SubConverter__WEBPACK_IMPORTED_MODULE_75__.SubConverter, _ElementProcessors_Layout_Subheader_SubheaderConverter__WEBPACK_IMPORTED_MODULE_76__.SubheaderConverter, _ElementProcessors_Typography_Sup_SupConverter__WEBPACK_IMPORTED_MODULE_77__.SupConverter, _ElementProcessors_ValueViewers_Text_TextConverter__WEBPACK_IMPORTED_MODULE_86__.TextConverter, _ElementProcessors_ValueEditors_Textarea_TextAreaConverter__WEBPACK_IMPORTED_MODULE_87__.TextAreaConverter, _ElementProcessors_ValueEditors_popupTextArea_PopupTextAreaConverter__WEBPACK_IMPORTED_MODULE_95__.PopupTextAreaConverter, _ElementProcessors_ValueViewers_ValueLength_ValueLengthConverter__WEBPACK_IMPORTED_MODULE_91__.ValueLengthConverter, _ElementProcessors_ControlFlow_VisibilityBlock_VisibilityBlockConverter__WEBPACK_IMPORTED_MODULE_92__.VisibilityBlockConverter, _ElementProcessors_Layout_Warning_WarningConverter__WEBPACK_IMPORTED_MODULE_93__.WarningConverter, _ElementProcessors_Layout_InnerText_InnertextConverter__WEBPACK_IMPORTED_MODULE_10__.InnertextConverter, _ElementProcessors_ControlFlow_Otherwise_OtherwiseConverter__WEBPACK_IMPORTED_MODULE_64__.OtherwiseConverter, _ElementProcessors_ControlFlow_When_WhenConverter__WEBPACK_IMPORTED_MODULE_94__.WhenConverter, _ElementProcessors_FormParts_UnitList_UnitListConverter__WEBPACK_IMPORTED_MODULE_90__.UnitListConverter, _ElementProcessors_FormParts_UnitItem_UnitItemConverter__WEBPACK_IMPORTED_MODULE_89__.UnitItemConverter, _ElementProcessors_Modal_Body_BodyConverter__WEBPACK_IMPORTED_MODULE_14__.BodyConverter, _ElementProcessors_Modal_Footer_FooterConverter__WEBPACK_IMPORTED_MODULE_35__.FooterConverter, _ElementProcessors_Modal_ModalFormConfirm_ModalFormConfirmConverter__WEBPACK_IMPORTED_MODULE_60__.ModalFormConfirmConverter, _ElementProcessors_Modal_ModalFormCancel_ModalFormCancelConverter__WEBPACK_IMPORTED_MODULE_59__.ModalFormCancelConverter, _ElementProcessors_Action_Button_ButtonConverter__WEBPACK_IMPORTED_MODULE_17__.ButtonConverter, _ElementProcessors_FormParts_Tour_TourConverter__WEBPACK_IMPORTED_MODULE_88__.TourConverter, _ElementProcessors_ControlFlow_Switch_SwitchConverter__WEBPACK_IMPORTED_MODULE_78__.SwitchConverter, _ElementProcessors_ControlFlow_Switch_SwitchConverter__WEBPACK_IMPORTED_MODULE_78__.SwitchCaseConverter, _ElementProcessors_ControlFlow_Switch_SwitchConverter__WEBPACK_IMPORTED_MODULE_78__.SwitchDefaultConverter, _ElementProcessors_MultiControls_StickyTable_StickyTableColumnConverter__WEBPACK_IMPORTED_MODULE_83__.StickyTableColumnConverter, _ElementProcessors_MultiControls_CrossfitTable_CrossfitTableColumnConverter__WEBPACK_IMPORTED_MODULE_79__.CrossfitTableColumnConverter, _ElementProcessors_Layout_SimpleTable_SimpleTableColumnConverter__WEBPACK_IMPORTED_MODULE_81__.SimpleTableColumnConverter, _ElementProcessors_MultiControls_CrossfitTable_CrossfitTableConverter__WEBPACK_IMPORTED_MODULE_80__.CrossfitTableConverter, _ElementProcessors_Layout_SimpleTable_SimpleTableConverter__WEBPACK_IMPORTED_MODULE_82__.SimpleTableConverter, _ElementProcessors_MultiControls_StickyTable_StickyTableWithMultilineConverter__WEBPACK_IMPORTED_MODULE_84__.StickyTableWithMultilineConverter, _ElementProcessors_Layout_Stack_StackConverter__WEBPACK_IMPORTED_MODULE_5__.StackConverter, _ElementProcessors_Layout_Grid_GridConverter__WEBPACK_IMPORTED_MODULE_4__.GridConverter, _ElementProcessors_UnitParts_HeaderPanel_HeaderPanelConverter__WEBPACK_IMPORTED_MODULE_9__.HeaderPanelConverter, _ElementProcessors_MultiControls_Tabs_TabsConverter__WEBPACK_IMPORTED_MODULE_8__.TabsConverter, _ElementProcessors_Action_DropdownButton_DropdownButtonConverter__WEBPACK_IMPORTED_MODULE_100__.DropdownButtonConverter, _ElementProcessors_ValueEditors_FiasMvd_FiasMvdConverter__WEBPACK_IMPORTED_MODULE_3__.FiasMvdConverter, _ElementProcessors_ValueEditors_FiasFns_FiasFnsConverter__WEBPACK_IMPORTED_MODULE_0__.FiasFnsConverter, _ElementProcessors_ValueEditors_FiasPfr_FiasPfrConverter__WEBPACK_IMPORTED_MODULE_2__.FiasPfrConverter, _ElementProcessors_ValueEditors_FiasFss_FiasFssConverter__WEBPACK_IMPORTED_MODULE_1__.FiasFssConverter, _ElementProcessors_MultiControls_FilterSelect_FilterSelectConverter__WEBPACK_IMPORTED_MODULE_6__.FilterSelectConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2Converter, _ElementProcessors_MultiControls_Table2_Table2RowConverter__WEBPACK_IMPORTED_MODULE_99__.Table2RowConverter, _ElementProcessors_MultiControls_Table2_Table2MultirowConverter__WEBPACK_IMPORTED_MODULE_98__.Table2MultirowConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2ColumnConverter, _ElementProcessors_MultiControls_Table2_Table2Converter__WEBPACK_IMPORTED_MODULE_7__.Table2VerticalColumnConverter, _ElementProcessors_Layout_FixedTabs_FixedTabsConverter__WEBPACK_IMPORTED_MODULE_102__.FixedTabsConverter, _ElementProcessors_Layout_FixedTabs_FixedTabConverter__WEBPACK_IMPORTED_MODULE_101__.FixedTabConverter, _ElementProcessors_MultiControls_Multiple_MultipleConverter__WEBPACK_IMPORTED_MODULE_103__.MultipleConverter, _ElementProcessors_Action_ExcelPastePanel_ExcelPastePanelConverter__WEBPACK_IMPORTED_MODULE_104__.ExcelPastePanelConverter, _ElementProcessors_ValueEditors_ReferencedFields_ReferencedFieldsConverter__WEBPACK_IMPORTED_MODULE_105__.ReferencedFieldsConverter, _ElementProcessors_FormParts_UserPicklist_UserPicklistConverter__WEBPACK_IMPORTED_MODULE_106__.UserPicklistConverter, _ElementProcessors_ValueEditors_TaxRebate_TaxRebateConverter__WEBPACK_IMPORTED_MODULE_107__.TaxRebateConverter];
   return new Map(converters.map(converterClass => [converterClass.getAcceptNodeClass(), converterClass]));
 }
 
@@ -132593,11 +132558,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../common/ConditionUtils */ "./Generator/src/common/ConditionUtils.ts");
 /* harmony import */ var _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../../../Common/KCLangRuntimeUtils */ "./Common/KCLangRuntimeUtils.ts");
 /* harmony import */ var _RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../RequisiteLIst/requisiteList */ "./Generator/src/generators/RequisiteLIst/requisiteList.ts");
-/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
-/* harmony import */ var _ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/PathHelper */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/PathHelper.ts");
-/* harmony import */ var _IfNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./IfNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If/IfNode.ts");
-
+/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _IfNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./IfNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If/IfNode.ts");
 
 
 
@@ -132610,76 +132573,26 @@ __webpack_require__.r(__webpack_exports__);
 
 class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode;
+    return _IfNode__WEBPACK_IMPORTED_MODULE_9__.IfNode;
   }
 
   doGetRequisites() {
-    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
+    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_9__.IfNode);
     return (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__.getRequisitesFromEvaluableProps)(node.condition);
   }
 
-  getDepsWithResolvedPath(condition, evaluatorsContextPathExpression) {
-    const deps = (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__.getPathsFromEvaluablePropValue)(condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)());
-    return deps.filter(p => !p.toLegacyPath().startsWith("@")).map(x => evaluatorsContextPathExpression.toCurrentIteration().joinWith(x));
-  }
-
-  buildChildrenValidations(validationGenerator) {
-    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
-
-    if (node.then != undefined) {
-      const evaluatorsContextPathExpression = this.getEvaluatorsContextPathExpression();
-      const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__.convertConditionToJsOrFailWithFriendlySugarError)(this.getCondition(node), "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_9__.extractPath)(x => x.condition));
-      const condition = conditionWithDependencies.condition;
-      const deps = this.getDepsWithResolvedPath(condition, evaluatorsContextPathExpression);
-      validationGenerator.pushVisibilityCondition([condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)(), evaluatorsContextPathExpression, deps]);
-
-      try {
-        super.buildChildrenValidations(validationGenerator, Iterator.from(node.then.children));
-      } finally {
-        validationGenerator.popVisibilityCondition();
-      }
-
-      if (node.else != undefined) {
-        validationGenerator.pushVisibilityCondition(["!(" + (condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)()) + ")", evaluatorsContextPathExpression, this.getDepsWithResolvedPath(condition, evaluatorsContextPathExpression)]);
-
-        try {
-          super.buildChildrenValidations(validationGenerator, Iterator.from(node.else.children));
-        } finally {
-          validationGenerator.popVisibilityCondition();
-        }
-      }
-    } else {
-      const evaluatorsContextPathExpression = this.getEvaluatorsContextPathExpression();
-      const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__.convertConditionToJsOrFailWithFriendlySugarError)(this.getCondition(node), "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_9__.extractPath)(x => x.condition));
-      const condition = conditionWithDependencies.condition;
-      validationGenerator.pushVisibilityCondition([condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)(), evaluatorsContextPathExpression, this.getDepsWithResolvedPath(condition, evaluatorsContextPathExpression)]);
-
-      try {
-        super.buildChildrenValidations(validationGenerator);
-      } finally {
-        validationGenerator.popVisibilityCondition();
-      }
-    }
-  }
-
-  getCondition(node) {
-    var _node$condition;
-
-    return node.isIndividual === undefined ? (_node$condition = node.condition) !== null && _node$condition !== void 0 ? _node$condition : "" : `path("@settings/isIndividual") === ${node.isIndividual}`;
-  }
-
   doBuildDataDeclaration(context) {
     return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
   }
 
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
+    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_9__.IfNode);
     return context.processChildrenDataDeclaration(node.children, x => {
-      if (x instanceof _IfNode__WEBPACK_IMPORTED_MODULE_10__.ThenNode) {
+      if (x instanceof _IfNode__WEBPACK_IMPORTED_MODULE_9__.ThenNode) {
         return context.processChildrenDataDeclaration(x.children);
       }
 
-      if (x instanceof _IfNode__WEBPACK_IMPORTED_MODULE_10__.ElseNode) {
+      if (x instanceof _IfNode__WEBPACK_IMPORTED_MODULE_9__.ElseNode) {
         return context.processChildrenDataDeclaration(x.children);
       }
 
@@ -132688,12 +132601,12 @@ class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sugar
   }
 
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
+    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_9__.IfNode);
 
     for (const child of node.children) {
-      if (child instanceof _IfNode__WEBPACK_IMPORTED_MODULE_10__.ThenNode) {
+      if (child instanceof _IfNode__WEBPACK_IMPORTED_MODULE_9__.ThenNode) {
         yield* child.children;
-      } else if (child instanceof _IfNode__WEBPACK_IMPORTED_MODULE_10__.ElseNode) {
+      } else if (child instanceof _IfNode__WEBPACK_IMPORTED_MODULE_9__.ElseNode) {
         yield* child.children;
       } else {
         yield child;
@@ -132704,10 +132617,10 @@ class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sugar
   doConvert(context) {
     var _node$then, _node$else;
 
-    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
+    const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_9__.IfNode);
     const builder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("If");
 
-    if (node.isIndividual == undefined && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.isNullOrWhiteSpace)(node.condition)) {
+    if (node.isIndividual == undefined && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_8__.isNullOrWhiteSpace)(node.condition)) {
       throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarAttributeReadError(`ifnode должна иметь свойство condition или isIndividual`, node, "condition");
     }
 
@@ -132715,19 +132628,19 @@ class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sugar
       throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarAttributeReadError(`Выберите или condition или isIndividual`, node, "condition");
     }
 
-    const condition = node.isIndividual === undefined ? node.condition : `path("@settings/isIndividual") === '${node.isIndividual}'`;
-    const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__.convertConditionToJsOrFailWithFriendlySugarError)(condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)(), "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__.KCLangRuntimeUtils.kcLangUtilsName, node, "condition");
+    const condition = node.isIndividual !== undefined ? `path("@settings/isIndividual") === '${node.isIndividual}'` : node.condition;
+    const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__.convertConditionToJsOrFailWithFriendlySugarError)(condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_8__.reject)(), "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__.KCLangRuntimeUtils.kcLangUtilsName, node, "condition");
     const thenBuilder = builder.createChild("Then");
     thenBuilder.appendChild(context.convertChildNodes(((_node$then = node.then) !== null && _node$then !== void 0 ? _node$then : node).children));
     thenBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
-    thenBuilder.prop(x => x.positiveCondition).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_8__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies));
+    thenBuilder.prop(x => x.positiveCondition).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies));
 
     if (((_node$else = node.else) === null || _node$else === void 0 ? void 0 : _node$else.children) !== undefined) {
       var _node$else2;
 
       const elseBuilder = builder.createChild("Else");
       elseBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
-      elseBuilder.prop(x => x.positiveCondition).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_8__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies));
+      elseBuilder.prop(x => x.positiveCondition).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies));
       elseBuilder.appendChild(context.convertChildNodes((_node$else2 = node.else) === null || _node$else2 === void 0 ? void 0 : _node$else2.children));
     }
 
@@ -132934,6 +132847,8 @@ let OtherwiseNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MOD
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "SwitchDefaultConverter": () => (/* binding */ SwitchDefaultConverter),
+/* harmony export */   "SwitchCaseConverter": () => (/* binding */ SwitchCaseConverter),
 /* harmony export */   "SwitchConverter": () => (/* binding */ SwitchConverter)
 /* harmony export */ });
 /* harmony import */ var _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../DataDeclarationGenerator/DataDeclarationGenerationContext */ "./Generator/src/generators/DataDeclarationGenerator/DataDeclarationGenerationContext.ts");
@@ -132943,26 +132858,86 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../../Common/KCLangRuntimeUtils */ "./Common/KCLangRuntimeUtils.ts");
 /* harmony import */ var _ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/PathHelper */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/PathHelper.ts");
 /* harmony import */ var _RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../RequisiteLIst/requisiteList */ "./Generator/src/generators/RequisiteLIst/requisiteList.ts");
-/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
-/* harmony import */ var _SwitchNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./SwitchNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/Switch/SwitchNode.ts");
+/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
+/* harmony import */ var _SwitchNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./SwitchNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/Switch/SwitchNode.ts");
+
+
+
+
 
 
 
 
 
+class SwitchDefaultConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
+  static getAcceptNodeClass() {
+    return _SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchDefaultNode;
+  }
+
+  doBuildDataDeclaration(context) {
+    return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
+  }
+
+  buildChildrenDataDeclaration(context) {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchDefaultNode);
+    return context.processChildrenDataDeclaration(node.children);
+  }
+
+  *doTraverseChildren() {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchDefaultNode);
+    yield* node.children;
+  }
+
+  doConvert(context) {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchDefaultNode);
+    const builder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("SwitchDefault");
+    builder.appendChild(context.convertChildNodes(node.children));
+    return builder.buildConverterResult();
+  }
+
+}
+class SwitchCaseConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
+  static getAcceptNodeClass() {
+    return _SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchCaseNode;
+  }
+
+  doBuildDataDeclaration(context) {
+    return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
+  }
 
+  buildChildrenDataDeclaration(context) {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchCaseNode);
+    return context.processChildrenDataDeclaration(node.children);
+  }
 
+  doGetRequisites() {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchCaseNode);
+    return (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__.getRequisitesFromEvaluableProps)(node.condition);
+  }
 
+  *doTraverseChildren() {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchCaseNode);
+    yield* node.children;
+  }
 
+  doConvert(context) {
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchCaseNode);
+    const builder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("SwitchCase");
+    const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_3__.convertConditionToJsOrFailWithFriendlySugarError)(node.condition, "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_4__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_5__.extractPath)(x => x.condition));
+    builder.prop(x => x.condition).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies));
+    builder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
+    builder.appendChild(context.convertChildNodes(node.children));
+    return builder.buildConverterResult();
+  }
 
+}
 class SwitchConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode;
+    return _SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchNode;
   }
 
   doGetRequisites() {
-    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode);
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchNode);
     return node.cases.flatMap(x => (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__.getRequisitesFromEvaluableProps)(x.condition));
   }
 
@@ -132973,12 +132948,12 @@ class SwitchConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.S
   buildChildrenDataDeclaration(context) {
     var _node$default, _node$default2;
 
-    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode);
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchNode);
     return context.mergeDataDeclaration(...node.cases.map(x => context.processChildrenDataDeclaration(x.children)).flat(), ((_node$default = node.default) === null || _node$default === void 0 ? void 0 : _node$default.children) && context.processChildrenDataDeclaration((_node$default2 = node.default) === null || _node$default2 === void 0 ? void 0 : _node$default2.children));
   }
 
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode);
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchNode);
     yield* node.cases;
 
     if (node.default != undefined) {
@@ -132986,46 +132961,8 @@ class SwitchConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.S
     }
   }
 
-  getDepsWithResolvedPath(condition, evaluatorsContextPathExpression) {
-    const deps = (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_6__.getPathsFromEvaluablePropValue)(condition !== null && condition !== void 0 ? condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)());
-    return deps.filter(p => !p.toLegacyPath().startsWith("@")).map(x => evaluatorsContextPathExpression.toCurrentIteration().joinWith(x));
-  }
-
-  buildChildrenValidations(validationGenerator) {
-    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode);
-    const evaluatorsContextPathExpression = this.getEvaluatorsContextPathExpression();
-    const prevConditions = [];
-
-    for (const caseNode of node.cases) {
-      const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_3__.convertConditionToJsOrFailWithFriendlySugarError)(caseNode.condition, "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_4__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_5__.extractPath)(x => x.condition));
-      const condition = conditionWithDependencies.condition;
-      const currentCaseCondition = prevConditions.length ? prevConditions.map(x => `!(${x})`).join(" && ") + " && " + condition : condition;
-      const deps = this.getDepsWithResolvedPath(currentCaseCondition, evaluatorsContextPathExpression);
-      prevConditions.push(currentCaseCondition);
-      validationGenerator.pushVisibilityCondition([currentCaseCondition, evaluatorsContextPathExpression, deps]);
-
-      try {
-        super.buildChildrenValidations(validationGenerator, Iterator.from(caseNode.children));
-      } finally {
-        validationGenerator.popVisibilityCondition();
-      }
-    }
-
-    if (node.default != undefined) {
-      const defaultCondition = prevConditions.map(x => `!(${x})`).join(" && ");
-      const deps = this.getDepsWithResolvedPath(defaultCondition, evaluatorsContextPathExpression);
-      validationGenerator.pushVisibilityCondition([defaultCondition, evaluatorsContextPathExpression, deps]);
-
-      try {
-        super.buildChildrenValidations(validationGenerator, Iterator.from(node.default.children));
-      } finally {
-        validationGenerator.popVisibilityCondition();
-      }
-    }
-  }
-
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_9__.SwitchNode);
+    const node = this.getCurrentNodeAs(_SwitchNode__WEBPACK_IMPORTED_MODULE_8__.SwitchNode);
     const builder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("Switch");
     const prevConditions = [];
 
@@ -133033,7 +132970,7 @@ class SwitchConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.S
       const caseBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("SwitchCase");
       caseBuilder.prop(x => x.prevCaseConditions).set([...prevConditions]);
       const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_3__.convertConditionToJsOrFailWithFriendlySugarError)(caseNode.condition, "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_4__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_5__.extractPath)(x => x.condition));
-      const currentCaseCondition = (0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_8__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies);
+      const currentCaseCondition = (0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_7__.buildExpressionPropValue)(conditionWithDependencies.condition, conditionWithDependencies.dependencies);
       caseBuilder.prop(x => x.condition).set(currentCaseCondition);
       prevConditions.push(currentCaseCondition);
       caseBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
@@ -146834,7 +146771,7 @@ class CheckboxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_CheckboxNode__WEBPACK_IMPORTED_MODULE_5__.CheckboxNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -147045,7 +146982,7 @@ class ComboBoxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_ComboBoxNode__WEBPACK_IMPORTED_MODULE_6__.ComboBoxNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription);
   }
 
   doGetRequisites() {
@@ -147549,7 +147486,7 @@ class DateConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__.Sug
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_DateNode__WEBPACK_IMPORTED_MODULE_6__.DateNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   get nodePaths() {
@@ -147773,7 +147710,7 @@ class DiadocSuggestComboBoxConverter extends _SugarNodeConverter__WEBPACK_IMPORT
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_DiadocSuggestComboBoxNode__WEBPACK_IMPORTED_MODULE_5__.DiadocSuggestComboBoxNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   get nodePaths() {
@@ -147956,7 +147893,7 @@ class ExpertNoteConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_ExpertNoteNode__WEBPACK_IMPORTED_MODULE_3__.ExpertNoteNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -148301,6 +148238,8 @@ class FiasFssConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("FiasFss");
     markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_0__.getNewBindingPathExpression)(node));
     markupBuilder.prop(x => x.postalTransfer).set(node.postalTransfer);
+    markupBuilder.prop(x => x.optionalIndex).set(node.optionalIndex || false);
+    markupBuilder.prop(x => x.optionalAddress).set(node.optionalAddress || false);
     return markupBuilder.buildConverterResult();
   }
 
@@ -148331,17 +148270,21 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
 
 
 
-let FiasFssNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("fiasfss", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/FiasFss sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("postalTransfer", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, "Адрес для перевода выплаты по почте"), _dec(_class = (_class2 = class FiasFssNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
+let FiasFssNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("fiasfss", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/FiasFss sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("postalTransfer", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, "Адрес для перевода выплаты по почте"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("optionalIndex", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, "Опциональный индекс. По умолчание - false (не опциональный)"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("optionalAddress", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, "Опциональный Адрес. По умолчание - false (не опциональный)"), _dec(_class = (_class2 = class FiasFssNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataBinding", _descriptor, this);
 
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "postalTransfer", _descriptor2, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "optionalIndex", _descriptor3, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "optionalAddress", _descriptor4, this);
   }
 
   getOwnPath() {
@@ -148358,6 +148301,16 @@ let FiasFssNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODUL
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "optionalIndex", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "optionalAddress", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 
 /***/ }),
@@ -149189,7 +149142,7 @@ class INNConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__.Suga
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_INNNode__WEBPACK_IMPORTED_MODULE_3__.INNNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -149347,7 +149300,7 @@ class InputConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Su
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_InputNode__WEBPACK_IMPORTED_MODULE_7__.InputNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -150060,7 +150013,7 @@ class KladrConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_5__.Su
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_7__.KladrNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   buildSugarAutoCalculations() {
@@ -150388,7 +150341,7 @@ class PicklistConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_PicklistNode__WEBPACK_IMPORTED_MODULE_6__.PicklistNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription);
   }
 
   *doBuildNormalizeRules(builder) {
@@ -150844,7 +150797,7 @@ class RadioGroupConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_RadioGroupNode__WEBPACK_IMPORTED_MODULE_4__.RadioGroupNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildNormalizeRules(builder) {
@@ -151211,7 +151164,7 @@ class SelectConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.S
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_SelectNode__WEBPACK_IMPORTED_MODULE_6__.SelectNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), node.gId, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -151607,7 +151560,7 @@ class TaxRebateConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3_
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_TaxRebateNode__WEBPACK_IMPORTED_MODULE_7__.TaxRebateNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -151809,7 +151762,7 @@ class TextAreaConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_TextAreaNode__WEBPACK_IMPORTED_MODULE_7__.TextAreaNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -152078,7 +152031,7 @@ class PopupTextAreaConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_PopupTextAreaNode__WEBPACK_IMPORTED_MODULE_6__.PopupTextAreaNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -152508,9 +152461,9 @@ class FIOConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Suga
     const node1 = new _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.TypeNode();
     node1.children = [m1, m2];
     node1.base = "string";
-    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Фамилия"), false, node1, undefined, node.emptydescription, undefined);
-    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Имя"), false, node1, undefined, node.emptydescription, undefined);
-    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Отчество"), true, node1, undefined, node.emptydescription, undefined);
+    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Фамилия"), false, node1, undefined, node.emptydescription);
+    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Имя"), false, node1, undefined, node.emptydescription);
+    validationGenerator.processValidations((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_4__.getBindingPathWithSuffix)(node, "Отчество"), true, node1, undefined, node.emptydescription);
   }
 
   doBuildDataDeclaration(context) {
@@ -152916,7 +152869,7 @@ class TextConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Sug
 
   doBuildNodeValidations(validationGenerator) {
     const node = this.getCurrentNodeAs(_TextNode__WEBPACK_IMPORTED_MODULE_9__.TextNode);
-    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
+    validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription);
   }
 
   doBuildNormalizeRules() {
@@ -155680,8 +155633,8 @@ class SugarNodeConverterBase {
     return SugarNodeConverterBase.deserializeNodeAs(nodeClass, sourceXmlNode !== null && sourceXmlNode !== void 0 ? sourceXmlNode : this.node);
   }
 
-  buildChildrenValidations(validationGenerator, children) {
-    for (const child of children !== null && children !== void 0 ? children : this.doTraverseChildren()) {
+  buildChildrenValidations(validationGenerator) {
+    for (const child of this.doTraverseChildren()) {
       const controlConverterClass = (0,_AllConverters__WEBPACK_IMPORTED_MODULE_3__.getConverterByNodeClass)((0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_7__.getNodeClass)(child));
 
       if (controlConverterClass == undefined) {
@@ -155694,7 +155647,7 @@ class SugarNodeConverterBase {
 
           if (customControl != undefined) {
             const childNode = child.sourceXmlNode;
-            validationGenerator.processValidations(this.getResolvedBindingPath(child), childNode.boolAttr("optional"), validationGenerator.getTypeNodeLegacy(childNode), undefined, undefined, undefined);
+            validationGenerator.processValidations(this.getResolvedBindingPath(child), childNode.boolAttr("optional"), validationGenerator.getTypeNodeLegacy(childNode), undefined, undefined);
           }
         }
 
@@ -157704,25 +157657,23 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "ValidationGenerator": () => (/* binding */ ValidationGenerator)
 /* harmony export */ });
-/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
-/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../common/CodeGeneration/ClassInstanceBuilder */ "./Generator/src/common/CodeGeneration/ClassInstanceBuilder.ts");
-/* harmony import */ var _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../common/XmlParser/XmlNode */ "./Generator/src/common/XmlParser/XmlNode.ts");
-/* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
-/* harmony import */ var _Common_PathConstants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../Common/PathConstants */ "./Common/PathConstants.ts");
-/* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
-/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_AttachmentsValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/AttachmentsValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/AttachmentsValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_CustomValidationValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/CustomValidationValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/CustomValidationValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_NumberLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/NumberLengthConstraintValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/NumberLengthConstraintValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_DigestCheckValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/DigestCheckValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/DigestCheckValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_EnumerationValidatorGenerator__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/EnumerationValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/EnumerationValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_IntegerRangeValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/IntegerRangeValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/IntegerRangeValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_MatchOneOfPatternValidatorGenerator__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/MatchOneOfPatternValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/MatchOneOfPatternValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_StringLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/StringLengthConstraintValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/StringLengthConstraintValueValidatorGenerator.ts");
-/* harmony import */ var _TypeBasedValidatorGenerators_DigestConditionValidatorGenerator__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/DigestConditionValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/DigestConditionValidatorGenerator.ts");
-
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../common/CodeGeneration/ClassInstanceBuilder */ "./Generator/src/common/CodeGeneration/ClassInstanceBuilder.ts");
+/* harmony import */ var _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../common/XmlParser/XmlNode */ "./Generator/src/common/XmlParser/XmlNode.ts");
+/* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
+/* harmony import */ var _Common_PathConstants__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../Common/PathConstants */ "./Common/PathConstants.ts");
+/* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
+/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_AttachmentsValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/AttachmentsValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/AttachmentsValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_CustomValidationValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/CustomValidationValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/CustomValidationValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_NumberLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/NumberLengthConstraintValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/NumberLengthConstraintValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_DigestCheckValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/DigestCheckValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/DigestCheckValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_EnumerationValidatorGenerator__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/EnumerationValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/EnumerationValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_IntegerRangeValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/IntegerRangeValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/IntegerRangeValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_MatchOneOfPatternValidatorGenerator__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/MatchOneOfPatternValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/MatchOneOfPatternValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_StringLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/StringLengthConstraintValueValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/StringLengthConstraintValueValidatorGenerator.ts");
+/* harmony import */ var _TypeBasedValidatorGenerators_DigestConditionValidatorGenerator__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./TypeBasedValidatorGenerators/DigestConditionValidatorGenerator */ "./Generator/src/generators/validationGenerator/TypeBasedValidatorGenerators/DigestConditionValidatorGenerator.ts");
 
 
 
@@ -157742,7 +157693,7 @@ __webpack_require__.r(__webpack_exports__);
 
 class ValidationGenerator {
   constructor(sugarRoot, typesRegistry, controlCustomizationContext, schemaRng, useSchemaValidations, validationsContent = []) {
-    this.typeBasedValidatorGenerators = [_TypeBasedValidatorGenerators_MatchOneOfPatternValidatorGenerator__WEBPACK_IMPORTED_MODULE_15__.MatchOneOfPatternValidatorGenerator, _TypeBasedValidatorGenerators_EnumerationValidatorGenerator__WEBPACK_IMPORTED_MODULE_13__.EnumerationValidatorGenerator, _TypeBasedValidatorGenerators_StringLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_16__.StringLengthConstraintValueValidatorGenerator, _TypeBasedValidatorGenerators_NumberLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_11__.NumberLengthConstraintValueValidatorGenerator, _TypeBasedValidatorGenerators_IntegerRangeValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_14__.IntegerRangeValueValidatorGenerator, _TypeBasedValidatorGenerators_DigestCheckValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_12__.DigestCheckValueValidatorGenerator, _TypeBasedValidatorGenerators_DigestConditionValidatorGenerator__WEBPACK_IMPORTED_MODULE_17__.DigestConditionValidatorGenerator, _TypeBasedValidatorGenerators_AttachmentsValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_9__.AttachmentsValueValidatorGenerator, _TypeBasedValidatorGenerators_CustomValidationValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_10__.CustomValidationValueValidatorGenerator];
+    this.typeBasedValidatorGenerators = [_TypeBasedValidatorGenerators_MatchOneOfPatternValidatorGenerator__WEBPACK_IMPORTED_MODULE_14__.MatchOneOfPatternValidatorGenerator, _TypeBasedValidatorGenerators_EnumerationValidatorGenerator__WEBPACK_IMPORTED_MODULE_12__.EnumerationValidatorGenerator, _TypeBasedValidatorGenerators_StringLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_15__.StringLengthConstraintValueValidatorGenerator, _TypeBasedValidatorGenerators_NumberLengthConstraintValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_10__.NumberLengthConstraintValueValidatorGenerator, _TypeBasedValidatorGenerators_IntegerRangeValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_13__.IntegerRangeValueValidatorGenerator, _TypeBasedValidatorGenerators_DigestCheckValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_11__.DigestCheckValueValidatorGenerator, _TypeBasedValidatorGenerators_DigestConditionValidatorGenerator__WEBPACK_IMPORTED_MODULE_16__.DigestConditionValidatorGenerator, _TypeBasedValidatorGenerators_AttachmentsValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_8__.AttachmentsValueValidatorGenerator, _TypeBasedValidatorGenerators_CustomValidationValueValidatorGenerator__WEBPACK_IMPORTED_MODULE_9__.CustomValidationValueValidatorGenerator];
     this.sugarRoot = void 0;
     this.validationsContent = void 0;
     this.customValidations = void 0;
@@ -157752,7 +157703,6 @@ class ValidationGenerator {
     this.controlCustomizationContext = void 0;
     this.useSchemaValidations = void 0;
     this.criterionOfExistenceFromSchemaRng = [];
-    this.visibilityConditionsStack = [];
     this.sugarRoot = sugarRoot;
     this.typesRegistry = typesRegistry;
     this.validationsContent = validationsContent;
@@ -157779,14 +157729,6 @@ class ValidationGenerator {
     this.validations = {};
   }
 
-  pushVisibilityCondition(data) {
-    this.visibilityConditionsStack.push(data);
-  }
-
-  popVisibilityCondition() {
-    this.visibilityConditionsStack.pop();
-  }
-
   getTypeNodeLegacy(childNode) {
     return this.typesRegistry.getTypeNodeLegacy(childNode);
   }
@@ -157800,7 +157742,7 @@ class ValidationGenerator {
       const result = this.typesRegistry.getByName(node.type);
 
       if (result == undefined) {
-        throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarAttributeReadError(`Type with name '${node.type}' not found`, node, "type");
+        throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_2__.SugarAttributeReadError(`Type with name '${node.type}' not found`, node, "type");
       }
 
       return result;
@@ -157818,14 +157760,13 @@ class ValidationGenerator {
     var _getConverterByNodeCl;
 
     const sugarNode = this.sugarRoot;
-    const converterType = (_getConverterByNodeCl = (0,_markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_6__.getConverterByNodeClass)((0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.getNodeClass)(sugarNode))) !== null && _getConverterByNodeCl !== void 0 ? _getConverterByNodeCl : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)(`Converter for root node must be defined`);
+    const converterType = (_getConverterByNodeCl = (0,_markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_5__.getConverterByNodeClass)((0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.getNodeClass)(sugarNode))) !== null && _getConverterByNodeCl !== void 0 ? _getConverterByNodeCl : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)(`Converter for root node must be defined`);
     const converter = new converterType(sugarNode);
     converter.buildValidations(this);
-    let result = `
-            function validationFunctions({ Engine: { ValidationHelper, Validators }, ap, current, each, kcLangUtils }) {
+    let result = `function validationFunctions({ Engine: { ValidationHelper, Validators } }) {
                 const t = str => x => x.translate(str);
                 return {
-                ${Object.keys(this.validations).map(x => `["${x}"]: ${this.generateValidation(this.validations[x])}`).join(",")}
+                    ${Object.keys(this.validations).map(x => `["${x}"]: ${this.generateValidation(this.validations[x])}`).join(",")}
                 };
             }`; // '\u0424' -> 'Ф'
 
@@ -157836,11 +157777,11 @@ class ValidationGenerator {
 
   modelPathInstance(target) {
     return `new AbsoluteModelPath([${[...target.getPathParts()].map(x => {
-      if (x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.PathTokens.each) {
+      if (x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.PathTokens.each) {
         return "PathTokens.each";
       }
 
-      if (x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.PathTokens.current) {
+      if (x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.PathTokens.current) {
         return "PathTokens.current";
       }
 
@@ -157894,7 +157835,7 @@ class ValidationGenerator {
       const checkNodes = sugarTypeNode.flattenTypeCheckNodes().filter(x => !processedNodeTypes.has(x.name));
       let typeCheckNodes = [...checkNodes];
 
-      while ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isLengthGreaterThenOrEqual)(typeCheckNodes, 1)) {
+      while ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isLengthGreaterThenOrEqual)(typeCheckNodes, 1)) {
         const currentNode = typeCheckNodes[0];
         const generator = this.getGeneratorByNode(currentNode);
         const acceptNodes = typeCheckNodes.filter(x => generator.acceptNodeForGroup(x));
@@ -157928,40 +157869,20 @@ class ValidationGenerator {
   }
 
   generateValidation(validationInfos) {
-    const groupedValidationInfos = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.groupBy(validationInfos !== null && validationInfos !== void 0 ? validationInfos : [], x => x.conditions.map(z => z[0]).join(""));
-    return "[" + [...groupedValidationInfos.values()].map(validationInfoGroup => {
-      var _validationInfoGroup$, _validationInfoGroup$2;
-
-      const conditions = (_validationInfoGroup$ = (_validationInfoGroup$2 = validationInfoGroup[0]) === null || _validationInfoGroup$2 === void 0 ? void 0 : _validationInfoGroup$2.conditions) !== null && _validationInfoGroup$ !== void 0 ? _validationInfoGroup$ : [];
-      const validator = this.generateCompositeValidation(validationInfoGroup);
-      const generatedConditions = "[" + conditions.map(x => {
-        const condition = x[0];
-        const context = x[1];
-        const deps = x[2];
-        return `[path => ${condition}, ${absoluteModelPathGenerator(context)}, [${deps.map(absoluteModelPathGenerator).join(", ")}]]`;
-      }).join(",") + "]";
-      return `[
-                        ${generatedConditions},
-                        ${validator}
-                    ]`;
-    }).join(", ") + "]";
-  }
-
-  generateCompositeValidation(validationInfos) {
     var _validationInfos$find, _validationInfos$find2, _ref, _ref2, _ref3, _ref4, _sugarNodeWithBase$ba;
 
     if (validationInfos == undefined) {
-      throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarReadingError("Couldn't generate from empty validation!");
+      throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_2__.SugarReadingError("Couldn't generate from empty validation!");
     }
 
-    const rootValidator = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.CompositeValueValidatorWithForcedValidators");
+    const rootValidator = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.CompositeValueValidatorWithForcedValidators");
     const firstItem = validationInfos[0];
 
     if (firstItem == undefined) {
-      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_7__.InvalidProgramStateError();
+      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_6__.InvalidProgramStateError();
     }
 
-    const bindingPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.convertToAbsolutModelPath)(firstItem.bindingPath);
+    const bindingPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.convertToAbsolutModelPath)(firstItem.bindingPath);
     const rngSchemaNodeType = this.getRngSchemaTypeInfo(bindingPath);
     const sugarOptional = (_validationInfos$find = validationInfos.find(x => x.sugarOptional != undefined)) === null || _validationInfos$find === void 0 ? void 0 : _validationInfos$find.sugarOptional;
     const [isOptional, requiredDependencies] = this.getOptionalWithDependencies(bindingPath, sugarOptional);
@@ -157997,10 +157918,11 @@ class ValidationGenerator {
     rootValidator.set(1, validators);
     rootValidator.set(2, sugarNodeTypeAllValidators.forcedValidators);
     return rootValidator.build();
-  }
+  } // tslint:disable-next-line:cyclomatic-complexity
+
 
   processValidations(bindingPath, sugarOptional, sugarNodeType, gId, highOrderDescription, fileLoaderOptions) {
-    const rngSchemaNodeType = this.getRngSchemaTypeInfo((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.convertToAbsolutModelPath)(bindingPath));
+    const rngSchemaNodeType = this.getRngSchemaTypeInfo((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.convertToAbsolutModelPath)(bindingPath));
 
     if (bindingPath && (sugarNodeType != undefined || rngSchemaNodeType != undefined)) {
       var _this$validations$val;
@@ -158008,7 +157930,7 @@ class ValidationGenerator {
       let validationBindingPath = bindingPath;
 
       if (fileLoaderOptions !== undefined) {
-        validationBindingPath = fileLoaderOptions.multiple ? `${bindingPath}/*/${_Common_PathConstants__WEBPACK_IMPORTED_MODULE_5__.AttachmentInfoPath.toLegacyPath()}` : `${bindingPath}/${_Common_PathConstants__WEBPACK_IMPORTED_MODULE_5__.AttachmentInfoPath.toLegacyPath()}`;
+        validationBindingPath = fileLoaderOptions.multiple ? `${bindingPath}/*/${_Common_PathConstants__WEBPACK_IMPORTED_MODULE_4__.AttachmentInfoPath.toLegacyPath()}` : `${bindingPath}/${_Common_PathConstants__WEBPACK_IMPORTED_MODULE_4__.AttachmentInfoPath.toLegacyPath()}`;
       }
 
       const currentItem = {
@@ -158016,8 +157938,7 @@ class ValidationGenerator {
         sugarOptional: sugarOptional,
         sugarNodeType: sugarNodeType,
         gId: gId,
-        highOrderDescription: highOrderDescription,
-        conditions: [...this.visibilityConditionsStack]
+        highOrderDescription: highOrderDescription
       };
       const validations = (_this$validations$val = this.validations[validationBindingPath]) !== null && _this$validations$val !== void 0 ? _this$validations$val : [];
       this.validations[validationBindingPath] = [currentItem, ...validations];
@@ -158061,14 +157982,14 @@ class ValidationGenerator {
     const generatorClass = this.typeBasedValidatorGenerators.find(x => x.acceptNode(node));
 
     if (generatorClass == undefined) {
-      throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarAttributeReadError("Cannot find validation generator for node", node, "");
+      throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_2__.SugarAttributeReadError("Cannot find validation generator for node", node, "");
     }
 
     return generatorClass.createFromNode(node);
   }
 
   buildRequiredValidator(description) {
-    const requiredValidator = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.RequiredValueValidator");
+    const requiredValidator = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.RequiredValueValidator");
     requiredValidator.set(0, "error");
     requiredValidator.set(1, description);
     return requiredValidator;
@@ -158082,42 +158003,42 @@ class ValidationGenerator {
 
       case "integer":
         {
-          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.IsIntegerValueValidator");
+          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.IsIntegerValueValidator");
           result.set(0, description);
           return result;
         }
 
       case "decimal":
         {
-          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.IsDecimalValueValidator");
+          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.IsDecimalValueValidator");
           result.set(0, description);
           return result;
         }
 
       case "date":
         {
-          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.IsDateValueValidator");
+          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.IsDateValueValidator");
           result.set(0, description);
           return result;
         }
 
       case "gYear":
         {
-          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.IsYearValueValidator");
+          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.IsYearValueValidator");
           result.set(0, description);
           return result;
         }
 
       case "gMonth":
         {
-          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_2__.instanceBuilder)("Validators.IsMonthValueValidator");
+          const result = (0,_common_CodeGeneration_ClassInstanceBuilder__WEBPACK_IMPORTED_MODULE_1__.instanceBuilder)("Validators.IsMonthValueValidator");
           result.set(0, description);
           return result;
         }
 
       default:
         if (typeNode != undefined) {
-          throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_3__.SugarAttributeReadError("Unknown base type name", typeNode, "base");
+          throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_2__.SugarAttributeReadError("Unknown base type name", typeNode, "base");
         } else {
           throw new Error(`Unknown base type name: '${baseName}'`);
         }
@@ -158127,10 +158048,6 @@ class ValidationGenerator {
 
 }
 
-function absoluteModelPathGenerator(path) {
-  return `ap([${path.getPathPartsAsArray().map(x => x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.PathTokens.each ? "each" : x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_8__.PathTokens.current ? "current" : JSON.stringify(x)).join(", ")}])`;
-}
-
 /***/ }),
 
 /***/ "./node_modules/babel-plugin-dynamic-import-node/lib/utils.js":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.247.0",
+  "version": "4.248.0-fiasfssvalidations.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,