@kontur.candy/generator 5.34.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) {
@@ -85889,7 +85894,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
 /* harmony import */ var _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../../Common/CandyApiClient/Types/DraftActions/CombineFufResult */ "./Common/CandyApiClient/Types/DraftActions/CombineFufResult.ts");
-/* harmony import */ var _DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./DropDownButtonLoadExcelNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropDownButtonLoadExcel/DropDownButtonLoadExcelNode.ts");
+/* harmony import */ var _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../common/XmlParser/XmlNode */ "./Generator/src/common/XmlParser/XmlNode.ts");
+/* harmony import */ var _DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./DropDownButtonLoadExcelNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropDownButtonLoadExcel/DropDownButtonLoadExcelNode.ts");
+
 
 
 
@@ -85898,10 +85905,10 @@ __webpack_require__.r(__webpack_exports__);
 
 class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_5__.DropDownButtonLoadExcelNode;
+    return _DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_6__.DropDownButtonLoadExcelNode;
   }
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_5__.DropDownButtonLoadExcelNode);
+    const node = this.getCurrentNodeAs(_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_6__.DropDownButtonLoadExcelNode);
     return [(0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node)];
   }
   doBuildDataDeclaration(context) {
@@ -85914,8 +85921,8 @@ class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPO
     // no children
   }
   doConvert(context) {
-    var _node$text, _node$textInLoading, _node$combinatorType, _node$combineType, _node$acceptGFVs;
-    const node = this.getCurrentNodeAs(_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_5__.DropDownButtonLoadExcelNode);
+    var _node$text, _node$textInLoading, _node$combinatorType, _node$combineType, _node$acceptGFVs, _node$needTypeId;
+    const node = this.getCurrentNodeAs(_DropDownButtonLoadExcelNode__WEBPACK_IMPORTED_MODULE_6__.DropDownButtonLoadExcelNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("DropDownButtonLoadExcel");
     markupBuilder.prop(x => x.pathToTable).set(node.pathToTable);
     markupBuilder.prop("data-tid").set(node.tid);
@@ -85926,6 +85933,16 @@ class DropDownButtonLoadExcelConverter extends _SugarNodeConverter__WEBPACK_IMPO
     markupBuilder.prop(x => x.combinatorType).set((_node$combinatorType = node.combinatorType) !== null && _node$combinatorType !== void 0 ? _node$combinatorType : _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.Default);
     markupBuilder.prop(x => x.combineType).set((_node$combineType = node.combineType) !== null && _node$combineType !== void 0 ? _node$combineType : _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.FufCombineMethod.AddToEnd);
     markupBuilder.prop(x => x.acceptGFVs).set((_node$acceptGFVs = node.acceptGFVs) !== null && _node$acceptGFVs !== void 0 ? _node$acceptGFVs : []);
+    markupBuilder.prop(x => x.needTypeId).set((_node$needTypeId = node.needTypeId) !== null && _node$needTypeId !== void 0 ? _node$needTypeId : false);
+    markupBuilder.prop(x => x.navigationPath).set(node.navigationPath);
+    markupBuilder.prop(x => x.lastPathTokenPageExist).set(node.lastPathTokenPageExist);
+    if (node.isOnlyAddToEnd && node.isOnlyReplace) {
+      throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_5__.SugarAttributeReadError("В контроле должен быть только один атрибут: или isOnlyAddToEnd, или isOnlyReplace.", node, "isOnlyAddToEnd");
+    } else {
+      var _node$isOnlyAddToEnd, _node$isOnlyReplace;
+      markupBuilder.prop(x => x.isOnlyAddToEnd).set((_node$isOnlyAddToEnd = node.isOnlyAddToEnd) !== null && _node$isOnlyAddToEnd !== void 0 ? _node$isOnlyAddToEnd : false);
+      markupBuilder.prop(x => x.isOnlyReplace).set((_node$isOnlyReplace = node.isOnlyReplace) !== null && _node$isOnlyReplace !== void 0 ? _node$isOnlyReplace : false);
+    }
     return markupBuilder.buildConverterResult();
   }
 }
@@ -85955,7 +85972,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
 
 
 
@@ -85970,7 +85987,7 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
     `), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("combinatorType", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.enum(_Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.Default, _Common_CandyApiClient_Types_DraftActions_CombineFufResult__WEBPACK_IMPORTED_MODULE_4__.CombinatorType.XmlCombinatorByPath), `Default: использует умный комбинатор, который пишется флешами.
           XmlCombinatorByPath: новый вид комбинатора по пути. Перекладывает из фуфа в черновик 1 к 1.
           В связке с XmlCombinatorByPath - в combineType писать AddToEnd.
-    `), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("acceptGFVs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string), `Разрешенные гфв, например старых форматов`), _dec(_class = (_class2 = class DropDownButtonLoadExcelNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+    `), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("acceptGFVs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string), `Разрешенные гфв, например старых форматов.`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("needTypeId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Атрибут для вычисления typeId в загрузке excel, например в ЕФС. По умолчанию false.`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("navigationPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Путь для навигации, если он отличается от пути до таблицы (pathToTable). Если этот путь задан, то навигируется в него, иначе в pathToTable.`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lastPathTokenPageExist", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Токен пути для определения заполненности раздела. Нужен в ЕФС-1.`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyAddToEnd", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только добавления в конец, без замены. Например в ЕФС-1. По умолчанию false.`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isOnlyReplace", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Если для формы реализована функция только замены данных. Например в ЕФС-1 ДСВ-3. По умолчанию false.`), _dec(_class = (_class2 = class DropDownButtonLoadExcelNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "pathToTable", _descriptor, this);
@@ -85982,6 +85999,11 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "combineType", _descriptor7, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "combinatorType", _descriptor8, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "acceptGFVs", _descriptor9, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "needTypeId", _descriptor10, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "navigationPath", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lastPathTokenPageExist", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyAddToEnd", _descriptor13, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isOnlyReplace", _descriptor14, this);
   }
 }, (_descriptor = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "pathToTable", [_dec2], {
   configurable: true,
@@ -86028,6 +86050,31 @@ let DropDownButtonLoadExcelNode = (_dec = (0,_Serializer_SugarSerializer__WEBPAC
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "needTypeId", [_dec11], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "navigationPath", [_dec12], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "lastPathTokenPageExist", [_dec13], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyAddToEnd", [_dec14], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "isOnlyReplace", [_dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 
 /***/ }),
@@ -89113,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
       }
     };
   }
@@ -89147,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));

package/package.json

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