@kontur.candy/generator 5.69.0-markup-in-modalheader.0 → 5.69.0

package/dist/index.js

@@ -46492,6 +46492,16 @@ class ModelPathImpl {
     }
     return this;
   }
+  trimFirstStarIfLastToken() {
+    const firstItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.first(this.tokens);
+    if (firstItem != undefined && PathTokens.isMultiToken(firstItem)) {
+      return new ModelPathImpl(this.tokens.slice(1), this.absolute);
+    }
+    return this;
+  }
+  getSuffixPathFrom(modelFieldPath) {
+    return createRelativeFromTokens(modelFieldPath.matchFor(this).map(x => x.kind === _PathMatcher__WEBPACK_IMPORTED_MODULE_4__.MatchKind.DifferentSuffix ? x.source : undefined).filter(_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined).flatMap(x => x.getPathPartsAsArray()));
+  }
   getParentPath() {
     const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(this.absolute);
     for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.skipLast(this.getPathParts(), 1)) {
@@ -59089,7 +59099,7 @@ class FormSchemaRngAttribute {
 }
 const RootParent = Symbol.for("__ROOT_ELEMENT_PARENT__");
 class FormSchemaRngElement {
-  constructor(name, parent, optional, multiple, nillable, maxOccurs, lazyLoadMode, lazyLoadAggregations, errorAndWarningCountRequired, lazyLoadingThreshold, disableValueAutoInit, editorOnly) {
+  constructor(name, parent, optional, multiple, nillable, maxOccurs, lazyLoadMode, lazyLoadAggregations, errorAndWarningCountRequired, lazyLoadingThreshold, disableValueAutoInit, editorOnly, useServerFilters) {
     this.name = void 0;
     this.multiple = void 0;
     this.lazyLoadMode = void 0;
@@ -59100,6 +59110,7 @@ class FormSchemaRngElement {
     this.innerTextType = void 0;
     this.children = new Map();
     this.maxOccurs = void 0;
+    this.useServerFilters = void 0;
     this.attributes = new Map();
     this.parent = void 0;
     this.optional = void 0;
@@ -59117,6 +59128,7 @@ class FormSchemaRngElement {
     this.lazyLoadingThreshold = lazyLoadingThreshold;
     this.disableValueAutoInit = disableValueAutoInit;
     this.editorOnly = editorOnly;
+    this.useServerFilters = useServerFilters;
   }
   addElement(element) {
     this.children.set(element.name, element);
@@ -59150,6 +59162,9 @@ class FormSchemaRngElement {
     var _this$disableValueAut2;
     return (_this$disableValueAut2 = this.disableValueAutoInit) !== null && _this$disableValueAut2 !== void 0 ? _this$disableValueAut2 : this.parent instanceof FormSchemaRngElement ? this.parent.isIgnoreForcedValueSet() : false;
   }
+  getUseServerFilters() {
+    return this.useServerFilters;
+  }
 }
 class FormSchemaRng {
   constructor(rootElement) {
@@ -59165,7 +59180,7 @@ class FormSchemaRng {
     return new FormSchemaRng(this.convertSchemaRngElement(schemaRngElement, RootParent));
   }
   static convertSchemaRngElement(schemaRngElement, parent) {
-    const result = new FormSchemaRngElement(schemaRngElement.name, parent, schemaRngElement.optional, schemaRngElement.multiple, schemaRngElement.nillable, schemaRngElement.maxOccurs, schemaRngElement.lazyLoadMode, schemaRngElement.lazyLoadAggregations, schemaRngElement.errorAndWarningCountRequired, schemaRngElement.lazyLoadingThreshold, schemaRngElement.disableValueAutoInit, schemaRngElement.editorOnly);
+    const result = new FormSchemaRngElement(schemaRngElement.name, parent, schemaRngElement.optional, schemaRngElement.multiple, schemaRngElement.nillable, schemaRngElement.maxOccurs, schemaRngElement.lazyLoadMode, schemaRngElement.lazyLoadAggregations, schemaRngElement.errorAndWarningCountRequired, schemaRngElement.lazyLoadingThreshold, schemaRngElement.disableValueAutoInit, schemaRngElement.editorOnly, schemaRngElement.useServerFilters);
     if (schemaRngElement.innerText != undefined) {
       if (schemaRngElement.innerText.type != undefined) {
         result.setInnerTextType(this.buildTypeInfo(schemaRngElement.innerText.type));
@@ -59516,7 +59531,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _dec4, _class3, _class4, _descriptor2, _dec5, _dec6, _class5, _class6, _descriptor3, _dec7, _dec8, _class7, _class8, _descriptor4, _dec9, _dec10, _class9, _class10, _descriptor5, _dec11, _dec12, _class11, _class12, _descriptor6, _dec13, _dec14, _class13, _class14, _descriptor7, _dec15, _dec16, _class15, _class16, _descriptor8, _dec17, _dec18, _class17, _class18, _descriptor9, _dec19, _dec20, _class19, _class20, _descriptor10, _dec21, _dec22, _dec23, _class21, _class22, _descriptor11, _descriptor12, _dec24, _dec25, _dec26, _dec27, _dec28, _class23, _class24, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _dec29, _dec30, _dec31, _dec32, _dec33, _dec34, _dec35, _dec36, _dec37, _dec38, _class25, _class26, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21, _descriptor22, _descriptor23, _descriptor24, _descriptor25, _dec39, _dec40, _class27, _class28, _descriptor26, _dec41, _dec42, _class29, _class30, _descriptor27, _dec43, _dec44, _dec45, _dec46, _dec47, _dec48, _dec49, _dec50, _dec51, _dec52, _dec53, _dec54, _dec55, _dec56, _dec57, _dec58, _dec59, _class31, _class32, _descriptor28, _descriptor29, _descriptor30, _descriptor31, _descriptor32, _descriptor33, _descriptor34, _descriptor35, _descriptor36, _descriptor37, _descriptor38, _descriptor39, _descriptor40, _descriptor41, _descriptor42, _descriptor43;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _dec4, _class3, _class4, _descriptor2, _dec5, _dec6, _class5, _class6, _descriptor3, _dec7, _dec8, _class7, _class8, _descriptor4, _dec9, _dec10, _class9, _class10, _descriptor5, _dec11, _dec12, _class11, _class12, _descriptor6, _dec13, _dec14, _class13, _class14, _descriptor7, _dec15, _dec16, _class15, _class16, _descriptor8, _dec17, _dec18, _class17, _class18, _descriptor9, _dec19, _dec20, _class19, _class20, _descriptor10, _dec21, _dec22, _dec23, _class21, _class22, _descriptor11, _descriptor12, _dec24, _dec25, _dec26, _dec27, _dec28, _class23, _class24, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _dec29, _dec30, _dec31, _dec32, _dec33, _dec34, _dec35, _dec36, _dec37, _dec38, _class25, _class26, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21, _descriptor22, _descriptor23, _descriptor24, _descriptor25, _dec39, _dec40, _class27, _class28, _descriptor26, _dec41, _dec42, _class29, _class30, _descriptor27, _dec43, _dec44, _dec45, _dec46, _dec47, _dec48, _dec49, _dec50, _dec51, _dec52, _dec53, _dec54, _dec55, _dec56, _dec57, _dec58, _dec59, _dec60, _class31, _class32, _descriptor28, _descriptor29, _descriptor30, _descriptor31, _descriptor32, _descriptor33, _descriptor34, _descriptor35, _descriptor36, _descriptor37, _descriptor38, _descriptor39, _descriptor40, _descriptor41, _descriptor42, _descriptor43, _descriptor44;
 
 class SchemaRngTypeCheck extends _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {}
 let PatternTypeCheck = (_dec = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("pattern", ``), _dec2 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("value", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, ``), _dec(_class = (_class2 = class PatternTypeCheck extends SchemaRngTypeCheck {
@@ -59763,7 +59778,7 @@ let SchemaRngElement = (_dec43 = (0,_generators_markupGenerator_Serializer_Sugar
             - deferred: ставится на коллекцию, которую хотим получать частями; например, в 6-НДФЛ при открытии одной справки, загрузятся все данные по ней
             - initial: данные загружаются всегда; например, данные для фильтров
             - request: загрузка по запросу с фронта; используется для постраничного отображения списков; например, видимые пользователю поля в таблице
-    `), _dec57 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("errorAndWarningCountRequired", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Подсчет количества ошибок и предупреждений по элементу в множественности`), _dec58 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadingThreshold", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Количество элементов в множественности, начиная с которого включается частичная загрузка. Не поддерживается для вложенных множественностей, только для корневой с lazyLoadMode=deferred`), _dec59 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disableValueAutoInit", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `В значениии true запрещает при кастомной нормализации перезаписывать значение value,
+    `), _dec57 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("errorAndWarningCountRequired", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Подсчет количества ошибок и предупреждений по элементу в множественности`), _dec58 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("useServerFilters", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, "Включает режим серверной фильтрации для коллекции"), _dec59 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("lazyLoadingThreshold", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Количество элементов в множественности, начиная с которого включается частичная загрузка. Не поддерживается для вложенных множественностей, только для корневой с lazyLoadMode=deferred`), _dec60 = (0,_generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disableValueAutoInit", _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `В значениии true запрещает при кастомной нормализации перезаписывать значение value,
         полученное из ФУФа, даже если оно пустое`), _dec43(_class31 = (_class32 = class SchemaRngElement extends _generators_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
@@ -59781,8 +59796,9 @@ let SchemaRngElement = (_dec43 = (0,_generators_markupGenerator_Serializer_Sugar
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lazyLoadAggregations", _descriptor39, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lazyLoadMode", _descriptor40, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorAndWarningCountRequired", _descriptor41, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lazyLoadingThreshold", _descriptor42, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disableValueAutoInit", _descriptor43, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "useServerFilters", _descriptor42, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "lazyLoadingThreshold", _descriptor43, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disableValueAutoInit", _descriptor44, this);
   }
 }, (_descriptor28 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "name", [_dec44], {
   configurable: true,
@@ -59854,12 +59870,17 @@ let SchemaRngElement = (_dec43 = (0,_generators_markupGenerator_Serializer_Sugar
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "lazyLoadingThreshold", [_dec58], {
+}), _descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "useServerFilters", [_dec58], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "lazyLoadingThreshold", [_dec59], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "disableValueAutoInit", [_dec59], {
+}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class32.prototype, "disableValueAutoInit", [_dec60], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -63913,6 +63934,7 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const defaultValue = this.dataDeclarationHelper.getDefaultValue(target.toLegacyPath());
     const autoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(target.toLegacyPath());
     const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
+    const optional = this.dataDeclarationHelper.isNodeOptionalBySchemaOrSugar(target);
     const compiledTarget = this.modelPathInstance(target);
     const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => ({
       path: x.asDependencyModelPath(),
@@ -63923,7 +63945,7 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths.filter(x => !x.isIgnoreForChecks).map(x => x.path));
     const compiledDelegate = `context => KCCalculation.execute(context, expression => ${compiledExpressionWithCheck}, "${defaultValue}")`;
     return {
-      compiledFunction: `new CalculationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate}, ${autoField}, ${disabled})`,
+      compiledFunction: `new CalculationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate}, ${autoField}, ${disabled}, ${optional})`,
       dependencies: dependencies
     };
   }
@@ -66385,8 +66407,8 @@ class DataDeclarationGenerationContext {
     disabled
   }) {
     const declEntry = {};
-    if (optional) {
-      declEntry.optional = [true];
+    if (optional != undefined) {
+      declEntry.optional = [optional];
     }
     if (disabled) {
       declEntry.disabled = [true];
@@ -66549,8 +66571,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class DataDeclarationGenerationTimeHelper {
-  constructor(dataDeclaration) {
+  constructor(dataDeclaration, formSchemaRng) {
     this.dataDeclaration = void 0;
+    this.formSchemaRng = void 0;
+    this.formSchemaRng = formSchemaRng;
     this.dataDeclaration = dataDeclaration;
   }
   isErrorsAndWarningsCountRequired(targetPath) {
@@ -66587,6 +66611,13 @@ class DataDeclarationGenerationTimeHelper {
     const optionalValue = (_this$getDataDeclarat5 = this.getDataDeclarationEntry(targetPath)) === null || _this$getDataDeclarat5 === void 0 ? void 0 : _this$getDataDeclarat5.optional;
     return (_optionalValue$ = optionalValue === null || optionalValue === void 0 ? void 0 : optionalValue[0]) !== null && _optionalValue$ !== void 0 ? _optionalValue$ : false;
   }
+  isNodeOptionalBySchemaOrSugar(targetPath) {
+    var _this$getDataDeclarat6, _this$formSchemaRng$g, _this$formSchemaRng;
+    const optionalValue = (_this$getDataDeclarat6 = this.getDataDeclarationEntry(targetPath)) === null || _this$getDataDeclarat6 === void 0 ? void 0 : _this$getDataDeclarat6.optional;
+    const optionalBySugar = optionalValue === null || optionalValue === void 0 ? void 0 : optionalValue[0];
+    const optionalBySchema = (_this$formSchemaRng$g = (_this$formSchemaRng = this.formSchemaRng) === null || _this$formSchemaRng === void 0 || (_this$formSchemaRng = _this$formSchemaRng.getElementByPath(targetPath)) === null || _this$formSchemaRng === void 0 ? void 0 : _this$formSchemaRng.isOptional()) !== null && _this$formSchemaRng$g !== void 0 ? _this$formSchemaRng$g : false;
+    return optionalBySugar == undefined ? optionalBySchema : optionalBySugar;
+  }
   getDataDeclarationEntry(targetPath) {
     return this.dataDeclaration[(0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.convertToLegacyPath)(targetPath)];
   }
@@ -66717,6 +66748,9 @@ class DataDeclarationGenerator {
       if (entry instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_6__.FormSchemaRngElement && entry.errorAndWarningCountRequired != undefined) {
         declarationEntry.errorAndWarningCountRequired = [entry.errorAndWarningCountRequired];
       }
+      if (entry instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_6__.FormSchemaRngElement && entry.useServerFilters != undefined) {
+        declarationEntry.useServerFilters = entry.useServerFilters;
+      }
       if (entry.disableValueAutoInit != undefined) {
         declarationEntry.disableValueAutoInit = entry.disableValueAutoInit;
       }
@@ -68390,7 +68424,9 @@ class LazyLoadDeclarationGenerator {
     }
   }
   *processElement(path, element) {
-    if (element.lazyLoadMode != undefined) {
+    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")) {
       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 items = currentPaths.map(currentPath => {
@@ -68411,45 +68447,51 @@ class LazyLoadDeclarationGenerator {
           lazyLoadMode: "initial"
         }));
         yield* additionalItems;
-        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"
-        };
+        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 {
-        yield {
-          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".errorsCount")),
-          lazyLoadMode: "request"
-        };
-        yield {
-          path: this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name + ".warningsCount")),
-          lazyLoadMode: "request"
-        };
+        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 (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");
-        yield {
-          path: sumPath,
-          lazyLoadMode: "initial"
-        };
-        const countPath = baseAggregationPath.joinWith("Count.value");
-        yield {
-          path: countPath,
-          lazyLoadMode: "initial"
-        };
+    if (!useServerFilters) {
+      for (const attr of element.attributes.values()) {
+        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");
+          yield {
+            path: sumPath,
+            lazyLoadMode: "initial"
+          };
+          const countPath = baseAggregationPath.joinWith("Count.value");
+          yield {
+            path: countPath,
+            lazyLoadMode: "initial"
+          };
+        }
       }
     }
     const nextPath = path.joinWith(element.name);
@@ -68612,7 +68654,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
       dataDeclarationContent,
       dataDeclaration
     } = dataDeclarationGenerator.generate();
-    const dataDeclarationHelper = new _DataDeclarationGenerator_DataDeclarationGenerationTimeHelper__WEBPACK_IMPORTED_MODULE_26__.DataDeclarationGenerationTimeHelper(dataDeclaration);
+    const dataDeclarationHelper = new _DataDeclarationGenerator_DataDeclarationGenerationTimeHelper__WEBPACK_IMPORTED_MODULE_26__.DataDeclarationGenerationTimeHelper(dataDeclaration, formSchemaRng);
     const validationGenerator = new _validationGenerator_ValidationGenerator__WEBPACK_IMPORTED_MODULE_16__.ValidationGenerator(sugarRoot, typeRegistry, controlCustomizationContext, formSchemaRng, useSchemaValidations, additionalContent.validationsContent, additionalContent.formJsonSettings);
     const lazyLoadGenerator = new _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_29__.LazyLoadDeclarationGenerator(sugarRoot, formSchemaRng);
     const lazyLoadGeneratorResult = lazyLoadGenerator.generate();
@@ -69577,7 +69619,12 @@ class FLangValidationBuildContext {
     }
     const typeNodePatterns = (_typeNode$children$fi2 = typeNode === null || typeNode === void 0 || (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_0__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined)) !== null && _typeNode$children$fi2 !== void 0 ? _typeNode$children$fi2 : [];
     const stringPatterns = ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.arrayIsNotEmpty)(typeNodePatterns) ? typeNodePatterns : (_schemaTypeNode$patte = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.patterns) !== null && _schemaTypeNode$patte !== void 0 ? _schemaTypeNode$patte : []).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined);
-    const patterns = stringPatterns.map(pattern => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.StringLiteralExpression(pattern))).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.OrBinaryExpression(acc, current) : current, undefined);
+    const patterns = stringPatterns.map(pattern => {
+      if (pattern.startsWith("^") || pattern.endsWith("$")) {
+        return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.StringLiteralExpression(pattern));
+      }
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.StringLiteralExpression(`^${pattern}$`));
+    }).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.OrBinaryExpression(acc, current) : current, undefined);
     if (patterns != undefined) {
       const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.NegateUnaryExpression(patterns);
       yield {
@@ -72531,7 +72578,13 @@ class FormulaRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_6__.
     return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value"));
   }
   createValueRuleForAutoField(fullTarget, defaultValue, getFormulaExpression) {
-    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeStringValueReference)(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))));
+    const valueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value");
+    const valueRefCurrentIteration = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value");
+    const autoFlagRefCurrentIteration = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag");
+    const isRequiredField = !this.dataDeclarationHelper.isNodeOptionalBySchemaOrSugar(fullTarget);
+    const autoFlagIsTrueCondition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeStringValueReference)(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true"));
+    const combinedCondition = isRequiredField ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(autoFlagIsTrueCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)(valueRefCurrentIteration), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)(autoFlagRefCurrentIteration), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()))) : autoFlagIsTrueCondition;
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(valueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(combinedCondition, getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))));
   }
   adjustPathMultiplicity(path) {
     return (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__.adjustPathMultiplicityComplex)(path, this.formSchemaRng, this.dataDeclarationHelper);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.69.0-markup-in-modalheader.0",
+  "version": "5.69.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,