@kontur.candy/generator 4.241.0-server-norm.11 → 4.241.0-server-norm-faster.16

package/dist/index.js

@@ -132857,6 +132857,10 @@ class KCXmlGeneratorBase {
     return pathPart.replace(/\@/g, "");
   }
 
+  removeMultiplicity(path) {
+    return path.replace(/\/\*/g, "");
+  }
+
   modelPathInstance(target) {
     return `new ModelPath([${[...target.getPathParts()].map(x => {
       if (x === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each) {
@@ -132947,8 +132951,8 @@ class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPA
   compileCondition(condition) {
     var _condition$descriptio, _condition$errorLevel;
 
-    const prefix = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.ModelPath.createFromMask(this.removeAttributePrefix(condition.match), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each).toAbsolute();
-    const target = this.schema.adjustPathMultiplicity(prefix.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.ModelPath.createFromMask(this.removeAttributePrefix(condition.target), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
+    const prefix = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.ModelPath.createFromMask(this.removeMultiplicity(this.removeAttributePrefix(condition.match)), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each).toAbsolute();
+    const target = this.schema.adjustPathMultiplicity(prefix.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.ModelPath.createFromMask(this.removeMultiplicity(this.removeAttributePrefix(condition.target)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
     const deps = [];
     const compiledExpression = this.compileExpression(prefix, target, condition.expression, deps);
     const compiledTarget = this.modelPathInstance(target);
@@ -133705,7 +133709,7 @@ class FLangValidationBuildContext {
   }
 
   buildBasicValidations(targetPath, typeNode, schemaTypeNode, optional) {
-    var _typeNode$base;
+    var _typeNode$base, _typeNode$checkType;
 
     const validations = [];
     const valueReference = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression(targetPath.toCurrentIteration(), "value");
@@ -133739,9 +133743,10 @@ class FLangValidationBuildContext {
       errorExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.IsEqualsBinaryExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(""))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullLiteralExpression(), errorExpression);
     }
 
+    const checkType = (_typeNode$checkType = typeNode === null || typeNode === void 0 ? void 0 : typeNode.checkType) !== null && _typeNode$checkType !== void 0 ? _typeNode$checkType : "error";
     return [{
-      statement: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression(targetPath, "error"), errorExpression),
-      checkType: "error"
+      statement: new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression(targetPath, checkType), errorExpression),
+      checkType: checkType
     }];
   }
 
@@ -133819,7 +133824,7 @@ class FLangValidationBuildContext {
 
     if (totalDigitsValue != undefined) {
       const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.LenExpression(valueReference), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.DecimalLiteralExpression(totalDigitsValue)));
-      yield [totalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(`["Поле должно быть заполнено"]`)];
+      yield [totalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(`["Число не может содержать более ${totalDigitsValue} знаков"]`)];
     }
 
     const typeNodePattern = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.PatternTypeCheckNode));
@@ -158609,6 +158614,14 @@ class CheckboxConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__
     }), context.addPathSectionDeclarationEntry(node, node.dataBinding.requisite), context.addVisibilityPathDeclEntryNew(node, node.dataBinding.requisite));
   }
 
+  doBuildNormalizeRules(builder) {
+    const node = this.getCurrentNodeAs(_CheckboxNode__WEBPACK_IMPORTED_MODULE_5__.CheckboxNode);
+    return [builder.valueInitializer(node, node.dataBinding, false), ...builder.specialFieldsInitializer(node, {
+      optional: node.dataBinding.optional,
+      disabled: false
+    })];
+  }
+
   getDefaultValue(node) {
     var _node$dataBinding$def;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.241.0-server-norm.11",
+  "version": "4.241.0-server-norm-faster.16",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,