@kontur.candy/generator 5.43.0 → 5.44.0-fix-holkin-validations.0

package/dist/index.js

@@ -58179,6 +58179,21 @@ class FormSchemaRng {
     }
     return children;
   }
+  getAllChildValueNodes(element) {
+    const children = [];
+    const queue = [element];
+    while (queue.length > 0) {
+      const current = queue.shift();
+      if (current instanceof FormSchemaRngElement) {
+        const childrenOfCurrent = Array.from(current.children.values());
+        const attributesOfCurrent = Array.from(current.attributes.values());
+        children.push(...childrenOfCurrent.filter(x => x.innerTextType != undefined));
+        queue.push(...childrenOfCurrent);
+        children.push(...attributesOfCurrent);
+      }
+    }
+    return children;
+  }
   getPath(element, multiplicityToken = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.current) {
     const result = [];
     let currentElement = element;
@@ -68074,7 +68089,7 @@ class FLangValidationBuildContext {
     this.pathsWithValidations.add(targetPath);
     const schemaNode = this.schemaRng.getElementByPath(targetPath);
     const parentNode = schemaNode != undefined ? this.getFirstAcceptedParent(schemaNode) : undefined;
-    const allChildrenPaths = parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_2__.FormSchemaRngElement ? this.schemaRng.getAllChildren(parentNode).map(x => this.schemaRng.getPath(x, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).filter(x => !(0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetPath, x).differentPath.isContainIteration()) : undefined;
+    const allChildrenPaths = parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_2__.FormSchemaRngElement ? this.schemaRng.getAllChildValueNodes(parentNode).map(x => this.schemaRng.getPath(x, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).filter(x => !(0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetPath, x).differentPath.isContainIteration()) : undefined;
     const restChecks = allChildrenPaths === null || allChildrenPaths === void 0 ? void 0 : allChildrenPaths.map(childPath => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.ValueReferenceExpression(childPath.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_14__.StringLiteralExpression(""))).reduce(_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.combineByAndFlangExpr, undefined);
     const errorValidations = validations.filter(x => !x.checkType || x.checkType === "error");
     const errorExpression = this.createFlangExpression((0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_5__.reverseArray)(errorValidations), targetPath, valueReference, "error", highOrderDescription !== null && highOrderDescription !== void 0 ? highOrderDescription : typeNode === null || typeNode === void 0 ? void 0 : typeNode.requiredDescription, optional, parentNode, restChecks);
@@ -99580,7 +99595,6 @@ class ValidationGenerator {
     this.controlCustomizationContext = void 0;
     this.useSchemaValidations = void 0;
     this.criterionOfExistenceFromSchemaRng = [];
-    this.depsRngSchemaValidationCounter = 0;
     this.settings = void 0;
     this.visibilityConditionsStack = [];
     this.sugarRoot = sugarRoot;
@@ -99672,7 +99686,7 @@ class ValidationGenerator {
       // NOTE Просто, чтоб не падали аппрувал тесты
       return emptyResult;
     }
-    const result = `export default function rngSchemaValidationConfigurator ({ form, ValidationHelper, Validators, ap, ValidationFunction, DependenciesRequiredAreEmpty, PathTokens }) {
+    const result = `export default function rngSchemaValidationConfigurator ({ form, ValidationHelper, Validators, ap, ValidationFunction, DependenciesRequiredAreEmpty, PathTokens, kcLangUtils }) {
                 const t = str => x => x.translate(str);
                 ${compiledConditions.join("\n")}
             }
@@ -99680,18 +99694,35 @@ class ValidationGenerator {
     return result;
   }
   generateRequiredValidationByDeps(bindingPath, dependencies, localizedString) {
+    var _this$validations$bin, _this$validations$bin2, _this$validations$bin3;
     const targetAsString = this.modelPathInstance(bindingPath);
-    const dependenciesAsString = dependencies.map(x => this.modelPathInstance(x.toCurrentIteration())).join(", \n");
     const message = typeof localizedString === "string" ? `"${localizedString}"` : localizedString.expression;
-    const depsVariableName = `deps${this.depsRngSchemaValidationCounter++}`;
+    const hasAlwaysVisibleCondition = (_this$validations$bin = this.validations[bindingPath.toLegacyPath()]) === null || _this$validations$bin === void 0 ? void 0 : _this$validations$bin.map(x => x.conditions).some(x => x.length == 0);
+    const conditions = (_this$validations$bin2 = (_this$validations$bin3 = this.validations[bindingPath.toLegacyPath()]) === null || _this$validations$bin3 === void 0 ? void 0 : _this$validations$bin3.map(x => x.conditions).flat()) !== null && _this$validations$bin2 !== void 0 ? _this$validations$bin2 : [];
+    if (conditions.length == 0 || hasAlwaysVisibleCondition) {
+      const dependenciesToCheck = dependencies.map(x => this.modelPathInstance(x.toCurrentIteration()));
+      return `
+                form.calculator2.addCalculationFunction(
+                    new ValidationFunction(
+                        ${targetAsString},
+                        [${dependenciesToCheck}],
+                        context => DependenciesRequiredAreEmpty.execute(context, ${targetAsString}, [${dependenciesToCheck}], ${message}, "Error", form.localization)
+                    )
+                );`;
+    }
+    const depsFromConditions = conditions.map(x => x[2].map(depPath => x[1].joinWith(depPath))).flat();
+    const generatedCondition = conditions.map(([condition, context]) => `[(path, count) => ${condition}, ${this.modelPathInstance(context)}]`).join(",");
+    const dependenciesAsString = [...dependencies.map(x => this.modelPathInstance(x.toCurrentIteration())), ...depsFromConditions.map(x => this.modelPathInstance(x.normalize().toCurrentIteration()))].join(", \n");
+    const dependenciesToCheck = dependencies.map(x => this.modelPathInstance(x.toCurrentIteration()));
     return `
-        const ${depsVariableName} = [${dependenciesAsString}]
         form.calculator2.addCalculationFunction(
             new ValidationFunction(
                 ${targetAsString},
-                ${depsVariableName},
-                context =>
-                DependenciesRequiredAreEmpty.execute(context, ${targetAsString}, ${depsVariableName}, ${message}, "Error", form.localization)
+                [${dependenciesAsString}],
+                ValidationFunction.conditionalValidatorEvaluator(
+                    ValidationFunction.javascriptSugarExpressionToEvaluator(form, [${generatedCondition}]),
+                    context => DependenciesRequiredAreEmpty.execute(context, ${targetAsString}, [${dependenciesToCheck}], ${message}, "Error", form.localization)
+                )
             )
         );`;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.43.0",
+  "version": "5.44.0-fix-holkin-validations.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,