@kontur.candy/generator 4.278.0-efs-partial-load.7 → 4.278.0-efs-partial-load.8

package/dist/index.js

@@ -115473,6 +115473,7 @@ class KCLangAntlrParser {
     const tokens = new antlr4ts__WEBPACK_IMPORTED_MODULE_0__.CommonTokenStream(lexer);
     const parser = new _KCLangGenerated_KCLangParser__WEBPACK_IMPORTED_MODULE_4__.KCLangParser(tokens);
     const errorListener = new ErrorListener();
+    parser.removeErrorListeners();
     parser.addErrorListener(errorListener);
     const tree = parser.kclang();
 
@@ -131925,9 +131926,7 @@ class FLangValidationBuildContext {
   getFlangExpressionFromKclangCondition(prefix, target, condition, invertRequired) {
     const fullKcLangExpr = `
             in ${prefix.toLegacyPath()} {
-                check ${condition}
-                    with description \`\`\`Condition must match\`\`\`
-                    with errorLevel \`\`\`Error\`\`\`;
+                check Test === (${condition}) ? 1 : 0;
             }
         `;
 
@@ -131936,10 +131935,11 @@ class FLangValidationBuildContext {
 
       const formulaReader = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_8__.FormulaReader();
       const kcLangMathContainer = formulaReader.readFormulas(_common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_7__.KCLangToXmlTranspiler.transpile(fullKcLangExpr));
-      const conditionNode = (_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.conditions) === null || _kcLangMathContainer$2 === void 0 ? void 0 : (_kcLangMathContainer$3 = _kcLangMathContainer$2.items) === null || _kcLangMathContainer$3 === void 0 ? void 0 : _kcLangMathContainer$3[0]) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.reject)();
-      const flangExpr = this.formulaExprConverter.compileExpressionToFlangExpression(conditionNode.expression, prefix, target, value => {
+      const formulaNode = (_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : (_kcLangMathContainer$3 = _kcLangMathContainer$2.items) === null || _kcLangMathContainer$3 === void 0 ? void 0 : _kcLangMathContainer$3[0]) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.reject)();
+      const formulaExpr = this.formulaExprConverter.compileExpressionToFlangExpression(formulaNode.expression, prefix, target, value => {
         throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_9__.NotSupportedError("In contextual KcLang conditions should not be summation.");
       });
+      const flangExpr = formulaExpr instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.ConditionalExpression ? formulaExpr.condition : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.reject)();
 
       const getTypeCorrectedExpression = () => {
         const argExpr = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.castOperandToStringIfNeed)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_11__.tryExtractValueReferenceAsStringFromDecimal)(flangExpr));
@@ -131994,6 +131994,12 @@ class FLangValidationBuildContext {
 
 
       console.warn(`Could not process kclang to flang: [${condition}]`);
+
+      if (e instanceof Error) {
+        // eslint-disable-next-line no-console
+        console.warn(e === null || e === void 0 ? void 0 : e.toString());
+      }
+
       return undefined;
     }
   }
@@ -157406,8 +157412,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _CommonNodeProperties_TooltipProperties_SetTooltipSettingsProps__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../CommonNodeProperties/TooltipProperties/SetTooltipSettingsProps */ "./Generator/src/generators/markupGenerator/ElementProcessors/CommonNodeProperties/TooltipProperties/SetTooltipSettingsProps.ts");
-/* harmony import */ var _PicklistReference__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./PicklistReference */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Select/PicklistReference.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _SelectNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./SelectNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Select/SelectNode.ts");
+/* harmony import */ var _PicklistReference__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./PicklistReference */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Select/PicklistReference.ts");
+
 
 
 
@@ -157433,6 +157441,27 @@ class SelectConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.S
     }), context.addPathSectionDeclarationEntry(node, node.dataBinding.requisite), context.addVisibilityPathDeclEntryNew(node, node.dataBinding.requisite));
   }
 
+  doBuildFLangValidations(buildContext, formSchemaRng) {
+    const node = this.getCurrentNodeAs(_SelectNode__WEBPACK_IMPORTED_MODULE_6__.SelectNode);
+    const element = formSchemaRng.getElementByPath(node.getFullPath());
+    const targetPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_5__.createAbsoluteFromMask)(this.getResolvedBindingPath(node), _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_5__.PathTokens.each);
+    const typeNode = buildContext.getTypeNode(node.validationInfo);
+    const schemaTypeNode = buildContext.getSchemaTypeInfo(targetPath);
+
+    if (typeNode == undefined && schemaTypeNode == undefined) {
+      return [];
+    }
+
+    return buildContext.buildBasicValidations(targetPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional);
+  }
+
+  doBuildNormalizeRules(builder) {
+    const node = this.getCurrentNodeAs(_SelectNode__WEBPACK_IMPORTED_MODULE_6__.SelectNode);
+    return [builder.valueInitializer(node, node.dataBinding, node.disabled), ...builder.specialFieldsInitializer(node, {
+      disabled: node.disabled
+    })];
+  }
+
   buildChildrenDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_SelectNode__WEBPACK_IMPORTED_MODULE_6__.SelectNode);
     return context.processChildrenDataDeclaration(node.helpNodes);
@@ -157469,13 +157498,13 @@ class SelectConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.S
       markupBuilder.prop(x => x.reference).set(referenceData);
     }
 
-    const reference = (0,_PicklistReference__WEBPACK_IMPORTED_MODULE_5__.extractPicklistReference)(node);
+    const reference = (0,_PicklistReference__WEBPACK_IMPORTED_MODULE_7__.extractPicklistReference)(node);
 
-    if ((reference === null || reference === void 0 ? void 0 : reference.type) === _PicklistReference__WEBPACK_IMPORTED_MODULE_5__.PicklistReferenceType.GlobalPicklist) {
+    if ((reference === null || reference === void 0 ? void 0 : reference.type) === _PicklistReference__WEBPACK_IMPORTED_MODULE_7__.PicklistReferenceType.GlobalPicklist) {
       markupBuilder.prop(x => x.gId).set(reference.id);
     }
 
-    if ((reference === null || reference === void 0 ? void 0 : reference.type) === _PicklistReference__WEBPACK_IMPORTED_MODULE_5__.PicklistReferenceType.LocalPaths) {
+    if ((reference === null || reference === void 0 ? void 0 : reference.type) === _PicklistReference__WEBPACK_IMPORTED_MODULE_7__.PicklistReferenceType.LocalPaths) {
       markupBuilder.prop(x => x.gPaths).set(reference.paths);
     }
 
@@ -160005,7 +160034,7 @@ class FLangNormalizationRulesBuilder {
     const currentValueReference = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "value"));
     const defaultValue = (_dataBinding$defaultV = dataBinding.defaultValue) !== null && _dataBinding$defaultV !== void 0 ? _dataBinding$defaultV : "";
 
-    if (dataBinding.fetchfn !== undefined) {
+    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(dataBinding.fetchfn)) {
       try {
         var _this$fetchFunctions$, _this$fetchFunctions$2;
 

package/package.json

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