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

package/dist/index.js

@@ -46776,10 +46776,10 @@ class AbsoluteModelFieldPath {
   toString(includeLeadingSlash = false) {
     return `${includeLeadingSlash ? "/" : ""}${this.path.toLegacyPath()}.${this.field}`;
   }
-  toLegacyPath() {
+  toLegacyPath(addSlashIfLastTokenIsInstanceOrMultiplicity = true) {
     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 = isLastTokenAnInstanceOrMultiplicity && (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrEmpty)(this.field) ? "/" : "";
+    const slashIfRequired = addSlashIfLastTokenIsInstanceOrMultiplicity && 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}`;
   }
@@ -70242,8 +70242,9 @@ class DataDeclarationGenerationTimeHelper {
     return declEntry !== undefined && "autoValue" in declEntry;
   }
   isNodeHasDisabledEntry(targetPath) {
+    var _declEntry$disabled;
     const declEntry = this.getDataDeclarationEntry(targetPath);
-    return Boolean(declEntry === null || declEntry === void 0 ? void 0 : declEntry.disabled);
+    return (declEntry === null || declEntry === void 0 || (_declEntry$disabled = declEntry.disabled) === null || _declEntry$disabled === void 0 ? void 0 : _declEntry$disabled[0]) == true;
   }
   getDefaultValue(targetPath) {
     const declEntry = this.getDataDeclarationEntry(targetPath);
@@ -81166,7 +81167,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)"]);
+  applyReplacements([/path\('([^']*?)'\)\.length/g, "length($1 as string)"]);
   applyReplacements([/path\('@formsClientInfo\/[^']*?'\)/g, "''"]);
   applyReplacements([/path\('@featureFlags\/([^']*?)'\)/g, "getProperty('$1')"]);
   applyReplacements([/path\('@draftMeta\/([^']*?)'\)/g, "getProperty('draftMeta/$1')"]);
@@ -81199,8 +81200,8 @@ function naiveConvertJsConditionToKCLangCondition(condition) {
   applyReplacements([/path\('@settings\/isFormInFormNds'\)\s*===?\s*'true'/g, "1 == 1"]);
   applyReplacements([/path\('@settings\/isFormInFormNds'\)\s*===?\s*false/g, "0 == 1"]);
   applyReplacements([/path\('@settings\/isFormInFormNds'\)\s*===?\s*'false'/g, "0 == 1"]);
-  applyReplacements([/path\('([^']*?)'\)\s*===?\s*'/g, "($1 as string) == '"]);
-  applyReplacements([/path\('([^']*?)'\)\s*!==?\s*'/g, "($1 as string) != '"]);
+  applyReplacements([/path\('([^']*?)'\)\s*===?\s*('|")/g, "($1 as string) == $2"]);
+  applyReplacements([/path\('([^']*?)'\)\s*!==?\s*('|")/g, "($1 as string) != $2"]);
   applyReplacements([/path\('([^']*?)'\)\s*===?\s*(\d)/g, "$1 == $2"]);
   applyReplacements([[/path\('([^']*?)'\)\s*===?\s*(\d)/g, "$1 == $2"], [/path\('([^']*?)'\)\s*!==?\s*(\d)/g, "$1 != $2"], [/path\('([^']*?)'\)\s*>=?\s*(\d)/g, "$1 >= $2"], [/path\('([^']*?)'\)\s*<=?\s*(\d)/g, "$1 <= $2"], [/path\('([^']*?)'\)\s*>?\s*(\d)/g, "$1 > $2"], [/path\('([^']*?)'\)\s*<?\s*(\d)/g, "$1 < $2"], [/path\('([^']*?)'\)\s*===?\s*'(\d+)'/g, "$1 == $2"], [/path\('([^']*?)'\)\s*!==?\s*'(\d+)'/g, "$1 != $2"], [/path\('([^']*?)'\)\s*>?\s*'(\d+)'/g, "$1 > $2"], [/path\('([^']*?)'\)\s*<?\s*'(\d+)'/g, "$1 < $2"], [/path\('([^']*?)'\)\s*>=?\s*'(\d+)'/g, "$1 >= $2"], [/path\('([^']*?)'\)\s*<=?\s*'(\d+)'/g, "$1 <= $2"]]);
   applyReplacements([/\|\|/g, "or"]);
@@ -81245,7 +81246,7 @@ const predefinedJsConditions = {
   "path`('ПризнакПродавец') === '2'": "ПризнакПродавец == 2",
   "(path('checked1') === 'true' &amp;&amp;  path('checked2') === 'true') or (path('checked1') === 'true')": "(checked1 and checked2) or checked1",
   "path('СНИЛС') != ''": "СНИЛС != ''",
-  "path('/Файл/LazyLoadingEnabled') !== 'true'": "not /Файл/LazyLoadingEnabled",
+  "path('/Файл/LazyLoadingEnabled') !== 'true'": "not (/Файл/LazyLoadingEnabled == 'true')",
   "path('НомКорр') !== '99'": "НомКорр != 99",
   "tableIsEmpty != 'true'": "tableIsEmpty as string != 'true'",
   "tableIsEmpty == 'true'": "tableIsEmpty as string == 'true'",
@@ -103367,6 +103368,12 @@ class PopupTextAreaConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
     const node = this.getCurrentNodeAs(_PopupTextAreaNode__WEBPACK_IMPORTED_MODULE_8__.PopupTextAreaNode);
     validationGenerator.processValidations(this.getResolvedBindingPath(node), node.validationInfo.optional, validationGenerator.getTypeNode(node.validationInfo), undefined, node.validationInfo.emptydescription, undefined);
   }
+  doBuildNormalizeRules(builder, __) {
+    const node = this.getCurrentNodeAs(_PopupTextAreaNode__WEBPACK_IMPORTED_MODULE_8__.PopupTextAreaNode);
+    return [builder.valueInitializer(node, node.dataBinding, node.disabled), ...builder.specialFieldsInitializer(node, {
+      disabled: node.disabled
+    })];
+  }
   *doBuildKCLangValidations(buildContext, formSchemaRng, prefixPath) {
     const node = this.getCurrentNodeAs(_PopupTextAreaNode__WEBPACK_IMPORTED_MODULE_8__.PopupTextAreaNode);
     const element = formSchemaRng.getElementByPath(node.getFullPath());
@@ -104306,6 +104313,9 @@ 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-flang-generator.1",
+  "version": "5.121.0-fixes-for-flang-generator.3",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,