@kontur.candy/generator 4.245.0-lazy-loading.14 → 4.245.0-lazy-loading.18

package/dist/index.js

@@ -114258,6 +114258,22 @@ class PathUtils {
     return fullPathTokens.slice(0, i + 1).join("/");
   }
 
+  static getFirstInstancePathWithMaskTail(fullPath, mask) {
+    const fullPathTokens = this.split(fullPath);
+    const maskTokens = this.split(mask);
+    let i = 0;
+
+    while (maskTokens[i] && fullPathTokens[i] === maskTokens[i]) {
+      i++;
+    }
+
+    if (maskTokens[i] !== "*") {
+      return null;
+    }
+
+    return fullPathTokens.slice(0, i + 1).concat(maskTokens.slice(i + 1)).join("/");
+  }
+
   static isPicklistFieldValueName(valueName) {
     return valueName.startsWith("picklist@");
   }
@@ -135134,12 +135150,12 @@ class NormalizationRulesGenerator {
 
   buildKcValidationRules() {
     const allRulesCheck = this.conditions.map(x => this.buildKcValidationRuleCheck(x)).reduce((ctx, current) => {
-      var _ctx$path;
+      var _targetCtx$path;
 
       const path = current.target.toLegacyPath();
-      const currentExpression = (_ctx$path = ctx[path]) !== null && _ctx$path !== void 0 ? _ctx$path : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.NullLiteralExpression();
-      const condition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.NegateUnaryExpression(current.checkExpression), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("[" + JSON.stringify(current.message) + "]"), currentExpression);
       const targetCtx = current.errorLevel === "Warning" ? ctx.warnings : ctx.errors;
+      const currentExpression = (_targetCtx$path = targetCtx[path]) !== null && _targetCtx$path !== void 0 ? _targetCtx$path : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.NullLiteralExpression();
+      const condition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.NegateUnaryExpression(current.checkExpression), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("[" + JSON.stringify(current.message) + "]"), currentExpression);
       targetCtx[path] = condition;
       return ctx;
     }, {
@@ -135334,7 +135350,7 @@ class NormalizationRulesGenerator {
         const countResultValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ValueReferenceExpression(iterablePath.joinWith(new _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.ModelPath(suffixWithoutMultiple, false)).joinWith("Count").normalize(), "value");
         const currenCountExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ValueReferenceExpression(iterablePath.joinWith(new _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.ModelPath(suffixWithoutMultiple, false)).joinWith("Count").toCurrentIteration().normalize(), "value");
         addPrecalculationRule(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SetStatement(nextResultValueExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ReduceCallExpression(iterablePath.toCurrentIteration(), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SumBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(resultValueExpression, "decimal", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)), "string", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("G29"))));
-        addPrecalculationRule(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SetStatement(countResultValueExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ReduceCallExpression(iterablePath.toCurrentIteration(), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SumBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentReferenceExpression("result"), countValueExpression == undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(1) : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(countValueExpression, "decimal", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)), "string", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("G29"))));
+        addPrecalculationRule(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SetStatement(countResultValueExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ReduceCallExpression(iterablePath.toCurrentIteration(), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.BuildInTypeExpression.decimal)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.SumBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ArgumentReferenceExpression("result"), countValueExpression == undefined ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.NotEqExpression(resultValueExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(1), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)) : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.CastExpression(countValueExpression, "decimal", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)), "string", new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.StringLiteralExpression("G29"))));
         resultValueExpression = currentSumExpression;
         countValueExpression = currenCountExpression;
       }
@@ -135444,7 +135460,7 @@ class NormalizationRulesGenerator {
       yield rule;
     }
 
-    const targetPaths = [..._Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.distinctBy(context.getAllPathsWithValidations(), x => x.toLegacyPath())];
+    const targetPaths = [..._Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.distinctBy(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.concat(context.getAllPathsWithValidations(), Object.keys(kcRules.errors).concat(Object.keys(kcRules.warnings)).map(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.ModelPath.createFromMask(x, "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each))), x => x.toLegacyPath())];
     yield* this.buildErrorWarningCountRules(targetPaths, "error");
     yield* this.buildErrorWarningCountRules(targetPaths, "warning");
   }
@@ -156885,6 +156901,17 @@ class TabsConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.Sug
     return context.mergeDataDeclaration(context.addPathDeclEntry(node, [["children", context.initSequenceFactory.children((_node$optional = node.optional) !== null && _node$optional !== void 0 ? _node$optional : false)]]), context.addPathSectionDeclarationEntry(node));
   }
 
+  *doBuildNormalizeRules(builder) {
+    var _node$optional2;
+
+    const node = this.getCurrentNodeAs(_TabsNode__WEBPACK_IMPORTED_MODULE_4__.TabsNode);
+    yield* builder.childrenInitializer(node, (_node$optional2 = node.optional) !== null && _node$optional2 !== void 0 ? _node$optional2 : false);
+    yield* builder.specialFieldsInitializer(node, {
+      optional: node.optional,
+      disabled: undefined
+    });
+  }
+
   buildChildrenDataDeclaration(context) {
     var _node$title$children, _node$title, _node$content$childre, _node$content;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.245.0-lazy-loading.14",
+  "version": "4.245.0-lazy-loading.18",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,