@kontur.candy/generator 6.33.0 → 6.34.0

package/dist/index.js

@@ -108120,192 +108120,6 @@ let TypeFileUploadErrors = /*#__PURE__*/function (TypeFileUploadErrors) {
 
 /***/ }),
 
-/***/ "./Engine/src/Engine/Core/PathUtils/PathUtils.ts":
-/*!*******************************************************!*\
-  !*** ./Engine/src/Engine/Core/PathUtils/PathUtils.ts ***!
-  \*******************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   PathUtils: () => (/* binding */ PathUtils)
-/* harmony export */ });
-/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _Common_ModelPath_PathMatcher__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../Common/ModelPath/PathMatcher */ "./Common/ModelPath/PathMatcher.ts");
-/* harmony import */ var _Common_ModelPath_ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../Common/ModelPath/ModelPathBuilder */ "./Common/ModelPath/ModelPathBuilder.ts");
-
-
-
-
-class PathUtils {
-  static getAbsolutePath(parentPath, relativePath) {
-    const parentSymbol = "-";
-    let pathSuffix = relativePath;
-    let parentLength = parentPath.length;
-    let i = 0;
-    while (i < pathSuffix.length && pathSuffix[i] === parentSymbol) {
-      if (parentLength === -1) {
-        throw new Error("Argument exception");
-      }
-      parentLength = parentPath.lastIndexOf("/", parentLength - 1);
-      i += 1;
-    }
-    parentPath = parentPath.substr(0, parentLength);
-    pathSuffix = pathSuffix.substr(i);
-    return (parentPath.length && pathSuffix.length && pathSuffix[0] !== "." ? parentPath + "/" : parentPath) + pathSuffix;
-  }
-  static getParentPath(nodePath) {
-    const delimIdx = nodePath.lastIndexOf("/");
-    return delimIdx === -1 ? null : nodePath.substr(0, delimIdx);
-  }
-  static splitToPathAndValueName(path) {
-    for (let i = path.length - 1; i >= 0; --i) {
-      if (path[i] === "/") {
-        return [path, ""];
-      } else if (path[i] === ".") {
-        return [path.substr(0, i), path.substr(i + 1)];
-      }
-    }
-    return [path, ""];
-  }
-  static getLastToken(nodePath) {
-    const delimIdx = nodePath.lastIndexOf("/");
-    return delimIdx === -1 ? nodePath : nodePath.substr(delimIdx + 1);
-  }
-  static getValuePath(nodePath, valueName) {
-    return nodePath + "." + valueName;
-  }
-  static isMask(path) {
-    return path.includes("*");
-  }
-  static trimLastStarIfLastToken(path) {
-    if ((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.isModelPath)(path)) {
-      return path.trimLastStarIfLastToken().toLegacyPath();
-    }
-    if (PathUtils.getLastToken(path) === "*") {
-      var _PathUtils$getParentP;
-      return (_PathUtils$getParentP = PathUtils.getParentPath(path)) !== null && _PathUtils$getParentP !== void 0 ? _PathUtils$getParentP : "";
-    }
-    return path;
-  }
-  static isPrefix(prefix, path) {
-    return path.indexOf(prefix) === 0 && (path.length === prefix.length || path[prefix.length] === "/");
-  }
-  static split(path) {
-    return path.split("/");
-  }
-  static splitMask(mask) {
-    return mask.split("*").map(subPath => this.join(this.split(subPath).filter(x => x)));
-  }
-  static join(tokens) {
-    return tokens.join("/");
-  }
-  static resolve(pathWithMask, instances = []) {
-    if (typeof pathWithMask === "string") {
-      let instanceIndex = 0;
-      const tokens = this.split(pathWithMask);
-      const resolvedTokens = tokens.map(token => {
-        if (token !== "*") {
-          return token;
-        }
-        const instance = instances[instanceIndex];
-        instanceIndex++;
-        if (instance === undefined) {
-          return "*";
-        }
-        return instance;
-      });
-      return this.join(resolvedTokens);
-    } else {
-      const resultBuilder = new _Common_ModelPath_ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(pathWithMask.isAbsolute());
-      let instanceIndex = 0;
-      for (const token of pathWithMask.getPathParts()) {
-        if (_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isSimpleToken(token)) {
-          resultBuilder.append(token);
-        } else {
-          const instance = instances[instanceIndex];
-          instanceIndex++;
-          if (instance === undefined) {
-            resultBuilder.append(token);
-          } else {
-            resultBuilder.append(instance);
-          }
-        }
-      }
-      if (pathWithMask.isAbsolute()) {
-        return resultBuilder.toAbsolutePath();
-      }
-      return resultBuilder.toPath();
-    }
-  }
-  static resolveMaskToDeepestCommonInstance(fullPath, mask) {
-    const fullPathTokens = this.split(fullPath);
-    const maskTokens = this.split(mask);
-    const deepestCommonInstancePathTokens = [];
-    let tokensBeforeLastMultiplicity = [];
-    for (let index = 0; maskTokens[index] && fullPathTokens[index]; index++) {
-      if (maskTokens[index] === fullPathTokens[index]) {
-        tokensBeforeLastMultiplicity.push(fullPathTokens[index]);
-      } else if (maskTokens[index] === "*") {
-        const instanceNumber = fullPathTokens[index];
-        deepestCommonInstancePathTokens.push(...tokensBeforeLastMultiplicity, instanceNumber);
-        tokensBeforeLastMultiplicity = [];
-      } else {
-        break;
-      }
-    }
-    const deepestCommonInstancePathTokensLength = deepestCommonInstancePathTokens.length;
-    if (deepestCommonInstancePathTokensLength === 0) {
-      return null;
-    }
-    return deepestCommonInstancePathTokens.concat(maskTokens.slice(deepestCommonInstancePathTokensLength)).join("/");
-  }
-  static isPicklistFieldValueName(valueName) {
-    return valueName.startsWith("picklist@");
-  }
-  static getPicklistFieldName(valueName) {
-    if (!valueName.startsWith("picklist@")) {
-      throw new Error(`${valueName} is not picklist field name`);
-    }
-    const splitValueName = valueName.split("@");
-    if (!(0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.arrayHasLength)(splitValueName, 2)) {
-      throw new Error(`${valueName} is not a valid picklist field name`);
-    }
-    return splitValueName[1];
-  }
-
-  /**
-   * Используется снаружи. Извлкается номер инстанса для пути. Например, если передать `pathWithMask` /A/B*, а
-   * `path` /A/B/2, то функция вернёт `"2"`
-   * @param pathWithMask
-   * @param path
-   */
-  static extractInstance(pathWithMask, path) {
-    const modelPathWithMask = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(pathWithMask, true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
-    const modelPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createFromMask)(path, true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
-    const matchedMultiplicity = modelPathWithMask.matchFor(modelPath).filter(x => x.kind === _Common_ModelPath_PathMatcher__WEBPACK_IMPORTED_MODULE_2__.MatchKind.MatchedMultiplicity && _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isInstanceToken(x.target));
-    if ((0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.arrayHasLength)(matchedMultiplicity, 1) && matchedMultiplicity[0].kind === _Common_ModelPath_PathMatcher__WEBPACK_IMPORTED_MODULE_2__.MatchKind.MatchedMultiplicity) {
-      if (_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.isInstanceToken(matchedMultiplicity[0].target)) {
-        return matchedMultiplicity[0].target;
-      }
-    }
-    throw new Error(`Unable to extract single index while match paths '${modelPathWithMask.toString()}' and '${modelPath.toString()}'`);
-  }
-  static extractPathWithInstance(pathWithMask, path) {
-    const prefix = PathUtils.trimLastStarIfLastToken(pathWithMask);
-    if (!PathUtils.isPrefix(prefix, path)) {
-      return undefined;
-    }
-    const instance = PathUtils.extractInstance(pathWithMask, path);
-    const pathWithInstance = PathUtils.join([prefix, instance]);
-    return pathWithInstance;
-  }
-}
-
-/***/ }),
-
 /***/ "./Engine/src/Engine/ValidationHelper/ValidationHelper.ts":
 /*!****************************************************************!*\
   !*** ./Engine/src/Engine/ValidationHelper/ValidationHelper.ts ***!
@@ -127704,7 +127518,7 @@ function kladrPreprocessor(node) {
   };
   const types = {
     address: `
-            <type base="string" requiredDescription="Адрес должен быть заполнен" />`,
+            <type base="string" />`,
     regionCode: `
             <type base="integer" description="Код региона должен состоять из 2 цифр" requiredDescription="Заполните регион">
                 <length value="2" />
@@ -127744,13 +127558,14 @@ function kladrPreprocessor(node) {
                 <maxLength value="20" />
             </type>`
   };
+  const optional = node.attrAsBoolean("optional");
   const pb = new _CodeGeneration_PropsBuilder__WEBPACK_IMPORTED_MODULE_0__.PropsBuilder({
     path: node.attributes.path,
     title: node.attributes.title,
     tid: node.attributes.tid,
+    optional: node.attributes.optional,
     kind: "envd"
   });
-  const optional = node.attrAsBoolean("optional");
   const childrenJsx = Object.keys(setting).map(field => {
     const childPb = new _CodeGeneration_PropsBuilder__WEBPACK_IMPORTED_MODULE_0__.PropsBuilder({
       path: setting[field],
@@ -127767,7 +127582,7 @@ function kladrPreprocessor(node) {
   }).join("");
   const newNode = (0,_XmlParser_XmlParser__WEBPACK_IMPORTED_MODULE_1__.parseXml)(`<kladr ${pb}>
             ${childrenJsx}
-            <text ${optional != undefined ? `optional="${optional.toString()}" ` : ""}path="address">
+            <text optional="true" path="address">
                 ${types.address}
             </text>
         </kladr>`);
@@ -148794,7 +148609,7 @@ class AddRowButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE
     const element = formSchemaRng.getElementByPath(node.getFullPath());
 
     // eslint-disable-next-line no-warning-comments
-    // TODO(2026-07-31): Необходимо разобраться с тем, что тут конфликтят свойства в type. Подробности в задаче https://yt.skbkontur.ru/issue/FS-9234
+    // TODO(2026-08-31): Необходимо разобраться с тем, что тут конфликтят свойства в type. Подробности в задаче https://yt.skbkontur.ru/issue/FS-9234
     const fakeNode = new _validationGenerator_Nodes_TypeNode__WEBPACK_IMPORTED_MODULE_7__.TypeNode();
     fakeNode.base = "string";
     fakeNode.children = [];
@@ -149873,6 +149688,10 @@ class CrossfitTableConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
     if (loader != undefined) {
       tableBuilder.appendChild(loader);
     }
+    const filterInfoOverlayBuilder = this.buildFilterInfoOverlay(node.filterinfo);
+    if (filterInfoOverlayBuilder != undefined) {
+      tableBuilder.appendChild(filterInfoOverlayBuilder);
+    }
     const sidebarBuilder = this.buildSidebar(context, node, sidebarColumns, (_node$optional = node.optional) !== null && _node$optional !== void 0 ? _node$optional : false);
     if (sidebarBuilder != undefined) {
       tableBuilder.appendChild(sidebarBuilder);
@@ -149973,10 +149792,6 @@ class CrossfitTableConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
     }
     const sidebarBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("CrossfitTable", "CrossfitTable.Sidebar");
     sidebarBuilder.prop(x => x.columns).set(sidebarColumns);
-    const filterInfoJsxConverterResult = this.buildFilterInfo(node.filterinfo);
-    if (filterInfoJsxConverterResult != undefined) {
-      sidebarBuilder.appendChild(filterInfoJsxConverterResult);
-    }
     const bodyRows = node.getBodyRows();
     if (bodyRows.length === 0) {
       sidebarBuilder.appendChild("<tr />");
@@ -150059,19 +149874,19 @@ class CrossfitTableConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
       // )
     }).flat();
   }
-  buildFilterInfo(filterInfo) {
+  buildFilterInfoOverlay(filterInfo) {
     var _getPluralTitles;
     if (filterInfo == undefined) {
       return undefined;
     }
-    const rowBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("CrossfitTableFilterInfoSidebarRow");
+    const overlayBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("CrossfitTable", "CrossfitTable.FilterInfo");
     const filterInfoBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("FilterInfo");
     filterInfoBuilder.prop(x => x.multilinePath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_1__.getNewBindingPathExpression)(filterInfo, filterInfo.multilinePath));
     filterInfoBuilder.prop(x => x.notFoundText).set(filterInfo.notFoundText);
     filterInfoBuilder.prop(x => x.filteredUniqKey).set(filterInfo.filteredUniqKey);
     filterInfoBuilder.prop(x => x.titles).set((_getPluralTitles = (0,_Multilinefield_GetPluralTitles__WEBPACK_IMPORTED_MODULE_10__.getPluralTitles)(filterInfo.titles)) !== null && _getPluralTitles !== void 0 ? _getPluralTitles : ["%s", "%s", "%s"]);
-    rowBuilder.appendChild(filterInfoBuilder);
-    return rowBuilder.buildConverterResult();
+    overlayBuilder.appendChild(filterInfoBuilder);
+    return overlayBuilder;
   }
   findNumbersColumn(node) {
     const rows = node.getHeaderRows();
@@ -158327,7 +158142,7 @@ class FileLoaderConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_4
   }
 
   // eslint-disable-next-line no-warning-comments
-  // TODO(2026-07-31): Исправить в рамках задачи https://yt.skbkontur.ru/issue/FS-9386
+  // TODO(2026-08-31): Исправить в рамках задачи https://yt.skbkontur.ru/issue/FS-9386
   *doBuildKCLangValidations_REMOVE_THIS_SUFFIX(buildContext, formSchemaRng, prefixPath) {
     const node = this.getCurrentNodeAs(_FileLoaderNode__WEBPACK_IMPORTED_MODULE_11__.FileLoaderNode);
     const element = formSchemaRng.getElementByPath(node.getFullPath());
@@ -159507,16 +159322,35 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   KladrConverter: () => (/* binding */ KladrConverter)
 /* harmony export */ });
