@kontur.candy/generator 5.37.0-fix-fs-7820.3 → 5.37.0

package/dist/index.js

@@ -59828,11 +59828,6 @@ 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) {
@@ -78621,12 +78616,12 @@ class DataDeclarationGenerationContext {
       [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(node)]: declEntry
     };
   }
-  addPathSectionDeclarationEntry(sugarNode, requisite, skipRequisitesSection = false, suffix) {
+  addPathSectionDeclarationEntry(sugarNode, requisite, skipRequisitesSection = false) {
     const declEntry = {};
     const requisitesMode = skipRequisitesSection ? RequisiteSectionMode.ForceSkip : RequisiteSectionMode.AsRequisiteAttribute;
     declEntry.section = this.getSections(sugarNode, requisite, requisitesMode);
     return {
-      [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(sugarNode, suffix)]: declEntry
+      [(0,_markupGenerator_getBindingPath__WEBPACK_IMPORTED_MODULE_7__.getResolvedBindingPath)(sugarNode)]: declEntry
     };
   }
   addChildPathSectionDeclarationEntry(sugarNode, childPath, requisite) {
@@ -84396,56 +84391,28 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
   buildRulesInternal() {
     const allOptionalSections = this.dataDeclarationHelper.getOptionalSections();
     const section2PathsMap = this.dataDeclarationHelper.getAllPathsBySection();
-    const childrenSectionsByParent = this.getChildrenSectionsByParent();
     const allRules = allOptionalSections.map(x => {
-      const allDependentSectionIds = this.getDependentSingleSections(x.id, childrenSectionsByParent).map(sectionInfo => sectionInfo.sectionId);
+      var _section2PathsMap$get, _section2PathsMap$get2;
+      const sectionId = x.id;
       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 => {
-        var _section2PathsMap$get, _section2PathsMap$get2;
-        return [...((_section2PathsMap$get = (_section2PathsMap$get2 = section2PathsMap.get(sectionId)) === null || _section2PathsMap$get2 === void 0 ? void 0 : _section2PathsMap$get2.values()) !== null && _section2PathsMap$get !== void 0 ? _section2PathsMap$get : [])];
-      });
+      const pathsBySection = (_section2PathsMap$get = (_section2PathsMap$get2 = section2PathsMap.get(sectionId)) === null || _section2PathsMap$get2 === void 0 ? void 0 : _section2PathsMap$get2.values()) !== null && _section2PathsMap$get !== void 0 ? _section2PathsMap$get : [];
       return this.buildOptionalSectionIsFilledCheckRule(targetPath, pathsBySection);
     }).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined);
     return allRules;
   }
-  getDependentSingleSections(sourceSection, childrenSectionsByParent) {
-    var _childrenSectionsByPa;
-    const childrenSections = ((_childrenSectionsByPa = childrenSectionsByParent.get(sourceSection)) !== null && _childrenSectionsByPa !== void 0 ? _childrenSectionsByPa : []).filter(x => !x.optional && !x.multiple);
-    const nestedSections = childrenSections.flatMap(x => this.getDependentSingleSections(x.sectionId, childrenSectionsByParent));
-    return childrenSections.concat(...nestedSections);
-  }
-  getChildrenSectionsByParent() {
-    return Iterator.from(this.getAllSections()).reduce((result, current) => {
-      var _result$get;
-      const data = (_result$get = result.get(current.parentSectionId)) !== null && _result$get !== void 0 ? _result$get : [];
-      result.set(current.parentSectionId, data.concat(current));
-      return result;
-    }, new Map());
-  }
   *getAllSections() {
-    const pagesToProcess = this.sugarRoot.pages.map(x => ({
-      page: x,
-      parentId: undefined
-    }));
+    const pagesToProcess = [...this.sugarRoot.pages];
     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)) {
+      const page = pagesToProcess.pop();
+      if (page != null && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined)(page.path)) {
         var _page$optional, _page$multiple;
-        const {
-          page,
-          parentId
-        } = info;
         yield {
           sectionId: page.id,
           path: page.getFullPath(),
           optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false,
-          multiple: (_page$multiple = page.multiple) !== null && _page$multiple !== void 0 ? _page$multiple : false,
-          parentSectionId: parentId
+          multiple: (_page$multiple = page.multiple) !== null && _page$multiple !== void 0 ? _page$multiple : false
         };
-        pagesToProcess.push(...page.pages.map(x => ({
-          page: x,
-          parentId: page.id
-        })));
+        pagesToProcess.push(...page.pages);
       }
     }
   }
