@kontur.candy/generator 6.30.0 → 6.31.0

package/dist/index.js

@@ -91844,7 +91844,7 @@ module.exports = "";
   \************************************************************************/
 /***/ ((module) => {
 
-module.exports = "Корневой элемент для именованных и анонимных типов для валидаций (подробнее в разделе про [валидации](../../dev/Неразобрано/Старая%20дока/Валидации.md)).\n\nВалидации определяются атрибутом `base` и добавлением дополнительных ограничений в дочерние элементы типа. Например:\n\n```xml\n<type base=\"integer\" name=\"rate\" />\n```\n\nЗадаст тип `rate` (можно использовать в атрибуте `type` у контрола), с валидацией на целое число. Если необходимо\nзадать минимальное значение, пишем:\n\n```xml\n<type base=\"integer\" name=\"rate\">\n    <mininclusive value=\"10\" />\n</type>\n```\n\nКоличество ограничений может быть любым:\n\n```xml\n<type base=\"integer\" name=\"rate\">\n    <mininclusive value=\"10\" />\n    <maxinclusive value=\"99\" />\n</type>\n```\n\nТакой тип задаст проверку на диапазон от 10 до 99.\n";
+module.exports = "Корневой элемент для именованных и анонимных типов для валидаций (подробнее в разделе про [валидации](../../dev/Справочники/Формы/Валидации.md)).\n\nВалидации определяются атрибутом `base` и добавлением дополнительных ограничений в дочерние элементы типа. Например:\n\n```xml\n<type base=\"integer\" name=\"rate\" />\n```\n\nЗадаст тип `rate` (можно использовать в атрибуте `type` у контрола), с валидацией на целое число. Если необходимо\nзадать минимальное значение, пишем:\n\n```xml\n<type base=\"integer\" name=\"rate\">\n    <mininclusive value=\"10\" />\n</type>\n```\n\nКоличество ограничений может быть любым:\n\n```xml\n<type base=\"integer\" name=\"rate\">\n    <mininclusive value=\"10\" />\n    <maxinclusive value=\"99\" />\n</type>\n```\n\nТакой тип задаст проверку на диапазон от 10 до 99.\n";
 
 /***/ }),
 
@@ -109223,7 +109223,7 @@ class IterUtils {
       index++;
     }
   }
-  static *skipLast(items, skipCount) {
+  static *skipLast(items, skipCount = 1) {
     if (skipCount === 0) {
       yield* items;
       return;
@@ -129519,11 +129519,12 @@ let SchemaRngElementChoiceElement = (_dec45 = (0,_generators_markupGenerator_Ser
   writable: true,
   initializer: null
 }), _class34)) || _class33);
