@kontur.candy/generator 4.261.0-excel-load.0 → 4.261.0-optional-nested-units.1

package/dist/index.js

@@ -112815,6 +112815,17 @@ class ModelPathImpl {
     return this.tokens.some(x => x === PathTokens.current);
   }
 
+  getLastListPath() {
+    if (!this.isContainIteration()) {
+      throw new Error("Path must contain iteration");
+    } // Проверка выше гарантирует, что будет PathTokens.each
+    // @ts-ignore
+
+
+    const lastIterationIndex = this.tokens.lastIndexOf(PathTokens.each);
+    return this.tokens.slice(0, lastIterationIndex);
+  }
+
   isAbsolute() {
     return this.absolute;
   }
@@ -128659,14 +128670,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) {
@@ -134120,6 +134133,7 @@ class LinkConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Sug
     markupBuilder.prop(x => x.metricsId).set(node.metricsId);
     markupBuilder.prop(x => x.icon).set((0,_Typography_Icon_GetIconName__WEBPACK_IMPORTED_MODULE_5__.getIconName)(node, node.icon));
     markupBuilder.appendChild(context.convertChildNodes(node.children));
+    markupBuilder.prop(x => x.stopPropagation).set(node.stopPropagation);
 
     if (node.disabled2 != undefined) {
       markupBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_6__.buildExpressionPropValue)(node.disabled2));
@@ -134133,24 +134147,25 @@ class LinkConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Sug
   }
 
   getLinkWithHref(context, node) {
-    const mb = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("Link");
-    mb.prop("data-tid").set(node.tid);
-    mb.prop(x => x.href).set(node.href);
-    mb.prop(x => x.target).set("_blank");
-    mb.prop(x => x.use).set(node.use);
-    mb.prop(x => x.metricsId).set(node.metricsId);
-    mb.prop(x => x.icon).set((0,_Typography_Icon_GetIconName__WEBPACK_IMPORTED_MODULE_5__.getIconName)(node, node.icon));
+    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("Link");
+    markupBuilder.prop("data-tid").set(node.tid);
+    markupBuilder.prop(x => x.href).set(node.href);
+    markupBuilder.prop(x => x.target).set("_blank");
+    markupBuilder.prop(x => x.use).set(node.use);
+    markupBuilder.prop(x => x.metricsId).set(node.metricsId);
+    markupBuilder.prop(x => x.icon).set((0,_Typography_Icon_GetIconName__WEBPACK_IMPORTED_MODULE_5__.getIconName)(node, node.icon));
+    markupBuilder.prop(x => x.stopPropagation).set(node.stopPropagation);
 
     if (node.disabled2 != undefined) {
-      mb.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_6__.buildExpressionPropValue)(node.disabled2));
+      markupBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_6__.buildExpressionPropValue)(node.disabled2));
 
       if (this.getLegacyNode().getParent() != undefined) {
-        mb.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
+        markupBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
       }
     }
 
-    mb.appendChild(context.convertChildNodes(node.children));
-    return mb.buildConverterResult();
+    markupBuilder.appendChild(context.convertChildNodes(node.children));
+    return markupBuilder.buildConverterResult();
   }
 
 }
@@ -134183,14 +134198,14 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13;
+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;
 
 
 
 
 
 
-let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("link", `Ссылка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Link sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.bindingPath, "Путь в модели"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("optional", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.UntypedUsage), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("defaultValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("default", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.InvalidUsage), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("color", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.Removed), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "success", "danger", "grayed"), "Тип, влияет на цвет. см. в retail-ui"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("href", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Ссылка"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Название иконки, можно посмотреть http://tech.skbkontur.ru/react-ui/#/Icons`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("metrics-id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Идентификатор ссылки, который будет отправлен вместе с метриками по этой ссылке"), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class LinkNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
+let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("link", `Ссылка`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Link sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.bindingPath, "Путь в модели"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("optional", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.UntypedUsage), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("defaultValue", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, ``), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("default", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.InvalidUsage), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("color", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_3__.DeprecationReason.Removed), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("use", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "success", "danger", "grayed"), "Тип, влияет на цвет. см. в retail-ui"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("href", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Ссылка"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Название иконки, можно посмотреть http://tech.skbkontur.ru/react-ui/#/Icons`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("stopPropagation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Прекращает дальнейшую передачу собития клика https://developer.mozilla.org/ru/docs/Web/API/Event/stopPropagation`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_7__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("metrics-id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, "Идентификатор ссылки, который будет отправлен вместе с метриками по этой ссылке"), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class LinkNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
 
@@ -134214,11 +134229,13 @@ let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5
 
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "icon", _descriptor10, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "stopPropagation", _descriptor11, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "metricsId", _descriptor12, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor12, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor13, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "metricsId", _descriptor13, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor14, this);
   }
 
   getOwnPath() {
@@ -134275,17 +134292,22 @@ let LinkNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled2", [_dec12], {
+}), _descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "stopPropagation", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "metricsId", [_dec13], {
+}), _descriptor12 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disabled2", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec14], {
+}), _descriptor13 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "metricsId", [_dec14], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec15], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -136274,12 +136296,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");
 
@@ -136297,20 +136327,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-excel-load.0",
+  "version": "4.261.0-optional-nested-units.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,