@kontur.candy/generator 4.241.0-server-norm.10 → 4.241.0-server-norm.15

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,14 +133743,15 @@ 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
     }];
   }
 
   *createTypeValidations(valueReference, typeNode, schemaTypeNode) {
-    var _typeNode$children$fi, _typeNode$children, _typeNode$children$fi2, _schemaTypeNode$enume, _typeNode$children2, _typeNodeLength$value, _typeNode$children3, _typeNodeMinLength$va, _typeNode$children4, _typeNodeMaxLength$va, _typeNode$children5, _typeNodeMinInclusive, _typeNode$children6, _typeNodeMaxInclusive, _typeNode$children7, _typeNodeTotalDigits$, _typeNode$children8, _typeNodePattern$valu, _schemaTypeNode$patte;
+    var _typeNode$children$fi, _typeNode$children, _typeNode$children$fi2, _schemaTypeNode$enume, _typeNode$children2, _typeNodeLength$value, _typeNode$children3, _typeNodeMinLength$va, _typeNode$children4, _typeNodeMaxLength$va, _typeNode$children5, _typeNodeMinInclusive, _typeNode$children6, _typeNodeMaxInclusive, _typeNode$children7, _typeNodeTotalDigits$, _typeNode$children8, _typeNodePattern$valu, _schemaTypeNode$patte, _typeNode$children9, _typeNodeFractional$v;
 
     //const baseCheckType = typeNode?.checkType;
     const typeNodeEnumerations = (_typeNode$children$fi = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children = typeNode.children) === null || _typeNode$children === void 0 ? void 0 : (_typeNode$children$fi2 = _typeNode$children.filter(x => x instanceof _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.EnumerationTypeCheckNode)) === null || _typeNode$children$fi2 === void 0 ? void 0 : _typeNode$children$fi2.map(x => x.value)) !== null && _typeNode$children$fi !== void 0 ? _typeNode$children$fi : [];
@@ -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));
@@ -133829,6 +133834,14 @@ class FLangValidationBuildContext {
       const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.CallExpression("regexMatch", [valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(pattern)]));
       yield [totalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(`["Поле должно быть заполнено"]`)];
     }
+
+    const typeNodeFractional = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children9 = typeNode.children) === null || _typeNode$children9 === void 0 ? void 0 : _typeNode$children9.find((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.FractiondigitsTypeCheckNode));
+    const fractionalDigits = (_typeNodeFractional$v = typeNodeFractional === null || typeNodeFractional === void 0 ? void 0 : typeNodeFractional.value) !== null && _typeNodeFractional$v !== void 0 ? _typeNodeFractional$v : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.fractionDigits;
+
+    if (fractionalDigits != undefined) {
+      const fractionalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.LeExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.FractionalLenExpression(this.castOperandToDecimalIfNeed(valueReference)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.DecimalLiteralExpression(fractionalDigits)));
+      yield [fractionalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(`["Число не может содержать более ${fractionalDigits} знаков в дробной части"]`)];
+    }
   }
 
   createBaseTypeValidation(valueReference, baseType) {
@@ -133970,6 +133983,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "BoolLiteralExpression": () => (/* binding */ BoolLiteralExpression),
 /* harmony export */   "AbsExpression": () => (/* binding */ AbsExpression),
 /* harmony export */   "LenExpression": () => (/* binding */ LenExpression),
+/* harmony export */   "FractionalLenExpression": () => (/* binding */ FractionalLenExpression),
 /* harmony export */   "RoundExpression": () => (/* binding */ RoundExpression),
 /* harmony export */   "IntegerLiteralExpression": () => (/* binding */ IntegerLiteralExpression),
 /* harmony export */   "NullLiteralExpression": () => (/* binding */ NullLiteralExpression),
@@ -134528,6 +134542,24 @@ class LenExpression extends FLangExpression {
     this[key] = eval(code);
   }
 
+}
+class FractionalLenExpression extends FLangExpression {
+  constructor(expression) {
+    super();
+    this.expression = void 0;
+    this.expression = expression;
+  }
+
+  convertToString() {
+    return `fractionalLen(${this.expression.convertToString()})`;
+  }
+
+  // @ts-ignore
+  __reactstandin__regenerateByEval(key, code) {
+    // @ts-ignore
+    this[key] = eval(code);
+  }
+
 }
 class RoundExpression extends ConstExpression {
   constructor(expression, fractionalDigits) {
@@ -134675,6 +134707,7 @@ class SetStatement extends FLangStatement {
   reactHotLoader.register(BoolLiteralExpression, "BoolLiteralExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
   reactHotLoader.register(AbsExpression, "AbsExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
   reactHotLoader.register(LenExpression, "LenExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
+  reactHotLoader.register(FractionalLenExpression, "FractionalLenExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
   reactHotLoader.register(RoundExpression, "RoundExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
   reactHotLoader.register(IntegerLiteralExpression, "IntegerLiteralExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
   reactHotLoader.register(NullLiteralExpression, "NullLiteralExpression", "C:\\buildAgent\\work\\8df8f1edd755969c\\Generator\\src\\generators\\ServerSideFLangNormalization\\FLang\\FLangCodeDom.ts");
@@ -166832,14 +166865,15 @@ class FLangNormalizationRulesBuilder {
     var _dataBinding$defaultV;
 
     const targetPathReference = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.ModelPath.createFromMask((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_2__.getResolvedBindingPath)(node), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
+    const currentValueReference = 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) {
       // eslint-disable-next-line no-console
       console.warn("Атрибут fetchfn не поддержиается в режиме серверной нормализации");
+      return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), currentValueReference);
     }
 
-    const currentValueReference = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference.toCurrentIteration(), "value");
     let valueExpression = new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue);
 
     if (dataBinding.settings) {

package/package.json

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