@kontur.candy/generator 5.122.0-test-9115.0 → 5.123.0-validation-choices.0

package/dist/index.js

@@ -62511,6 +62511,7 @@ class FormSchemaRngElement {
     this.useServerFilters = void 0;
     this.attributes = new Map();
     this.parent = void 0;
+    this.choices = [];
     this.optional = void 0;
     this.nillable = void 0;
     this.editorOnly = void 0;
@@ -62534,6 +62535,9 @@ class FormSchemaRngElement {
   addAttribute(attribute) {
     this.attributes.set(attribute.name, attribute);
   }
+  setChoices(choices) {
+    this.choices.push(choices);
+  }
   setInnerTextType(type) {
     this.innerTextType = type;
   }
@@ -62601,9 +62605,17 @@ class FormSchemaRng {
         result.addElement(this.convertSchemaRngElement(childElement, result));
       }
       for (const childChoiceElement of schemaRngElement.choices) {
+        const choiceChildren = new Map();
+        const rngElements = [];
         for (const childElement of childChoiceElement.children) {
-          result.addElement(this.convertSchemaRngElement(childElement, result));
+          const rngElement = this.convertSchemaRngElement(childElement, result);
+          rngElements.push(rngElement);
+          choiceChildren.set(childElement.name, rngElement);
         }
+        rngElements.forEach(rngElement => {
+          rngElement.setChoices(choiceChildren);
+          result.addElement(rngElement);
+        });
       }
     }
     return result;
@@ -62751,6 +62763,13 @@ class FormSchemaRng {
         optional: true
       };
     }
+    if (currentElement instanceof FormSchemaRngElement && currentElement.choices.length > 0) {
+      return {
+        dependencies: [],
+        hasOptionalParent: false,
+        optional: false
+      };
+    }
     if (endOptionalElement == undefined || endOptionalElement instanceof FormSchemaRngElement && ((_endOptionalElement = endOptionalElement) === null || _endOptionalElement === void 0 ? void 0 : _endOptionalElement.multiple) === true) {
       return {
         dependencies: [],
@@ -105164,7 +105183,8 @@ class MarkupBuildingContext {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   KCLangCalculationsBuildContext: () => (/* binding */ KCLangCalculationsBuildContext),
-/* harmony export */   combineByAndKCLangExpr: () => (/* binding */ combineByAndKCLangExpr)
+/* harmony export */   combineByAndKCLangExpr: () => (/* binding */ combineByAndKCLangExpr),
+/* harmony export */   combineByOrKCLangExpr: () => (/* binding */ combineByOrKCLangExpr)
 /* harmony export */ });
 /* harmony import */ var _Common_AutoValidationUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/AutoValidationUtils */ "./Common/AutoValidationUtils.ts");
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
@@ -105287,9 +105307,26 @@ class KCLangCalculationsBuildContext {
       if (((_allChildrenPaths$len = (_allChildrenPaths = allChildrenPaths) === null || _allChildrenPaths === void 0 ? void 0 : _allChildrenPaths.length) !== null && _allChildrenPaths$len !== void 0 ? _allChildrenPaths$len : 0) > _validationGenerator_MaxOptionalChildrenLimit__WEBPACK_IMPORTED_MODULE_31__.maxOptionalChildrenLimit) {
         allChildrenPaths = undefined;
       }
-      const restChecks = (_allChildrenPaths2 = allChildrenPaths) === null || _allChildrenPaths2 === void 0 ? void 0 : _allChildrenPaths2.map(childPath => 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(childPath, 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(childPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")))).reduce(combineByAndKCLangExpr, undefined);
+      const restChecks = (_allChildrenPaths2 = allChildrenPaths) === null || _allChildrenPaths2 === void 0 ? void 0 : _allChildrenPaths2.map(childPath => 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(childPath, 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(childPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")))).reduce(combineByOrKCLangExpr, undefined);
+      let choiceChecks;
+      const haveChoices = schemaNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__.FormSchemaRngElement && schemaNode.choices.length > 0;
+      if (haveChoices) {
+        const choiceRules = [];
+        for (const schemaNodeChoice of schemaNode.choices) {
+          const allChoicesPaths = schemaNodeChoice === null || schemaNodeChoice === void 0 ? void 0 : schemaNodeChoice.values().map(x => this.schemaRng.getPath(x, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each)).filter(x => !(0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_2__.getMatchedAndDifferentModelPaths)(targetFullPath, x).differentPath.isContainIteration());
+          choiceChecks = allChoicesPaths === null || allChoicesPaths === void 0 ? void 0 : allChoicesPaths.map(childPath => 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(childPath, 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(childPath, true)), _common_KCLang_CodeDom_KCLangType__WEBPACK_IMPORTED_MODULE_18__.StringType.default), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_25__.StringConstExpression("")))).reduce(combineByOrKCLangExpr, undefined);
+          if (choiceChecks) {
+            choiceRules.push(new _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_21__.NotExpression(choiceChecks));
+          }
+        }
+        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()))]);
-      if (restChecks != undefined) {
+      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) {
+        yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(choiceChecks, [checkRequiredStatement]);
+      } else if (restChecks != undefined) {
         yield new _common_KCLang_CodeDom_IfStatement__WEBPACK_IMPORTED_MODULE_16__.IfStatement(restChecks, [checkRequiredStatement]);
       } else {
         yield checkRequiredStatement;
@@ -105490,9 +105527,12 @@ class KCLangCalculationsBuildContext {
     }
   }
 }
-function combineByAndKCLangExpr(acc, current) {
+function combineByOrKCLangExpr(acc, current) {
   return acc != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_23__.OrExpression(acc, current) : current;
 }
+function combineByAndKCLangExpr(acc, current) {
+  return acc != undefined ? new _common_KCLang_CodeDom_AndExpression__WEBPACK_IMPORTED_MODULE_4__.AndExpression(acc, current) : current;
+}
 
 /***/ }),
 
@@ -108223,7 +108263,8 @@ function getSettings(sugarRoot, gfv, additionalSettings, formJsonSettings) {
     ...additionalSettings,
     useServerSideFLangNormalization: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.useServerSideFLangNormalization,
     useServerSideCalculations: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.useServerSideCalculations,
-    disableFlangRulesForEnableAutoFieldFeature: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.disableFlangRulesForEnableAutoFieldFeature
+    disableFlangRulesForEnableAutoFieldFeature: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.disableFlangRulesForEnableAutoFieldFeature,
+    enableAutocalcsInReadOnly: formJsonSettings === null || formJsonSettings === void 0 ? void 0 : formJsonSettings.enableAutocalcsInReadOnly
   };
   return `module.exports = ${JSON.stringify(settings, undefined, 2)}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.122.0-test-9115.0",
+  "version": "5.123.0-validation-choices.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,