@kontur.candy/generator 5.40.0 → 5.40.2

package/dist/index.js

@@ -59847,6 +59847,11 @@ class ModelPathImpl {
     }
     return _PathMatcher__WEBPACK_IMPORTED_MODULE_4__.PathMatcher.match(this.tokens, modelPath.getPathPartsAsArray());
   }
+  startsWith(modelPath) {
+    const thisParts = this.getPathPartsAsArray();
+    const otherParts = modelPath.getPathPartsAsArray();
+    return otherParts.every((value, index) => value === thisParts[index]);
+  }
   *splitByMultiplicity() {
     let lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(this.isAbsolute());
     for (const token of this.tokens) {
@@ -60022,6 +60027,48 @@ class ModelPathBuilder {
 
 /***/ }),
 
+/***/ "./Common/ModelPath/ModelPathHelper.ts":
+/*!*********************************************!*\
+  !*** ./Common/ModelPath/ModelPathHelper.ts ***!
+  \*********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   getMask: () => (/* binding */ getMask),
+/* harmony export */   getMaskWithInstances: () => (/* binding */ getMaskWithInstances),
+/* harmony export */   isAggregationPath: () => (/* binding */ isAggregationPath)
+/* harmony export */ });
+/* harmony import */ var _ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ModelPath */ "./Common/ModelPath/ModelPath.ts");
+
+function isAggregationPath(modelPath) {
+  const tokens = modelPath.getPathPartsAsArray();
+  const lastToken = tokens[tokens.length - 1];
+  return lastToken === "Sum" || lastToken === "Count";
+}
+function getMask(exactPath) {
+  return (0,_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(Iterator.from(exactPath.getPathParts()).map(x => _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isInstanceToken(x) ? _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each : x).toArray());
+}
+function getMaskWithInstances(exactPath) {
+  const reduceResult = Iterator.from(exactPath.getPathParts()).reduce((result, token) => {
+    if (_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isInstanceToken(token) || _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isMultiToken(token)) {
+      result.instances.push(token);
+    }
+    result.tokens.push(_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isInstanceToken(token) ? _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each : token);
+    return result;
+  }, {
+    tokens: [],
+    instances: []
+  });
+  return {
+    mask: (0,_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(reduceResult.tokens),
+    instances: reduceResult.instances
+  };
+}
+
+/***/ }),
+
 /***/ "./Common/ModelPath/PathMatcher.ts":
 /*!*****************************************!*\
   !*** ./Common/ModelPath/PathMatcher.ts ***!
@@ -60271,12 +60318,14 @@ class Set2 {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   AttachmentInfoPath: () => (/* binding */ AttachmentInfoPath),
+/* harmony export */   OptionalSectionFilledFieldName: () => (/* binding */ OptionalSectionFilledFieldName),
 /* harmony export */   UnitLabelPath: () => (/* binding */ UnitLabelPath)
 /* harmony export */ });
 /* harmony import */ var _ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 
 const UnitLabelPath = (0,_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeResolvedModelPath)("label");
 const AttachmentInfoPath = (0,_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeResolvedModelPath)("attachment");
+const OptionalSectionFilledFieldName = "isFilledOptional";
 
 /***/ }),
 
@@ -78661,12 +78710,12 @@ class DataDeclarationGenerationContext {
       [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(node)]: declEntry
     };
   }
