@kontur.candy/generator 5.58.1-novalidationsmchd.0 → 5.59.0

package/dist/index.js

@@ -49607,15 +49607,16 @@ class KCLangAntlrVisitor {
     }
   }
   visitWithBlock(ctx) {
-    var _ctx$withBlockValue;
-    const value = (_ctx$withBlockValue = ctx.withBlockValue()) === null || _ctx$withBlockValue === void 0 ? void 0 : _ctx$withBlockValue.text;
+    var _ctx$withBlockValue, _ctx$withBlockValue2;
+    const hasInterpolation = ((_ctx$withBlockValue = ctx.withBlockValue()) === null || _ctx$withBlockValue === void 0 ? void 0 : _ctx$withBlockValue.interpolationExpression()) != undefined;
+    const value = (_ctx$withBlockValue2 = ctx.withBlockValue()) === null || _ctx$withBlockValue2 === void 0 ? void 0 : _ctx$withBlockValue2.text;
     if (value == undefined) {
       throw Error("visitWithBlock syntax incorrect");
     }
     return {
       type: "withBlock",
       name: ctx.NAME().text,
-      value: value.replace(/```/g, "")
+      value: hasInterpolation ? value.replace(/```/g, "") : value.replace(/^'|^"|'$|"$/g, "")
     };
   }
   visitFormula(ctx) {
@@ -67563,7 +67564,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const sugarRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.SugarRulesBuilder(sugarRoot, formSchemaRng, controlCustomizationContext, fetchFunctions, dataDeclarationHelper, typeRegistry, useSchemaValidations);
     const validationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.ValidationRulesBuilder(sugarRoot, dataDeclarationHelper, formSchemaRng, formulaExprConverter, kcXmlConditions, typeRegistry, useSchemaValidations);
     const optionalSectionRuleBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalSectionRulesBuilder__WEBPACK_IMPORTED_MODULE_33__.OptionalSectionRulesBuilder(sugarRoot, dataDeclarationHelper);
-    const normalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng);
+    const normalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng, false);
     const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter, validationRulesBuilder, {
       enableTypedFlang: (_additionalContent$fo9 = (_additionalContent$fo10 = additionalContent.formJsonSettings) === null || _additionalContent$fo10 === void 0 ? void 0 : _additionalContent$fo10.enableTypedFlang) !== null && _additionalContent$fo9 !== void 0 ? _additionalContent$fo9 : false
     });
@@ -71322,14 +71323,16 @@ __webpack_require__.r(__webpack_exports__);
  *   Базовый нормализатор для основного сценария серверной нормализации
  */
 class NormalizationRulesGenerator {
-  constructor(optionalSectionRulesBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng) {
+  constructor(optionalSectionRulesBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng, calculateServerOnlyPaths) {
     this.formulaRulesBuilder = void 0;
+    this.calculateServerOnlyPaths = void 0;
     this.initializationRulesBuilder = void 0;
     this.sugarRulesBuilder = void 0;
     this.lazyLoadingRulesBuilder = void 0;
     this.validationRulesBuilder = void 0;
     this.optionalSectionRulesBuilder = void 0;
     this.formSchemaRng = void 0;
+    this.calculateServerOnlyPaths = calculateServerOnlyPaths;
     this.formulaRulesBuilder = formulaRulesBuilder;
     this.initializationRulesBuilder = initializationRulesBuilder;
     this.sugarRulesBuilder = sugarRulesBuilder;
@@ -71351,11 +71354,11 @@ class NormalizationRulesGenerator {
       (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_1__.ensureCorrectFieldNameByExpressionType)(rule);
       return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_1__.wrapWithDisableValueAutoInitFlagCheckIfRequired)(this.formSchemaRng, rule);
     }).toArray();
-    const dictionaryRules = Iterator.from(allRules).filter(rule => rule instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.SetStatement && (rule.right.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict || rule.right instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.CastExpression && rule.right.targetExpression.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict || rule.right instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.NullCoalesceExpression && rule.right.expression instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.CastExpression && rule.right.expression.targetExpression.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict)).map(x => x instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.SetStatement ? new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_3__.AbsoluteModelFieldPath(x.left.modePath, x.left.valueName) : undefined).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined).toArray();
+    const getDictionaryTargets = () => Iterator.from(allRules).filter(rule => rule instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.SetStatement && (rule.right.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict || rule.right instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.CastExpression && rule.right.targetExpression.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict || rule.right instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.NullCoalesceExpression && rule.right.expression instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.CastExpression && rule.right.expression.targetExpression.getType() === _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.BuildInTypeExpression.dict)).map(x => x instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_2__.SetStatement ? new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_3__.AbsoluteModelFieldPath(x.left.modePath, x.left.valueName) : undefined).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined).toArray();
     const content = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_1__.combineRulesWithOptionalSectionChecking)(allRules, this.optionalSectionRulesBuilder);
     return {
       content: content,
-      serverOnlyPaths: dictionaryRules
+      serverOnlyPaths: this.calculateServerOnlyPaths ? getDictionaryTargets() : []
     };
   }
 }
