@kontur.candy/generator 4.278.0-efs-partial-load.8 → 4.278.0-efs-partial-load.9

package/dist/index.js

@@ -131317,7 +131317,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const lazyLoadingRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_LazyLoadingRulesBuilder__WEBPACK_IMPORTED_MODULE_37__.LazyLoadingRulesBuilder(sugarRoot, lazyLoadGeneratorResult.declaration);
     const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_38__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions);
     const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false);
-    const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_32__.OptionalSectionRulesBuilder(dataDeclarationHelper);
+    const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_32__.OptionalSectionRulesBuilder(sugarRoot, dataDeclarationHelper);
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder);
     const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter);
     const formulaAndInitOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_40__.FormulaAndInitOnlyNormalizationRuleGenerator(sugarRulesBuilder, formulaRulesBuilder, optionalSectionRuleBuilder);
@@ -131943,7 +131943,7 @@ class FLangValidationBuildContext {
 
       const getTypeCorrectedExpression = () => {
         const argExpr = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToStringIfNeed)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.tryExtractValueReferenceAsStringFromDecimal)(flangExpr));
-        return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.EqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.EqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.StringLiteralExpression("")));
+        return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NotEqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NotEqExpression(argExpr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.StringLiteralExpression("")));
       };
 
       const correctedFLangExpr = flangExpr.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.BuildInTypeExpression.bool ? flangExpr : getTypeCorrectedExpression();
@@ -131994,12 +131994,6 @@ class FLangValidationBuildContext {
 
 
       console.warn(`Could not process kclang to flang: [${condition}]`);
-
-      if (e instanceof Error) {
-        // eslint-disable-next-line no-console
-        console.warn(e === null || e === void 0 ? void 0 : e.toString());
-      }
-
       return undefined;
     }
   }
@@ -134188,8 +134182,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class OptionalSectionRulesBuilder {
-  constructor(dataDeclarationHelper) {
+  constructor(sugarRoot, dataDeclarationHelper) {
+    this.sugarRoot = void 0;
     this.dataDeclarationHelper = void 0;
+    this.sugarRoot = sugarRoot;
     this.dataDeclarationHelper = dataDeclarationHelper;
   }
 
@@ -134207,20 +134203,36 @@ class OptionalSectionRulesBuilder {
     return allRules;
   }
 
+  *getAllSections() {
+    const pagesToProcess = [...this.sugarRoot.pages];
+
+    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)) {
+        var _page$optional;
+
+        yield {
+          sectionId: page.id,
+          path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromMask)(page.path, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each),
+          optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false
+        };
+        pagesToProcess.push(...page.pages);
+      }
+    }
+  }
+
   wrapRulesWithOptionalPageCheck(rules) {
-    const allOptionalSections = (0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.reverseArray)(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.IterUtils.sortBy(this.dataDeclarationHelper.getOptionalSections().map(x => ({
-      path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromMask)(x.path, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each),
-      sectionId: x.id
-    })), x => x.path.toLegacyPath())).toArray();
+    const allOptionalSections = (0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.reverseArray)(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.IterUtils.sortBy(this.getAllSections(), x => x.path.toLegacyPath())).toArray();
     const wrappedRules = Iterator.from(rules).map(rule => rule instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement && rule.left.valueName != "children" ? this.wrapSetStatementWithOptionalPageCheckIfNeeded(rule, allOptionalSections) : rule);
     return wrappedRules;
   }
 
-  wrapSetStatementWithOptionalPageCheckIfNeeded(rule, orderedOptionalSections) {
+  wrapSetStatementWithOptionalPageCheckIfNeeded(rule, orderedSections) {
     const targetPath = rule.left.modePath;
-    const targetOptionalSection = orderedOptionalSections.find(x => _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), targetPath.toLegacyPath()));
+    const targetOptionalSection = orderedSections.find(x => _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.isPrefix(x.path.toLegacyPath(), targetPath.toLegacyPath()));
 
-    if (targetOptionalSection != undefined) {
+    if (targetOptionalSection != undefined && targetOptionalSection.optional) {
       const targetIsFilledPath = targetOptionalSection.path.joinWith(OptionalSectionRulesBuilder.optionalSectionFilledFieldName);
 
       if (!targetIsFilledPath.isEquals(targetPath)) {
@@ -161821,6 +161833,13 @@ class SugarNodeBase {
     return this.sourceXmlNode.getChildren();
   }
 
+  *getParentsRecursive() {
+    if (this.parent != undefined) {
+      yield this.parent;
+      yield* this.parent.getParentsRecursive();
+    }
+  }
+
 }
 class UnknownSugarNode extends SugarNodeBase {
   constructor(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.278.0-efs-partial-load.8",
+  "version": "4.278.0-efs-partial-load.9",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,