@kontur.candy/generator 5.121.0-fixes-for-patch.1 → 5.121.0-fixes-for-flang-generator.1

package/dist/index.js

@@ -46776,10 +46776,10 @@ class AbsoluteModelFieldPath {
   toString(includeLeadingSlash = false) {
     return `${includeLeadingSlash ? "/" : ""}${this.path.toLegacyPath()}.${this.field}`;
   }
-  toLegacyPath(addSlashIfLastTokenIsInstanceOrMultiplicity = true) {
+  toLegacyPath() {
     const lastToken = _IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.last(this.path.getPathParts());
     const isLastTokenAnInstanceOrMultiplicity = _ModelPath__WEBPACK_IMPORTED_MODULE_5__.PathTokens.isInstanceTokenOrInstancesSpec(lastToken) || _ModelPath__WEBPACK_IMPORTED_MODULE_5__.PathTokens.isMultiToken(lastToken);
-    const slashIfRequired = addSlashIfLastTokenIsInstanceOrMultiplicity && isLastTokenAnInstanceOrMultiplicity && (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(this.field) ? "/" : "";
+    const slashIfRequired = isLastTokenAnInstanceOrMultiplicity && (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(this.field) ? "/" : "";
     const dotIfRequired = (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(this.field) ? "." : "";
     return `${this.path.toLegacyPath()}${slashIfRequired}${dotIfRequired}${this.field}`;
   }
@@ -75920,11 +75920,12 @@ class FormulaExpressionToFlangExpressionConverter {
   compiledArgumentExpression(prefix, target, selectPath, selectType, addPrecalculationRule, aggregationFunction = "Sum") {
     const builtInType = this.convertExpressionTypePropertyToFLangType(selectType !== null && selectType !== void 0 ? selectType : "string");
     const adjustedSelectPath = this.preparePathAndAdjustMultiplicity(prefix, selectPath);
+    const isSelectEqualsTarget = target.path.isEquals(adjustedSelectPath);
     const splitInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, adjustedSelectPath);
     const baseSelectPath = splitInfo.matchedPath;
     if (!splitInfo.differentPath.isContainIteration()) {
       const valueRefExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.ValueReferenceExpression(adjustedSelectPath.toCurrentIteration().normalize(), "value");
-      const finalValue = splitInfo.differentPath.isEmpty() && target.field === "value" ? (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.makeNoDeps)(valueRefExpression) : valueRefExpression;
+      const finalValue = isSelectEqualsTarget && target.field === "value" ? (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.makeNoDeps)(valueRefExpression) : valueRefExpression;
       return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandIfNeed)(finalValue, builtInType);
     } else {
       var _countValueExpression;
@@ -81165,7 +81166,7 @@ function naiveConvertJsConditionToKCLangCondition(condition) {
   applyReplacements([/path\('([^']*?)',\s*'error'\)\s*!==?\s*''/g, "1 == 1"]);
   applyReplacements([/path\('([^']*?)',\s*'warning'\)\s*===?\s*''/g, "1 == 0"]);
   applyReplacements([/path\('([^']*?)',\s*'warning'\)\s*!==?\s*''/g, "1 == 1"]);
-  applyReplacements([/path\('([^']*?)'\)\.length/g, "length($1 as string)"]);
+  applyReplacements([/path\('([^']*?)'\)\.length/g, "length($1)"]);
   applyReplacements([/path\('@formsClientInfo\/[^']*?'\)/g, "''"]);
   applyReplacements([/path\('@featureFlags\/([^']*?)'\)/g, "getProperty('$1')"]);
   applyReplacements([/path\('@draftMeta\/([^']*?)'\)/g, "getProperty('draftMeta/$1')"]);
@@ -103941,14 +103942,14 @@ class FIOConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Suga
   }
   doBuildNormalizeRules(builder) {
     const node = this.getCurrentNodeAs(_FIONode__WEBPACK_IMPORTED_MODULE_7__.FIONode);
-    return [builder.valueInitializer(node, node.dataBinding, node.disabled, "Фамилия", "surname"), ...builder.specialFieldsInitializer(node, {
-      disabled: node.disabled,
+    return [builder.valueInitializer(node, node.dataBinding, true, "Фамилия", "surname"), ...builder.specialFieldsInitializer(node, {
+      disabled: true,
       pathSuffix: "Фамилия"
-    }), builder.valueInitializer(node, node.dataBinding, node.disabled, "Имя", "name"), ...builder.specialFieldsInitializer(node, {
-      disabled: node.disabled,
+    }), builder.valueInitializer(node, node.dataBinding, true, "Имя", "name"), ...builder.specialFieldsInitializer(node, {
+      disabled: true,
       pathSuffix: "Имя"
-    }), builder.valueInitializer(node, node.dataBinding, node.disabled, "Отчество", "patronymic"), ...builder.specialFieldsInitializer(node, {
-      disabled: node.disabled,
+    }), builder.valueInitializer(node, node.dataBinding, true, "Отчество", "patronymic"), ...builder.specialFieldsInitializer(node, {
+      disabled: true,
       pathSuffix: "Отчество"
     })];
   }
@@ -104305,9 +104306,6 @@ class TextConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Sug
   }
   doBuildNormalizeRules(builder) {
     const node = this.getCurrentNodeAs(_TextNode__WEBPACK_IMPORTED_MODULE_7__.TextNode);
-    if (!node.dataBinding.path) {
-      return [];
-    }
     return [builder.valueInitializer(node, node.dataBinding, node.disabled), ...builder.specialFieldsInitializer(node, {
       disabled: node.disabled
     })];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.121.0-fixes-for-patch.1",
+  "version": "5.121.0-fixes-for-flang-generator.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,