-  addPathSectionDeclarationEntry(sugarNode, requisite, skipRequisitesSection = false) {
+  addPathSectionDeclarationEntry(sugarNode, requisite, skipRequisitesSection = false, suffix) {
     const declEntry = {};
     const requisitesMode = skipRequisitesSection ? RequisiteSectionMode.ForceSkip : RequisiteSectionMode.AsRequisiteAttribute;
     declEntry.section = this.getSections(sugarNode, requisite, requisitesMode);
     return {
-      [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(sugarNode)]: declEntry
+      [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(sugarNode, suffix)]: declEntry
     };
   }
   addChildPathSectionDeclarationEntry(sugarNode, childPath, requisite) {
@@ -80830,7 +80879,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function processSugar(formSugarContent, additionalContent, generationOptions) {
   try {
-    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _additionalContent$fo, _additionalContent$fo2, _additionalContent$fo3, _additionalContent$fo4, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _generationOptions$re, _sugarRoot$schemaVali3, _sugarRoot$schemaVali4, _sugarRoot$schemaVali5, _additionalContent$fo5, _additionalContent$fo6;
+    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _additionalContent$fo, _additionalContent$fo2, _additionalContent$fo3, _additionalContent$fo4, _sugarRoot$schemaVali, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _generationOptions$re, _additionalContent$fo5, _additionalContent$fo6;
     const sugarAst = (0,_common_SugarXmlParser_SugarParser__WEBPACK_IMPORTED_MODULE_4__.parseSugar)(formSugarContent, additionalContent.preprocessor || {});
     const serializer = (0,_markupGenerator_SugarNodes_DefaultSugarSerializer__WEBPACK_IMPORTED_MODULE_13__.createDefaultSugarSerializer)();
     const sugarRoot = (0,_markupGenerator_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_14__.strictCastNode)(serializer.deserializeFromSugarXmlNode(sugarAst), _markupGenerator_ElementProcessors_FormParts_Form_FormNode__WEBPACK_IMPORTED_MODULE_11__.FormNode);
@@ -80842,6 +80891,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const useServerCalculations = (_additionalContent$fo = (_additionalContent$fo2 = additionalContent.formJsonSettings) === null || _additionalContent$fo2 === void 0 ? void 0 : _additionalContent$fo2.useServerSideCalculations) !== null && _additionalContent$fo !== void 0 ? _additionalContent$fo : false;
     const useCalculator2 = ((_additionalContent$fo3 = additionalContent.formJsonSettings) === null || _additionalContent$fo3 === void 0 ? void 0 : _additionalContent$fo3.autoCalculationCalculatorImpl) === "calculator2" || ((_additionalContent$fo4 = additionalContent.formJsonSettings) === null || _additionalContent$fo4 === void 0 ? void 0 : _additionalContent$fo4.useServerSideFLangNormalization);
     const useOldCalculator = !useCalculator2 && !useServerCalculations;
+    const useSchemaValidations = (_sugarRoot$schemaVali = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali !== void 0 ? _sugarRoot$schemaVali : true;
     const kcXmlConditions = (_Iterator$from$map$fl = Iterator.from(getImportedKcXmlValidations(sugarRoot, additionalContent)).map(x => {
       var _container$conditions, _container$conditions2;
       const container = formulaReader.readFormulas(x);
@@ -80856,13 +80906,13 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     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 dataDeclarationGenerator = new _DataDeclarationGenerator_DataDeclarationGenerator__WEBPACK_IMPORTED_MODULE_19__.DataDeclarationGenerator(sugarRoot, new _DataDeclarationGenerator_DataDeclarationInitSourceSequenceFactory__WEBPACK_IMPORTED_MODULE_20__.DataDeclarationInitSourceSequenceFactory(fetchFunctions), controlCustomizationContext, typeRegistry, formSchemaRng, (_sugarRoot$schemaVali = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali !== void 0 ? _sugarRoot$schemaVali : false);
+    const dataDeclarationGenerator = new _DataDeclarationGenerator_DataDeclarationGenerator__WEBPACK_IMPORTED_MODULE_19__.DataDeclarationGenerator(sugarRoot, new _DataDeclarationGenerator_DataDeclarationInitSourceSequenceFactory__WEBPACK_IMPORTED_MODULE_20__.DataDeclarationInitSourceSequenceFactory(fetchFunctions), controlCustomizationContext, typeRegistry, formSchemaRng, useSchemaValidations);
     const {
       dataDeclarationContent,
       dataDeclaration
     } = dataDeclarationGenerator.generate();
     const dataDeclarationHelper = new _DataDeclarationGenerator_DataDeclarationGenerationTimeHelper__WEBPACK_IMPORTED_MODULE_26__.DataDeclarationGenerationTimeHelper(dataDeclaration);
-    const validationGenerator = new _validationGenerator_ValidationGenerator__WEBPACK_IMPORTED_MODULE_16__.ValidationGenerator(sugarRoot, typeRegistry, controlCustomizationContext, formSchemaRng, (_sugarRoot$schemaVali2 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali2 !== void 0 ? _sugarRoot$schemaVali2 : false, additionalContent.validationsContent, additionalContent.formJsonSettings);
+    const validationGenerator = new _validationGenerator_ValidationGenerator__WEBPACK_IMPORTED_MODULE_16__.ValidationGenerator(sugarRoot, typeRegistry, controlCustomizationContext, formSchemaRng, useSchemaValidations, additionalContent.validationsContent, additionalContent.formJsonSettings);
     const lazyLoadGenerator = new _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_29__.LazyLoadDeclarationGenerator(sugarRoot, formSchemaRng);
     const lazyLoadGeneratorResult = lazyLoadGenerator.generate();
     const resourcesHash = (_generationOptions$re = generationOptions === null || generationOptions === void 0 ? void 0 : generationOptions.resourcesHash) !== null && _generationOptions$re !== void 0 ? _generationOptions$re : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)("Current generator version requires resources hash");
@@ -80870,15 +80920,15 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const formulaRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_FormulaRulesBuilder__WEBPACK_IMPORTED_MODULE_36__.FormulaRulesBuilder(formSchemaRng, formulas, dataDeclarationHelper, formulaExprConverter);
     const initializationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_InitializationRulesBuilder__WEBPACK_IMPORTED_MODULE_37__.InitializationRulesBuilder(sugarRoot, resourcesHash);
     const lazyLoadingRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_LazyLoadingRulesBuilder__WEBPACK_IMPORTED_MODULE_38__.LazyLoadingRulesBuilder(sugarRoot, lazyLoadGeneratorResult.declaration);
-    const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper, typeRegistry, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false);
-    const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali4 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali4 !== void 0 ? _sugarRoot$schemaVali4 : false);
+    const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper, typeRegistry, useSchemaValidations);
+    const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, useSchemaValidations);
     const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_33__.OptionalSectionRulesBuilder(sugarRoot, dataDeclarationHelper);
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng);
     const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter, validationRulesBuilder);
     const formulaAndInitOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_41__.FormulaAndInitOnlyNormalizationRuleGenerator(sugarRulesBuilder, formulaRulesBuilder, optionalSectionRuleBuilder, formSchemaRng);
     const autoValueForValueByDefaultNormalizationRuleGenerator = new _ServerSideFLangNormalization_Normalizers_AutoValueForValueByDefaultNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_45__.AutoValueForValueByDefaultNormalizationRuleGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng, dataDeclarationHelper);
     const builder = new _FormSourcesBuilder_FormSourcesBuilder__WEBPACK_IMPORTED_MODULE_21__.FormSourcesBuilder(additionalContent.formSourcesPath);
-    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali5 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali5 !== void 0 ? _sugarRoot$schemaVali5 : false);
+    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, useSchemaValidations);
     markupGenerator.generate(sugarRoot, builder);
     builder.addResource("settings.js", (0,_markupGenerator_getSettings__WEBPACK_IMPORTED_MODULE_9__.getSettings)(sugarRoot, additionalContent.gfv, additionalSettings, additionalContent.formJsonSettings));
     builder.addResource("requisiteList.js", (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_24__.getRequisiteList)(sugarRoot, fetchFunctions));
