@kontur.candy/generator 4.286.0-zeroReportingWithOptions.12 → 4.286.0-zeroReportingWithOptions.14

package/dist/index.js

@@ -132052,6 +132052,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
+
 
 
 
@@ -132082,19 +132084,13 @@ function getRequisitesFromEvaluablePropValue(filter) {
   return (_filter$match$map$fil = (_filter$match = filter.match(/path([^)]+)/g)) === null || _filter$match === void 0 ? void 0 : _filter$match.map(path => path.slice(6, -1)).filter(path => path.startsWith("@clientInfo") || path.startsWith("@formsClientInfo")).map(path => `${path}.value`)) !== null && _filter$match$map$fil !== void 0 ? _filter$match$map$fil : [];
 }
 function getPathsFromEvaluablePropValue(evaluableProp) {
-  const result = [];
   const pathRegex = /(?<=path\((?:'|")).*?(?=(?:'|"))/g;
-  const pathList = [...evaluableProp.matchAll(pathRegex)];
-
-  if (pathList.length > 0) {
-    result.push(...pathList.map(x => {
-      var _x$;
-
-      return (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.createModelPath)((_x$ = x[0]) !== null && _x$ !== void 0 ? _x$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)("Path regexp parse error - unexpected undefined"), "auto");
-    }));
-  }
+  const pathList = evaluableProp.matchAll(pathRegex).map(x => {
+    var _x$;
 
-  return result;
+    return (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.createModelPath)((_x$ = x[0]) !== null && _x$ !== void 0 ? _x$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)("Path regexp parse error - unexpected undefined"), "auto");
+  });
+  return [..._Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.distinctBy(pathList, path => path.toString())];
 }
 function getRequisitesFromEvaluableProps(...evaluablePropValues) {
   return evaluablePropValues.filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined).flatMap(getRequisitesFromEvaluablePropValue);
@@ -138796,8 +138792,8 @@ class SwitchConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.S
       const conditionWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_3__.convertConditionToJsOrFailWithFriendlySugarError)(caseNode.condition, "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_4__.KCLangRuntimeUtils.kcLangUtilsName, node, (0,_ComponentMarkupBuilder_PathHelper__WEBPACK_IMPORTED_MODULE_5__.extractPath)(x => x.condition));
       const condition = conditionWithDependencies.condition;
       const currentCaseCondition = prevConditions.length ? prevConditions.map(x => `!(${x})`).join(" && ") + " && " + condition : condition;
+      prevConditions.push(condition);
       const deps = this.getDepsWithResolvedPath(currentCaseCondition, evaluatorsContextPathExpression);
-      prevConditions.push(currentCaseCondition);
       validationGenerator.pushVisibilityCondition([currentCaseCondition, evaluatorsContextPathExpression, deps]);
 
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.286.0-zeroReportingWithOptions.12",
+  "version": "4.286.0-zeroReportingWithOptions.14",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,