@kontur.candy/generator 5.112.0 → 5.112.2

package/dist/index.js

@@ -73520,7 +73520,7 @@ class MinusBinaryExpression extends BinaryExpression {
 }
 class MultiplicativeBinaryExpression extends BinaryExpression {
   needAddBraces(child) {
-    return !(child instanceof NegateUnaryExpression || child instanceof ValueReferenceExpression || child instanceof ArgumentReferenceExpression || child instanceof CastExpression || child instanceof ConstExpression);
+    return !(child instanceof NegateUnaryExpression || child instanceof ValueReferenceExpression || child instanceof ArgumentReferenceExpression || child instanceof SumBinaryExpression || child instanceof MinusBinaryExpression || child instanceof CastExpression || child instanceof ConstExpression);
   }
   getType() {
     return BuildInTypeExpression.decimal;
@@ -75783,7 +75783,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return result;
+    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
   }
   compileConcatExpression(expression, prefix, target, addPrecalculationRule) {
     const result = expression.arguments.reduce((acc, curr) => {
@@ -75823,7 +75823,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return result;
+    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
   }
   compileDivisionExpression(expression, prefix, target, addPrecalculationRule) {
     const makeDivision = (numerator, denominator) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.NotEqExpression(denominator, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.DecimalLiteralExpression(0)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.DivisionBinaryExpression(numerator, denominator), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.NullLiteralExpression());
@@ -75834,7 +75834,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return result;
+    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
   }
   preparePathAndAdjustMultiplicity(prefix, path) {
     const resultPath = this.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createModelPath)(path.replace(/\@/g, ""), "auto")).normalize());
@@ -76586,8 +76586,8 @@ class OptionalElementsRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MO
     return this.rules;
   }
   selectPrimaryElements() {
-    const optionalBlocksPaths = Iterator.from(this.dataDeclarationHelper.getAllPaths());
-    const primaryElements = optionalBlocksPaths.map(path => this.formSchemaRng.getElementByPath(path)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrUndefined).filter(_common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_3__.isFormSchemaRngElement).toArray();
+    const optionalBlocksPaths = this.dataDeclarationHelper.getOptionalBlocksPaths();
+    const primaryElements = optionalBlocksPaths.map(path => this.formSchemaRng.getElementByPath(path)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrUndefined).filter(_common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_3__.isFormSchemaRngElement);
     return primaryElements;
   }
   buildRulesForElement(element) {
@@ -76749,8 +76749,8 @@ class OptionalElementsRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MO
   }
   createIsMultipleChildExistsExpression(element) {
     const childrenPath = this.formSchemaRng.getPath(element).trimLastStarIfLastToken();
-    const childrenFieldRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ValueReferenceExpression(childrenPath, "children"), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.BuildInTypeExpression.string);
-    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(childrenFieldRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.StringLiteralExpression("[]")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(childrenFieldRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullLiteralExpression()));
+    const childrenFieldRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ValueReferenceExpression(childrenPath, "children"), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.BuildInTypeExpression.array);
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.GtExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ArrayLengthExpression(childrenFieldRef), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.DecimalLiteralExpression(0));
   }
   createElementExistenceValueRefForLeftPart(element) {
     const elementPath = this.formSchemaRng.getPath(element).toEachIteration();

package/package.json

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