@kontur.candy/generator 4.278.0-efs-partial-load.11 → 4.278.0-efs-partial-load.13

package/dist/index.js

@@ -131940,7 +131940,7 @@ class FLangValidationBuildContext {
       if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_0__.FormSchemaRngElement) {
         const targetCheck = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression("")));
         const allChildrenPaths = 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_11__.getMatchedAndDifferentModelPaths)(targetPath, x).differentPath.isContainIteration());
-        const restChecks = allChildrenPaths.map(childPath => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(childPath.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(acc, current) : current, undefined);
+        const restChecks = allChildrenPaths.map(childPath => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.EqExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.ValueReferenceExpression(childPath.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.StringLiteralExpression(""))).reduce(_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_13__.combineByAndFlangExpr, undefined);
 
         if (restChecks != undefined) {
           const finalChildrenCondition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_12__.AndBinaryExpression(targetCheck, restChecks);
@@ -133239,7 +133239,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "castOperandToBoolIfNeed": () => (/* binding */ castOperandToBoolIfNeed),
 /* harmony export */   "castOperandToDecimalIfNeed": () => (/* binding */ castOperandToDecimalIfNeed),
 /* harmony export */   "nullCoalesceWithTypeCheck": () => (/* binding */ nullCoalesceWithTypeCheck),
-/* harmony export */   "ensureOperandsOfTypeOrNull": () => (/* binding */ ensureOperandsOfTypeOrNull)
+/* harmony export */   "ensureOperandsOfTypeOrNull": () => (/* binding */ ensureOperandsOfTypeOrNull),
+/* harmony export */   "combineByOrFlangExpr": () => (/* binding */ combineByOrFlangExpr),
+/* harmony export */   "combineByAndFlangExpr": () => (/* binding */ combineByAndFlangExpr)
 /* harmony export */ });
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
@@ -133312,6 +133314,12 @@ function ensureOperandsOfTypeOrNull(type, ...operands) {
     }
   }
 }
+function combineByOrFlangExpr(acc, current) {
+  return acc != undefined ? new _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.OrBinaryExpression(acc, current) : current;
+}
+function combineByAndFlangExpr(acc, current) {
+  return acc != undefined ? new _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.AndBinaryExpression(acc, current) : current;
+}
 
 /***/ }),
 
@@ -134454,8 +134462,7 @@ class ValidationRulesBuilder {
   *buildSugarValidationRules() {
     const converter = new _markupGenerator_ElementProcessors_FormParts_Form_FormConverter__WEBPACK_IMPORTED_MODULE_2__.FormConverter(this.sugarRoot);
     const context = new _FLangValidationBuildContext__WEBPACK_IMPORTED_MODULE_3__.FLangValidationBuildContext(this.typesRegistry, this.formSchemaRng, this.useSchemaValidations, this.formulaExprConverter);
-    const kcRules = this.buildKcValidationRules();
-    const allRules = Iterator.from(converter.buildFLangValidations(context, this.formSchemaRng)).reduce((ctx, current) => {
+    const sugarRules = Iterator.from(converter.buildFLangValidations(context, this.formSchemaRng)).reduce((ctx, current) => {
       const statement = current.statement;
 
       if (!(statement instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement)) {
@@ -134464,15 +134471,30 @@ class ValidationRulesBuilder {
 
       const targetCtx = current.checkType === "warning" ? ctx.warnings : ctx.errors;
       const path = statement.left.modePath.toLegacyPath();
-      const existing = targetCtx[path];
-      const expression = existing != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NotEqExpression(statement.right, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression()), statement.right, existing) : statement.right;
+      const currentExpression = targetCtx[path];
+      const expression = currentExpression != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NotEqExpression(statement.right, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression()), statement.right, currentExpression) : statement.right;
       targetCtx[path] = expression;
       return ctx;
-    }, kcRules);
+    }, {
+      errors: {},
+      warnings: {}
+    });
+
+    const mergeRules = (left, right) => Object.entries(right).reduce((ctx, [path, expr]) => {
+      const current = ctx[path];
+      const nextExpr = current != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NotEqExpression(expr, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression()), expr, current) : expr;
+      ctx[path] = nextExpr;
+      return ctx;
+    }, { ...left
+    });
+
+    const kcRules = this.buildKcValidationRules();
+    const allErrorRules = mergeRules(kcRules.errors, sugarRules.errors);
+    const allWarningRules = mergeRules(kcRules.warnings, sugarRules.warnings);
 
     const createRule = (rules, path, checkType) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(path, true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each), checkType), rules[path]);
 
-    const rules = Object.keys(allRules.errors).map(path => createRule(allRules.errors, path, "error")).concat(Object.keys(allRules.warnings).map(path => createRule(allRules.warnings, path, "warning")));
+    const rules = Object.keys(allErrorRules).map(path => createRule(allErrorRules, path, "error")).concat(Object.keys(allWarningRules).map(path => createRule(allWarningRules, path, "warning")));
 
     for (const rule of rules) {
       yield rule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.278.0-efs-partial-load.11",
+  "version": "4.278.0-efs-partial-load.13",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,