@kontur.candy/generator 5.21.0-picklist-new.1 → 5.21.0-picklist-again.1

package/dist/index.js

@@ -59580,6 +59580,9 @@ class ModelPathImpl {
   isContainCurrentIteration() {
     return this.tokens.some(x => x === PathTokens.current);
   }
+  isContainCurrentOrEachIteration() {
+    return this.tokens.some(x => x === PathTokens.current || x === PathTokens.each);
+  }
   getLastListPath() {
     if (!this.isContainIteration()) {
       throw new Error("Path must contain iteration");
@@ -80911,8 +80914,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "IsInnExpression": () => (/* binding */ IsInnExpression),
 /* harmony export */   "IsValidMirCardNumberExpression": () => (/* binding */ IsValidMirCardNumberExpression),
 /* harmony export */   "IsValidAccountNumberExpression": () => (/* binding */ IsValidAccountNumberExpression),
-/* harmony export */   "AddSumExpression": () => (/* binding */ AddSumExpression),
-/* harmony export */   "GetExpression": () => (/* binding */ GetExpression),
+/* harmony export */   "AddSumByKeysExpression": () => (/* binding */ AddSumByKeysExpression),
+/* harmony export */   "GetSumByKeysExpression": () => (/* binding */ GetSumByKeysExpression),
 /* harmony export */   "IntegerLiteralExpression": () => (/* binding */ IntegerLiteralExpression),
 /* harmony export */   "NullLiteralExpression": () => (/* binding */ NullLiteralExpression),
 /* harmony export */   "ConditionalExpression": () => (/* binding */ ConditionalExpression),
@@ -81375,7 +81378,7 @@ class ReduceCallExpression extends CallExpression {
     return this.reduceFunction.getType();
   }
   convertToString() {
-    return `reduce(${toFLangString(this.modelPath)}${this.modelPath.isEndsWithIteration() ? "" : "/#iter"}, ${this.reduceFunction.convertToString()}, ${this.initialValue.convertToString()})`;
+    return `reduce(${toFLangString(this.modelPath)}/#iter, ${this.reduceFunction.convertToString()}, ${this.initialValue.convertToString()})`;
   }
 }
 class ReduceMultipleCallExpression extends CallExpression {
@@ -81707,7 +81710,7 @@ class IsValidAccountNumberExpression extends FLangBoolExpression {
     return `isValidAccountNumber(${this.bik.convertToString()}, ${this.account.convertToString()})`;
   }
 }
-class AddSumExpression extends FLangDictExpression {
+class AddSumByKeysExpression extends FLangDictExpression {
   constructor(argumentReference, key, value) {
     super();
     this.argumentReference = void 0;
@@ -81729,7 +81732,7 @@ class AddSumExpression extends FLangDictExpression {
     return `addSumByKeys(${dictName}, ${key}, ${value})`;
   }
 }
-class GetExpression extends FLangDecimalExpression {
+class GetSumByKeysExpression extends FLangDecimalExpression {
   constructor(dictionaryExpression, key) {
     super();
     this.dictionaryExpression = void 0;
@@ -82205,7 +82208,7 @@ function* getAllExpressionChildren(node, descendantsFilter) {
   }
 }
 function wrapWithArgumentsCondition(expression) {
-  const childFilter = node => !(node instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.ReduceCallExpression || node instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.GetExpression);
+  const childFilter = node => !(node instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.ReduceCallExpression || node instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.GetSumByKeysExpression);
   const allValueRefNodes = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.concat([expression], getAllExpressionChildren(expression, childFilter)).map(x => x instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.ValueReferenceExpression ? x : undefined).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined);
   const uniquePaths = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.distinctBy(allValueRefNodes, x => x.convertToString());
   const conditionExpression = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.reduce(uniquePaths, (acc, curr) => {
@@ -82767,48 +82770,27 @@ class FormulaExpressionToFlangExpressionConverter {
     const matchPaths = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, sourceKeyPath);
     const sourceKeyParts = sourceKeyPath.getPathPartsAsArray();
     const firstPart = matchPaths.matchedPath.toCurrentIteration();
-    let finalIterPath;
     const firstPartLength = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.count(firstPart.getPathParts());
     const secondParts = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(sourceKeyParts.slice(firstPartLength));
-    if (secondParts.isContainIteration() || secondParts.isContainCurrentIteration()) {
+    const getIterationPathWithNestedMultiplicity = () => {
       const secondPartParts = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(sourceKeyParts.slice(firstPartLength)).getPathPartsAsArray();
       const lastStarIndexSecondPart = secondPartParts.lastIndexOf(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
       const secondPartFinalParts = secondPartParts.slice(0, lastStarIndexSecondPart);
-      finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)([...firstPart.getPathParts(), ...secondPartFinalParts]).trimLastStarIfLastToken();
-    } else {
-      const predictIterMultiplisity = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)(sourceKeyParts.slice(0, firstPartLength));
-      if (predictIterMultiplisity.getIterationRank() > 1) {
-        /**
-         * В зависимости от того - на каком уровне пишем groupCount
-         * in GroupCountConstThrewMultiple
-         *    {
-         * 		check all === groupCount("1", Б/С/Код);
-         *      GroupCountConstThrewMultiple/Б/__EACH__/С/__EACH__/Код
-         * 		in Б
-         * 		{
-         * 			in С
-         * 			{
-         * 				check inС === groupCount(Код, Код);
-         * 			    GroupCountConstThrewMultiple/Б/__CURRENT__/С/__CURRENT__/Код
-         * 			}
-         * 		}
-         * 	}
-         * */
-        finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)(predictIterMultiplisity.toCurrentIteration().getPathPartsAsArray().slice(0, firstPartLength - 1));
-      } else {
-        finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)(sourceKeyParts.slice(0, firstPartLength - 1));
-      }
-    }
-    if (!finalIterPath) {
+      return (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)([...firstPart.getPathParts(), ...secondPartFinalParts]).trimLastStarIfLastToken();
+    };
+    const getIterationPathWithoutNestedMultiplicity = () => {
+      const firstPartParts = matchPaths.matchedPath.getPathPartsAsArray();
+      const lastStarIndexSecondPart = firstPartParts.lastIndexOf(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
+      return (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)(sourceKeyParts.slice(0, lastStarIndexSecondPart)).toCurrentIteration().trimLastStarIfLastToken();
+    };
+    const finalIterPath = secondParts.isContainCurrentOrEachIteration() ? getIterationPathWithNestedMultiplicity() : getIterationPathWithoutNestedMultiplicity();
+    if (finalIterPath.isEmpty()) {
       throw new Error("Error occurred while trying parse path for reduce: " + firstPart.toLegacyPath());
     }
     const keys = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DeserializeEnumerationExpression([new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value")], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BoolLiteralExpression(true));
-    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"), keys, (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression());
-    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}`);
-    }
+    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__.AddSumByKeysExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), keys, (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression());
     const deserializedKeys = targetKeys.items[0] instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaGetPicklistValuesExpression ? this.compileExpressionToFlangExpressionInternal(targetKeys.items[0], prefix, target, addPrecalculationRule) : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DeserializeEnumerationExpression(targetKeys.items.map(i => this.compileEnumerationItem(i, prefix, target, addPrecalculationRule)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BoolLiteralExpression(true));
-    const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, deserializedKeys !== null && deserializedKeys !== void 0 ? deserializedKeys : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)());
+    const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetSumByKeysExpression(reduceExpression, deserializedKeys !== null && deserializedKeys !== void 0 ? deserializedKeys : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)());
     return finalValueExpression;
   }
   compileEnumerationItem(expression, prefix, target, addPrecalculationRule) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.21.0-picklist-new.1",
+  "version": "5.21.0-picklist-again.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,