@@ -84468,9 +84435,8 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
   }
   buildOptionalSectionIsFilledCheckRule(targetPath, pathsBySection) {
     const createDecimalCondExpr = checkExpt => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(checkExpt, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.DecimalLiteralExpression(1), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.DecimalLiteralExpression(0));
-    const targetValueRefBase = targetPath.joinWith(OptionalSectionRulesBuilder.optionalSectionFilledFieldName);
-    const targetValueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(targetValueRefBase, "value");
-    const pathInfos = Iterator.from(pathsBySection).filter(path => !path.isEquals(targetValueRefBase)).map(path => {
+    const targetValueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(targetPath.joinWith(OptionalSectionRulesBuilder.optionalSectionFilledFieldName), "value");
+    const pathInfos = Iterator.from(pathsBySection).map(path => {
       const splitInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_2__.getMatchedAndDifferentModelPaths)(targetPath, path);
       const iterationEntries = (0,_Common_ModelPath_BuildIterationSequence__WEBPACK_IMPORTED_MODULE_3__.buildIterationSequence)(splitInfo.differentPath);
       return {
@@ -84493,7 +84459,7 @@ class OptionalSectionRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MOD
       return pathCheckWithReduceIfRequiredExpr;
     });
     const allChecksExpressions = pathTestRules.reduce((acc, current) => acc == undefined ? current : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.OrBinaryExpression(acc, current), undefined);
-    return allChecksExpressions != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(targetValueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(allChecksExpressions, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("1"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression())) : undefined;
+    return allChecksExpressions != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(targetValueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(allChecksExpressions, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("1"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.StringLiteralExpression("0"))) : undefined;
   }
 }
 OptionalSectionRulesBuilder.optionalSectionFilledFieldName = "isFilledOptional";
@@ -89747,21 +89713,17 @@ 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.findAllSingleSections(node);
     if (node.requisite) {
       entrySections.push(_Common_CommonConstants_SectionNames__WEBPACK_IMPORTED_MODULE_12__.SectionNames.requisitesSection);
     }
-    const result = {
+    return {
       [rootPath]: optionalSections.length > 0 ? {
         section: entrySections,
-        allSingleSections: allSections,
         optionalSections: optionalSections
       } : {
-        section: entrySections,
-        allSingleSections: allSections
+        section: entrySections
       }
     };
-    return result;
   }
   buildChildrenDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_FormNode__WEBPACK_IMPORTED_MODULE_21__.FormNode);
@@ -89785,41 +89747,18 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     }
   }
   findOptionalSections(node) {
-    const pages = this.findAllSingleSections(node).filter(page => page.optional);
-    return pages;
-  }
-  findNearestOptionalSection(sectionId, allSinglePagesWithParent) {
-    const pageInfo = allSinglePagesWithParent.get(sectionId);
-    if (pageInfo == undefined || pageInfo.page.optional || pageInfo.parentPage == undefined || pageInfo.parentPage.multiple) {
-      return undefined;
-    }
-    if (pageInfo.parentPage.optional) {
-      return pageInfo.parentPage.id;
-    }
-    return this.findNearestOptionalSection(pageInfo.parentPage.id, allSinglePagesWithParent);
-  }
-  findAllSingleSections(node) {
-    const allSinglePagesWithParent = new Map(this.getAllPages(node.pages).filter(x => !x.page.multiple).map(x => [x.page.id, x]));
-    const pages = Iterator.from(allSinglePagesWithParent.values()).map(x => x.page).map(page => {
+    const optionalPages = this.getAllPages(node.pages).filter(page => {
       var _page$optional;
-      return {
-        id: page.id,
-        path: page.getFullPath().toLegacyPath(),
-        optional: (_page$optional = page.optional) !== null && _page$optional !== void 0 ? _page$optional : false,
-        dependsOnSection: this.findNearestOptionalSection(page.id, allSinglePagesWithParent)
-      };
-    }).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id)).toArray();
-    return pages;
+      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;
   }