@@ -84519,7 +84569,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../../Engine/src/Engine/Core/PathUtils/PathUtils */ "./Engine/src/Engine/Core/PathUtils/PathUtils.ts");
-/* harmony import */ var _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./BaseRuleBuilder */ "./Generator/src/generators/ServerSideFLangNormalization/RuleBuilders/BaseRuleBuilder.ts");
+/* harmony import */ var _Common_ModelPath_ModelPathHelper__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../../Common/ModelPath/ModelPathHelper */ "./Common/ModelPath/ModelPathHelper.ts");
+/* harmony import */ var _Common_PathConstants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../../../Common/PathConstants */ "./Common/PathConstants.ts");
+/* harmony import */ var _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./BaseRuleBuilder */ "./Generator/src/generators/ServerSideFLangNormalization/RuleBuilders/BaseRuleBuilder.ts");
+
 
 
 
@@ -84528,7 +84581,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_7__.BaseRuleBuilder {
+
+class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_9__.BaseRuleBuilder {
   constructor(sugarRoot, dataDeclarationHelper) {
     super();
     this.sugarRoot = void 0;
@@ -84539,28 +84593,56 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
   buildRulesInternal() {
     const allOptionalSections = this.dataDeclarationHelper.getOptionalSections();
     const section2PathsMap = this.dataDeclarationHelper.getAllPathsBySection();
+    const childrenSectionsByParent = this.getChildrenSectionsByParent();
     const allRules = allOptionalSections.map(x => {
-      var _section2PathsMap$get, _section2PathsMap$get2;
-      const sectionId = x.id;
+      const allDependentSectionIds = this.getDependentSingleSections(x.id, childrenSectionsByParent).map(sectionInfo => sectionInfo.sectionId);
       const targetPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromMask)(x.path, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each);
-      const pathsBySection = (_section2PathsMap$get = (_section2PathsMap$get2 = section2PathsMap.get(sectionId)) === null || _section2PathsMap$get2 === void 0 ? void 0 : _section2PathsMap$get2.values()) !== null && _section2PathsMap$get !== void 0 ? _section2PathsMap$get : [];
+      const pathsBySection = [x.id, ...allDependentSectionIds].flatMap(sectionId => {
+        var _section2PathsMap$get, _section2PathsMap$get2;
+        return [...((_section2PathsMap$get = (_section2PathsMap$get2 = section2PathsMap.get(sectionId)) === null || _section2PathsMap$get2 === void 0 ? void 0 : _section2PathsMap$get2.values()) !== null && _section2PathsMap$get !== void 0 ? _section2PathsMap$get : [])];
+      });
       return this.buildOptionalSectionIsFilledCheckRule(targetPath, pathsBySection);
     }).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined);
     return allRules;
   }
+  getDependentSingleSections(sourceSection, childrenSectionsByParent) {
+    var _childrenSectionsByPa;
+    const childrenSections = ((_childrenSectionsByPa = childrenSectionsByParent.get(sourceSection)) !== null && _childrenSectionsByPa !== void 0 ? _childrenSectionsByPa : []).filter(x => !x.optional && !x.multiple);
+    const nestedSections = childrenSections.flatMap(x => this.getDependentSingleSections(x.sectionId, childrenSectionsByParent));
+    return childrenSections.concat(...nestedSections);
+  }
+  getChildrenSectionsByParent() {
+    return Iterator.from(this.getAllSections()).reduce((result, current) => {
+      var _result$get;
+      const data = (_result$get = result.get(current.parentSectionId)) !== null && _result$get !== void 0 ? _result$get : [];
+      result.set(current.parentSectionId, data.concat(current));
+      return result;
+    }, new Map());
+  }
   *getAllSections() {
-    const pagesToProcess = [...this.sugarRoot.pages];
+    const pagesToProcess = this.sugarRoot.pages.map(x => ({
+      page: x,
+      parentId: undefined
+    }));
     while ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.arrayIsNotEmpty)(pagesToProcess)) {
-      const page = pagesToProcess.pop();
-      if (page != null && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)(page.path)) {
+      const info = pagesToProcess.pop();
+      if (info != null && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)(info.page.path)) {
         var _page$optional, _page$multiple;
+        const {
+          page,
+          parentId
+        } = info;
         yield {
           sectionId: page.id,
           path: page.getFullPath(),
           optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false,
-          multiple: (_page$multiple = page.multiple) !== null && _page$multiple !== void 0 ? _page$multiple : false
+          multiple: (_page$multiple = page.multiple) !== null && _page$multiple !== void 0 ? _page$multiple : false,
+          parentSectionId: parentId
         };
-        pagesToProcess.push(...page.pages);
+        pagesToProcess.push(...page.pages.map(x => ({
+          page: x,
+          parentId: page.id
+        })));
       }
     }
   }