-/* harmony import */ var _babel_template__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/template */ "./node_modules/@babel/template/lib/index.js");
-/* harmony import */ var _babel_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/types */ "./node_modules/@babel/types/lib/index.js");
-/* harmony import */ var _babel_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_types__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../DataDeclarationGenerator/DataDeclarationGenerationContext */ "./Generator/src/generators/DataDeclarationGenerator/DataDeclarationGenerationContext.ts");
-/* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
-/* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
-/* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
-/* harmony import */ var _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../../../../Engine/src/Engine/Core/PathUtils/PathUtils */ "./Engine/src/Engine/Core/PathUtils/PathUtils.ts");
-/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _KladrNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./KladrNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Kladr/KladrNode.ts");
+/* harmony import */ var _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../DataDeclarationGenerator/DataDeclarationGenerationContext */ "./Generator/src/generators/DataDeclarationGenerator/DataDeclarationGenerationContext.ts");
+/* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
+/* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
+/* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/Functions/ExistsFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/ExistsFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/ValueReferenceExpression */ "./Generator/src/common/KCLang/CodeDom/ValueReferenceExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/KCLangPath */ "./Generator/src/common/KCLang/CodeDom/KCLangPath.ts");
+/* harmony import */ var _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/OrExpression */ "./Generator/src/common/KCLang/CodeDom/OrExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/CheckStatement */ "./Generator/src/common/KCLang/CodeDom/CheckStatement.ts");
+/* harmony import */ var _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/WithBlock */ "./Generator/src/common/KCLang/CodeDom/WithBlock.ts");
+/* harmony import */ var _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/DescriptionText */ "./Generator/src/common/KCLang/CodeDom/DescriptionText.ts");
+/* harmony import */ var _Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/PathSplitHelper */ "./Common/ModelPath/PathSplitHelper.ts");
+/* harmony import */ var _common_KCLang_CodeDom_InBlock__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/InBlock */ "./Generator/src/common/KCLang/CodeDom/InBlock.ts");
+/* harmony import */ var _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/StringConstExpression */ "./Generator/src/common/KCLang/CodeDom/StringConstExpression.ts");
+/* harmony import */ var _common_KCLang_CodeDom_KCLangUtils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/KCLangUtils */ "./Generator/src/common/KCLang/CodeDom/KCLangUtils.ts");
+/* harmony import */ var _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/Functions/RegexMatchFunctionCall */ "./Generator/src/common/KCLang/CodeDom/Functions/RegexMatchFunctionCall.ts");
+/* harmony import */ var _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../../../../../common/KCLang/CodeDom/NotExpression */ "./Generator/src/common/KCLang/CodeDom/NotExpression.ts");
+/* harmony import */ var _KladrNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./KladrNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/Kladr/KladrNode.ts");
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -159526,144 +159360,81 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-class KladrConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_5__.SugarNodeConverterBase {
+class KladrConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.SugarNodeConverterBase {
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     const dependencies = node.kind === "stat" ? this.getStatBindings(node) : this.getFNSBindings(node);
     return dependencies.map(({
       path
     }) => path);
   }
   static getAcceptNodeClass() {
-    return _KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode;
+    return _KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode;
   }
   *doBuildKCLangValidations(buildContext, formSchemaRng, prefixPath) {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     const element = formSchemaRng.getElementByPath(node.getFullPath());
-    const targetPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.createAbsoluteFromMask)(this.getResolvedBindingPath(node), _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_7__.PathTokens.each);
+    const targetPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.createAbsoluteFromMask)(this.getResolvedBindingPath(node), _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.PathTokens.each);
     const typeNode = buildContext.getTypeNode(node.validationInfo);
     const schemaTypeNode = buildContext.getSchemaTypeInfo(targetPath);
     const ownPath = node.getOwnPathForKCLang();
