@kontur.candy/generator 4.261.0-error-log-lll.0 → 4.261.0-optional-nested-units.0

package/dist/index.js

@@ -128659,14 +128659,16 @@ class DataDeclarationGenerationContext {
     const pageName = page === null || page === void 0 ? void 0 : page.id;
 
     if (!(node instanceof _markupGenerator_ElementProcessors_FormParts_Page_PageNode__WEBPACK_IMPORTED_MODULE_8__.PageNode)) {
-      if (page != undefined && page.multiple) {
+      if (page != undefined) {
         return [{
           fn: `#getSectionFunction('${pageName}')#`
         }];
       }
     }
 
-    const sections = pageName != undefined ? [pageName] : [];
+    const sections = pageName != undefined ? [{
+      fn: `#getSectionFunction('${pageName}')#`
+    }] : [];
 
     if (requisiteMode === RequisiteSectionMode.AsRequisiteAttribute) {
       if (requisite) {
@@ -136283,12 +136285,20 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
   }
 
   findOptionalSections(node) {
-    const optionalPages = node.pages.filter(page => page.optional && !page.multiple).map(page => page.id).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined);
+    const optionalPages = this.getAllPages(node.pages).filter(page => {
+      var _page$optional;
+
+      return ((_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false) && !page.multiple;
+    }).map(page => page.id).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined);
     return optionalPages;
   }
 
+  getAllPages(pages) {
+    const allPages = pages.flatMap(page => this.getAllPages(page.pages));
+    return pages.concat(allPages);
+  }
+
   buildBaseFormWithContent(context, formContent, formNode) {
-    this.assertHasNowOptionalNestedPagesInsideMultipleUnits(formNode);
     const pageNodes = this.getFormPages(formNode);
     const formMarkupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("BaseForm");
 
@@ -136306,20 +136316,6 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     return result;
   }
 
-  assertHasNowOptionalNestedPagesInsideMultipleUnits(formNode) {
-    function assert(pages, hasMultipleUnitsInParents) {
-      for (const page of pages) {
-        if (hasMultipleUnitsInParents && page.optional && !page.multiple) {
-          throw new Error(`Check page with id '${page.id}'. Optional nested pages not supported: actions 'add', 'remove', 'check is empty' does not work for optional nested of multiple instance`);
-        }
-
-        assert(page.pages, hasMultipleUnitsInParents || !!page.multiple);
-      }
-    }
-
-    assert(formNode.pages, false);
-  }
-
   getFormPages(formNode) {
     const pages = [];
     const queue = [...formNode.pages];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.261.0-error-log-lll.0",
+  "version": "4.261.0-optional-nested-units.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,