@kontur.candy/generator 5.73.0 → 5.73.2

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) {
@@ -69733,7 +69735,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 +69763,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);
@@ -74360,7 +74362,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 {

package/package.json

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