@kontur.candy/generator 5.121.0-fixes-for-flang-generator.6 → 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,9 +71396,9 @@ 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()) {
-    var _node$properties2;
     if (path.isEmpty() || path.endsWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each]))) {
       continue;
     }
@@ -71354,7 +71407,7 @@ function buildExtendedSchemaInfo(dataDeclaration) {
     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 = {};
+    node.properties ??= {};
     const props = node.properties;
     if (isMultiple) {
       props.multiple = true;
@@ -71369,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 {
@@ -77180,7 +77232,7 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
     const allOptionalSections = this.dataDeclarationHelper.getOptionalSections();
     const section2PathsMap = this.dataDeclarationHelper.getAllPathsBySection();
     const childrenSectionsByParent = this.getChildrenSectionsByParent();
-    const allRules = allOptionalSections.filter(x => !this.dataDeclarationHelper.isNodeHasChildrenEntry(x.path)).map(x => {
+    const allRules = allOptionalSections.map(x => {
       const allDependentSectionIds = this.getDependentSingleSections(x.id, childrenSectionsByParent).map(sectionInfo => sectionInfo.sectionId);
       const targetPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromMask)(x.path, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each);
       const pathsBySection = [x.id, ...allDependentSectionIds].flatMap(sectionId => {
@@ -77213,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
@@ -77222,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 => ({
@@ -81372,13 +81424,13 @@ const predefinedJsConditions = {
   "Show5 == 'true'": "Show5 as string == 'true'",
   "checked1 == 'true'": "checked1 as string == 'true'",
   "checked2 == 'true'": "checked2 as string == 'true'",
-  "path('kind') === '1'": "kind == '1'",
-  "path('kind') === '2'": "kind == '2'",
+  "path('kind') === '1'": "kind as string == '1'",
+  "path('kind') === '2'": "kind as string == '2'",
   "path('ПризнакПродавец') === '1'": "ПризнакПродавец == 1",
   "path`('ПризнакПродавец') === '2'": "ПризнакПродавец == 2",
   "(path('checked1') === 'true' &&  path('checked2') === 'true') or (path('checked1') === 'true')": "(checked1 and checked2) or checked1",
-  "path('СНИЛС') != ''": "СНИЛС != ''",
-  "path('/Файл/LazyLoadingEnabled') !== 'true'": "not (/Файл/LazyLoadingEnabled == 'true')",
+  "path('СНИЛС') != ''": "СНИЛС as string != ''",
+  "path('/Файл/LazyLoadingEnabled') !== 'true'": "not (/Файл/LazyLoadingEnabled as string == 'true')",
   "path('НомКорр') !== '99'": "НомКорр != 99",
   "tableIsEmpty != 'true'": "tableIsEmpty as string != 'true'",
   "tableIsEmpty == 'true'": "tableIsEmpty as string == 'true'",
@@ -81414,27 +81466,27 @@ const predefinedJsConditions = {
   "path('/Root/D') === 'true'": "(/Root/D as string) == 'true'",
   "path('D') === 'true'": "(D as string) == 'true'",
   "path('../../../../ОтчетныйПериод/Месяц') != ''": "(../../../../ОтчетныйПериод/Месяц as string) != ''",
-  "path('ПолучДох/ФИО/Фамилия') != '' || path('ПолучДох/ФИО/Имя') != '' || path('ПолучДох/ФИО/Отчество') != ''": "ПолучДох/ФИО/Фамилия != '' or ПолучДох/ФИО/Имя != '' or ПолучДох/ФИО/Отчество != ''",
-  "(path('../../../ПолучДох/Статус') == '1' || path('../../../ПолучДох/Статус') == '7') && (path('../Ставка') == '13' || path('../Ставка') == '15')": "(../../../ПолучДох/Статус == '1' or ../../../ПолучДох/Статус == '7') and (../Ставка == '13' or ../Ставка == '15')",
+  "path('ПолучДох/ФИО/Фамилия') != '' || path('ПолучДох/ФИО/Имя') != '' || path('ПолучДох/ФИО/Отчество') != ''": "ПолучДох/ФИО/Фамилия as string != '' or ПолучДох/ФИО/Имя as string != '' or ПолучДох/ФИО/Отчество as string != ''",
+  "(path('../../../ПолучДох/Статус') == '1' || path('../../../ПолучДох/Статус') == '7') && (path('../Ставка') == '13' || path('../Ставка') == '15')": "(../../../ПолучДох/Статус as string == '1' or ../../../ПолучДох/Статус as string == '7') and (../Ставкаv as string == '13' or ../Ставка as string == '15')",
   "path('@formsClientInfo/sender/type') != '2'": "1 == 1",
   "path('@formsClientInfo/currentAccount/fns/representativeDocument/warrantId') != ''": "1 == 1",
   "path('КорНБЛиш') === 'true' || path('КорНБЛиш/КорНБЛишВс') != '' || path('КорНБЛиш/КорНБЛишГод/0/Год') != '' || path('КорНБЛишГод/0/КорНБЛишВс') != '' || path('КорНБЛиш/КорНБЛишГод/1/Год') != '' || path('КорНБЛишГод/1/КорНБЛишВс') != '' || path('КорНБЛиш/КорНБЛишГод/2/Год') != '' || path('КорНБЛишГод/2/КорНБЛишВс') != ''": "1 == 0",
-  "path('СвСчБанк/НаимБанк')": "СвСчБанк/НаимБанк != ''",
-  "path('../..//kpp') == ''": "../../kpp == ''",
-  "path('БанкРекв/СведБанк/НаимБанк')": "БанкРекв/СведБанк/НаимБанк != ''",
-  "path('БанкРекв/НаимБанк')": "БанкРекв/СведБанк/НаимБанк != ''",
+  "path('СвСчБанк/НаимБанк')": "СвСчБанк/НаимБанк as string != ''",
+  "path('../..//kpp') == ''": "../../kpp as string == ''",
+  "path('БанкРекв/СведБанк/НаимБанк')": "БанкРекв/СведБанк/НаимБанк as string != ''",
+  "path('БанкРекв/НаимБанк')": "БанкРекв/СведБанк/НаимБанк as string != ''",
   "path('T7R39C1_autovalue', 'visible') == 'true' || path('T7R39C1_autovalue', 'visible') == true": "1 == 1",
   'path("/Файл/Документ/РасчетСВ/ModalReplaceCategoryCode/КодКатЛиц_хешсет_строкой") == "[\\"\\"]" \n|| path("/Файл/Документ/РасчетСВ/ModalReplaceCategoryCode/КодКатЛиц_хешсет_строкой") == ""': "1 == 0",
-  ДекретДети: "exists(ДекретДети) and ДекретДети != ''",
-  "ТерриториальныеУсловия/ОснованиеТУ": "exists(ТерриториальныеУсловия/ОснованиеТУ) and ТерриториальныеУсловия/ОснованиеТУ != ''",
-  "ОсобыеУсловияТруда/ОснованиеОУТ": "exists(ОсобыеУсловияТруда/ОснованиеОУТ) and ОсобыеУсловияТруда/ОснованиеОУТ != ''",
-  "ИсчисляемыйСтаж/ОснованиеИС": "exists(ИсчисляемыйСтаж/ОснованиеИС) and ИсчисляемыйСтаж/ОснованиеИС != ''",
-  "ВыслугаЛет/ОснованиеВЛ": "exists(ВыслугаЛет/ОснованиеВЛ) and ВыслугаЛет/ОснованиеВЛ != ''",
-  ДопСведенияИС: "exists(ДопСведенияИС) and ДопСведенияИС != ''",
-  "ТУ/Основание": "exists(ТУ/Основание) and ТУ/Основание != ''",
-  "ОУТ/Код": "exists(ОУТ/Код) and ОУТ/Код != ''",
-  "ИС/Основание": "exists(ИС/Основание) and ИС/Основание != ''",
-  "ВЛ/Основание": "exists(ВЛ/Основание) and ВЛ/Основание != ''"
+  ДекретДети: "exists(ДекретДети) and ДекретДети as string != ''",
+  "ТерриториальныеУсловия/ОснованиеТУ": "exists(ТерриториальныеУсловия/ОснованиеТУ) and ТерриториальныеУсловия/ОснованиеТУ as string != ''",
+  "ОсобыеУсловияТруда/ОснованиеОУТ": "exists(ОсобыеУсловияТруда/ОснованиеОУТ) and ОсобыеУсловияТруда/ОснованиеОУТ as string != ''",
+  "ИсчисляемыйСтаж/ОснованиеИС": "exists(ИсчисляемыйСтаж/ОснованиеИС) and ИсчисляемыйСтаж/ОснованиеИС as string != ''",
+  "ВыслугаЛет/ОснованиеВЛ": "exists(ВыслугаЛет/ОснованиеВЛ) and ВыслугаЛет/ОснованиеВЛ as string != ''",
+  ДопСведенияИС: "exists(ДопСведенияИС) and ДопСведенияИС as string != ''",
+  "ТУ/Основание": "exists(ТУ/Основание) and ТУ/Основание as string != ''",
+  "ОУТ/Код": "exists(ОУТ/Код) and ОУТ/Код as string != ''",
+  "ИС/Основание": "exists(ИС/Основание) and ИС/Основание as string != ''",
+  "ВЛ/Основание": "exists(ВЛ/Основание) and ВЛ/Основание as string != ''"
 };
 function convertToKCLangCondition(node, condition) {
   var _tryConvertToKCLangCo;
@@ -83266,6 +83318,11 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
         section: [attachmentSection.id],
         pageId: attachmentSection.id
       };
+      if (attachmentSection.optional) {
+        result[attachmentSection.path] = {
+          optional: [true]
+        };
+      }
     });
     return result;
   }
@@ -95491,10 +95548,10 @@ function getColumnWidths(node, guessContentWidthCallback) {
     let maxWidth = 0;
     let firstCondition = undefined;
     for (let r = 0; r < rows.length; r++) {
-      var _resultRows$r$numberC, _resultRows$r$numberC2, _firstCondition, _resultRows$r;
+      var _resultRows$r$numberC, _resultRows$r$numberC2, _resultRows$r;
       // @ts-ignore RowsWorker.rows - какая-то не понятная шняга, я не могу её победить
       maxWidth = Math.max(maxWidth, (_resultRows$r$numberC = (_resultRows$r$numberC2 = resultRows[r][numberCol]) === null || _resultRows$r$numberC2 === void 0 ? void 0 : _resultRows$r$numberC2.width) !== null && _resultRows$r$numberC !== void 0 ? _resultRows$r$numberC : -Infinity);
-      (_firstCondition = firstCondition) !== null && _firstCondition !== void 0 ? _firstCondition : firstCondition = (_resultRows$r = resultRows[r]) === null || _resultRows$r === void 0 || (_resultRows$r = _resultRows$r[numberCol]) === null || _resultRows$r === void 0 ? void 0 : _resultRows$r.visibilityConditionExpression;
+      firstCondition ??= (_resultRows$r = resultRows[r]) === null || _resultRows$r === void 0 || (_resultRows$r = _resultRows$r[numberCol]) === null || _resultRows$r === void 0 ? void 0 : _resultRows$r.visibilityConditionExpression;
     }
     return {
       width: maxWidth,

package/package.json

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