@kontur.candy/generator 4.295.0-fs-7926-fix-groupsum.2 → 4.296.0-finalerrorlogapi.0

package/dist/index.js

@@ -127552,11 +127552,10 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
     const compiledTarget = this.modelPathInstance(target);
     const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => ({
-      path: x.asDependencyModelPath(),
-      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x),
-      pathString: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(x.asDependencyModelPath().getPathPartsAsArray().map(token => token === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.current ? "!" : token)).toLegacyPath()
-    })).filter(x => !x.path.isEquals(target)), x => x.pathString));
-    const compiledDeps = dependencyModelPaths.map(x => x.path).map(x => this.modelPathInstance(x)).join(", ");
+      path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(x) ? x : (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isAggregationDependencyModelPath)(x) ? x.modelPath : x.path,
+      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
+    })).filter(x => !x.path.isEquals(target)), x => x.path.toLegacyPath()));
+    const compiledDeps = dependencyModelPaths.map(x => x.path.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
     const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths.filter(x => !x.isIgnoreForChecks).map(x => x.path));
     const compiledDelegate = `context => KCCalculation.execute(context, expression => ${compiledExpressionWithCheck}, "${defaultValue}")`;
     return {
@@ -131547,7 +131546,6 @@ const statementsToCode = statements => {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "RegularDependency": () => (/* binding */ RegularDependency),
 /* harmony export */   "AggregationDependencyModelPath": () => (/* binding */ AggregationDependencyModelPath),
 /* harmony export */   "DependencyWithoutChecks": () => (/* binding */ DependencyWithoutChecks),
 /* harmony export */   "isAggregationDependencyModelPath": () => (/* binding */ isAggregationDependencyModelPath),
@@ -131568,20 +131566,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-class RegularDependency {
-  constructor(currentDependencyPath, eachDependencyPath) {
-    this.currentDependencyPath = void 0;
-    this.eachDependencyPath = void 0;
-    this.eachDependencyPath = eachDependencyPath;
-    this.currentDependencyPath = currentDependencyPath;
-  }
-
-  asDependencyModelPath() {
-    const currentPart = this.currentDependencyPath.toCurrentIteration();
-    return this.eachDependencyPath != undefined ? currentPart.joinWith(this.eachDependencyPath) : currentPart;
-  }
-
-}
 class AggregationDependencyModelPath {
   constructor(type, modelPath, prefixModelPath, restModelPath) {
     this.type = void 0;
@@ -131594,12 +131578,14 @@ class AggregationDependencyModelPath {
     this.restModelPath = restModelPath;
   }
 
-  asDependencyModelPath() {
-    return this.modelPath.toCurrentIteration();
+}
+class DependencyWithoutChecks {
+  constructor(path) {
+    this.path = void 0;
+    this.path = path;
   }
 
 }
-class DependencyWithoutChecks extends RegularDependency {}
 function isAggregationDependencyModelPath(path) {
   return path instanceof AggregationDependencyModelPath;
 }
@@ -131625,7 +131611,7 @@ class KCXmlGeneratorBase {
   getArgumentDeps(targetFullPath, selectFullPath, aggregationType) {
     const pathDiffInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetFullPath, selectFullPath);
     const restPath = pathDiffInfo.differentPath;
-    return !restPath.isContainIteration() ? new RegularDependency(selectFullPath) : new AggregationDependencyModelPath(aggregationType, pathDiffInfo.matchedPath.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([...restPath.getPathPartsAsArray().filter(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isSimpleToken(x)), aggregationType])), pathDiffInfo.matchedPath, restPath);
+    return !restPath.isContainIteration() ? selectFullPath : new AggregationDependencyModelPath(aggregationType, pathDiffInfo.matchedPath.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([...restPath.getPathPartsAsArray().filter(x => _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isSimpleToken(x)), aggregationType])), pathDiffInfo.matchedPath, restPath);
   }
 
   getAggregationPathsRecursively(currentParts, restParts) {
@@ -131698,13 +131684,13 @@ class KCXmlGeneratorBase {
       const modelPath = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeMultiplicity(this.removeAttributePrefix(expression.select)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
       const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Sum");
       deps.push(argumentDependency);
-      const finalPath = argumentDependency.asDependencyModelPath();
+      const finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : isAggregationDependencyModelPath(argumentDependency) ? argumentDependency.modelPath : argumentDependency.path;
       return gcf(x => x.argument, `"${finalPath.toLegacyPath()}"`);
     }
 
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaExistsExpression) {
       const modelPath = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.select)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
-      deps.push(new RegularDependency(modelPath));
+      deps.push(modelPath);
       return gcf(x => x.exists, `"${modelPath.toLegacyPath()}"`);
     }
 
@@ -131743,9 +131729,9 @@ class KCXmlGeneratorBase {
       if (targetFullPath.isContainIteration()) {
         const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Count");
         deps.push(argumentDependency);
-        finalPath = argumentDependency.asDependencyModelPath();
+        finalPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(argumentDependency) ? argumentDependency : isAggregationDependencyModelPath(argumentDependency) ? argumentDependency.modelPath : argumentDependency.path;
       } else {
-        deps.push(new RegularDependency(modelPath));
+        deps.push(modelPath);
       }
 
       return gcf(x => x.count, `"${finalPath.toLegacyPath()}"`, `"${(_expression$withNullO = expression.withNullOrEmptyValues) !== null && _expression$withNullO !== void 0 ? _expression$withNullO : false}"`);
@@ -131888,11 +131874,9 @@ class KCXmlGeneratorBase {
       const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
       deps.push(new DependencyWithoutChecks(targetKeyPath));
       const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
-      const sourceKeyDeps = this.calculatedGroupSumDependencies(targetKeyPath, sourceKeyPath);
-      deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
+      deps.push(new DependencyWithoutChecks(sourceKeyPath));
       const sourceValuePath = this.getModelPath(prefix, expression.sourceValuePath);
-      const sourceValueDeps = this.calculatedGroupSumDependencies(targetKeyPath, sourceValuePath);
-      deps.push(new DependencyWithoutChecks(sourceValueDeps.currentDepsPath, sourceValueDeps.eachDepsPath));
+      deps.push(new DependencyWithoutChecks(sourceValuePath));
       return gcf(x => x.groupSum, `"${targetKeyPath}", "${sourceKeyPath}", "${sourceValuePath}"`);
     }
 
@@ -131900,8 +131884,7 @@ class KCXmlGeneratorBase {
       const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
       deps.push(new DependencyWithoutChecks(targetKeyPath));
       const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
-      const sourceKeyDeps = this.calculatedGroupSumDependencies(targetKeyPath, sourceKeyPath);
-      deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
+      deps.push(new DependencyWithoutChecks(sourceKeyPath));
       return gcf(x => x.groupCount, `"${targetKeyPath}", "${sourceKeyPath}"`);
     }
 
@@ -131925,38 +131908,6 @@ class KCXmlGeneratorBase {
   }
   /* eslint-enable @typescript-eslint/unbound-method */
 
-  /*
-      Метод вычисляет зависимости для оператора.
-      Для того, чтобы калькулятор корректно реагировал на измнения необходимо сделать корректные зависимости:
-      1) Если исходная множественность и множественность по которой строится группа совпадают, то необходио
-          для последней звёздочки построить зависимость не через PathTokens.current, а через PathTokens.each,
-          т.к. в таком случае пересчёт groupSum/groupCount должен тригетрися при изменении любого элемента в множественности, а не только текущего.
-      2) Если множественности не совпадают, то количество звёздочек (getIterationRank()) в общей части будет разным и ничего дополнительно делать не нужно,
-          в зависимостях в CalculationFunction в данном случае все звёздочки превратятся в PathTokens.current.
-  */
-
-
-  calculatedGroupSumDependencies(targetKeyPath, sourcePath) {
-    var _targetPathParts$last;
-
-    const diffPaths = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetKeyPath, sourcePath);
-
-    if (targetKeyPath.getIterationRank() > diffPaths.matchedPath.getIterationRank()) {
-      return {
-        currentDepsPath: diffPaths.matchedPath,
-        eachDepsPath: diffPaths.differentPath
-      };
-    }
-
-    const targetPathParts = diffPaths.matchedPath.getPathPartsAsArray();
-    const lastStarIndex = targetPathParts.lastIndexOf(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each);
-    const currentDepsPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(targetPathParts.slice(0, lastStarIndex));
-    const eachDepsPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)([(_targetPathParts$last = targetPathParts[lastStarIndex]) !== null && _targetPathParts$last !== void 0 ? _targetPathParts$last : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)(), ...targetPathParts.slice(lastStarIndex + 1)]).joinWith(diffPaths.differentPath);
-    return {
-      currentDepsPath: currentDepsPath,
-      eachDepsPath: eachDepsPath
-    };
-  }
 
   removeAttributePrefix(pathPart) {
     return pathPart.replace(/\@/g, "");
@@ -132033,11 +131984,10 @@ class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPA
     const compiledExpression = this.compileExpression(prefix, target, condition.expression, deps);
     const compiledTarget = this.modelPathInstance(target);
     const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(deps.map(x => ({
-      path: x.asDependencyModelPath(),
-      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x),
-      pathString: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(x.asDependencyModelPath().getPathPartsAsArray().map(token => token === _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.current ? "!" : token)).toLegacyPath()
-    })).filter(x => !x.path.isEquals(target)), x => x.pathString));
-    const compiledDeps = dependencyModelPaths.map(x => x.path).map(x => this.modelPathInstance(x)).join(", ");
+      path: (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.isModelPath)(x) ? x : (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isAggregationDependencyModelPath)(x) ? x.modelPath : x.path,
+      isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
+    })).filter(x => !x.path.isEquals(target)), x => x.path.toLegacyPath()));
+    const compiledDeps = dependencyModelPaths.map(x => x.path.toCurrentIteration()).map(x => this.modelPathInstance(x)).join(", ");
     const compiledDescription = (_condition$descriptio = condition.description) !== null && _condition$descriptio !== void 0 ? _condition$descriptio : "Error Message";
     const compiledDelegate = `context => KCCondition.execute(context, expression => ${compiledExpression}, ` + `() => "${compiledDescription}", "${(_condition$errorLevel = condition.errorLevel) !== null && _condition$errorLevel !== void 0 ? _condition$errorLevel : "Error"}")`;
     return `new ValidationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.295.0-fs-7926-fix-groupsum.2",
+  "version": "4.296.0-finalerrorlogapi.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,