@@ -84569,11 +84651,21 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
     const wrappedRules = Iterator.from(rules).map(rule => rule instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement && rule.left.valueName != "children" ? this.wrapSetStatementWithOptionalPageCheckIfNeeded(rule, allOrderedSections) : rule);
     return wrappedRules;
   }
+  findParentOptionalForAggregationPath(targetPath, orderedSections) {
+    const multipleSectionOfAggregationPath = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.IterUtils.first(Iterator.from(orderedSections).filter(x => _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), targetPath.toLegacyPath())));
+    const firstParentOptionalOrMultiple = multipleSectionOfAggregationPath != undefined ? _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.IterUtils.first(Iterator.from(orderedSections).filter(x => x.sectionId !== multipleSectionOfAggregationPath.sectionId && _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), multipleSectionOfAggregationPath.path.toLegacyPath()) && (x.optional || x.multiple))) : undefined;
+    return firstParentOptionalOrMultiple;
+  }
+  findParentOptionalForNonAggregationPath(targetPath, valueName, orderedSections) {
+    const isTargetPathMultiple = this.dataDeclarationHelper.isNodeHasChildrenEntry(targetPath);
+    const checkingPath = isTargetPathMultiple && (valueName === "errorsCount" || valueName === "warningsCount") ? targetPath.getParentPath() : targetPath;
+    return orderedSections.find(x => _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), checkingPath.toLegacyPath()) && (x.optional || x.multiple));
+  }
   wrapSetStatementWithOptionalPageCheckIfNeeded(rule, orderedSections) {
     const targetPath = rule.left.modePath;
-    const targetOptionalSection = orderedSections.find(x => _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), targetPath.toLegacyPath()) && x.optional);
+    const targetOptionalSection = !(0,_Common_ModelPath_ModelPathHelper__WEBPACK_IMPORTED_MODULE_7__.isAggregationPath)(targetPath) ? this.findParentOptionalForNonAggregationPath(targetPath, rule.left.valueName, orderedSections) : this.findParentOptionalForAggregationPath(targetPath, orderedSections);
     if (targetOptionalSection != undefined && !targetOptionalSection.multiple) {
-      const targetIsFilledPath = targetOptionalSection.path.joinWith(OptionalSectionRulesBuilder.optionalSectionFilledFieldName);
+      const targetIsFilledPath = targetOptionalSection.path.joinWith(_Common_PathConstants__WEBPACK_IMPORTED_MODULE_8__.OptionalSectionFilledFieldName);
       if (!targetIsFilledPath.isEquals(targetPath)) {
         const targetIsFilledValueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(targetIsFilledPath.toCurrentIteration(), "value");
         return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(rule.left, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.EqExpression(targetIsFilledValueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("1")), rule.right, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression()));
@@ -84583,8 +84675,9 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
   }
   buildOptionalSectionIsFilledCheckRule(targetPath, pathsBySection) {
     const createDecimalCondExpr = checkExpt => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(checkExpt, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.DecimalLiteralExpression(1), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.DecimalLiteralExpression(0));
-    const targetValueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(targetPath.joinWith(OptionalSectionRulesBuilder.optionalSectionFilledFieldName), "value");
-    const pathInfos = Iterator.from(pathsBySection).map(path => {
+    const targetValueRefBase = targetPath.joinWith(_Common_PathConstants__WEBPACK_IMPORTED_MODULE_8__.OptionalSectionFilledFieldName);
+    const targetValueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(targetValueRefBase, "value");
+    const pathInfos = Iterator.from(pathsBySection).filter(path => !path.isEquals(targetValueRefBase)).map(path => {
       const splitInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_2__.getMatchedAndDifferentModelPaths)(targetPath, path);
       const iterationEntries = (0,_Common_ModelPath_BuildIterationSequence__WEBPACK_IMPORTED_MODULE_3__.buildIterationSequence)(splitInfo.differentPath);
       return {
@@ -84607,10 +84700,9 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
       return pathCheckWithReduceIfRequiredExpr;
     });
     const allChecksExpressions = pathTestRules.reduce((acc, current) => acc == undefined ? current : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.OrBinaryExpression(acc, current), undefined);
-    return allChecksExpressions != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(targetValueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(allChecksExpressions, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("1"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("0"))) : undefined;
+    return allChecksExpressions != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(targetValueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(allChecksExpressions, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("1"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression())) : undefined;
   }
 }
-OptionalSectionRulesBuilder.optionalSectionFilledFieldName = "isFilledOptional";
 
 /***/ }),
 
@@ -86622,7 +86714,7 @@ class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPO
     // no children
   }
   doConvert(context) {
-    var _node$text, _node$textInLoading, _node$combinatorType, _node$combineType, _node$acceptGFVs, _node$needTypeId;
+    var _node$text, _node$textInLoading, _node$combinatorType, _node$combineType, _node$acceptGFVs;
     const node = this.getCurrentNodeAs(_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_6__.DropDownButtonLoadExcelNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("DropDownButtonLoadExcel");
     markupBuilder.prop(x => x.pathToTable).set(node.pathToTable);
@@ -86634,9 +86726,7 @@ class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPO
     markupBuilder.prop(x => x.combinatorType).set((_node$combinatorType = node.combinatorType) !== null && _node$combinatorType !== void 0 ? _node$combinatorType : _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.Default);
     markupBuilder.prop(x => x.combineType).set((_node$combineType = node.combineType) !== null && _node$combineType !== void 0 ? _node$combineType : _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.FufCombineMethod.AddToEnd);
     markupBuilder.prop(x => x.acceptGFVs).set((_node$acceptGFVs = node.acceptGFVs) !== null && _node$acceptGFVs !== void 0 ? _node$acceptGFVs : []);
-    markupBuilder.prop(x => x.needTypeId).set((_node$needTypeId = node.needTypeId) !== null && _node$needTypeId !== void 0 ? _node$needTypeId : false);
     markupBuilder.prop(x => x.navigationPath).set(node.navigationPath);
-    markupBuilder.prop(x => x.lastPathTokenPageExist).set(node.lastPathTokenPageExist);
     if (node.isOnlyAddToEnd && node.isOnlyReplace) {
       throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_5__.SugarAttributeReadError("В контроле должен быть только один атрибут: или isOnlyAddToEnd, или isOnlyReplace.", node, "isOnlyAddToEnd");
     } else {
@@ -86644,6 +86734,7 @@ class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPO
       markupBuilder.prop(x => x.isOnlyAddToEnd).set((_node$isOnlyAddToEnd = node.isOnlyAddToEnd) !== null && _node$isOnlyAddToEnd !== void 0 ? _node$isOnlyAddToEnd : false);
       markupBuilder.prop(x => x.isOnlyReplace).set((_node$isOnlyReplace = node.isOnlyReplace) !== null && _node$isOnlyReplace !== void 0 ? _node$isOnlyReplace : false);
     }
+    markupBuilder.prop(x => x.getTypeId).set(context.generateHelperFunctionExpression(node, "getTypeId", node.getTypeId));
     return markupBuilder.buildConverterResult();
   }
 }