+    const isOptional = node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional;
+    if (ownPath != undefined && node.kind != "stat" && !isOptional) {
+      const bindings = this.getFNSBindings(node);
+      const existsChecks = bindings.filter(x => x.propName != "address").map(x => {
+        const {
+          differentPath
+        } = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_12__.getMatchedAndDifferentModelPaths)(targetPath, x.path);
+        return new _common_KCLang_CodeDom_Functions_ExistsFunctionCall__WEBPACK_IMPORTED_MODULE_5__.ExistsFunctionCall(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_7__.KCLangPath.fromModelPath(differentPath)));
+      }).reduce((result, current) => result != undefined ? new _common_KCLang_CodeDom_OrExpression__WEBPACK_IMPORTED_MODULE_8__.OrExpression(result, current) : current, undefined);
+      if (existsChecks != undefined) {
+        yield new _common_KCLang_CodeDom_InBlock__WEBPACK_IMPORTED_MODULE_13__.InBlock(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_7__.KCLangPath.fromModelPath(ownPath), new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_9__.CheckStatement(existsChecks, [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_10__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_11__.DescriptionText("address")), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_10__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_11__.DescriptionText("Адрес должен быть заполнен"))]));
+      }
+    }
+    if (ownPath != undefined && node.kind == "stat" && !isOptional) {
+      const condition = new _common_KCLang_CodeDom_NotExpression__WEBPACK_IMPORTED_MODULE_17__.NotExpression(new _common_KCLang_CodeDom_Functions_RegexMatchFunctionCall__WEBPACK_IMPORTED_MODULE_16__.RegexMatchFunctionCall((0,_common_KCLang_CodeDom_KCLangUtils__WEBPACK_IMPORTED_MODULE_15__.castToString)(new _common_KCLang_CodeDom_ValueReferenceExpression__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression(_common_KCLang_CodeDom_KCLangPath__WEBPACK_IMPORTED_MODULE_7__.KCLangPath.fromModelPath(ownPath))), new _common_KCLang_CodeDom_StringConstExpression__WEBPACK_IMPORTED_MODULE_14__.StringConstExpression("^[, ]*$")));
+      yield new _common_KCLang_CodeDom_CheckStatement__WEBPACK_IMPORTED_MODULE_9__.CheckStatement(condition, [new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_10__.WithBlock("target", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_11__.DescriptionText(ownPath.toString())), new _common_KCLang_CodeDom_WithBlock__WEBPACK_IMPORTED_MODULE_10__.WithBlock("description", new _common_KCLang_CodeDom_DescriptionText__WEBPACK_IMPORTED_MODULE_11__.DescriptionText("Адрес должен быть заполнен"))]);
+    }
     if (typeNode == undefined && schemaTypeNode == undefined || ownPath == undefined) {
       return;
     }