@@ -71851,10 +71854,12 @@ class ValidationRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_1
       const currentExpression = (_targetCtx$path = targetCtx[path]) !== null && _targetCtx$path !== void 0 ? _targetCtx$path : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression();
       const validationRule = this.generateValidationText(currentExpression, current);
       targetCtx[path] = validationRule;
+      ctx.additionalRules.push(...current.precalculationRules);
       return ctx;
     }, {
       errors: {},
-      warnings: {}
+      warnings: {},
+      additionalRules: []
     });
     return allRulesCheck;
   }
@@ -71898,6 +71903,7 @@ class ValidationRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_1
     const kcRules = this.buildKcValidationRules();
     const allErrorRules = mergeRules(kcRules.errors, sugarRules.errors);
     const allWarningRules = mergeRules(kcRules.warnings, sugarRules.warnings);
+    yield* kcRules.additionalRules;
     const createRule = (rules, path, checkType) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(path, true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each), checkType), rules[path]);
     const rules = Object.keys(allErrorRules).map(path => createRule(allErrorRules, path, "error")).concat(Object.keys(allWarningRules).map(path => createRule(allWarningRules, path, "warning")));
     for (const rule of rules) {
@@ -76128,7 +76134,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../Engine/src/Controls/FormParts/Unit/UnitId/UnitId */ "./Engine/src/Controls/FormParts/Unit/UnitId/UnitId.ts");
 /* harmony import */ var _Common_PathConstants__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../../Common/PathConstants */ "./Common/PathConstants.ts");
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
-/* harmony import */ var _AttachmentFormNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./AttachmentFormNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/AttachmentForm/AttachmentFormNode.ts");
+/* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
+/* harmony import */ var _AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./AttachmentFormNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/AttachmentForm/AttachmentFormNode.ts");
+
 
 
 
@@ -76138,10 +76146,10 @@ __webpack_require__.r(__webpack_exports__);
 
 class AttachmentFormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _AttachmentFormNode__WEBPACK_IMPORTED_MODULE_6__.AttachmentFormNode;
+    return _AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__.AttachmentFormNode;
   }
   *getAttachmentPaths() {
-    const node = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_6__.AttachmentFormNode);
+    const node = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__.AttachmentFormNode);
     yield (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_5__.createAbsolute)(node.path).joinWith(_Common_PathConstants__WEBPACK_IMPORTED_MODULE_4__.AttachmentInfoPath);
   }
   doBuildDataDeclaration(context) {
@@ -76154,14 +76162,14 @@ class AttachmentFormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
     // no children
   }
   doConvert(context) {
-    const attachmentFormNode = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_6__.AttachmentFormNode);
+    const attachmentFormNode = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__.AttachmentFormNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("AttachmentFormUnit");
     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);
     markupBuilder.prop(x => x.caption).set(attachmentFormNode.name);
     markupBuilder.prop(x => x.description).set(attachmentFormNode.description);
-    markupBuilder.prop(x => x.path).set(attachmentFormNode.path);
+    markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_6__.getNewBindingPathExpression)(attachmentFormNode, attachmentFormNode.path));
     return markupBuilder.buildConverterResult();
   }
 }
@@ -77248,7 +77256,7 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     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.path).set(attachmentFormNode.path);
+    markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentFormNode, attachmentFormNode.path));
     return markupBuilder;
   }
   isPageContainsTableWithStickyElements(pageNode) {

package/package.json

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