@kontur.candy/generator 5.6.0 → 5.7.0-fs-7964-multiple-keys-groupsum.8

package/dist/index.js

@@ -60452,6 +60452,7 @@ let PatchFufSteps = /*#__PURE__*/function (PatchFufSteps) {
   PatchFufSteps[PatchFufSteps["SelectFiles"] = 1] = "SelectFiles";
   PatchFufSteps[PatchFufSteps["ErrorMessage"] = 2] = "ErrorMessage";
   PatchFufSteps[PatchFufSteps["LoadToForm"] = 3] = "LoadToForm";
+  PatchFufSteps[PatchFufSteps["ConfirmMerge"] = 4] = "ConfirmMerge";
   return PatchFufSteps;
 }({});
 let TableType = /*#__PURE__*/function (TableType) {
@@ -61727,7 +61728,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "groupCountKCLangFunction": () => (/* binding */ groupCountKCLangFunction),
 /* harmony export */   "concatKCLangFunction": () => (/* binding */ concatKCLangFunction),
 /* harmony export */   "newlineKCLangFunction": () => (/* binding */ newlineKCLangFunction),
-/* harmony export */   "dateNowKCLangFunction": () => (/* binding */ dateNowKCLangFunction)
+/* harmony export */   "dateNowKCLangFunction": () => (/* binding */ dateNowKCLangFunction),
+/* harmony export */   "listOfKCLangFunction": () => (/* binding */ listOfKCLangFunction)
 /* harmony export */ });
 class ArgumentValidationError {
   constructor(validationMessage) {
@@ -62024,16 +62026,20 @@ const groupSumKCLangFunction = params => {
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeyPathParam = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
+  const targetKeysParam = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
   const sourceKeyPathParam = (_params$21 = params[1]) === null || _params$21 === void 0 ? void 0 : _params$21.value;
   const sourceValuePathParam = (_params$22 = params[2]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
-  if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || (sourceValuePathParam === null || sourceValuePathParam === void 0 ? void 0 : sourceValuePathParam.type) !== "argument") {
-    const argumentsValidationError = new ArgumentValidationError("Expected 3 paths as arguments: targetKeyPath, sourceKeyPath, sourceValuePath");
+  if (targetKeysParam == undefined || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || (sourceValuePathParam === null || sourceValuePathParam === void 0 ? void 0 : sourceValuePathParam.type) !== "argument") {
+    const argumentsValidationError = new ArgumentValidationError("Expected 3 paths as arguments: targetKeys, sourceKeyPath, sourceValuePath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
   }
+  const targetKeys = targetKeysParam.type === "array" ? targetKeysParam : {
+    type: "array",
+    items: [targetKeysParam]
+  };
   return {
     type: "groupSum",
-    targetKeyPath: targetKeyPathParam.select,
+    targetKeys: targetKeys,
     sourceKeyPath: sourceKeyPathParam.select,
     sourceValuePath: sourceValuePathParam.select
   };
@@ -62044,15 +62050,19 @@ const groupCountKCLangFunction = params => {
   if (errors.length > 0) {
     return new FunctionValidationErrorCollection(errors);
   }
-  const targetKeyPathParam = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
+  const targetKeysParam = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
   const sourceKeyPathParam = (_params$24 = params[1]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
-  if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
+  if (targetKeysParam == undefined || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
     const argumentsValidationError = new ArgumentValidationError("Expected 2 paths as arguments: targetKeyPath, sourceKeyPath");
     return new FunctionValidationErrorCollection([argumentsValidationError]);
   }
+  const targetKeys = targetKeysParam.type === "array" ? targetKeysParam : {
+    type: "array",
+    items: [targetKeysParam]
+  };
   return {
     type: "groupCount",
-    targetKeyPath: targetKeyPathParam.select,
+    targetKeys: targetKeys,
     sourceKeyPath: sourceKeyPathParam.select
   };
 };
@@ -62084,6 +62094,16 @@ const dateNowKCLangFunction = params => {
     type: "dateNow"
   };
 };
+const listOfKCLangFunction = params => {
+  const errors = Array.from(validateParams(params, 0, 1000));
+  if (errors.length > 0) {
+    return new FunctionValidationErrorCollection(errors);
+  }
+  return {
+    type: "array",
+    items: params.map(x => x.value)
+  };
+};
 
 /***/ }),
 
@@ -62129,7 +62149,8 @@ const getKCLangGlobalFunctionBuilders = () => ({
   groupCount: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.groupCountKCLangFunction],
   concat: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.concatKCLangFunction],
   newline: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.newlineKCLangFunction],
-  dateNow: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.dateNowKCLangFunction]
+  dateNow: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.dateNowKCLangFunction],
+  listOf: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.listOfKCLangFunction]
 });
 class ErrorListener {
   constructor() {
@@ -69590,6 +69611,8 @@ function traverseKCLangExpression(node, visitor) {
     case "dateNow":
       visitor.visitDateNowKCLangNode(node);
       break;
+    case "array":
+      break;
     default:
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(node);
       break;
@@ -69689,6 +69712,9 @@ class DefaultKCLangExpressionVisitor {
   visitDateNowKCLangNode(node) {
     // default empty implementation
   }
+  visitArrayKCLangNode(node) {
+    // default empty implementation
+  }
 }
 
 /***/ }),
@@ -70030,6 +70056,8 @@ const getGenerateJsExpressionFunc = options => {
         throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
       case "dateNow":
         return `${utilsName}.dateNow()`;
+      case "array":
+        throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
       default:
         (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(expression);
     }
@@ -70104,9 +70132,9 @@ function generateKCXmlExpression(expression) {
     case "isValidAccountNumber":
       return `<m:${expression.type} bik="${expression.bik}" account="${expression.account}" />`;
     case "groupSum":
-      return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" sourceValuePath="${expression.sourceValuePath}" />`;
+      return [`<m:${expression.type} sourceKeyPath="${expression.sourceKeyPath}" sourceValuePath="${expression.sourceValuePath}" >`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.targetKeys), 1), `</m:${expression.type}>`].join("\n");
     case "groupCount":
-      return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" />`;
+      return [`<m:${expression.type} sourceKeyPath="${expression.sourceKeyPath}" >`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.targetKeys), 1), `</m:${expression.type}>`].join("\n");
     case "cast":
       if (expression.expression.type === "argument") {
         return `<m:argument select="${expression.expression.select}" type="${expression.targetType}" />`;
@@ -70171,6 +70199,11 @@ function generateKCXmlExpression(expression) {
         const enumerationItems = expression.expressions.items.map(generateKCXmlExpression);
         return [`<m:oneof>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(testExpr, 1), [`<m:oneofitems>`, enumerationItems.map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:oneofitems>`].flat().map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)).join("\n"), `</m:oneof>`].join("\n");
       }