-let SchemaRngElement = (_dec47 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("element", ``), _dec48 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("name", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, ``), _dec49 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("description", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, ``), _dec50 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("optional", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec51 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("nillable", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec52 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("multiple", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec53 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("maxOccurs", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, ``), _dec54 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("attribute", [SchemaRngAttribute]), _dec55 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("element"), _dec56 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("choice"), _dec57 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("innertext", [SchemaRngInnerText]), _dec58 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("editorOnly", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec59 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadAggregations", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `При частичной загрузке подгружать Sum, Count`), _dec60 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadMode", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.enum("deferred", "initial", "request"), `
+let SchemaRngElement = (_dec47 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("element", ``), _dec48 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("name", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, ``), _dec49 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("description", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, ``), _dec50 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("optional", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec51 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("nillable", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec52 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("multiple", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec53 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("maxOccurs", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, ``), _dec54 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("attribute", [SchemaRngAttribute]), _dec55 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("element"), _dec56 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)("choice"), _dec57 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("innertext", [SchemaRngInnerText]), _dec58 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("editorOnly", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec59 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadAggregations", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `При частичной загрузке подгружать Sum, Count`), _dec60 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadMode", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.enum("deferred", "initial", "request", "serverOnly"), `
         Режим частичной загрузки.
             - deferred: ставится на коллекцию, которую хотим получать частями; например, в 6-НДФЛ при открытии одной справки, загрузятся все данные по ней
             - initial: данные загружаются всегда; например, данные для фильтров
             - request: загрузка по запросу с фронта; используется для постраничного отображения списков; например, видимые пользователю поля в таблице
+            - serverOnly: данные не нужно загружать совсем (если они не нужны редактору, но нужны в ФУФе)
     `), _dec61 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("errorAndWarningCountRequired", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Подсчет количества ошибок и предупреждений по элементу в множественности`), _dec62 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("useServerFilters", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, "Включает режим серверной фильтрации для коллекции"), _dec63 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadingThreshold", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Количество элементов в множественности, начиная с которого включается частичная загрузка. Не поддерживается для вложенных множественностей, только для корневой с lazyLoadMode=deferred`), _dec64 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disableValueAutoInit", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `В значениии true запрещает при кастомной нормализации перезаписывать значение value,
         полученное из ФУФа, даже если оно пустое`), _dec47(_class35 = (_class36 = class SchemaRngElement extends _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
@@ -139385,6 +139386,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
 /* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../Common/ModelPath/AbsoluteModelFieldPath */ "./Common/ModelPath/AbsoluteModelFieldPath.ts");
+
 
 
 
@@ -139401,7 +139404,7 @@ class LazyLoadDeclarationGenerator {
   }
   generate() {
     const declaration = {};
-    const resultItems = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.concat(this.processElement((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.emptyAbsoluteModelPath)(), this.formSchemaRng.getRootElement()), this.extractLazyLoadingDeclarationFromSugar(this.sugarRoot));
+    const resultItems = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.concat(this.processElementRecurcively((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.emptyAbsoluteModelPath)(), this.formSchemaRng.getRootElement()), this.extractLazyLoadingDeclarationFromSugar(this.sugarRoot)).toArray();
     for (const lazyLoadingNodeDeclaration of resultItems) {
       const legacyPathWithField = lazyLoadingNodeDeclaration.path instanceof _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.ModelPathImpl ? lazyLoadingNodeDeclaration.path.toLegacyPath() : lazyLoadingNodeDeclaration.path.toString();
       declaration[legacyPathWithField] = {
@@ -139441,12 +139444,67 @@ class LazyLoadDeclarationGenerator {
       }
     }
   }
-  *processElement(path, element) {
+  *getLoadingRulesForSpecialFieldsInDeferred(path, element, useServerFilters) {
+    if (element.multiple) {
+      const additionalFields = ["children", "errorsCount", "warningsCount"];
+      const additionalItems = additionalFields.map(field => ({
+        path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(`${element.name}.${field}`)),
+        lazyLoadMode: "initial"
+      }));
+      yield* additionalItems;
+      if (!useServerFilters) {
+        yield {
+          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name).joinWith(".errorsCount")),
+          lazyLoadMode: "initial"
+        };
+        yield {
+          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name).joinWith(".warningsCount")),
+          lazyLoadMode: "initial"
+        };
+      }
+    } else {
+      if (!useServerFilters) {
+        yield {
+          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".errorsCount")),
+          lazyLoadMode: "request"
+        };
+        yield {
+          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".warningsCount")),
+          lazyLoadMode: "request"
+        };
+      }
+    }
+  }
+  *processAttribute(path, attr, element, useServerFilters) {
+    if (!useServerFilters) {
+      if (attr.lazyLoadMode != undefined) {
+        const currentPath = path.joinWith(element.name, attr.name + ".value");
+        yield {
+          path: this.formSchemaRng.adjustPathMultiplicity(currentPath),
+          lazyLoadMode: attr.lazyLoadMode
+        };
+      }
+    }
+    if (attr.lazyLoadMode != undefined && attr.lazyLoadAggregations) {
+      const baseAggregationPath = this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name)).trimLastStarIfLastToken().joinWith(attr.name);
+      const sumPath = new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_7__.AbsoluteModelFieldPath(baseAggregationPath.joinWith("Sum"), "value");
+      yield {
+        path: sumPath,
+        lazyLoadMode: "initial"
+      };
+      const countPath = new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_7__.AbsoluteModelFieldPath(baseAggregationPath.joinWith("Count"), "value");
+      yield {
+        path: countPath,
+        lazyLoadMode: "initial"
+      };
+    }
+  }
+  *processElementRecurcively(path, element) {
     var _element$useServerFil;
     const useServerFilters = (_element$useServerFil = element.useServerFilters) !== null && _element$useServerFil !== void 0 ? _element$useServerFil : false;
-    if (element.lazyLoadMode != undefined && (!useServerFilters || element.lazyLoadMode === "deferred")) {
+    if (element.lazyLoadMode != undefined && (!useServerFilters || element.lazyLoadMode === "deferred" || element.lazyLoadMode === "serverOnly")) {
       const adjustedPath = this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name));
-      const currentPaths = element.multiple ? [element.lazyLoadMode === "deferred" ? adjustedPath : adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each)] : [adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each), this.formSchemaRng.adjustPathMultiplicity(path).joinWith(element.name + ".value")];
+      const currentPaths = element.multiple ? [element.lazyLoadMode === "deferred" || element.lazyLoadMode === "serverOnly" ? adjustedPath : adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each)] : [adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each), this.formSchemaRng.adjustPathMultiplicity(path).joinWith(element.name + ".value")];
       const items = currentPaths.map(currentPath => {
         var _element$lazyLoadMode;
         return {
@@ -139458,63 +139516,22 @@ class LazyLoadDeclarationGenerator {
         thresholdValue: element.lazyLoadingThreshold
       } : item);
       yield* items;
-      if (element.multiple) {
-        const additionalFields = ["children", "errorsCount", "warningsCount"];
-        const additionalItems = additionalFields.map(field => ({
-          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(`${element.name}.${field}`)),
-          lazyLoadMode: "initial"
-        }));
-        yield* additionalItems;
-        if (!useServerFilters) {
-          yield {
-            path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name).joinWith(".errorsCount")),
-            lazyLoadMode: "initial"
-          };
-          yield {
-            path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name).joinWith(".warningsCount")),
-            lazyLoadMode: "initial"
-          };
-        }
-      } else {
-        if (!useServerFilters) {
-          yield {
-            path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".errorsCount")),
-            lazyLoadMode: "request"
-          };
-          yield {
-            path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".warningsCount")),
-            lazyLoadMode: "request"
-          };
-        }
-      }
-    }
-    for (const attr of element.attributes.values()) {
-      if (!useServerFilters) {
-        if (attr.lazyLoadMode != undefined) {
-          const currentPath = path.joinWith(element.name, attr.name + ".value");
-          yield {
-            path: this.formSchemaRng.adjustPathMultiplicity(currentPath),
-            lazyLoadMode: attr.lazyLoadMode
-          };
-        }
-      }
-      if (attr.lazyLoadMode != undefined && attr.lazyLoadAggregations) {
-        const baseAggregationPath = this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name)).trimLastStarIfLastToken().joinWith(attr.name);
-        const sumPath = baseAggregationPath.joinWith("Sum.value");
+      if (element.lazyLoadMode === "serverOnly" && element.multiple) {
         yield {
-          path: sumPath,
-          lazyLoadMode: "initial"
-        };
-        const countPath = baseAggregationPath.joinWith("Count.value");
-        yield {
-          path: countPath,
-          lazyLoadMode: "initial"
+          path: new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_7__.AbsoluteModelFieldPath(adjustedPath.trimLastStarIfLastToken(), "children"),
+          lazyLoadMode: "serverOnly"
         };
       }