@@ -86673,7 +86764,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13;
 
 
 
@@ -86688,7 +86779,7 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
     `), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("combinatorType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.enum(_Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.Default, _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.XmlCombinatorByPath), `Default: использует умный комбинатор, который пишется флешами.
           XmlCombinatorByPath: новый вид комбинатора по пути. Перекладывает из фуфа в черновик 1 к 1.
           В связке с XmlCombinatorByPath - в combineType писать AddToEnd.
-    `), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("acceptGFVs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string), `Разрешенные гфв, например старых форматов.`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("needTypeId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Атрибут для вычисления typeId в загрузке excel, например в ЕФС. По умолчанию false.`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("navigationPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Путь для навигации, если он отличается от пути до таблицы (pathToTable). Если этот путь задан, то навигируется в него, иначе в pathToTable.`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lastPathTokenPageExist", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Токен пути для определения заполненности раздела. Нужен в ЕФС-1.`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyAddToEnd", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только добавления в конец, без замены. Например в ЕФС-1. По умолчанию false.`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyReplace", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только замены данных. Например в ЕФС-1 ДСВ-3. По умолчанию false.`), _dec(_class = (_class2 = class DropDownButtonLoadExcelNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+    `), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("acceptGFVs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string), `Разрешенные гфв, например старых форматов.`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("navigationPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Путь для навигации, если он отличается от пути до таблицы (pathToTable). Если этот путь задан, то навигируется в него, иначе в pathToTable.`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyAddToEnd", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только добавления в конец, без замены. Например в ЕФС-1 в первых разделах. По умолчанию false.`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("getTypeId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Хелпер для определения typeId для метода transfer/combine-multiple. Например в ЕФС-1."), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyReplace", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только замены данных. Например в ЕФС-1 ДСВ-3. По умолчанию false.`), _dec(_class = (_class2 = class DropDownButtonLoadExcelNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "pathToTable", _descriptor, this);
@@ -86700,11 +86791,10 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "combineType", _descriptor7, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "combinatorType", _descriptor8, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "acceptGFVs", _descriptor9, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "needTypeId", _descriptor10, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "navigationPath", _descriptor11, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lastPathTokenPageExist", _descriptor12, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyAddToEnd", _descriptor13, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyReplace", _descriptor14, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "navigationPath", _descriptor10, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyAddToEnd", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "getTypeId", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyReplace", _descriptor13, this);
   }
 }, (_descriptor = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "pathToTable", [_dec2], {
   configurable: true,
@@ -86751,27 +86841,22 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "needTypeId", [_dec11], {
+}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "navigationPath", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "navigationPath", [_dec12], {
+}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyAddToEnd", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "lastPathTokenPageExist", [_dec13], {
+}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "getTypeId", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyAddToEnd", [_dec14], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyReplace", [_dec15], {
+}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyReplace", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -89861,17 +89946,21 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     const rootPath = (0,_getRootPath__WEBPACK_IMPORTED_MODULE_3__.getRootPath)(node);
     const entrySections = ["default"];
     const optionalSections = this.findOptionalSections(node);
+    const allSections = this.findAllSingleSections(node);
     if (node.requisite) {
       entrySections.push(_Common_CommonConstants_SectionNames__WEBPACK_IMPORTED_MODULE_12__.SectionNames.requisitesSection);
     }
-    return {
+    const result = {
       [rootPath]: optionalSections.length > 0 ? {
         section: entrySections,
+        allSingleSections: allSections,
         optionalSections: optionalSections
       } : {
-        section: entrySections
+        section: entrySections,
+        allSingleSections: allSections
       }
     };
+    return result;
   }
   buildChildrenDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_FormNode__WEBPACK_IMPORTED_MODULE_21__.FormNode);