+    case "array":
+      {
+        const enumerationItems = expression.items.map(generateKCXmlExpression);
+        return [`<m:oneofitems>`, enumerationItems.map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:oneofitems>`].flat().map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)).join("\n");
+      }
     default:
       // @ts-ignore
       throw new Error(`Expression of type '${expression.type}' is not supported`);
@@ -75466,12 +75499,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "FormulaWhenExpression": () => (/* binding */ FormulaWhenExpression),
 /* harmony export */   "DummyContent": () => (/* binding */ DummyContent),
 /* harmony export */   "FormulaSumExpression": () => (/* binding */ FormulaSumExpression),
+/* harmony export */   "FormulaOneOfItemsExpression": () => (/* binding */ FormulaOneOfItemsExpression),
 /* harmony export */   "FormulaGroupSumExpression": () => (/* binding */ FormulaGroupSumExpression),
 /* harmony export */   "FormulaGroupCountExpression": () => (/* binding */ FormulaGroupCountExpression),
 /* harmony export */   "FormulaAndExpression": () => (/* binding */ FormulaAndExpression),
 /* harmony export */   "FormulaOrExpression": () => (/* binding */ FormulaOrExpression),
 /* harmony export */   "FormulaGtExpression": () => (/* binding */ FormulaGtExpression),
-/* harmony export */   "FormulaOneOfItemsExpression": () => (/* binding */ FormulaOneOfItemsExpression),
 /* harmony export */   "FormulaOneOfExpression": () => (/* binding */ FormulaOneOfExpression),
 /* harmony export */   "FormulaRegexMatchExpression": () => (/* binding */ FormulaRegexMatchExpression),
 /* harmony export */   "FormulaLengthExpression": () => (/* binding */ FormulaLengthExpression),
@@ -75524,7 +75557,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _dec12, _class11, _class12, _descriptor6, _descriptor7, _dec13, _dec14, _class14, _class15, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _dec93, _class114, _class115, _descriptor52, _descriptor53, _dec94, _dec95, _class117, _class118, _descriptor54, _dec96, _class120, _dec97, _dec98, _dec99, _dec100, _class121, _class122, _descriptor55, _descriptor56, _descriptor57, _dec101, _dec102, _class124, _class125, _descriptor58, _dec103, _dec104, _dec105, _dec106, _dec107, _dec108, _class127, _class128, _descriptor59, _descriptor60, _descriptor61, _descriptor62, _descriptor63, _dec109, _dec110, _class130, _class131, _descriptor64, _dec111, _dec112, _dec113, _class133, _class134, _descriptor65, _descriptor66;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _class8, _class9, _descriptor3, _dec8, _dec9, _dec10, _dec11, _class11, _class12, _descriptor4, _descriptor5, _descriptor6, _dec12, _dec13, _dec14, _class14, _class15, _descriptor7, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _dec93, _class114, _class115, _descriptor52, _descriptor53, _dec94, _dec95, _class117, _class118, _descriptor54, _dec96, _class120, _dec97, _dec98, _dec99, _dec100, _class121, _class122, _descriptor55, _descriptor56, _descriptor57, _dec101, _dec102, _class124, _class125, _descriptor58, _dec103, _dec104, _dec105, _dec106, _dec107, _dec108, _class127, _class128, _descriptor59, _descriptor60, _descriptor61, _descriptor62, _descriptor63, _dec109, _dec110, _class130, _class131, _descriptor64, _dec111, _dec112, _dec113, _class133, _class134, _descriptor65, _descriptor66;
 
 
 
@@ -75567,67 +75600,64 @@ let FormulaSumExpression = (_dec4 = (0,_markupGenerator_Serializer_SugarSerializ
   writable: true,
   initializer: null
 })), _class6)) || _class5);
-let FormulaGroupSumExpression = (_dec6 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec7 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("targetKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в целевой множественности`), _dec8 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec9 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec6(_class8 = (_class9 = class FormulaGroupSumExpression extends FormulaExpression {
+let FormulaOneOfItemsExpression = (_dec6 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec7 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec6(_class8 = (_class9 = class FormulaOneOfItemsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeyPath", _descriptor3, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor4, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor5, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor3, this);
   }
-}, (_descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "targetKeyPath", [_dec7], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "sourceKeyPath", [_dec8], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "sourceValuePath", [_dec9], {
+}, (_descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "expressions", [_dec7], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class9)) || _class8);
-let FormulaGroupCountExpression = (_dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("targetKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в целевой множественности`), _dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec10(_class11 = (_class12 = class FormulaGroupCountExpression extends FormulaExpression {
+let FormulaGroupSumExpression = (_dec8 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec9 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec8(_class11 = (_class12 = class FormulaGroupSumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeyPath", _descriptor6, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor7, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor4, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor5, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor6, this);
   }
-}, (_descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "targetKeyPath", [_dec11], {
+}, (_descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "targetKeys", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceKeyPath", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceKeyPath", [_dec12], {
+}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceValuePath", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class12)) || _class11);
-let FormulaAndExpression = (_dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec13(_class14 = (_class15 = class FormulaAndExpression extends FormulaExpression {
+let FormulaGroupCountExpression = (_dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec12(_class14 = (_class15 = class FormulaGroupCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor7, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor8, this);
   }
-  getLegacyExpressionTypeForFunctionName() {
-    return "and";
-  }
-}, (_descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "arguments", [_dec14], {
+}, (_descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "targetKeys", [_dec13], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "sourceKeyPath", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class15)) || _class14);
-let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec15(_class17 = (_class18 = class FormulaOrExpression extends FormulaExpression {
+let FormulaAndExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec15(_class17 = (_class18 = class FormulaAndExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor9, this);
   }
   getLegacyExpressionTypeForFunctionName() {
-    return "or";
+    return "and";
   }
 }, (_descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class18.prototype, "arguments", [_dec16], {
   configurable: true,
@@ -75635,13 +75665,13 @@ let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializ
   writable: true,
   initializer: null
 })), _class18)) || _class17);
-let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec17(_class20 = (_class21 = class FormulaGtExpression extends FormulaExpression {
+let FormulaOrExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec17(_class20 = (_class21 = class FormulaOrExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor10, this);
   }
   getLegacyExpressionTypeForFunctionName() {
-    return "gt";
+    return "or";
   }
 }, (_descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class21.prototype, "arguments", [_dec18], {
   configurable: true,
@@ -75649,12 +75679,15 @@ let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializ
   writable: true,
   initializer: null
 })), _class21)) || _class20);
-let FormulaOneOfItemsExpression = (_dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec19(_class23 = (_class24 = class FormulaOneOfItemsExpression extends FormulaExpression {
+let FormulaGtExpression = (_dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec19(_class23 = (_class24 = class FormulaGtExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor11, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor11, this);
+  }
+  getLegacyExpressionTypeForFunctionName() {
+    return "gt";
   }
-}, (_descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "expressions", [_dec20], {
+}, (_descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "arguments", [_dec20], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -76233,7 +76266,7 @@ let MathContainer = (_dec111 = (0,_markupGenerator_Serializer_SugarSerializer__W
   writable: true,
   initializer: null
 })), _class134)) || _class133);
-const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression];
+const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaOneOfItemsExpression];
 
 /***/ }),
 
@@ -78318,24 +78351,27 @@ class KCXmlGeneratorBase {
       const compiledExpressions = expression.arguments.map(arg => this.compileExpression(prefix, targetFullPath, arg, deps)).join(",");
       return `expression.sum([${compiledExpressions}])`;
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaOneOfItemsExpression) {
+      const itemsText = expression.expressions.map(x => this.compileExpression(prefix, targetFullPath, x, deps)).join(", ");
+      return `JSON.stringify([${itemsText}])`;
+    }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupSumExpression) {
-      const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
-      deps.push(new DependencyWithoutChecks(targetKeyPath));
+      const targetKeys = this.compileExpression(prefix, targetFullPath, expression.targetKeys, deps);
       const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
-      const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
+      const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceKeyPath);
       deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
       const sourceValuePath = this.getModelPath(prefix, expression.sourceValuePath);
-      const sourceValueDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceValuePath);
+      const sourceValueDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceValuePath);
       deps.push(new DependencyWithoutChecks(sourceValueDeps.currentDepsPath, sourceValueDeps.eachDepsPath));
-      return gcf(x => x.groupSum, `"${targetKeyPath}", "${sourceKeyPath}", "${sourceValuePath}"`);
+      return gcf(x => x.groupSum, `${targetKeys}, "${sourceKeyPath}", "${sourceValuePath}"`);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupCountExpression) {
-      const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
-      deps.push(new DependencyWithoutChecks(targetKeyPath));
+      const targetKeys = this.compileExpression(prefix, targetFullPath, expression.targetKeys, deps);
+      deps.push(new DependencyWithoutChecks(targetFullPath));
       const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
-      const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
+      const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceKeyPath);
       deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
-      return gcf(x => x.groupCount, `"${targetKeyPath}", "${sourceKeyPath}"`);
+      return gcf(x => x.groupCount, `${targetKeys}, "${sourceKeyPath}"`);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaConcatExpression) {
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureArrayLengthGreaterThenOrEqual)(expression.arguments, 2);
@@ -79847,6 +79883,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "OneOfExpression": () => (/* binding */ OneOfExpression),
 /* harmony export */   "NoDepsExpression": () => (/* binding */ NoDepsExpression),
 /* harmony export */   "HasPicklistValueExpression": () => (/* binding */ HasPicklistValueExpression),
+/* harmony export */   "ArrayStringExpression": () => (/* binding */ ArrayStringExpression),
 /* harmony export */   "FLangStatement": () => (/* binding */ FLangStatement),
 /* harmony export */   "SetStatement": () => (/* binding */ SetStatement)
 /* harmony export */ });
