@kontur.candy/generator 5.121.0-fixes-for-flang-generator.8 → 5.121.0-fixes-for-flang-generator.9

package/dist/index.js

@@ -47766,6 +47766,52 @@ function getMatchedAndDifferentModelPaths(baseModelPath, splittingModelPath) {
 
 /***/ }),
 
+/***/ "./Common/ModelPath/Set/AbsoluteModelPathSet.ts":
+/*!******************************************************!*\
+  !*** ./Common/ModelPath/Set/AbsoluteModelPathSet.ts ***!
+  \******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   AbsoluteModelPathSet: () => (/* binding */ AbsoluteModelPathSet)
+/* harmony export */ });
+/* harmony import */ var _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../EachCurrentCollision */ "./Common/ModelPath/EachCurrentCollision.ts");
+/* harmony import */ var _Set2__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Set2 */ "./Common/ModelPath/Set/Set2.ts");
+
+
+class AbsoluteModelPathSet extends _Set2__WEBPACK_IMPORTED_MODULE_1__.Set2 {
+  constructor(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_0__.EachCurrentCollision.AreSame) {
+    super();
+    this.eachCurrentCollision = void 0;
+    this.eachCurrentCollision = eachCurrentCollision;
+  }
+  static *unique(paths) {
+    const set = new AbsoluteModelPathSet();
+    for (const path of paths) {
+      if (set.add(path)) {
+        yield path;
+      }
+    }
+  }
+  areItemsEqual(left, right) {
+    return left.isEquals(right, this.eachCurrentCollision);
+  }
+  getItemHash(key) {
+    return key.getHash(this.eachCurrentCollision);
+  }
+  static from(source) {
+    const set = new AbsoluteModelPathSet();
+    for (const sourceElement of source) {
+      set.add(sourceElement);
+    }
+    return set;
+  }
+}
+
+/***/ }),
+
 /***/ "./Common/ModelPath/Set/Set2.ts":
 /*!**************************************!*\
   !*** ./Common/ModelPath/Set/Set2.ts ***!
@@ -70404,6 +70450,11 @@ class DataDeclarationGenerationTimeHelper {
     const rootPath = this.getDataDeclarationRootPath();
     return (_this$dataDeclaration = (_this$dataDeclaration2 = this.dataDeclaration[rootPath]) === null || _this$dataDeclaration2 === void 0 ? void 0 : _this$dataDeclaration2.optionalSections) !== null && _this$dataDeclaration !== void 0 ? _this$dataDeclaration : [];
   }
+  getAllSingleSections() {
+    var _this$dataDeclaration3, _this$dataDeclaration4;
+    const rootPath = this.getDataDeclarationRootPath();
+    return (_this$dataDeclaration3 = (_this$dataDeclaration4 = this.dataDeclaration[rootPath]) === null || _this$dataDeclaration4 === void 0 ? void 0 : _this$dataDeclaration4.allSingleSections) !== null && _this$dataDeclaration3 !== void 0 ? _this$dataDeclaration3 : [];
+  }
   getOptionalBlocksPaths() {
     const visibilityFieldsPaths = Object.keys(this.dataDeclaration).filter(path => path.endsWith(_Common_PathConstants__WEBPACK_IMPORTED_MODULE_5__.OptionalBlockVisibilityFieldName));
     const optionalBlocksPaths = visibilityFieldsPaths.map(fieldPath => (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromMask)(fieldPath, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each).getParentPath());
@@ -71291,6 +71342,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _DataDeclarationGenerator_DataDeclaration__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../DataDeclarationGenerator/DataDeclaration */ "./Generator/src/generators/DataDeclarationGenerator/DataDeclaration.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/ModelPath/Set/AbsoluteModelPathSet */ "./Common/ModelPath/Set/AbsoluteModelPathSet.ts");
+
 
 
 
@@ -71343,6 +71396,7 @@ function buildFieldsConfiguration(path, dataDeclaration) {
   return resultFields;
 }
 function buildExtendedSchemaInfo(dataDeclaration) {
+  const singleSectionsSet = _Common_ModelPath_Set_AbsoluteModelPathSet__WEBPACK_IMPORTED_MODULE_3__.AbsoluteModelPathSet.from(dataDeclaration.getAllSingleSections().map(x => (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromMask)(x.path, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)));
   const nodes = new Map();
   for (const path of dataDeclaration.getAllPaths()) {
     if (path.isEmpty() || path.endsWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each]))) {
@@ -71368,9 +71422,8 @@ function buildExtendedSchemaInfo(dataDeclaration) {
     props.optional = optional;
     props.type = dataDeclaration.getType(path);
     props.disabled = dataDeclaration.isNodeHasDisabledEntry(path);
-    if (isPage) {
-      props.isPage = isPage;
-    }
+    props.isPage = isPage || undefined;
+    props.isForceFilledOptional = isPage && isMultiple && singleSectionsSet.has(path) || undefined;
     props.fields = buildFieldsConfiguration(path, dataDeclaration);
   }
   return {
@@ -77212,7 +77265,7 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
     while ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.arrayIsNotEmpty)(pagesToProcess)) {
       const info = pagesToProcess.pop();
       if (info != null && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)(info.page.path)) {
-        var _page$optional;
+        var _page$optional, _page$multiple;
         const {
           page,
           parentId
@@ -77221,7 +77274,7 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
           sectionId: page.id,
           path: page.getFullPath(),
           optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false,
-          multiple: this.dataDeclarationHelper.isNodeHasChildrenEntry(page.getFullPath()),
+          multiple: (_page$multiple = page.multiple) !== null && _page$multiple !== void 0 ? _page$multiple : false,
           parentSectionId: parentId
         };
         pagesToProcess.push(...page.pages.map(x => ({

package/package.json

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