@kontur.candy/generator 5.35.0 → 5.35.1-fs-7820-fix-nested-optional-page-normalization.1

package/dist/index.js

@@ -59828,6 +59828,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) {
@@ -89155,15 +89160,18 @@ 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.findAllSections(node);
     if (node.requisite) {
       entrySections.push(_Common_CommonConstants_SectionNames__WEBPACK_IMPORTED_MODULE_12__.SectionNames.requisitesSection);
     }
     return {
       [rootPath]: optionalSections.length > 0 ? {
         section: entrySections,
+        allSections: allSections,
         optionalSections: optionalSections
       } : {
-        section: entrySections
+        section: entrySections,
+        allSections: allSections
       }
     };
   }
@@ -89189,14 +89197,19 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     }
   }
   findOptionalSections(node) {
-    const optionalPages = this.getAllPages(node.pages).filter(page => {
+    const pages = this.findAllSections(node).filter(page => page.optional);
+    return pages;
+  }
+  findAllSections(node) {
+    const pages = this.getAllPages(node.pages).filter(page => !page.multiple).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
+      };
+    }).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id));
+    return pages;
   }
   getAllPages(pages) {
     const allPages = pages.flatMap(page => this.getAllPages(page.pages));
@@ -96025,7 +96038,6 @@ class CrossfitTableConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
       }
       rowMenuBuilder.prop(x => x.doNotCopyPaths).set(doNotCopyPaths);
       rowMenuBuilder.prop(x => x.bindingPath).set(multilinePath);
-      rowMenuBuilder.prop(x => x.optional).set(optional);
       sideControlsBuilder.appendChild(rowMenuBuilder);
     } else if (removeButton) {
       const removeButtonBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("RemoveRowButton");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.35.0",
+  "version": "5.35.1-fs-7820-fix-nested-optional-page-normalization.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,