@@ -80690,6 +80727,23 @@ class HasPicklistValueExpression extends FLangExpression {
     return `hasPicklistValue(${expression}, ${this.gidExpression})`;
   }
 }
+class ArrayStringExpression extends FLangExpression {
+  constructor(expressions) {
+    super();
+    this.expressions = void 0;
+    this.expressions = expressions;
+  }
+  *getChildNodes() {
+    yield* this.expressions;
+  }
+  getType() {
+    return BuildInTypeExpression.string;
+  }
+  convertToString() {
+    const stringItems = this.expressions.map(x => x.convertToString()).join(", ");
+    return `"[" ${stringItems} "]"`;
+  }
+}
 class FLangStatement extends FLangNode {}
 class SetStatement extends FLangStatement {
   constructor(left, right) {
@@ -81193,6 +81247,10 @@ class FormulaExpressionToFlangExpressionConverter {
       const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.OneOfExpression(arg, items);
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaOneOfItemsExpression) {
+      const items = expression.expressions.map(item => this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule));
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArrayStringExpression(items);
+    }
     throw new Error(`Unsupported type of node: ${expression.constructor.name}`);
   }
   compileEqExpression(prefix, target, expression, addPrecalculationRule) {
@@ -81206,7 +81264,7 @@ class FormulaExpressionToFlangExpressionConverter {
     }
     return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(left), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(right));
   }
