@kontur.candy/generator 5.73.1 → 5.73.3

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;
@@ -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'"]);

package/package.json

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