-  getAllPages(pages, parentPage) {
-    const allPages = pages.flatMap(page => this.getAllPages(page.pages, page)).map(x => ({
-      page: x.page,
-      parentPage: x.parentPage
-    }));
-    return pages.map(page => ({
-      page: page,
-      parentPage: parentPage
-    })).concat(...allPages);
+  getAllPages(pages) {
+    const allPages = pages.flatMap(page => this.getAllPages(page.pages));
+    return pages.concat(allPages);
   }
   buildBaseFormWithContent(context, formContent, formNode) {
     const pageNodes = this.getFormPages(formNode);
@@ -90770,9 +90709,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Helpers_Normativehelp_NormativeHelpNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../Helpers/Normativehelp/NormativeHelpNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Helpers/Normativehelp/NormativeHelpNode.ts");
 /* harmony import */ var _Banner_BannerNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../Banner/BannerNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Banner/BannerNode.ts");
 /* harmony import */ var _ControlFlow_If_IfNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../ControlFlow/If/IfNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If/IfNode.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _PageNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./PageNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page/PageNode.ts");
-
+/* harmony import */ var _PageNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./PageNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page/PageNode.ts");
 
 
 
@@ -90790,13 +90727,13 @@ __webpack_require__.r(__webpack_exports__);
 
 class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode;
+    return _PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode;
   }
   applyVisibilityPathProcessing() {
     return false;
   }
   *doBuildNormalizeRules(builder, formSchemaRng) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
     const element = formSchemaRng.getElementByPath(node.getFullPath());
     if (node.path == undefined) {
       return;
@@ -90810,8 +90747,7 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
     }
   }
   doBuildDataDeclaration(context) {
-    var _node$optional, _node$multiple;
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
     if (node.path == undefined) {
       return {};
     }
@@ -90824,30 +90760,20 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
         result.optional = [true];
       }
     }
-    const optionalFieldPath = node.getFullPath().joinWith(PageConverter.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);
     return context.mergeDataDeclaration({
       [this.getResolvedBindingPath(node)]: result
-    }, context.addPathSectionDeclarationEntry(node), optionalFieldRequired ? {
-      [optionalFieldPath]: {
-        value: context.initSequenceFactory.dataValue({
-          defaultValue: "1",
-          fetchfn: undefined,
-          settings: undefined
-        }, false, "1")
-      }
-    } : undefined, optionalFieldRequired ? context.addPathSectionDeclarationEntry(node, false, false, (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_14__.createRelativeFromTokens)([PageConverter.optionalSectionFilledFieldName])) : undefined);
+    }, context.addPathSectionDeclarationEntry(node));
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
     return context.processChildrenDataDeclaration(node.children);
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
     yield* node.children;
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_15__.PageNode);
+    const node = this.getCurrentNodeAs(_PageNode__WEBPACK_IMPORTED_MODULE_14__.PageNode);
     if (node.multiple) {
       this.ensurePathExists(node, node.path);
     }
@@ -90911,7 +90837,6 @@ class PageConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4__.Sug
     return pageBuilder.buildConverterResult();
   }
 }
-PageConverter.optionalSectionFilledFieldName = "isFilledOptional";
 
 /***/ }),
 
@@ -111727,8 +111652,8 @@ function getBindingPathExpression(node, customPath) {
   }
   return node.getFullPath().toLegacyPath();
 }
-function getResolvedBindingPath(node, suffix) {
-  return node.getFullPath().joinWith(suffix != undefined ? suffix : (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.emptyModelPath)()).toLegacyPath();
+function getResolvedBindingPath(node) {
+  return node.getFullPath().toLegacyPath();
 }
 function getBindingPathWithSuffix(node, customPath) {
   return node.getFullPath().joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(customPath, "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).normalize().toLegacyPath();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.37.0-fix-fs-7820.3",
+  "version": "5.37.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,