+      if (element.lazyLoadMode !== "serverOnly") {
+        yield* this.getLoadingRulesForSpecialFieldsInDeferred(path, element, useServerFilters);
+      }
+    }
+    for (const attr of element.attributes.values()) {
+      yield* this.processAttribute(path, attr, element, useServerFilters);
     }
     const nextPath = path.joinWith(element.name);
     for (const child of element.children.values()) {
-      yield* this.processElement(nextPath, child);
+      yield* this.processElementRecurcively(nextPath, child);
     }
   }
   static replaceHolder(decl) {
@@ -139647,6 +139664,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _markupGenerator_getRootPath__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(/*! ./markupGenerator/getRootPath */ "./Generator/src/generators/markupGenerator/getRootPath.ts");
 /* harmony import */ var _KCLangToJsGenerator_KClangUserDefinedFunctionsForJSRegistry__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(/*! ./KCLangToJsGenerator/KClangUserDefinedFunctionsForJSRegistry */ "./Generator/src/generators/KCLangToJsGenerator/KClangUserDefinedFunctionsForJSRegistry.ts");
 /* harmony import */ var _KCLangToJsGenerator_KCLangExpressionToJsExpressionConverter__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(/*! ./KCLangToJsGenerator/KCLangExpressionToJsExpressionConverter */ "./Generator/src/generators/KCLangToJsGenerator/KCLangExpressionToJsExpressionConverter.ts");
+/* harmony import */ var _markupGenerator_SugarNodeConverter__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(/*! ./markupGenerator/SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
+
 
 
 
@@ -139818,6 +139837,8 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     return builder.buildSources(additionalContent.gfv, resourcesHash);
   } catch (e) {
     return (0,_common_Errors_ProcessSugarErrors__WEBPACK_IMPORTED_MODULE_1__.processSugarErrors)(e, additionalContent.gfv);
+  } finally {
+    (0,_markupGenerator_SugarNodeConverter__WEBPACK_IMPORTED_MODULE_57__.clearDeserializedPagesCache)();
   }
 }
 function getReferencedFetchFunctions(fetchFunctionSources) {
@@ -168857,7 +168878,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _common_KCLang_CodeDom_GtExpression__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/GtExpression */ "./Generator/src/common/KCLang/CodeDom/GtExpression.ts");
 /* harmony import */ var _common_KCLang_CodeDom_LtExpression__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/LtExpression */ "./Generator/src/common/KCLang/CodeDom/LtExpression.ts");
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
-/* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_IsDateFunctionCall__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ../../common/KCLang/CodeDom/Functions/IsDateFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/IsDateFunctionCall.ts");
+/* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
+
 
 
 
@@ -168928,7 +168951,7 @@ class KCLangCalculationsBuildContext {
     const baseDescription = (_typeNode$description = typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _typeNode$description !== void 0 ? _typeNode$description : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description;
     const valueChecks = [];
     if (baseName != undefined) {
-      valueChecks.push(...Iterator.from(this.createBaseTypeValidation(targetPath, baseName, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(baseDescription), node)).toArray());
+      valueChecks.push(...Iterator.from(this.createBaseTypeValidation(targetPath, baseName, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)(baseDescription), node)).toArray());
     }
     valueChecks.push(...Iterator.from(this.createTypeValidations(targetPath, typeNode, schemaTypeNode, nodeGId)).toArray());
     const schemaNode = this.schemaRng.getElementByPath(targetFullPath);
@@ -168957,7 +168980,7 @@ class KCLangCalculationsBuildContext {
         }
         choiceChecks = choiceRules.reduce(combineByOrKCLangExpr, undefined);
       }
-      const checkRequiredStatement = new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(requiredDescription))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken).toArray()).toString()))]);
+      const checkRequiredStatement = new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)(requiredDescription))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(Iterator.from(targetPath.getPathParts()).filter(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken).toArray()).toString()))]);
       if (restChecks != undefined && choiceChecks != undefined) {
         yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(restChecks, choiceChecks), [checkRequiredStatement]);
       } else if (choiceChecks != undefined) {
@@ -169002,7 +169025,7 @@ class KCLangCalculationsBuildContext {
     const enumerationItems = (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.arrayIsNotEmpty)(typeNodeEnumerations) ? typeNodeEnumerations : (_schemaTypeNode$enume = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.enumeration) !== null && _schemaTypeNode$enume !== void 0 ? _schemaTypeNode$enume : [];
     const makeMessage = (constraints, sugarTypeCheckDescription, sugarTypeDescription, schemaTypeDescription) => {
       var _ref5, _ref6, _ref7, _omitLocalization;
-      return (_ref5 = (_ref6 = (_ref7 = (_omitLocalization = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(sugarTypeCheckDescription)) !== null && _omitLocalization !== void 0 ? _omitLocalization : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(sugarTypeDescription)) !== null && _ref7 !== void 0 ? _ref7 : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)(schemaTypeDescription)) !== null && _ref6 !== void 0 ? _ref6 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref5 !== void 0 ? _ref5 : "Поле должно быть заполнено";
+      return (_ref5 = (_ref6 = (_ref7 = (_omitLocalization = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)(sugarTypeCheckDescription)) !== null && _omitLocalization !== void 0 ? _omitLocalization : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)(sugarTypeDescription)) !== null && _ref7 !== void 0 ? _ref7 : (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)(schemaTypeDescription)) !== null && _ref6 !== void 0 ? _ref6 : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.generate(constraints !== null && constraints !== void 0 ? constraints : {})) !== null && _ref5 !== void 0 ? _ref5 : "Поле должно быть заполнено";
     };
     const valueReferenceExpression = new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_17__.KCLangPath.fromModelPath(targetPath, true));
     const stringValueReference = new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(valueReferenceExpression, _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default);
@@ -169017,7 +169040,7 @@ class KCLangCalculationsBuildContext {
       var _digest$keyColumnName, _digest$keyColumnName2, _ref8, _digest$description, _ref9, _digest$checkType;
       // const isIgnoreCase = typeNode?.isCaseIndependentValid ?? false;
       const ruleBody = new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(new _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_21__.NotExpression(new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_10__.ExistsFunctionCall(valueReferenceExpression)), new _common_KCLang_CodeDom_EqExpression__WEBPACK_IMPORTED_MODULE_9__.EqExpression(stringValueReference, new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(""))), new _common_KCLang_CodeDom_NotEqExpression__WEBPACK_IMPORTED_MODULE_20__.NotEqExpression(new _common_KCLang_CodeDom_Functions_JoinFunctionCall__WEBPACK_IMPORTED_MODULE_12__.JoinFunctionCall(new _common_KCLang_CodeDom_Functions_GetPicklistValuesFunctionCall__WEBPACK_IMPORTED_MODULE_11__.GetPicklistValuesFunctionCall(new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression(gId), new _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_24__.StringArrayConstExpression([new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression((_digest$keyColumnName = digest.keyColumnName) !== null && _digest$keyColumnName !== void 0 ? _digest$keyColumnName : "code")]), new _common_KCLang_CodeDom_StringArrayConstExpression__WEBPACK_IMPORTED_MODULE_24__.StringArrayConstExpression([stringValueReference]), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression((_digest$keyColumnName2 = digest.keyColumnName) !== null && _digest$keyColumnName2 !== void 0 ? _digest$keyColumnName2 : "code"))), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")));
-      yield this.createCheck(targetPath, ruleBody, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_38__.omitLocalization)((_ref8 = (_digest$description = digest.description) !== null && _digest$description !== void 0 ? _digest$description : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref8 !== void 0 ? _ref8 : "Поле заполнено не по справочнику"), (_ref9 = (_digest$checkType = digest.checkType) !== null && _digest$checkType !== void 0 ? _digest$checkType : typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _ref9 !== void 0 ? _ref9 : "error");
+      yield this.createCheck(targetPath, ruleBody, (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_39__.omitLocalization)((_ref8 = (_digest$description = digest.description) !== null && _digest$description !== void 0 ? _digest$description : typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _ref8 !== void 0 ? _ref8 : "Поле заполнено не по справочнику"), (_ref9 = (_digest$checkType = digest.checkType) !== null && _digest$checkType !== void 0 ? _digest$checkType : typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _ref9 !== void 0 ? _ref9 : "error");
     }
     const typeNodeLength = typeNode === null || typeNode === void 0 || (_typeNode$children2 = typeNode.children) === null || _typeNode$children2 === void 0 ? void 0 : _typeNode$children2.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_32__.LengthTypeCheckNode));
     const lengthValue = (_typeNodeLength$value = typeNodeLength === null || typeNodeLength === void 0 ? void 0 : typeNodeLength.value) !== null && _typeNodeLength$value !== void 0 ? _typeNodeLength$value : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.length;
@@ -169152,7 +169175,7 @@ class KCLangCalculationsBuildContext {
         {
           const dateNode = node;
           const isFss = (dateNode === null || dateNode === void 0 ? void 0 : dateNode.dateFormat) === "fss";
-          yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), isFss ? new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(19|20)[0-9]{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$") : new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$")), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
+          yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_6__.CheckStatement(new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(new _common_KCLang_CodeDom_Functions_IsDateFunctionCall__WEBPACK_IMPORTED_MODULE_38__.IsDateFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default)), new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_14__.RegexMatchFunctionCall(new _common_KCLang_CodeDom_CastExpression__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_26__.ValueReferenceExpression(path), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), isFss ? new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(19|20)[0-9]{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$") : new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("^(0[1-9]|[12][0-9]|3[01])\\.(0[1-9]|1[012])\\.(19|20)[0-9]{2}$"))), [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(baseDescription !== null && baseDescription !== void 0 ? baseDescription : _common_SchemaRng_StringTypeMessageGenerator__WEBPACK_IMPORTED_MODULE_30__.StringTypeMessageGenerator.getBaseTypeMessage(baseType))), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_27__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_8__.DescriptionText(checkTargetValue))]);
           break;
         }
       case "gYear":
@@ -170653,7 +170676,8 @@ function getNodeClass(node) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   SugarNodeConverterBase: () => (/* binding */ SugarNodeConverterBase)
+/* harmony export */   SugarNodeConverterBase: () => (/* binding */ SugarNodeConverterBase),
+/* harmony export */   clearDeserializedPagesCache: () => (/* binding */ clearDeserializedPagesCache)
 /* harmony export */ });
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
@@ -170690,6 +170714,9 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const deserializedPages = new Map();
+function clearDeserializedPagesCache() {
+  deserializedPages.clear();
+}
 class SugarNodeConverterBase {
   get nodePaths() {
     return [];

package/package.json

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