-  compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
+  compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
     const matchPaths = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, sourceKeyPath);
     const sourceKeyParts = sourceKeyPath.getPathPartsAsArray();
     const firstPart = matchPaths.matchedPath.toCurrentIteration();
@@ -81216,21 +81274,29 @@ class FormulaExpressionToFlangExpressionConverter {
     const secondPartFinalParts = secondPartParts.slice(0, lastStarIndexSecondPart);
     const finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)([...firstPart.getPathParts(), ...secondPartFinalParts]).trimLastStarIfLastToken();
     const reduceExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ReduceCallExpression(finalIterPath, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AddSumExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value"), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression());
-    const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(targetKeyPath.toCurrentIteration(), "value"));
-    return finalValueExpression;
+    if (reduceExpression == undefined) {
+      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Target and source must be in different collections! " + "\n" + `Target: ${target}` + "\n" + `SourceKey: ${sourceKeyPath}`);
+    }
+    if (targetKeys instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArrayStringExpression && targetKeys.expressions.length === 1) {
+      var _targetKeys$expressio;
+      const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, (_targetKeys$expressio = targetKeys.expressions[0]) !== null && _targetKeys$expressio !== void 0 ? _targetKeys$expressio : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)());
+      return finalValueExpression;
+    } else {
+      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Server normalization does not support multiple keys in groupSum operator");
+    }
   }
   compileGroupSumExpression(prefix, target, expression, addPrecalculationRule) {
-    const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
+    const targetKeys = this.compileExpressionToFlangExpressionInternal(expression.targetKeys, prefix, target, addPrecalculationRule);
     const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
     const sourceValuePath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceValuePath);
     const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceValuePath.toCurrentIteration(), "value");
