@kontur.candy/generator 4.296.0-useextendederrorlog.0 → 4.298.0-documentsPeriod.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +101 -34
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -113251,8 +113251,8 @@ class ModelPathImpl {
|
|
|
113251
113251
|
return true;
|
|
113252
113252
|
}
|
|
113253
113253
|
|
|
113254
|
-
getIterationRank() {
|
|
113255
|
-
return (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.count)(Iterator.from(this.tokens).filter(x => x === PathTokens.each));
|
|
113254
|
+
getIterationRank(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreDifferent) {
|
|
113255
|
+
return (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.count)(Iterator.from(this.tokens).filter(x => eachCurrentCollision == _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreDifferent ? x === PathTokens.each : PathTokens.isMultiToken(x)));
|
|
113256
113256
|
}
|
|
113257
113257
|
|
|
113258
113258
|
isEmpty() {
|
|
@@ -114702,7 +114702,8 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
114702
114702
|
/* harmony export */ "tryGetValidDateShape": () => (/* binding */ tryGetValidDateShape),
|
|
114703
114703
|
/* harmony export */ "comparator": () => (/* binding */ comparator),
|
|
114704
114704
|
/* harmony export */ "isValidStringDate": () => (/* binding */ isValidStringDate),
|
|
114705
|
-
/* harmony export */ "isLessOrEqualStringDates": () => (/* binding */ isLessOrEqualStringDates)
|
|
114705
|
+
/* harmony export */ "isLessOrEqualStringDates": () => (/* binding */ isLessOrEqualStringDates),
|
|
114706
|
+
/* harmony export */ "HelperFunctionsDateHelpers": () => (/* binding */ HelperFunctionsDateHelpers)
|
|
114706
114707
|
/* harmony export */ });
|
|
114707
114708
|
function parseDateString(value) {
|
|
114708
114709
|
const [date, month, year] = (value || "").split(".").map(x => x ? Number(x) : undefined);
|
|
@@ -114779,6 +114780,10 @@ function isLessOrEqualStringDates(a, b) {
|
|
|
114779
114780
|
|
|
114780
114781
|
return false;
|
|
114781
114782
|
}
|
|
114783
|
+
const HelperFunctionsDateHelpers = {
|
|
114784
|
+
isValidDate: isValidDate,
|
|
114785
|
+
parseDateString: parseDateString
|
|
114786
|
+
};
|
|
114782
114787
|
|
|
114783
114788
|
/***/ }),
|
|
114784
114789
|
|
|
@@ -114971,7 +114976,8 @@ let FilterType;
|
|
|
114971
114976
|
__webpack_require__.r(__webpack_exports__);
|
|
114972
114977
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
114973
114978
|
/* harmony export */ "splitLastOccurrence": () => (/* binding */ splitLastOccurrence),
|
|
114974
|
-
/* harmony export */ "pluralize": () => (/* binding */ pluralize)
|
|
114979
|
+
/* harmony export */ "pluralize": () => (/* binding */ pluralize),
|
|
114980
|
+
/* harmony export */ "HelperFunctionsStringHelpers": () => (/* binding */ HelperFunctionsStringHelpers)
|
|
114975
114981
|
/* harmony export */ });
|
|
114976
114982
|
/* harmony import */ var _Common_IntRangeUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../Common/IntRangeUtils */ "./Common/IntRangeUtils.ts");
|
|
114977
114983
|
|
|
@@ -114992,6 +114998,9 @@ const pluralize = (count, words, localizer) => {
|
|
|
114992
114998
|
const x = count % 100 > 4 && count % 100 < 20 ? 2 : cases[(0,_Common_IntRangeUtils__WEBPACK_IMPORTED_MODULE_0__.clampUInt)(count % 10, 0, 5)];
|
|
114993
114999
|
return count.toString() + " " + (localizer ? localizer.translate(words[x]) : words[x]);
|
|
114994
115000
|
};
|
|
115001
|
+
const HelperFunctionsStringHelpers = {
|
|
115002
|
+
pluralize: pluralize
|
|
115003
|
+
};
|
|
114995
115004
|
|
|
114996
115005
|
/***/ }),
|
|
114997
115006
|
|
|
@@ -127552,10 +127561,11 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
|
|
|
127552
127561
|
const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
|
|
127553
127562
|
const compiledTarget = this.modelPathInstance(target);
|
|
127554
127563
|
const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => ({
|
|
127555
|
-
path:
|
|
127556
|
-
isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
|
|
127557
|
-
|
|
127558
|
-
|
|
127564
|
+
path: x.asDependencyModelPath(),
|
|
127565
|
+
isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x),
|
|
127566
|
+
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()
|
|
127567
|
+
})).filter(x => !x.path.isEquals(target)), x => x.pathString));
|
|
127568
|
+
const compiledDeps = dependencyModelPaths.map(x => x.path).map(x => this.modelPathInstance(x)).join(", ");
|
|
127559
127569
|
const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths.filter(x => !x.isIgnoreForChecks).map(x => x.path));
|
|
127560
127570
|
const compiledDelegate = `context => KCCalculation.execute(context, expression => ${compiledExpressionWithCheck}, "${defaultValue}")`;
|
|
127561
127571
|
return {
|
|
@@ -131546,6 +131556,7 @@ const statementsToCode = statements => {
|
|
|
131546
131556
|
"use strict";
|
|
131547
131557
|
__webpack_require__.r(__webpack_exports__);
|
|
131548
131558
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
131559
|
+
/* harmony export */ "RegularDependency": () => (/* binding */ RegularDependency),
|
|
131549
131560
|
/* harmony export */ "AggregationDependencyModelPath": () => (/* binding */ AggregationDependencyModelPath),
|
|
131550
131561
|
/* harmony export */ "DependencyWithoutChecks": () => (/* binding */ DependencyWithoutChecks),
|
|
131551
131562
|
/* harmony export */ "isAggregationDependencyModelPath": () => (/* binding */ isAggregationDependencyModelPath),
|
|
@@ -131566,6 +131577,20 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
131566
131577
|
|
|
131567
131578
|
|
|
131568
131579
|
|
|
131580
|
+
class RegularDependency {
|
|
131581
|
+
constructor(currentDependencyPath, eachDependencyPath) {
|
|
131582
|
+
this.currentDependencyPath = void 0;
|
|
131583
|
+
this.eachDependencyPath = void 0;
|
|
131584
|
+
this.eachDependencyPath = eachDependencyPath;
|
|
131585
|
+
this.currentDependencyPath = currentDependencyPath;
|
|
131586
|
+
}
|
|
131587
|
+
|
|
131588
|
+
asDependencyModelPath() {
|
|
131589
|
+
const currentPart = this.currentDependencyPath.toCurrentIteration();
|
|
131590
|
+
return this.eachDependencyPath != undefined ? currentPart.joinWith(this.eachDependencyPath) : currentPart;
|
|
131591
|
+
}
|
|
131592
|
+
|
|
131593
|
+
}
|
|
131569
131594
|
class AggregationDependencyModelPath {
|
|
131570
131595
|
constructor(type, modelPath, prefixModelPath, restModelPath) {
|
|
131571
131596
|
this.type = void 0;
|
|
@@ -131578,14 +131603,12 @@ class AggregationDependencyModelPath {
|
|
|
131578
131603
|
this.restModelPath = restModelPath;
|
|
131579
131604
|
}
|
|
131580
131605
|
|
|
131581
|
-
|
|
131582
|
-
|
|
131583
|
-
constructor(path) {
|
|
131584
|
-
this.path = void 0;
|
|
131585
|
-
this.path = path;
|
|
131606
|
+
asDependencyModelPath() {
|
|
131607
|
+
return this.modelPath.toCurrentIteration();
|
|
131586
131608
|
}
|
|
131587
131609
|
|
|
131588
131610
|
}
|
|
131611
|
+
class DependencyWithoutChecks extends RegularDependency {}
|
|
131589
131612
|
function isAggregationDependencyModelPath(path) {
|
|
131590
131613
|
return path instanceof AggregationDependencyModelPath;
|
|
131591
131614
|
}
|
|
@@ -131611,7 +131634,7 @@ class KCXmlGeneratorBase {
|
|
|
131611
131634
|
getArgumentDeps(targetFullPath, selectFullPath, aggregationType) {
|
|
131612
131635
|
const pathDiffInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetFullPath, selectFullPath);
|
|
131613
131636
|
const restPath = pathDiffInfo.differentPath;
|
|
131614
|
-
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);
|
|
131637
|
+
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);
|
|
131615
131638
|
}
|
|
131616
131639
|
|
|
131617
131640
|
getAggregationPathsRecursively(currentParts, restParts) {
|
|
@@ -131684,39 +131707,39 @@ class KCXmlGeneratorBase {
|
|
|
131684
131707
|
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());
|
|
131685
131708
|
const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Sum");
|
|
131686
131709
|
deps.push(argumentDependency);
|
|
131687
|
-
const finalPath =
|
|
131710
|
+
const finalPath = argumentDependency.asDependencyModelPath();
|
|
131688
131711
|
return gcf(x => x.argument, `"${finalPath.toLegacyPath()}"`);
|
|
131689
131712
|
}
|
|
131690
131713
|
|
|
131691
131714
|
if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaExistsExpression) {
|
|
131692
131715
|
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());
|
|
131693
|
-
deps.push(modelPath);
|
|
131716
|
+
deps.push(new RegularDependency(modelPath));
|
|
131694
131717
|
return gcf(x => x.exists, `"${modelPath.toLegacyPath()}"`);
|
|
131695
131718
|
}
|
|
131696
131719
|
|
|
131697
131720
|
if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsSnilsExpression) {
|
|
131698
131721
|
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());
|
|
131699
|
-
deps.push(modelPath);
|
|
131722
|
+
deps.push(new RegularDependency(modelPath));
|
|
131700
131723
|
return gcf(x => x.isSnils, `"${modelPath.toLegacyPath()}"`);
|
|
131701
131724
|
}
|
|
131702
131725
|
|
|
131703
131726
|
if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsInnExpression) {
|
|
131704
131727
|
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());
|
|
131705
|
-
deps.push(modelPath);
|
|
131728
|
+
deps.push(new RegularDependency(modelPath));
|
|
131706
131729
|
return gcf(x => x.isInn, `"${modelPath.toLegacyPath()}"`);
|
|
131707
131730
|
}
|
|
131708
131731
|
|
|
131709
131732
|
if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsValidMirCardNumberExpression) {
|
|
131710
131733
|
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());
|
|
131711
|
-
deps.push(modelPath);
|
|
131734
|
+
deps.push(new RegularDependency(modelPath));
|
|
131712
131735
|
return gcf(x => x.isValidMirCardNumber, `"${modelPath.toLegacyPath()}"`);
|
|
131713
131736
|
}
|
|
131714
131737
|
|
|
131715
131738
|
if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaIsValidAccountNumberExpression) {
|
|
131716
131739
|
const bikPath = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.bik)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
|
|
131717
131740
|
const accountPath = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(this.removeMultiplicity(expression.account)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
|
|
131718
|
-
deps.push(bikPath);
|
|
131719
|
-
deps.push(accountPath);
|
|
131741
|
+
deps.push(new RegularDependency(bikPath));
|
|
131742
|
+
deps.push(new RegularDependency(accountPath));
|
|
131720
131743
|
return gcf(x => x.isValidAccountNumber, `"${bikPath.toLegacyPath()}"`, `"${accountPath.toLegacyPath()}"`);
|
|
131721
131744
|
}
|
|
131722
131745
|
|
|
@@ -131729,9 +131752,9 @@ class KCXmlGeneratorBase {
|
|
|
131729
131752
|
if (targetFullPath.isContainIteration()) {
|
|
131730
131753
|
const argumentDependency = this.getArgumentDeps(targetFullPath, modelPath, "Count");
|
|
131731
131754
|
deps.push(argumentDependency);
|
|
131732
|
-
finalPath =
|
|
131755
|
+
finalPath = argumentDependency.asDependencyModelPath();
|
|
131733
131756
|
} else {
|
|
131734
|
-
deps.push(modelPath);
|
|
131757
|
+
deps.push(new RegularDependency(modelPath));
|
|
131735
131758
|
}
|
|
131736
131759
|
|
|
131737
131760
|
return gcf(x => x.count, `"${finalPath.toLegacyPath()}"`, `"${(_expression$withNullO = expression.withNullOrEmptyValues) !== null && _expression$withNullO !== void 0 ? _expression$withNullO : false}"`);
|
|
@@ -131874,9 +131897,11 @@ class KCXmlGeneratorBase {
|
|
|
131874
131897
|
const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
|
|
131875
131898
|
deps.push(new DependencyWithoutChecks(targetKeyPath));
|
|
131876
131899
|
const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
|
|
131877
|
-
|
|
131900
|
+
const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
|
|
131901
|
+
deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
|
|
131878
131902
|
const sourceValuePath = this.getModelPath(prefix, expression.sourceValuePath);
|
|
131879
|
-
|
|
131903
|
+
const sourceValueDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceValuePath);
|
|
131904
|
+
deps.push(new DependencyWithoutChecks(sourceValueDeps.currentDepsPath, sourceValueDeps.eachDepsPath));
|
|
131880
131905
|
return gcf(x => x.groupSum, `"${targetKeyPath}", "${sourceKeyPath}", "${sourceValuePath}"`);
|
|
131881
131906
|
}
|
|
131882
131907
|
|
|
@@ -131884,7 +131909,8 @@ class KCXmlGeneratorBase {
|
|
|
131884
131909
|
const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
|
|
131885
131910
|
deps.push(new DependencyWithoutChecks(targetKeyPath));
|
|
131886
131911
|
const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
|
|
131887
|
-
|
|
131912
|
+
const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
|
|
131913
|
+
deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
|
|
131888
131914
|
return gcf(x => x.groupCount, `"${targetKeyPath}", "${sourceKeyPath}"`);
|
|
131889
131915
|
}
|
|
131890
131916
|
|
|
@@ -131908,6 +131934,38 @@ class KCXmlGeneratorBase {
|
|
|
131908
131934
|
}
|
|
131909
131935
|
/* eslint-enable @typescript-eslint/unbound-method */
|
|
131910
131936
|
|
|
131937
|
+
/*
|
|
131938
|
+
Метод вычисляет зависимости для оператора.
|
|
131939
|
+
Для того, чтобы калькулятор корректно реагировал на измнения необходимо сделать корректные зависимости:
|
|
131940
|
+
1) Если исходная множественность и множественность по которой строится группа совпадают, то необходио
|
|
131941
|
+
для последней звёздочки построить зависимость не через PathTokens.current, а через PathTokens.each,
|
|
131942
|
+
т.к. в таком случае пересчёт groupSum/groupCount должен тригетрися при изменении любого элемента в множественности, а не только текущего.
|
|
131943
|
+
2) Если множественности не совпадают, то количество звёздочек (getIterationRank()) в общей части будет разным и ничего дополнительно делать не нужно,
|
|
131944
|
+
в зависимостях в CalculationFunction в данном случае все звёздочки превратятся в PathTokens.current.
|
|
131945
|
+
*/
|
|
131946
|
+
|
|
131947
|
+
|
|
131948
|
+
calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourcePath) {
|
|
131949
|
+
var _targetPathParts$last;
|
|
131950
|
+
|
|
131951
|
+
const diffPaths = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_4__.getMatchedAndDifferentModelPaths)(targetKeyPath, sourcePath);
|
|
131952
|
+
|
|
131953
|
+
if (targetKeyPath.getIterationRank() > diffPaths.matchedPath.getIterationRank()) {
|
|
131954
|
+
return {
|
|
131955
|
+
currentDepsPath: diffPaths.matchedPath,
|
|
131956
|
+
eachDepsPath: diffPaths.differentPath
|
|
131957
|
+
};
|
|
131958
|
+
}
|
|
131959
|
+
|
|
131960
|
+
const targetPathParts = diffPaths.matchedPath.getPathPartsAsArray();
|
|
131961
|
+
const lastStarIndex = targetPathParts.lastIndexOf(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each);
|
|
131962
|
+
const currentDepsPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens)(targetPathParts.slice(0, lastStarIndex));
|
|
131963
|
+
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), ...diffPaths.differentPath.getPathParts()]);
|
|
131964
|
+
return {
|
|
131965
|
+
currentDepsPath: currentDepsPath,
|
|
131966
|
+
eachDepsPath: eachDepsPath
|
|
131967
|
+
};
|
|
131968
|
+
}
|
|
131911
131969
|
|
|
131912
131970
|
removeAttributePrefix(pathPart) {
|
|
131913
131971
|
return pathPart.replace(/\@/g, "");
|
|
@@ -131984,10 +132042,11 @@ class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPA
|
|
|
131984
132042
|
const compiledExpression = this.compileExpression(prefix, target, condition.expression, deps);
|
|
131985
132043
|
const compiledTarget = this.modelPathInstance(target);
|
|
131986
132044
|
const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(deps.map(x => ({
|
|
131987
|
-
path:
|
|
131988
|
-
isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x)
|
|
131989
|
-
|
|
131990
|
-
|
|
132045
|
+
path: x.asDependencyModelPath(),
|
|
132046
|
+
isIgnoreForChecks: (0,_KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__.isDependencyWithoutChecks)(x),
|
|
132047
|
+
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()
|
|
132048
|
+
})).filter(x => !x.path.isEquals(target)), x => x.pathString));
|
|
132049
|
+
const compiledDeps = dependencyModelPaths.map(x => x.path).map(x => this.modelPathInstance(x)).join(", ");
|
|
131991
132050
|
const compiledDescription = (_condition$descriptio = condition.description) !== null && _condition$descriptio !== void 0 ? _condition$descriptio : "Error Message";
|
|
131992
132051
|
const compiledDelegate = `context => KCCondition.execute(context, expression => ${compiledExpression}, ` + `() => "${compiledDescription}", "${(_condition$errorLevel = condition.errorLevel) !== null && _condition$errorLevel !== void 0 ? _condition$errorLevel : "Error"}")`;
|
|
131993
132052
|
return `new ValidationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate})`;
|
|
@@ -145997,6 +146056,7 @@ class MinitourConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1__
|
|
|
145997
146056
|
markupBuilder.prop(x => x.id).set(node.id);
|
|
145998
146057
|
markupBuilder.prop(x => x.label).set(node.label);
|
|
145999
146058
|
markupBuilder.prop(x => x.width).set(node.width);
|
|
146059
|
+
markupBuilder.prop(x => x.openedFrom).set(node.openedFrom);
|
|
146000
146060
|
markupBuilder.prop(x => x.positions).set((_node$positions = node.positions) !== null && _node$positions !== void 0 ? _node$positions : ["bottom left"]);
|
|
146001
146061
|
markupBuilder.appendChild(context.convertChildNodes(node.children));
|
|
146002
146062
|
return markupBuilder.buildConverterResult();
|
|
@@ -146031,13 +146091,13 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
146031
146091
|
|
|
146032
146092
|
|
|
146033
146093
|
|
|
146034
|
-
var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6;
|
|
146094
|
+
var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7;
|
|
146035
146095
|
|
|
146036
146096
|
|
|
146037
146097
|
|
|
146038
146098
|
|
|
146039
146099
|
|
|
146040
|
-
let MinitourNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("minitour", `Минитур`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Layout/Minitour sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingScopeMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Id минитура.`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("label", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Текст в минитуре.`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Ширина минитура. По умолчанию растягивается по ширине текста. Min = 256px, max = 400px.`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("positions", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"](..._Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_6__.allPopupPositions)), `Позиции минитура. По умолчанию \"bottom left\". Запись в сахаре в виде: \"positions={["bottom left"]}\". Возможные позиции: ${_Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_6__.allPopupPositions.join(", ")}`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class MinitourNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
|
|
146100
|
+
let MinitourNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("minitour", `Минитур`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Layout/Minitour sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingScopeMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Id минитура.`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("label", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Текст в минитуре.`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Ширина минитура. По умолчанию растягивается по ширине текста. Min = 256px, max = 400px.`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("positions", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"](..._Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_6__.allPopupPositions)), `Позиции минитура. По умолчанию \"bottom left\". Запись в сахаре в виде: \"positions={["bottom left"]}\". Возможные позиции: ${_Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_6__.allPopupPositions.join(", ")}`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("openedFrom", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `Нужно для метрик. Показывает, откуда открыли минитур. Если не указан - то будет браться из id`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class MinitourNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_4__.SugarNodeWithLegacyVisibility {
|
|
146041
146101
|
constructor(...args) {
|
|
146042
146102
|
super(...args);
|
|
146043
146103
|
|
|
@@ -146051,7 +146111,9 @@ let MinitourNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODU
|
|
|
146051
146111
|
|
|
146052
146112
|
_babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "positions", _descriptor5, this);
|
|
146053
146113
|
|
|
146054
|
-
_babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "
|
|
146114
|
+
_babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "openedFrom", _descriptor6, this);
|
|
146115
|
+
|
|
146116
|
+
_babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor7, this);
|
|
146055
146117
|
}
|
|
146056
146118
|
|
|
146057
146119
|
getOwnPath() {
|
|
@@ -146083,7 +146145,12 @@ let MinitourNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODU
|
|
|
146083
146145
|
enumerable: true,
|
|
146084
146146
|
writable: true,
|
|
146085
146147
|
initializer: null
|
|
146086
|
-
}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "
|
|
146148
|
+
}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "openedFrom", [_dec7], {
|
|
146149
|
+
configurable: true,
|
|
146150
|
+
enumerable: true,
|
|
146151
|
+
writable: true,
|
|
146152
|
+
initializer: null
|
|
146153
|
+
}), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec8], {
|
|
146087
146154
|
configurable: true,
|
|
146088
146155
|
enumerable: true,
|
|
146089
146156
|
writable: true,
|