-    yield* buildContext.buildBasicValidations(ownPath, targetPath, prefixPath, typeNode, schemaTypeNode, node.validationInfo.optional == undefined ? element === null || element === void 0 ? void 0 : element.isOptional() : node.validationInfo.optional, undefined, node.validationInfo.emptydescription);
+    yield* buildContext.buildBasicValidations(ownPath, targetPath, prefixPath, typeNode, schemaTypeNode, true, undefined, node.validationInfo.emptydescription);
   }
   doBuildNodeValidations(validationGenerator) {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
   }
-  buildSugarAutoCalculations() {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
-    const statFields = ["index", "regionCode", "district", "city", "settlement", "street", "house", "building", "room"];
-    const path = this.getResolvedBindingPath(node).replace(/^[\/]+/g, "");
-    let kladrHooks;
-    if (node.kind === "stat") {
-      kladrHooks = statFields.map(field => ({
-        path: `${path}.${field}`,
-        value: [{
-          base: "-",
-          fn: "kladrchange"
-        }]
-      }));
-    } else {
-      const fields = node.textNodeForDataDeclaration.map(child => child.field).filter(field => field != undefined && field !== "");
-      kladrHooks = fields.map(field => ({
-        path: `${path}/${field}.value`,
-        value: [{
-          base: "-",
-          fn: "kladrchange"
-        }]
-      }));
-    }
-    const bindingPathForStatHook = node.statKladrInUnit && node.path ? _Engine_src_Engine_Core_PathUtils_PathUtils__WEBPACK_IMPORTED_MODULE_6__.PathUtils.getLastToken(node.path) : undefined;
-    const newFunction = node.kind === "stat" ? this.createFuncStatKladr(bindingPathForStatHook) : this.createFuncKladr();
-    return [{
-      functions: [newFunction],
-      hooks: kladrHooks
-    }];
-  }
   doBuildDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