@@ -89895,18 +89984,41 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     }
   }
   findOptionalSections(node) {
-    const optionalPages = this.getAllPages(node.pages).filter(page => {
+    const pages = this.findAllSingleSections(node).filter(page => page.optional);
+    return pages;
+  }
+  findNearestOptionalSection(sectionId, allSinglePagesWithParent) {
+    const pageInfo = allSinglePagesWithParent.get(sectionId);
+    if (pageInfo == undefined || pageInfo.page.optional || pageInfo.parentPage == undefined || pageInfo.parentPage.multiple) {
+      return undefined;
+    }
+    if (pageInfo.parentPage.optional) {
+      return pageInfo.parentPage.id;
+    }
+    return this.findNearestOptionalSection(pageInfo.parentPage.id, allSinglePagesWithParent);
+  }
+  findAllSingleSections(node) {
+    const allSinglePagesWithParent = new Map(this.getAllPages(node.pages).filter(x => !x.page.multiple).map(x => [x.page.id, x]));
+    const pages = Iterator.from(allSinglePagesWithParent.values()).map(x => x.page).map(page => {
       var _page$optional;
-      return ((_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false) && !page.multiple;
-    }).map(page => ({
-      id: page.id,
-      path: page.getFullPath().toLegacyPath()
-    })).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id));
-    return optionalPages;
+      return {
+        id: page.id,
+        path: page.getFullPath().toLegacyPath(),
+        optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false,
+        dependsOnSection: this.findNearestOptionalSection(page.id, allSinglePagesWithParent)
+      };
+    }).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id)).toArray();
+    return pages;
   }
-  getAllPages(pages) {
-    const allPages = pages.flatMap(page => this.getAllPages(page.pages));
-    return pages.concat(allPages);
+  getAllPages(pages, parentPage) {
+    const allPages = pages.flatMap(page => this.getAllPages(page.pages, page)).map(x => ({
+      page: x.page,
+      parentPage: x.parentPage
+    }));
+    return pages.map(page => ({
+      page: page,
+      parentPage: parentPage
+    })).concat(...allPages);
   }
   buildBaseFormWithContent(context, formContent, formNode) {
     const pageNodes = this.getFormPages(formNode);
@@ -90299,7 +90411,7 @@ let ModalTitleNode = (_dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_M
   writable: true,
   initializer: null
 })), _class5)) || _class4);
