@kontur.candy/generator 5.74.0-forminform.0 → 5.74.0-forminform.1

package/dist/index.js

@@ -50114,9 +50114,11 @@ class KCLangAntlrVisitor {
     };
   }
   visitConstString(ctx) {
+    const stringLiteralAsIs = ctx.STRING_LITERAL().text;
+    const literalValue = stringLiteralAsIs.startsWith("'") ? stringLiteralAsIs.replace(/^\'|\'$/g, "").replace(/\\'/g, "'") : stringLiteralAsIs.replace(/^\"|\"$/g, "").replace(/\\"/g, '"');
     return {
       type: "string",
-      value: ctx.STRING_LITERAL().text.replace(/^\'|\'$/g, "").replace(/^\"|\"$/g, "")
+      value: literalValue
     };
   }
   visitConstDecimal(ctx) {
@@ -60190,7 +60192,15 @@ function removeTrailingSlash(inputStr) {
   return inputStr;
 }
 function joinPaths(paths) {
-  return paths.map(removeTrailingSlash).join("/");
+  let result = "";
+  for (const path of paths) {
+    if (path.startsWith("/")) {
+      result = removeTrailingSlash(path);
+    } else {
+      result += (result == "" ? "" : "/") + removeTrailingSlash(path);
+    }
+  }
+  return result;
 }
 function generateBlockKCXmlFormulas(block, parents) {
   const nextParents = [...parents, {
@@ -69733,7 +69743,7 @@ class KCXmlGeneratorBase {
       return gcf(x => x.eq, ...compiledParts);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaConstExpression) {
-      return gcf(x => x.const, `"${expression.value}"`);
+      return gcf(x => x.const, `${JSON.stringify(expression.value)}`);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGtExpression) {
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureArrayHasLength)(expression.arguments, 2);
@@ -69761,8 +69771,8 @@ class KCXmlGeneratorBase {
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaRegexMatchExpression) {
       const compiledArgument = this.compileExpression(prefix, targetFullPath, expression.argument, deps);
-      const preparedPattern = expression.pattern.replace(/"/g, '\\"').replace(/\\/g, "\\\\");
-      return gcf(x => x.regexMatch, compiledArgument, `"${preparedPattern}"`);
+      const preparedPattern = JSON.stringify(expression.pattern);
+      return gcf(x => x.regexMatch, compiledArgument, preparedPattern);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaMultiplyExpression) {
       (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureArrayLengthGreaterThenOrEqual)(expression.arguments, 2);
@@ -70972,7 +70982,7 @@ function getAllMatches(regexPattern, sourceString) {
 }
 function getRequisitesFromEvaluablePropValue(filter) {
   var _filter$match$map$fil, _filter$match, _getAllMatches$map$fi;
-  return [...((_filter$match$map$fil = (_filter$match = filter.match(/path([^)]+)/g)) === null || _filter$match === void 0 ? void 0 : _filter$match.map(path => path.slice(6, -1)).filter(path => path.startsWith("@clientInfo") || path.startsWith("@formsClientInfo")).map(path => `${path}.value`)) !== null && _filter$match$map$fil !== void 0 ? _filter$match$map$fil : []), ...((_getAllMatches$map$fi = getAllMatches(/getProperty\('([^']+?)'\)/g, filter).map(path => path[1]).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined).filter(path => path.startsWith("currentAccount") || path.startsWith("recipient") || (path === null || path === void 0 ? void 0 : path.startsWith("sender"))).map(path => `@formsClientInfo/${path}.value`)) !== null && _getAllMatches$map$fi !== void 0 ? _getAllMatches$map$fi : [])];
+  return [...((_filter$match$map$fil = (_filter$match = filter.match(/path([^)]+)/g)) === null || _filter$match === void 0 ? void 0 : _filter$match.map(path => path.slice(6, -1)).filter(path => path.startsWith("@clientInfo") || path.startsWith("@formsClientInfo") || path.startsWith("@draftMeta")).map(path => `${path}.value`)) !== null && _filter$match$map$fil !== void 0 ? _filter$match$map$fil : []), ...((_getAllMatches$map$fi = getAllMatches(/getProperty\('([^']+?)'\)/g, filter).map(path => path[1]).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.isNotNullOrUndefined).filter(path => path.startsWith("currentAccount") || path.startsWith("recipient") || (path === null || path === void 0 ? void 0 : path.startsWith("sender"))).map(path => `@formsClientInfo/${path}.value`)) !== null && _getAllMatches$map$fi !== void 0 ? _getAllMatches$map$fi : [])];
 }
 function getPathsFromEvaluablePropValue(evaluableProp) {
   const pathRegex = /(?<=path\((?:'|")).*?(?=(?:'|"))/g;
@@ -74360,7 +74370,7 @@ class ValidationRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_9
   }
   buildKcValidationRuleCheck(condition) {
     const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.match.replace(/\@/g, ""), true).normalize();
-    const target = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.target.replace(/\@/g, ""), false);
+    const target = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.target.replace(/\@/g, ""), "auto");
     const fullTarget = this.adjustPathMultiplicity(prefix.joinWith(target).normalize());
     const precalculationRules = [];
     return {
@@ -78143,6 +78153,7 @@ function naiveConvertJsConditionToKCLangCondition(condition) {
   applyReplacements([/path\('([^']*?)'\)\.length/g, "length($1)"]);
   applyReplacements([/path\('@formsClientInfo\/[^']*?'\)/g, "''"]);
   applyReplacements([/path\('@featureFlags\/([^']*?)'\)/g, "getProperty('$1')"]);
+  applyReplacements([/path\('@draftMeta\/([^']*?)'\)/g, "getProperty('draftMeta/$1')"]);
   applyReplacements([/path\('@settings\/someSettings'\)/g, "getProperty('someSettings')"]);
   applyReplacements([/path\('@settings\/scenario'\)/g, "''"]);
   applyReplacements([/path\('@settings\/isForeign'\)/g, "'false'"]);
@@ -78879,7 +78890,7 @@ class AttachmentFormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
   }
   doConvert(context) {
     const attachmentFormNode = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__.AttachmentFormNode);
-    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("AttachmentFormUnit");
+    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("AttachmentUnit");
     markupBuilder.prop("data-tid").set("attachment" + attachmentFormNode.gfv);
     markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_3__.createUnitId)("attachment" + attachmentFormNode.gfv));
     markupBuilder.prop(x => x.gfv).set(attachmentFormNode.gfv);
@@ -78914,16 +78925,18 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6;
 
 
-let AttachmentFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("attachmentform", `Встроенный редактор для формализованного приложения`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/AttachmentForm sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("gfv", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `ГФВ приложения`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("name", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Крактое название раздела, в который поместить форму`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("description", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Описание формы приложения`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Путь до поля с именем приложения`), _dec(_class = (_class2 = class AttachmentFormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+let AttachmentFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("attachmentform", `Встроенный редактор для формализованного приложения`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/AttachmentForm sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("gfv", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `ГФВ приложения`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("name", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Крактое название раздела, в который поместить форму`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("description", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Описание формы приложения`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Путь до поля с именем приложения`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("multiple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Обозначение множественного раздела`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("navigationLimit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Количество экземпляров множественного раздела после которого в левом меню будет включаться компактный режим отображения разделов. По умолчанию: 15. Используется только для множественных разделов`), _dec(_class = (_class2 = class AttachmentFormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "gfv", _descriptor, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "name", _descriptor2, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor3, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "path", _descriptor4, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "multiple", _descriptor5, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "navigationLimit", _descriptor6, this);
   }
   getOwnPath() {
     return this.path != undefined ? (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.createFromMask)(this.path, "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.PathTokens.each) : undefined;
@@ -78948,6 +78961,16 @@ let AttachmentFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTE
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "multiple", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "navigationLimit", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 
 /***/ }),
@@ -79997,13 +80020,14 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     return markupBuilder;
   }
   buildAttachmentFormUnit(node, attachmentFormNode, context) {
-    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("AttachmentFormUnit");
+    const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("AttachmentUnit");
     markupBuilder.prop("data-tid").set(this.getAttachmentFormId(attachmentFormNode));
     markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)(this.getAttachmentFormId(attachmentFormNode)));
     markupBuilder.prop(x => x.gfv).set(attachmentFormNode.gfv);
     markupBuilder.prop(x => x.caption).set(attachmentFormNode.name);
     markupBuilder.prop(x => x.description).set(attachmentFormNode.description);
     markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentFormNode));
+    markupBuilder.prop(x => x.multiple).set(attachmentFormNode.multiple);
     return markupBuilder;
   }
   isPageContainsTableWithStickyElements(pageNode) {
@@ -80050,19 +80074,28 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
   buildUnitItemsFromAttachmentForms(formNode, attachmentFormNodes) {
     const unitItemBuilders = [];
     for (const attachmentForm of attachmentFormNodes) {
+      var _attachmentForm$multi;
       const unitItemBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("UnitItem");
       unitItemBuilder.prop("data-tid").set(this.getAttachmentFormId(attachmentForm));
       unitItemBuilder.prop(x => x.id).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)(this.getAttachmentFormId(attachmentForm)));
       unitItemBuilder.prop(x => x.name).set(attachmentForm.name);
       unitItemBuilder.prop(x => x.optional).set(true);
-      unitItemBuilder.prop(x => x.multiple).set(false);
+      unitItemBuilder.prop(x => x.multiple).set((_attachmentForm$multi = attachmentForm.multiple) !== null && _attachmentForm$multi !== void 0 ? _attachmentForm$multi : false);
       unitItemBuilder.prop(x => x.multipleAppearance).set("flat");
       unitItemBuilder.prop(x => x.pages).set([]);
       unitItemBuilder.prop(x => x.clearConfirmationSettings).set({});
+      //unitItemBuilder.prop(x => x.maxOccurs).set(attachmentForm.maxOccurs ?? context.getPathMaxOccurs(page.getFullPath()));
+
       if (attachmentForm.path != undefined) {
         unitItemBuilder.prop(x => x.unitPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentForm));
       }
       unitItemBuilder.prop(x => x.evaluatorsContextPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(formNode));
+      if (attachmentForm.multiple) {
+        const navigationLimit = attachmentForm.navigationLimit != undefined ? attachmentForm.navigationLimit : formNode.navigationLimit != undefined ? formNode.navigationLimit : undefined;
+        if (navigationLimit != undefined) {
+          unitItemBuilder.prop(x => x.navigationLimit).set(navigationLimit);
+        }
+      }
       unitItemBuilders.push(unitItemBuilder);
     }
     return unitItemBuilders;

package/package.json

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