-    return context.mergeDataDeclaration(node.kind === "stat" ? context.addPathDeclEntry(node, [["value", context.initSequenceFactory.dataValue(node.dataBinding, false)], ["index", context.initSequenceFactory.takeFromModelOrFetchFn("index", node.dataBinding.fetchfn)], ["regionCode", context.initSequenceFactory.takeFromModelOrFetchFn("regionCode", node.dataBinding.fetchfn)], ["district", context.initSequenceFactory.takeFromModelOrFetchFn("district", node.dataBinding.fetchfn)], ["city", context.initSequenceFactory.takeFromModelOrFetchFn("city", node.dataBinding.fetchfn)], ["settlement", context.initSequenceFactory.takeFromModelOrFetchFn("settlement", node.dataBinding.fetchfn)], ["street", context.initSequenceFactory.takeFromModelOrFetchFn("street", node.dataBinding.fetchfn)], ["house", context.initSequenceFactory.takeFromModelOrFetchFn("house", node.dataBinding.fetchfn)], ["building", context.initSequenceFactory.takeFromModelOrFetchFn("building", node.dataBinding.fetchfn)], ["room", context.initSequenceFactory.takeFromModelOrFetchFn("room", node.dataBinding.fetchfn)]]) : _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_2__.emptyDataDeclarationCollection, context.addSpecialFieldsEntry(node, {
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
+    return context.mergeDataDeclaration(node.kind === "stat" ? context.addPathDeclEntry(node, [["value", context.initSequenceFactory.dataValue(node.dataBinding, false)]]) : _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection, context.addSpecialFieldsEntry(node, {
       optional: node.dataBinding.optional
     }), context.addPathSectionDeclarationEntry(node, node.dataBinding.requisite), context.addVisibilityPathDeclEntryNew(node, node.dataBinding.requisite));
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     return context.processChildrenDataDeclaration([...node.helpNodes, ...node.textNodeForDataDeclaration]);
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     yield* node.helpNodes;
     yield* node.textNodeForDataDeclaration;
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_8__.KladrNode);
+    const node = this.getCurrentNodeAs(_KladrNode__WEBPACK_IMPORTED_MODULE_18__.KladrNode);
     if (node.kind === "stat") {
       this.ensurePathExists(node, node.dataBinding.path);
     }
-    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_4__.componentMarkupBuilder)("Kladr");
+    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("Kladr");
     markupBuilder.prop("data-tid").set(node.tid);
     markupBuilder.prop(x => x.title).set(node.title);
     const dependencies = node.kind === "stat" ? this.getStatBindings(node) : this.getFNSBindings(node);
     markupBuilder.prop(x => x.dependencies).set(dependencies);
+    const statMode = node.kind === "stat";
+    if (statMode) {
+      markupBuilder.prop(x => x.statMode).set(statMode);
+    }
     return markupBuilder.buildConverterResultWithHelp(node, context);
   }