-let FormNode = (_dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("form", `Корневой элемент формы.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Form sync recursive .md$")), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("userpicklist", [_UserPicklist_UserPicklistNode__WEBPACK_IMPORTED_MODULE_11__.UserPicklistNode]), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("tour", [_Tour_TourNode__WEBPACK_IMPORTED_MODULE_10__.TourNode]), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("fetchfunctions", [FetchFunctionsReferenceNode]), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("modalIE8", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("m", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("uf", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("forceNavigate", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hideUnitsAdder", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hasRegionalForms", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.UntypedUsage), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("controls"), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("modalheader", [ModalTitleNode]), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("import", [_SugarNodes_Nodes_ImportNode__WEBPACK_IMPORTED_MODULE_7__.ImportNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("panel", [_Nodes_PanelNode__WEBPACK_IMPORTED_MODULE_14__.PanelNode]), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("zeroreportoptions", [_ZeroReportOptions_ZeroReportOptionsNode__WEBPACK_IMPORTED_MODULE_13__.ZeroReportOptionsNode]), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("page", [_Page_PageNode__WEBPACK_IMPORTED_MODULE_8__.PageNode]), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("attachmentform", [_AttachmentForm_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_9__.AttachmentFormNode]), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("simple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("schemaValidations", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("isReadOnly", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отобразить форму в режиме чтения - все редактирование будет отключено (включая интерактивные элементы - валидации, фокус, подсветки тултипы и тд)"), _dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieDeprecationWarningEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отображать окно с предупреждением, что некоторые функции в ie не работают, с предложением скачать другие браузеры. Не блокирует взаимодействие"), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("compactActionPanel", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec29 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("enableCustomizationButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Включить кнопку настройки оформления"), _dec30 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieSizeLimitation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Это флаг включает отображение заглушки для IE, если фуф больше определенного размера`), _dec31 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("templates", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Управляет влючение возможность создавать и применять шаблоны keweb-а (кнопка в меню)`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("__deleteMe__enableIndentToSingleUnit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включить несогласованные с дизайнером отступы, которые использовались для ЕФС`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("plain", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Форма без боковой панели, которая будет содержать один раздел`), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("requisite", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Есть подозрение что это свойство не используется`), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("cssWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Более преоритетный чем обычный width, задается как css`), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("buttonSettingsType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.enum(_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.Revise, _Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.DigitalWarrant), `Разные настройки кнопок отправить и действий с формой. Сейчас есть только ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.Revise} / ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.DigitalWarrant} который будет делать кнопки в плашке для simple form как у ИОН или Сверке ФСС`), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("validationBeforeSend", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Локальная проверка, которая не даст отправить форму, если есть невалидные поля.\n
+let FormNode = (_dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("form", `Корневой элемент формы.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Form sync recursive .md$")), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("userpicklist", [_UserPicklist_UserPicklistNode__WEBPACK_IMPORTED_MODULE_11__.UserPicklistNode]), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("tour", [_Tour_TourNode__WEBPACK_IMPORTED_MODULE_10__.TourNode]), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("fetchfunctions", [FetchFunctionsReferenceNode]), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("modalIE8", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("m", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("uf", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("forceNavigate", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hideUnitsAdder", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.InvalidUsage), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("hasRegionalForms", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.UntypedUsage), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("controls"), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("modalheader", [ModalTitleNode]), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("import", [_SugarNodes_Nodes_ImportNode__WEBPACK_IMPORTED_MODULE_7__.ImportNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("panel", [_Nodes_PanelNode__WEBPACK_IMPORTED_MODULE_14__.PanelNode]), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.singleChild)("zeroreportoptions", [_ZeroReportOptions_ZeroReportOptionsNode__WEBPACK_IMPORTED_MODULE_13__.ZeroReportOptionsNode]), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("page", [_Page_PageNode__WEBPACK_IMPORTED_MODULE_8__.PageNode]), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("attachmentform", [_AttachmentForm_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_9__.AttachmentFormNode]), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("simple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("schemaValidations", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Валидации из схемы. По умолчанию true. Отключены старым формам `), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("isReadOnly", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отобразить форму в режиме чтения - все редактирование будет отключено (включая интерактивные элементы - валидации, фокус, подсветки тултипы и тд)"), _dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieDeprecationWarningEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Отображать окно с предупреждением, что некоторые функции в ie не работают, с предложением скачать другие браузеры. Не блокирует взаимодействие"), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.deprecatedAttr)("compactActionPanel", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_5__.DeprecationReason.Removed), _dec29 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("enableCustomizationButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, "Включить кнопку настройки оформления"), _dec30 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("ieSizeLimitation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Это флаг включает отображение заглушки для IE, если фуф больше определенного размера`), _dec31 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("templates", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Управляет влючение возможность создавать и применять шаблоны keweb-а (кнопка в меню)`), _dec32 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("__deleteMe__enableIndentToSingleUnit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включить несогласованные с дизайнером отступы, которые использовались для ЕФС`), _dec33 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("plain", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Форма без боковой панели, которая будет содержать один раздел`), _dec34 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("requisite", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Есть подозрение что это свойство не используется`), _dec35 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec36 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("cssWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Более преоритетный чем обычный width, задается как css`), _dec37 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("buttonSettingsType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.enum(_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.Revise, _Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.DigitalWarrant), `Разные настройки кнопок отправить и действий с формой. Сейчас есть только ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.Revise} / ${_Common_Enums_ButtonSettingsTypeEnum__WEBPACK_IMPORTED_MODULE_12__.ButtonSettingsTypeEnum.DigitalWarrant} который будет делать кнопки в плашке для simple form как у ИОН или Сверке ФСС`), _dec38 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("validationBeforeSend", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Локальная проверка, которая не даст отправить форму, если есть невалидные поля.\n
         После проверки фокус падает на невалидное поле, если это возможно. Например на input`), _dec39 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("padding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.lengthUnit, ``), _dec40 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("maxunitscount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `По дефолту 15. Если количество разделов превышает \`maxunitscount\`, начинает работать частичный рендеринг. Отрисовывается столько разделов вниз от текущего, сколько задано в настройке, а при скроллинге вниз рендерятся следующие. Используется для больших форм с множественными разделами (напр, ЕНВД, Прибыль), помогает облегчить загрузку редактора`), _dec41 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("onExternalInitSection", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.helperFunctionName, `Выполнение хелпер функции при вызове keweb-ого лайтбокса от внешних ребят. Когда редактор открывается из Контур Бухагалтерии или ТО. Чтобы вызвать - надо в query params передать initSectionLightbox="Path" где Path - путь до раздела`), _dec42 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("unitscount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, ``), _dec43 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("transferText", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, `Текст в лайтбоксе, который появляется по кнопке "Перенести данные"`), _dec44 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("navigationLimit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Количество множественных разделов при котором навигация сворачивается (в левой колонке отображаются не все экземпляры), как выглядит можешь посмотреть в ЕНВД при количестве разделов 2 больше 15`), _dec45 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("uploadFufButtonEnabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Включает кнопку загрузить отчет в "Другие действия" в панели слева.`), _dec46 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.markupAttr)("fufSizeTooLargeErrorText", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Описание ошибки для большого размера файла`), _dec47 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("uploadFufLightboxHideDemandNameButton", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, `Отключает кнопку "Показать имя требования" внутри лайтбокса Загрузки файла.`), _dec48 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("defaultUnitsCountForPaging", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Количество инстансов множественного раздела на котором включается паджинация раздела`), _dec49 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("type", [_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_3__.TypeNode]), _dec50 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("types", [_TypeListNode__WEBPACK_IMPORTED_MODULE_15__.TypeListNode]), _dec6(_class7 = (_class8 = class FormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.SugarNodeBase {
   constructor(...args) {
     super(...args);
@@ -90857,7 +90969,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Helpers_Normativehelp_NormativeHelpNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../Helpers/Normativehelp/NormativeHelpNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Helpers/Normativehelp/NormativeHelpNode.ts");
 /* harmony import */ var _Banner_BannerNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../Banner/BannerNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Banner/BannerNode.ts");
 /* harmony import */ var _ControlFlow_If_IfNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../ControlFlow/If/IfNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If/IfNode.ts");
-/* harmony import */ var _PageNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./PageNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page/PageNode.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _Common_PathConstants__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../../../../../../Common/PathConstants */ "./Common/PathConstants.ts");
+/* harmony import */ var _PageNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./PageNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page/PageNode.ts");
+
+
 
 
 
@@ -90875,13 +90991,13 @@ __webpack_require__.r(__webpack_exports__);
 
 class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode;
+    return _PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode;
   }
   applyVisibilityPathProcessing() {
     return false;
   }
   *doBuildNormalizeRules(builder, formSchemaRng) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode);
     const element = formSchemaRng.getElementByPath(node.getFullPath());
     if (node.path == undefined) {
       return;
@@ -90895,7 +91011,8 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
     }
   }
   doBuildDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
+    var _node$optional, _node$multiple;
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode);
     if (node.path == undefined) {
       return {};
     }
