@kontur.candy/generator 5.121.0-fixes-for-flang-generator.4 → 5.121.0-fixes-for-flang-generator.6

package/dist/index.js

@@ -71351,7 +71351,8 @@ function buildExtendedSchemaInfo(dataDeclaration) {
     }
     const defaultValue = dataDeclaration.getDefaultValue(path);
     const isMultiple = dataDeclaration.isNodeHasChildrenEntry(path);
-    const optional = dataDeclaration.isNodeOptionalBySchemaOrSugar(path);
+    const isPage = dataDeclaration.getPageId(path) != undefined;
+    const optional = isPage ? dataDeclaration.isNodeOptional(path) : dataDeclaration.isNodeOptionalBySchemaOrSugar(path);
     const node = getOrCreateNode(nodes, path);
     (_node$properties2 = node.properties) !== null && _node$properties2 !== void 0 ? _node$properties2 : node.properties = {};
     const props = node.properties;
@@ -71368,7 +71369,6 @@ function buildExtendedSchemaInfo(dataDeclaration) {
     props.optional = optional;
     props.type = dataDeclaration.getType(path);
     props.disabled = dataDeclaration.isNodeHasDisabledEntry(path);
-    const isPage = dataDeclaration.getPageId(path) != undefined;
     if (isPage) {
       props.isPage = isPage;
     }
@@ -83262,6 +83262,10 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
       result[`${attachmentSection.path}/${_Common_PathConstants__WEBPACK_IMPORTED_MODULE_21__.AttachmentInfoPath.toLegacyPath()}`] = {
         section: [attachmentSection.id]
       };
+      result[attachmentSection.path] = {
+        section: [attachmentSection.id],
+        pageId: attachmentSection.id
+      };
     });
     return result;
   }
@@ -84740,9 +84744,9 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
       result.children = [{
         model: true
       }, node.optional ? [] : ["0"]];
-      if (node.optional) {
-        result.optional = [true];
-      }
+    }
+    if (node.optional) {
+      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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.121.0-fixes-for-flang-generator.4",
+  "version": "5.121.0-fixes-for-flang-generator.6",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,