-  createFuncKladr() {
-    const buildFuncCall = (0,_babel_template__WEBPACK_IMPORTED_MODULE_0__["default"])(`
-    getAsyncTextResultHandler({
-      index: ['Индекс', 'value'],
-      regionCode: ['КодРегион', 'value'],
-      district: ['Район', 'value'],
-      city: ['Город', 'value'],
-      settlement: ['НаселПункт', 'value'],
-      street: ['Улица', 'value'],
-      house: ['Дом', 'value'],
-      building: ['Корпус', 'value'],
-      room: ['Кварт', 'value'],
-    }, (args) => {
-      const value = Object.keys(args).map((key) => args[key] || '').join('');
-
-      return [['address', 'value', value]];
-    })`, {
-      placeholderPattern: false
-    });
-    const funcCall = buildFuncCall();
-    return _babel_types__WEBPACK_IMPORTED_MODULE_1__.objectProperty(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("kladrchange"), funcCall.expression);
-  }
-  createFuncStatKladr(bindingPath = "value") {
-    const buildFuncCall = (0,_babel_template__WEBPACK_IMPORTED_MODULE_0__["default"])(`
-    getAsyncTextResultHandler({
-      index : ['${bindingPath}', 'index'],
-      regionCode : ['${bindingPath}', 'regionCode'],
-      district : ['${bindingPath}', 'district'],
-      city : ['${bindingPath}', 'city'],
-      settlement : ['${bindingPath}', 'settlement'],
-      street : ['${bindingPath}', 'street'],
-      house : ['${bindingPath}', 'house'],
-      building : ['${bindingPath}', 'building'],
-      room : ['${bindingPath}', 'room'],
-    }, (args) => {
-      const value = [
-        'index',
-        'regionCode',
-        'district',
-        'city',
-        'settlement',
-        'street',
-        'house',
-        'building',
-        'room'
-      ].map((key) => args[key] ? args[key] : '').join(',').split(',,,,,,,,')[0]
-
-      return [['${bindingPath}', 'value', value]];
-    })`, {
-      placeholderPattern: false
-    });
-    const funcCall = buildFuncCall();
-    return _babel_types__WEBPACK_IMPORTED_MODULE_1__.objectProperty(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("kladrchange"), funcCall.expression);
-  }
   getFNSBindings(node) {
     const setting = {
       address: "address",
@@ -159678,7 +159449,7 @@ class KladrConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_5__.Su
       room: "Кварт"
     };
     return Object.keys(setting).map(propName => ({
-      path: (0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewRelativePathExpression)(node, `${node.path}/${setting[propName]}`),
+      path: (0,_getBindingPath__WEBPACK_IMPORTED_MODULE_1__.getNewRelativePathExpression)(node, `${node.path}/${setting[propName]}`),
       valueName: "value",
       propName: propName
     }));
@@ -159686,7 +159457,7 @@ class KladrConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_5__.Su
   getStatBindings(node) {
     const values = ["index", "regionCode", "district", "city", "settlement", "street", "house", "building", "room"];
     return values.map(value => ({
-      path: (0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node),
+      path: (0,_getBindingPath__WEBPACK_IMPORTED_MODULE_1__.getNewBindingPathExpression)(node),
       valueName: value
     }));
   }

package/package.json

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