@kontur.candy/generator 4.278.0-efs-partial-load.5 → 4.278.0-efs-partial-load.6

package/dist/index.js

@@ -131999,7 +131999,7 @@ class FLangValidationBuildContext {
   }
 
   *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, _typeNode$children9, _typeNodeFractional$v;
+    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$children$fi3, _typeNode$children8, _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 : [];
@@ -132075,13 +132075,13 @@ class FLangValidationBuildContext {
       yield [totalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.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));
-    const pattern = (_typeNodePattern$valu = typeNodePattern === null || typeNodePattern === void 0 ? void 0 : typeNodePattern.value) !== null && _typeNodePattern$valu !== void 0 ? _typeNodePattern$valu : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : (_schemaTypeNode$patte = schemaTypeNode.patterns) === null || _schemaTypeNode$patte === void 0 ? void 0 : _schemaTypeNode$patte[0];
+    const typeNodePatterns = (_typeNode$children$fi3 = typeNode === null || typeNode === void 0 ? void 0 : (_typeNode$children8 = typeNode.children) === null || _typeNode$children8 === void 0 ? void 0 : _typeNode$children8.filter((0,_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.ofType)(_validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_1__.PatternTypeCheckNode)).map(x => x.value).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.isNotNullOrUndefined)) !== null && _typeNode$children$fi3 !== void 0 ? _typeNode$children$fi3 : [];
+    const patterns = ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.arrayIsNotEmpty)(typeNodePatterns) ? typeNodePatterns : (_schemaTypeNode$patte = schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.patterns) !== null && _schemaTypeNode$patte !== void 0 ? _schemaTypeNode$patte : []).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.isNotNullOrUndefined).map(pattern => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.StringLiteralExpression(pattern))).reduce((acc, current) => acc != undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.OrBinaryExpression(acc, current) : current, undefined);
 
-    if (pattern != undefined) {
+    if (patterns != undefined) {
       var _ref2, _typeNode$description2;
 
-      const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NegateUnaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.RegexMatchExpression(valueReference, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.StringLiteralExpression(pattern)));
+      const totalDigitsRuleBody = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.NegateUnaryExpression(patterns);
       const validationErrorMessage = (_ref2 = (_typeNode$description2 = typeNode === null || typeNode === void 0 ? void 0 : typeNode.description) !== null && _typeNode$description2 !== void 0 ? _typeNode$description2 : schemaTypeNode === null || schemaTypeNode === void 0 ? void 0 : schemaTypeNode.description) !== null && _ref2 !== void 0 ? _ref2 : "Поле заполнено неверно";
       yield [totalDigitsRuleBody, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_10__.StringLiteralExpression(`["${validationErrorMessage}"]`)];
     }
@@ -137448,17 +137448,18 @@ class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sugar
   }
 
   *buildChildrenFLangValidations(buildContext, formSchemaRng) {
-    var _node$parent$getFullP, _node$parent;
+    var _node$doNotIncludeInV, _node$parent$getFullP, _node$parent;
 
     const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
-    const contextPath = (_node$parent$getFullP = (_node$parent = node.parent) === null || _node$parent === void 0 ? void 0 : _node$parent.getFullPath()) !== null && _node$parent$getFullP !== void 0 ? _node$parent$getFullP : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)("Must be a parent with path!");
     const condition = this.getCondition(node);
 
-    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.isNullOrEmpty)(condition)) {
+    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.isNullOrEmpty)(condition) || ((_node$doNotIncludeInV = node.doNotIncludeInValidations) !== null && _node$doNotIncludeInV !== void 0 ? _node$doNotIncludeInV : false)) {
       yield* super.buildChildrenFLangValidations(buildContext, formSchemaRng);
       return;
     }
 
+    const contextPath = (_node$parent$getFullP = (_node$parent = node.parent) === null || _node$parent === void 0 ? void 0 : _node$parent.getFullPath()) !== null && _node$parent$getFullP !== void 0 ? _node$parent$getFullP : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_7__.reject)("Must be a parent with path!");
+
     if (node.then != undefined) {
       try {
         buildContext.pushVisibilityCondition(condition, contextPath);
@@ -137491,8 +137492,15 @@ class IfConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sugar
   }
 
   buildChildrenValidations(validationGenerator) {
+    var _node$doNotIncludeInV2;
+
     const node = this.getCurrentNodeAs(_IfNode__WEBPACK_IMPORTED_MODULE_10__.IfNode);
 
+    if ((_node$doNotIncludeInV2 = node.doNotIncludeInValidations) !== null && _node$doNotIncludeInV2 !== void 0 ? _node$doNotIncludeInV2 : false) {
+      super.buildChildrenValidations(validationGenerator);
+      return;
+    }
+
     if (node.then != undefined) {
       const evaluatorsContextPathExpression = this.getEvaluatorsContextPathExpression();
       const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_4__.convertConditionToJsOrFailWithFriendlySugarError)(this.getCondition(node), "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_5__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_9__.extractPath)(x => x.condition));
@@ -137629,7 +137637,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _dec4, _class4, _class5, _descriptor2, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class7, _class8, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _dec4, _class4, _class5, _descriptor2, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _class7, _class8, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
 
 
 let ThenNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("then", `Отображает блок, если выполняется условие.`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ThenNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
@@ -137658,19 +137666,21 @@ let ElseNode = (_dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_
   writable: true,
   initializer: null
 })), _class5)) || _class4);
-let IfNode = (_dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("if", `Условное отображение контента на основе настроек или произвольного выражения`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If sync recursive .md$")), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("condition", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, "Условие, при котором блок отображается"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isIndividual", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Выполнит проверку settings.isIndividual == true`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("then", [ThenNode]), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("else", [ElseNode]), _dec5(_class7 = (_class8 = class IfNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+let IfNode = (_dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("if", `Условное отображение контента на основе настроек или произвольного выражения`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ControlFlow/If sync recursive .md$")), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("condition", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, "Условие, при котором блок отображается"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("doNotIncludeInValidations", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, "Не включать это условие в валидацию видимых элементов"), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("isIndividual", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Выполнит проверку settings.isIndividual == true`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("then", [ThenNode]), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.singleChild)("else", [ElseNode]), _dec5(_class7 = (_class8 = class IfNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "condition", _descriptor3, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isIndividual", _descriptor4, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "doNotIncludeInValidations", _descriptor4, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor5, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "isIndividual", _descriptor5, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor6, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "then", _descriptor6, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "then", _descriptor7, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "else", _descriptor7, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "else", _descriptor8, this);
   }
 
 }, (_descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "condition", [_dec6], {
@@ -137678,22 +137688,27 @@ let IfNode = (_dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3_
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "isIndividual", [_dec7], {
+}), _descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "doNotIncludeInValidations", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "isIndividual", [_dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "children", [_dec8], {
+}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "children", [_dec9], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "then", [_dec9], {
+}), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "then", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "else", [_dec10], {
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class8.prototype, "else", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,

package/package.json

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