@kontur.candy/generator 5.2.0-server-side-calculations.4 → 5.2.0-server-side-calculations.5

package/dist/index.js

@@ -59315,12 +59315,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "AbsoluteModelFieldPath": () => (/* binding */ AbsoluteModelFieldPath),
 /* harmony export */   "ModelPathImpl": () => (/* binding */ ModelPathImpl)
 /* harmony export */ });
-/* harmony import */ var _IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../IterableUtils */ "./Common/IterableUtils.ts");
-/* harmony import */ var _TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _hashUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../hashUtils */ "./Common/hashUtils.ts");
-/* harmony import */ var _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./EachCurrentCollision */ "./Common/ModelPath/EachCurrentCollision.ts");
-/* harmony import */ var _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ModelPathBuilder */ "./Common/ModelPath/ModelPathBuilder.ts");
-/* harmony import */ var _PathMatcher__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./PathMatcher */ "./Common/ModelPath/PathMatcher.ts");
+/* harmony import */ var _Engine_src_Engine_Core_CoreTypes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../Engine/src/Engine/Core/CoreTypes */ "./Engine/src/Engine/Core/CoreTypes.ts");
+/* harmony import */ var _IterableUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../IterableUtils */ "./Common/IterableUtils.ts");
+/* harmony import */ var _TypingUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _hashUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../hashUtils */ "./Common/hashUtils.ts");
+/* harmony import */ var _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./EachCurrentCollision */ "./Common/ModelPath/EachCurrentCollision.ts");
+/* harmony import */ var _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./ModelPathBuilder */ "./Common/ModelPath/ModelPathBuilder.ts");
+/* harmony import */ var _PathMatcher__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./PathMatcher */ "./Common/ModelPath/PathMatcher.ts");
+
 
 
 
@@ -59450,9 +59452,9 @@ class AbsoluteModelFieldPath {
     this.field = fieldName;
   }
   getHash() {
-    return this.path.getHash() + (0,_hashUtils__WEBPACK_IMPORTED_MODULE_2__.getSimpleHashByString)(this.field);
+    return this.path.getHash() + (0,_hashUtils__WEBPACK_IMPORTED_MODULE_3__.getSimpleHashByString)(this.field);
   }
-  isEquals(modelPath, eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreSame) {
+  isEquals(modelPath, eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreSame) {
     return this.path.isEquals(modelPath.path, eachCurrentCollision) && this.field === modelPath.field;
   }
   static createFromString(pathWithFieldName) {
@@ -59465,6 +59467,7 @@ class AbsoluteModelFieldPath {
     return new AbsoluteModelFieldPath(createAbsolute(pathWithFieldName), "value");
   }
   static createFromMask(pathWithFieldName, multiplicitySymbol) {
+    var _match$, _ref;
     if (pathWithFieldName.endsWith(".$errorCount")) {
       return new AbsoluteModelFieldPath(createAbsoluteFromMask(pathWithFieldName.replace(".$errorCount", ""), multiplicitySymbol), "$errorCount");
     }
@@ -59477,12 +59480,19 @@ class AbsoluteModelFieldPath {
     if (pathWithFieldName.endsWith(".warningsCount")) {
       return new AbsoluteModelFieldPath(createAbsoluteFromMask(pathWithFieldName.replace(".warningsCount", ""), multiplicitySymbol), "warningsCount");
     }
-    return new AbsoluteModelFieldPath(createAbsoluteFromMask(pathWithFieldName, multiplicitySymbol), "value");
+    const match = AbsoluteModelFieldPath.fieldExtractRegex.exec(pathWithFieldName);
+    const path = match != undefined ? (_match$ = match[1]) !== null && _match$ !== void 0 ? _match$ : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)() : pathWithFieldName;
+    const field = match != undefined ? (_ref = match[2]) !== null && _ref !== void 0 ? _ref : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)() : "value";
+    return new AbsoluteModelFieldPath(createAbsoluteFromMask(path, multiplicitySymbol), field);
   }
   toString() {
     return `${this.path.toLegacyPath()}.${this.field}`;
   }
+  toLegacyPath() {
+    return `${this.path.toLegacyPath()}.${this.field}`;
+  }
 }
