@kontur.candy/generator 5.123.0 → 5.124.0

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}`;
   }
@@ -81297,7 +81297,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')"]);
@@ -81330,8 +81330,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"]);
@@ -81376,7 +81376,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'",
@@ -89847,6 +89847,7 @@ class ModalFormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_1_
     markupBuilder.prop(x => x.width).set(node.width);
     markupBuilder.prop(x => x.header).set(node.header);
     markupBuilder.prop(x => x.footerPanel).set(node.footerPanel);
+    markupBuilder.prop(x => x.disableFocusLock).set(node.disableFocusLock);
     markupBuilder.prop(x => x.enabledBackgroundClick).set(node.enabledBackgroundClick);
     markupBuilder.prop(x => x.doNotValidateFormOnStart).set(node.doNotValidateFormOnStart);
     markupBuilder.prop(x => x.onAfterOpen).set(context.generateHelperFunctionExpression(node, "onAfterOpen", node.onAfterOpen));
@@ -89888,10 +89889,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10;
 
 
-let ModalFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("modalform", `Модальное окно со значениями из модели`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Modal/ModalForm sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingScopeMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("header", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Заголовок`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("enabledBackgroundClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Закрывать окно при клике на фон.`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("doNotValidateFormOnStart", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Отменяет показ валидаций при откртии модального окна`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("footerPanel", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Задает серый footer`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.lengthUnit, `Ширина модального окна`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("onAfterOpen", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется после открытия модалки"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("excludedVerifiablePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Путь, который нужно исключить из валидаций`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.children)(), _dec(_class = (_class2 = class ModalFormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
+let ModalFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("modalform", `Модальное окно со значениями из модели`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Modal/ModalForm sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingScopeMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("header", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Заголовок`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("enabledBackgroundClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Закрывать окно при клике на фон.`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("doNotValidateFormOnStart", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Отменяет показ валидаций при откртии модального окна`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("footerPanel", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Задает серый footer`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.lengthUnit, `Ширина модального окна`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("onAfterOpen", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется после открытия модалки"), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("excludedVerifiablePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Путь, который нужно исключить из валидаций`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("disableFocusLock", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.boolean, `Отключает focusLock на модалке`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.children)(), _dec(_class = (_class2 = class ModalFormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataScope", _descriptor, this);
@@ -89902,7 +89903,8 @@ let ModalFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MOD
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "width", _descriptor6, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "onAfterOpen", _descriptor7, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "excludedVerifiablePath", _descriptor8, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor9, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disableFocusLock", _descriptor9, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor10, this);
   }
   getOwnPath() {
     return this.dataScope.getOwnPath();
@@ -89947,7 +89949,12 @@ let ModalFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MOD
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec10], {
+}), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "disableFocusLock", [_dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -104522,6 +104529,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.123.0",
+  "version": "5.124.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,