@@ -90908,20 +91025,30 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
         result.optional = [true];
       }
     }
+    const optionalFieldPath = node.getFullPath().joinWith(_Common_PathConstants__WEBPACK_IMPORTED_MODULE_15__.OptionalSectionFilledFieldName).toLegacyPath();
+    const optionalFieldRequired = ((_node$optional = node.optional) !== null && _node$optional !== void 0 ? _node$optional : false) && !((_node$multiple = node.multiple) !== null && _node$multiple !== void 0 ? _node$multiple : false);
     return context.mergeDataDeclaration({
       [this.getResolvedBindingPath(node)]: result
-    }, context.addPathSectionDeclarationEntry(node));
+    }, context.addPathSectionDeclarationEntry(node), optionalFieldRequired ? {
+      [optionalFieldPath]: {
+        value: context.initSequenceFactory.dataValue({
+          defaultValue: "1",
+          fetchfn: undefined,
+          settings: undefined
+        }, false, "1")
+      }
+    } : undefined, optionalFieldRequired ? context.addPathSectionDeclarationEntry(node, false, false, (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_14__.createRelativeFromTokens)([_Common_PathConstants__WEBPACK_IMPORTED_MODULE_15__.OptionalSectionFilledFieldName])) : undefined);
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode);
     return context.processChildrenDataDeclaration(node.children);
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode);
     yield* node.children;
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_16__.PageNode);
     if (node.multiple) {
       this.ensurePathExists(node, node.path);
     }
@@ -111800,8 +111927,8 @@ function getBindingPathExpression(node, customPath) {
   }
   return node.getFullPath().toLegacyPath();
 }
-function getResolvedBindingPath(node) {
-  return node.getFullPath().toLegacyPath();
+function getResolvedBindingPath(node, suffix) {
+  return node.getFullPath().joinWith(suffix != undefined ? suffix : (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.emptyModelPath)()).toLegacyPath();
 }
 function getBindingPathWithSuffix(node, customPath) {
   return node.getFullPath().joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(customPath, "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).normalize().toLegacyPath();

package/package.json

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