+AbsoluteModelFieldPath.fieldExtractRegex = new RegExp(`^(.*)\\.(${(0,_Engine_src_Engine_Core_CoreTypes__WEBPACK_IMPORTED_MODULE_0__.getKnownViewModelFieldNames)().join("|")})$`);
 function isAllTokensResolved(tokens) {
   // Я что-то немогу сообразить как тут всё строго написать...
   // @ts-expect-error
@@ -59557,7 +59567,7 @@ class ModelPathImpl {
     return this.tokens.slice(0, lastIterationIndex);
   }
   isEndsWithIteration() {
-    const lastItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.last(this.tokens);
+    const lastItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(this.tokens);
     return lastItem == PathTokens.each;
   }
   isAbsolute() {
@@ -59573,25 +59583,25 @@ class ModelPathImpl {
     var _this$legacyPath;
     return (_this$legacyPath = this.legacyPath) !== null && _this$legacyPath !== void 0 ? _this$legacyPath : this.legacyPath = this.tokens.map(x => this.pathPartToString(x)).join("/");
   }
-  isEquals(modelPath, eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreSame) {
-    if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreSame) {
+  isEquals(modelPath, eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreSame) {
+    if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreSame) {
       return this.toLegacyPath() === modelPath.toLegacyPath();
     } else {
-      return this.isAbsolute() === modelPath.isAbsolute() && Iterator.from(_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.zip(this.getPathParts(), modelPath.getPathParts())).every(([t1, t2]) => t1 === t2);
+      return this.isAbsolute() === modelPath.isAbsolute() && Iterator.from(_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.zip(this.getPathParts(), modelPath.getPathParts())).every(([t1, t2]) => t1 === t2);
     }
   }
 
   /**
    * Всегда целое положительное беззнаковое 32-битное число
    */
-  getHash(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreSame) {
+  getHash(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreSame) {
     let hash = 5381;
-    for (const token of (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.reverseArray)(this.tokens)) {
+    for (const token of (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.reverseArray)(this.tokens)) {
       let currentStr;
       if (PathTokens.isSimpleToken(token)) {
         currentStr = token;
       } else {
-        if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreDifferent) {
+        if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreDifferent) {
           currentStr = token === PathTokens.each ? "*" : "!";
         } else {
           currentStr = "*";
@@ -59645,8 +59655,8 @@ class ModelPathImpl {
     }
     return true;
   }
-  getIterationRank(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_3__.EachCurrentCollision.AreDifferent) {
-    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)));
+  getIterationRank(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreDifferent) {
+    return (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.count)(Iterator.from(this.tokens).filter(x => eachCurrentCollision == _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_4__.EachCurrentCollision.AreDifferent ? x === PathTokens.each : PathTokens.isMultiToken(x)));
   }
   isEmpty() {
     return this.tokens.length === 0;
@@ -59658,17 +59668,17 @@ class ModelPathImpl {
     if (!modelPath.isAbsolute()) {
       throw new Error(`Cannot match non absolute path '${modelPath.toString()}'`);
     }
-    return _PathMatcher__WEBPACK_IMPORTED_MODULE_5__.PathMatcher.match(this.tokens, modelPath.getPathPartsAsArray());
+    return _PathMatcher__WEBPACK_IMPORTED_MODULE_6__.PathMatcher.match(this.tokens, modelPath.getPathPartsAsArray());
   }
   *splitByMultiplicity() {
-    let lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__.ModelPathBuilder(this.isAbsolute());
+    let lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__.ModelPathBuilder(this.isAbsolute());
     for (const token of this.tokens) {
       if (PathTokens.isSimpleToken(token)) {
         lastSimpleParts.append(token);
       } else {
         if (!lastSimpleParts.empty) {
           yield lastSimpleParts.toResolvedPath();
-          lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__.ModelPathBuilder(false);
+          lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__.ModelPathBuilder(false);
         }
         yield token;
       }
@@ -59728,22 +59738,22 @@ class ModelPathImpl {
     return new ModelPathImpl(this.tokens, true);
   }
   *getAllParentPaths() {
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__.ModelPathBuilder(this.isAbsolute());
-    for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.skipLast(this.getPathParts(), 1)) {
+    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__.ModelPathBuilder(this.isAbsolute());
+    for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.skipLast(this.getPathParts(), 1)) {
       result.append(token);
       yield result.toPath();
     }
   }
   trimLastStarIfLastToken() {
-    const lastItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.last(this.tokens);
+    const lastItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(this.tokens);
     if (lastItem != undefined && PathTokens.isMultiToken(lastItem)) {
       return new ModelPathImpl(this.tokens.slice(0, -1), this.absolute);
     }
     return this;
   }
   getParentPath() {
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__.ModelPathBuilder(this.absolute);
-    for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.skipLast(this.getPathParts(), 1)) {
+    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__.ModelPathBuilder(this.absolute);
+    for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.skipLast(this.getPathParts(), 1)) {
       result.append(token);
     }
     // Тут получается так, что по другому никак
@@ -59755,11 +59765,11 @@ class ModelPathImpl {
       return this;
     }
     let instanceCounter = 0;
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_4__.ModelPathBuilder(true);
+    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_5__.ModelPathBuilder(true);
     for (const token of this.getPathParts()) {
       if (PathTokens.isMultiToken(token) && instanceCounter < instances.length) {
         var _instances$instanceCo;
-        result.append((_instances$instanceCo = instances[instanceCounter]) !== null && _instances$instanceCo !== void 0 ? _instances$instanceCo : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)());
+        result.append((_instances$instanceCo = instances[instanceCounter]) !== null && _instances$instanceCo !== void 0 ? _instances$instanceCo : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)());
         instanceCounter++;
       } else {
         result.append(token);
@@ -59779,7 +59789,7 @@ class ModelPathImpl {
     if (pathPart === PathTokens.current) {
       return "*";
     }
-    throw new Error(`Unknown path part specified: ${(0,_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.ensureAndGetString)(pathPart)}`);
+    throw new Error(`Unknown path part specified: ${(0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureAndGetString)(pathPart)}`);
   }
 }
 
@@ -60425,6 +60435,33 @@ function isMatchAbbreviation(abbreviation, value) {
 
 /***/ }),
 
+/***/ "./Engine/src/Engine/Core/CoreTypes.ts":
+/*!*********************************************!*\
+  !*** ./Engine/src/Engine/Core/CoreTypes.ts ***!
+  \*********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "nonRegularFieldName": () => (/* binding */ nonRegularFieldName),
+/* harmony export */   "getKnownViewModelFieldNames": () => (/* binding */ getKnownViewModelFieldNames)
+/* harmony export */ });
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+// Эту модель, которая лежит в redux-состоянии в поле viewModel, каждый узел кроме . является ViewModel
+
+function nonRegularFieldName(fieldName) {
+  // @ts-ignore
+  return fieldName;
+}
+function getKnownViewModelFieldNames() {
+  const names = ["value", "autoValue", "autoFlag", "error", "warning", "errorsCount", "warningsCount", "children", "disabled", "visible", "sum", "id", "agentValue", "city", "building", "code", "count", "description"];
+  return names;
+}
+
+/***/ }),
+
 /***/ "./Engine/src/Engine/Core/ModalManager/Modals/Utils/Types.ts":
 /*!*******************************************************************!*\
   !*** ./Engine/src/Engine/Core/ModalManager/Modals/Utils/Types.ts ***!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.2.0-server-side-calculations.4",
+  "version": "5.2.0-server-side-calculations.5",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,