-    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
+    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
   }
   compileGroupCountExpression(prefix, target, expression, addPrecalculationRule) {
-    const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
+    const targetKeys = this.compileExpressionToFlangExpressionInternal(expression.targetKeys, prefix, target, addPrecalculationRule);
     const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
     const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DecimalLiteralExpression(1);
-    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
+    return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
   }
   compiledArgumentExpression(prefix, target, selectPath, selectType, addPrecalculationRule, aggregationFunction = "Sum") {
     const adjustedSelectPath = this.preparePathAndAdjustMultiplicity(prefix, selectPath);
@@ -81283,6 +81349,19 @@ class FormulaExpressionToFlangExpressionConverter {
     }
     return result;
   }
+
+  // private makeConcat(expressions: FLangExpression[]) {
+  //     const result = expressions.reduce<FLangExpression | undefined>((acc, curr) => {
+  //         const currExpr = castOperandToStringIfNeed(curr);
+  //         return acc != undefined ? new ConcatStringsExpression(acc, currExpr) : currExpr;
+  //     }, undefined);
+  //
+  //     if (result == undefined) {
+  //         throw new InvalidProgramStateError();
+  //     }
+  //     return result;
+  // }
+
   compileOrExpression(expression, prefix, target, addPrecalculationRule) {
     const result = expression.arguments.reduce((acc, curr) => {
       const currExpr = this.compileExpressionToFlangExpressionInternal(curr, prefix, target, addPrecalculationRule);
@@ -83399,11 +83478,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
 
 
 
-let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("menuSeparator", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Элемент разделителя меню`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataReference", _descriptor, this);
@@ -83413,7 +83492,8 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled", _descriptor5, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor6, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "icon", _descriptor7, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "menuSeparator", _descriptor8, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor9, this);
   }
   getOwnPath() {
     return this.dataReference.getOwnPath();
@@ -83453,7 +83533,12 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec9], {
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "menuSeparator", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -83785,7 +83870,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
-/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
+/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
+/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
+
 
 
 
@@ -83793,27 +83880,27 @@ __webpack_require__.r(__webpack_exports__);
 
 class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode;
+    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode;
   }
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     return [(0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node)];
   }
   doBuildDataDeclaration(context) {
     return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     return context.mergeDataDeclaration(...node.items.map(item => context.processChildrenDataDeclaration(item.children)));
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     for (const item of node.items) {
       yield* item.children;
     }
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("DropdownButton");
     markupBuilder.prop("data-tid").set(node.tid);
     markupBuilder.prop(x => x.width).set(node.width);
@@ -83825,6 +83912,13 @@ class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
       itemBuilder.prop("data-tid").set(item.tid);
       itemBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(item));
       itemBuilder.prop(x => x.metricName).set(item.metricName);
+      itemBuilder.prop(x => x.menuSeparator).set(item.menuSeparator);
+      if (item.disabled2 != undefined) {
+        itemBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__.buildExpressionPropValue)(item.disabled2));
+        if (this.getLegacyNode().getParent() != undefined) {
+          itemBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
+        }
+      }
       itemBuilder.prop(x => x.onActionClick).set(context.generateHelperFunctionExpression(node, "onClick", item.onClick));
       itemBuilder.appendChild(context.convertChildNodes(item.children));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.6.0",
+  "version": "5.7.0-fs-7964-multiple-keys-groupsum.8",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,