@kontur.candy/generator 5.32.0 → 5.33.0-ss-doc-import.0

package/dist/index.js

@@ -61315,7 +61315,22 @@ function addYears(date, amount) {
   return date;
 }
 function dateToString(date, format) {
-  return format.replace("dd", date.getDate().toString().padStart(2, "0")).replace("MM", (date.getMonth() + 1).toString().padStart(2, "0")).replace("yyyy", date.getFullYear().toString());
+  var _months;
+  const months = {
+    "1": "января",
+    "2": "февраля",
+    "3": "марта",
+    "4": "апреля",
+    "5": "мая",
+    "6": "июня",
+    "7": "июля",
+    "8": "августа",
+    "9": "сентября",
+    "10": "октября",
+    "11": "ноября",
+    "12": "декабря"
+  };
+  return format.replace("HH", date.getHours().toString().padStart(2, "0")).replace("mm", date.getMinutes().toString().padStart(2, "0")).replace("dd", date.getDate().toString().padStart(2, "0")).replace("d", date.getDate().toString()).replace("MMMM", (_months = months[date.getMonth() + 1]) !== null && _months !== void 0 ? _months : "").replace("MM", (date.getMonth() + 1).toString().padStart(2, "0")).replace("yyyy", date.getFullYear().toString());
 }
 function isDate(date) {
   return date instanceof Date && !isNaN(date.getTime());
@@ -80093,7 +80108,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali4 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali4 !== void 0 ? _sugarRoot$schemaVali4 : false);
     const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_33__.OptionalSectionRulesBuilder(sugarRoot, dataDeclarationHelper);
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng);
-    const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter);
+    const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter, validationRulesBuilder);
     const formulaAndInitOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_41__.FormulaAndInitOnlyNormalizationRuleGenerator(sugarRulesBuilder, formulaRulesBuilder, optionalSectionRuleBuilder, formSchemaRng);
     const builder = new _FormSourcesBuilder_FormSourcesBuilder__WEBPACK_IMPORTED_MODULE_21__.FormSourcesBuilder(additionalContent.formSourcesPath);
     const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali5 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali5 !== void 0 ? _sugarRoot$schemaVali5 : false);
@@ -83250,20 +83265,24 @@ __webpack_require__.r(__webpack_exports__);
 
 
 class FormulaOnlyNormalizationRuleGenerator {
-  constructor(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter) {
+  constructor(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter, validationRulesBuilder) {
     this.dataDeclarationHelper = void 0;
     this.formSchemaRng = void 0;
     this.formulas = void 0;
     this.formulaExprConverter = void 0;
     this.optionalSectionRuleBuilder = void 0;
+    this.validationRulesBuilder = void 0;
     this.optionalSectionRuleBuilder = optionalSectionRuleBuilder;
     this.dataDeclarationHelper = dataDeclarationHelper;
     this.formSchemaRng = formSchemaRng;
     this.formulas = formulas;
     this.formulaExprConverter = formulaExprConverter;
+    this.validationRulesBuilder = validationRulesBuilder;
   }
   generateRules() {
-    const allRules = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.concat(this.buildFormulaFLangRules(), this.optionalSectionRuleBuilder.buildRules());
+    const calculationRules = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.concat(this.buildFormulaFLangRules(), this.optionalSectionRuleBuilder.buildRules());
+    const validationRules = this.validationRulesBuilder.buildRules();
+    const allRules = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.concat(calculationRules, validationRules);
     return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_5__.combineRulesWithOptionalSectionChecking)(allRules, this.optionalSectionRuleBuilder);
   }
   *buildFormulaFLangRules() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.32.0",
+  "version": "5.33.0-ss-doc-import.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,