@kontur.candy/generator 4.261.0-optional-nested-units.1 → 4.261.0-optional-nested-units.2

package/dist/index.js

@@ -126489,8 +126489,12 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function genWrapDecimalOperand(name) {
-  return _babel_types__WEBPACK_IMPORTED_MODULE_1__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("wrapDecimalOperand"), [_babel_types__WEBPACK_IMPORTED_MODULE_1__.memberExpression(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("args"), _babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier(name))]);
+function generateArgsMember(name) {
+  return _babel_types__WEBPACK_IMPORTED_MODULE_1__.memberExpression(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("args"), _babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier(name));
+}
+
+function generateWrapDecimalOperand(name) {
+  return _babel_types__WEBPACK_IMPORTED_MODULE_1__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier("wrapDecimalOperand"), [generateArgsMember(name)]);
 }
 
 class FormulaAutoCalculation {
@@ -126582,7 +126586,7 @@ class FormulaAutoCalculation {
         throw new TypeError();
       }
 
-      return _babel_types__WEBPACK_IMPORTED_MODULE_1__.variableDeclarator(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier(x.localVariableName), genWrapDecimalOperand(x.localVariableName));
+      return _babel_types__WEBPACK_IMPORTED_MODULE_1__.variableDeclarator(_babel_types__WEBPACK_IMPORTED_MODULE_1__.identifier(x.localVariableName), this.resolveVariableExpression(x.localVariableName, x.variableType));
     }));
     return {
       argsRequest: argsRequest,
@@ -126590,6 +126594,16 @@ class FormulaAutoCalculation {
     };
   }
 
+  resolveVariableExpression(variableName, variableType) {
+    switch (variableType) {
+      case "string":
+        return generateArgsMember(variableName);
+
+      default:
+        return generateWrapDecimalOperand(variableName);
+    }
+  }
+
 }
 
 /***/ }),
@@ -126838,7 +126852,7 @@ class FormulaProcessor {
   }
 
   afterArgumentExpression(expression) {
-    const argumentName = this.addDependency(expression.select);
+    const argumentName = this.addDependency(expression.select, expression.type);
     this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier(argumentName));
   }
 
@@ -127021,7 +127035,12 @@ class FormulaProcessor {
 
   afterEqExpression(expression) {
     const [leftExpression, rightExpression] = this.popExpressions(2);
-    this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightExpression]));
+
+    if (this.isStringExpression(leftExpression) && this.isStringExpression(rightExpression)) {
+      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.binaryExpression("===", leftExpression, rightExpression));
+    } else {
+      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightExpression]));
+    }
   }
 
   beforeChooseExpression(expression) {
@@ -127137,6 +127156,16 @@ class FormulaProcessor {
     return path.replace(/\.|@/g, "").replace(/\//g, "_");
   }
 
+  findDependencyByName(name) {
+    return this.dependencies.find(x => x.localVariableName === name);
+  }
+
+  isStringExpression(expression) {
+    var _this$findDependencyB;
+
+    return _babel_types__WEBPACK_IMPORTED_MODULE_0__.isStringLiteral(expression) || _babel_types__WEBPACK_IMPORTED_MODULE_0__.isIdentifier(expression) && ((_this$findDependencyB = this.findDependencyByName(expression.name)) === null || _this$findDependencyB === void 0 ? void 0 : _this$findDependencyB.variableType) === "string";
+  }
+
   buildFormula(resultExpression, countFormula = false) {
     const suffix = this.getLegacyExpressionTypeForFunctionName(this.formula.expression);
     const functionName = `${this.getNameByPath(`${this.formula.match}/${this.formula.target}`)}_${suffix}`;
@@ -127166,12 +127195,13 @@ class FormulaProcessor {
     return new _FormulaAutoCalculation__WEBPACK_IMPORTED_MODULE_4__.FormulaAutoCalculation(functionName, this.resolveFormulaPathToEnginePath(this.formula.match), this.dependencies, results, defaultValue);
   }
 
-  addDependency(path) {
+  addDependency(path, variableType) {
     const matchPath = this.resolveFormulaPathToEnginePath(this.formula.match);
     const absoluteResolvedPath = this.resolveFormulaPathToEnginePath(`${this.formula.match}/${path}`);
     const relativePath = absoluteResolvedPath.toRelativeOf(matchPath);
     const dependency = {
       localVariableName: this.getNameByPath(path),
+      variableType: variableType,
       absoluteResolvedPath: absoluteResolvedPath,
       valueType: "value",
       valueType2: undefined
@@ -127182,11 +127212,13 @@ class FormulaProcessor {
       dependency.valueType2 = "sum";
       this.dependencies.push({
         localVariableName: undefined,
+        variableType: variableType,
         absoluteResolvedPath: new _DataPath__WEBPACK_IMPORTED_MODULE_3__.DataPath(removeLastStar(absoluteResolvedPath.toString()).split("/")),
         valueType: "count",
         valueType2: undefined
       }, {
         localVariableName: undefined,
+        variableType: variableType,
         absoluteResolvedPath: new _DataPath__WEBPACK_IMPORTED_MODULE_3__.DataPath(removeLastStar(absoluteResolvedPath.toString()).split("/")),
         valueType: "sum",
         valueType2: undefined
@@ -127199,17 +127231,20 @@ class FormulaProcessor {
       this.additionalAutocalculations.push(new _FormulaAutoCalculation__WEBPACK_IMPORTED_MODULE_4__.FormulaAutoCalculation(this.getNameByPath(removeLastStar(`${this.formula.match}/${relativePath.toString()}`)) + "_count", matchPath, [{
         absoluteResolvedPath: new _DataPath__WEBPACK_IMPORTED_MODULE_3__.DataPath(removeLastStar(absoluteResolvedPath.toString()).split("/")),
         localVariableName: undefined,
+        variableType: variableType,
         valueType: "count",
         valueType2: "count"
       }, {
         absoluteResolvedPath: absoluteResolvedPath,
         localVariableName: this.getNameByPath(path),
+        variableType: variableType,
         valueType: "count",
         valueType2: "count",
         skipHook: true
       }, {
         absoluteResolvedPath: absoluteResolvedPath,
         localVariableName: undefined,
+        variableType: variableType,
         valueType: "value",
         valueType2: undefined
       }], [{
@@ -127221,17 +127256,20 @@ class FormulaProcessor {
       this.dataDeclarationHelper.getDefaultValue(absoluteResolvedPath.toString())), new _FormulaAutoCalculation__WEBPACK_IMPORTED_MODULE_4__.FormulaAutoCalculation(this.getNameByPath(removeLastStar(`${this.formula.match}/${relativePath.toString()}`)) + "_sum", matchPath, [{
         absoluteResolvedPath: new _DataPath__WEBPACK_IMPORTED_MODULE_3__.DataPath(removeLastStar(absoluteResolvedPath.toString()).split("/")),
         localVariableName: undefined,
+        variableType: variableType,
         valueType: "sum",
         valueType2: "sum"
       }, {
         absoluteResolvedPath: absoluteResolvedPath,
         localVariableName: this.getNameByPath(path),
+        variableType: variableType,
         valueType: "sum",
         valueType2: "sum",
         skipHook: true
       }, {
         absoluteResolvedPath: absoluteResolvedPath,
         localVariableName: undefined,
+        variableType: variableType,
         valueType: "value",
         valueType2: undefined
       }], [{
@@ -127442,7 +127480,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _class8, _class9, _descriptor3, _dec8, _dec9, _class11, _class12, _descriptor4, _dec10, _dec11, _class14, _class15, _descriptor5, _dec12, _dec13, _dec14, _class17, _class18, _descriptor6, _descriptor7, _dec15, _dec16, _class20, _class21, _descriptor8, _dec17, _dec18, _class23, _class24, _descriptor9, _dec19, _dec20, _class26, _class27, _descriptor10, _dec21, _dec22, _class29, _class30, _descriptor11, _dec23, _dec24, _class32, _class33, _descriptor12, _dec25, _dec26, _class35, _class36, _descriptor13, _dec27, _dec28, _class38, _class39, _descriptor14, _dec29, _dec30, _class41, _class42, _descriptor15, _dec31, _dec32, _class44, _class45, _descriptor16, _dec33, _dec34, _dec35, _dec36, _class47, _class48, _descriptor17, _descriptor18, _descriptor19, _dec37, _dec38, _class50, _class51, _descriptor20, _dec39, _dec40, _class53, _class54, _descriptor21, _dec41, _dec42, _dec43, _class56, _class57, _descriptor22, _descriptor23, _dec44, _dec45, _class59, _class60, _descriptor24, _dec46, _dec47, _class62, _class63, _descriptor25, _dec48, _dec49, _class65, _class66, _descriptor26, _dec50, _dec51, _dec52, _class68, _class69, _descriptor27, _descriptor28, _dec53, _dec54, _dec55, _dec56, _class71, _class72, _descriptor29, _descriptor30, _descriptor31, _dec57, _dec58, _dec59, _class74, _class75, _descriptor32, _descriptor33, _dec60, _class77, _dec61, _dec62, _class78, _class79, _descriptor34, _dec63, _dec64, _class81, _class82, _descriptor35, _dec65, _dec66, _class84, _class85, _descriptor36, _dec67, _dec68, _class87, _class88, _descriptor37, _dec69, _dec70, _dec71, _dec72, _class90, _class91, _descriptor38, _descriptor39, _descriptor40, _dec73, _dec74, _class93, _class94, _descriptor41, _dec75, _dec76, _dec77, _dec78, _dec79, _dec80, _class96, _class97, _descriptor42, _descriptor43, _descriptor44, _descriptor45, _descriptor46, _dec81, _dec82, _class99, _class100, _descriptor47, _dec83, _dec84, _dec85, _class102, _class103, _descriptor48, _descriptor49;
+var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _class8, _class9, _descriptor3, _dec8, _dec9, _class11, _class12, _descriptor4, _dec10, _dec11, _class14, _class15, _descriptor5, _dec12, _dec13, _dec14, _class17, _class18, _descriptor6, _descriptor7, _dec15, _dec16, _class20, _class21, _descriptor8, _dec17, _dec18, _class23, _class24, _descriptor9, _dec19, _dec20, _class26, _class27, _descriptor10, _dec21, _dec22, _class29, _class30, _descriptor11, _dec23, _dec24, _class32, _class33, _descriptor12, _dec25, _dec26, _class35, _class36, _descriptor13, _dec27, _dec28, _class38, _class39, _descriptor14, _dec29, _dec30, _class41, _class42, _descriptor15, _dec31, _dec32, _class44, _class45, _descriptor16, _dec33, _dec34, _dec35, _dec36, _class47, _class48, _descriptor17, _descriptor18, _descriptor19, _dec37, _dec38, _class50, _class51, _descriptor20, _dec39, _dec40, _class53, _class54, _descriptor21, _dec41, _dec42, _dec43, _class56, _class57, _descriptor22, _descriptor23, _dec44, _dec45, _class59, _class60, _descriptor24, _dec46, _dec47, _class62, _class63, _descriptor25, _dec48, _dec49, _class65, _class66, _descriptor26, _dec50, _dec51, _dec52, _class68, _class69, _descriptor27, _descriptor28, _dec53, _dec54, _dec55, _dec56, _class71, _class72, _descriptor29, _descriptor30, _descriptor31, _dec57, _dec58, _dec59, _class74, _class75, _descriptor32, _descriptor33, _dec60, _class77, _dec61, _dec62, _dec63, _class78, _class79, _descriptor34, _descriptor35, _dec64, _dec65, _class81, _class82, _descriptor36, _dec66, _dec67, _class84, _class85, _descriptor37, _dec68, _dec69, _class87, _class88, _descriptor38, _dec70, _dec71, _dec72, _dec73, _class90, _class91, _descriptor39, _descriptor40, _descriptor41, _dec74, _dec75, _class93, _class94, _descriptor42, _dec76, _dec77, _dec78, _dec79, _dec80, _dec81, _class96, _class97, _descriptor43, _descriptor44, _descriptor45, _descriptor46, _descriptor47, _dec82, _dec83, _class99, _class100, _descriptor48, _dec84, _dec85, _dec86, _class102, _class103, _descriptor49, _descriptor50;
 
 
 
@@ -127463,6 +127501,7 @@ class FormulaExpression extends _markupGenerator_Serializer_SugarSerializer__WEB
   }
 
 }
+const typeArgumentValueParser = _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("decimal", "string");
 let FormulaWhenExpression = (_dec = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("when", `TODO`), _dec2 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec(_class = (_class2 = class FormulaWhenExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
@@ -127838,7 +127877,7 @@ let FormulaMinusExpression = (_dec48 = (0,_markupGenerator_Serializer_SugarSeria
   writable: true,
   initializer: null
 })), _class66)) || _class65);
-let FormulaConstExpression = (_dec50 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("const", `TODO`), _dec51 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("value", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec52 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("decimal", "string"), ``), _dec50(_class68 = (_class69 = class FormulaConstExpression extends FormulaExpression {
+let FormulaConstExpression = (_dec50 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("const", `TODO`), _dec51 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("value", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec52 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип константы: string или decimal (по умолчанию)`), _dec50(_class68 = (_class69 = class FormulaConstExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
@@ -127891,7 +127930,7 @@ let FormulaSubstringExpression = (_dec53 = (0,_markupGenerator_Serializer_SugarS
   writable: true,
   initializer: null
 })), _class72)) || _class71);
-let FormulaCastExpression = (_dec57 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("cast", `TODO`), _dec58 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec59 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("decimal", "string").required, `TODO`), _dec57(_class74 = (_class75 = class FormulaCastExpression extends FormulaExpression {
+let FormulaCastExpression = (_dec57 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("cast", `TODO`), _dec58 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec59 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser.required, `TODO`), _dec57(_class74 = (_class75 = class FormulaCastExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
@@ -127916,11 +127955,13 @@ let FormulaCastExpression = (_dec57 = (0,_markupGenerator_Serializer_SugarSerial
   initializer: null
 })), _class75)) || _class74);
 let FormulaDateNowExpression = (_dec60 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("datenow", `Дата в формате: {dd/mm/yyyy hh:mm:ss} (время серверное)`), _dec60(_class77 = class FormulaDateNowExpression extends FormulaExpression {}) || _class77);
-let FormulaArgumentExpression = (_dec61 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec62 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec61(_class78 = (_class79 = class FormulaArgumentExpression extends FormulaExpression {
+let FormulaArgumentExpression = (_dec61 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("argument", `TODO`), _dec62 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec63 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("type", typeArgumentValueParser, `Тип атрибута: string или decimal (по умолчанию)`), _dec61(_class78 = (_class79 = class FormulaArgumentExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor34, this);
+
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "type", _descriptor35, this);
   }
 
 }, (_descriptor34 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class79.prototype, "select", [_dec62], {
@@ -127928,159 +127969,166 @@ let FormulaArgumentExpression = (_dec61 = (0,_markupGenerator_Serializer_SugarSe
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class79.prototype, "type", [_dec63], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "decimal";
+  }
 })), _class79)) || _class78);
-let FormulaExistsExpression = (_dec63 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec64 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec63(_class81 = (_class82 = class FormulaExistsExpression extends FormulaExpression {
+let FormulaExistsExpression = (_dec64 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("exists", `TODO`), _dec65 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec64(_class81 = (_class82 = class FormulaExistsExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor35, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor36, this);
   }
 
   getLegacyExpressionTypeForFunctionName() {
     return "exists";
   }
 
-}, (_descriptor35 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class82.prototype, "select", [_dec64], {
+}, (_descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class82.prototype, "select", [_dec65], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class82)) || _class81);
-let FormulaMultySumExpression = (_dec65 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec66 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec65(_class84 = (_class85 = class FormulaMultySumExpression extends FormulaExpression {
+let FormulaMultySumExpression = (_dec66 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("multysum", `TODO`), _dec67 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec66(_class84 = (_class85 = class FormulaMultySumExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor36, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor37, this);
   }
 
-}, (_descriptor36 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class85.prototype, "select", [_dec66], {
+}, (_descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class85.prototype, "select", [_dec67], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class85)) || _class84);
-let FormulaCountExpression = (_dec67 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec68 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec67(_class87 = (_class88 = class FormulaCountExpression extends FormulaExpression {
+let FormulaCountExpression = (_dec68 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("count", `TODO`), _dec69 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("select", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec68(_class87 = (_class88 = class FormulaCountExpression extends FormulaExpression {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor37, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "select", _descriptor38, this);
   }
 
-}, (_descriptor37 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class88.prototype, "select", [_dec68], {
+}, (_descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class88.prototype, "select", [_dec69], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class88)) || _class87);
-let Formula = (_dec69 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec70 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec71 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec72 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec69(_class90 = (_class91 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let Formula = (_dec70 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formula", `TODO`), _dec71 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec72 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec73 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec70(_class90 = (_class91 = class Formula extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor38, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor39, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor39, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor40, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor40, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor41, this);
   }
 
-}, (_descriptor38 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "match", [_dec70], {
+}, (_descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "match", [_dec71], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor39 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "target", [_dec71], {
+}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "target", [_dec72], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor40 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "expression", [_dec72], {
+}), _descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class91.prototype, "expression", [_dec73], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class91)) || _class90);
-let Formulas = (_dec73 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec74 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec73(_class93 = (_class94 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let Formulas = (_dec74 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("formulas", `TODO`), _dec75 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("formula", [Formula]), _dec74(_class93 = (_class94 = class Formulas extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor41, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor42, this);
   }
 
-}, (_descriptor41 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "items", [_dec74], {
+}, (_descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class94.prototype, "items", [_dec75], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class94)) || _class93);
-let ConditionNode = (_dec75 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec76 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec77 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec78 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec79 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec80 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec75(_class96 = (_class97 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let ConditionNode = (_dec76 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("condition", `TODO`), _dec77 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("match", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec78 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("target", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec79 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("description", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, ``), _dec80 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("errorLevel", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("Error", "Warning"), `Уровень ошибки может быть Error или Warning - параметр влияет на подсветку. Красную или Оранжевую соотвественно`), _dec81 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)(), _dec76(_class96 = (_class97 = class ConditionNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor42, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "match", _descriptor43, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor43, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "target", _descriptor44, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor44, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor45, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor45, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "errorLevel", _descriptor46, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor46, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expression", _descriptor47, this);
   }
 
-}, (_descriptor42 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "match", [_dec76], {
+}, (_descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "match", [_dec77], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor43 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "target", [_dec77], {
+}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "target", [_dec78], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor44 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "description", [_dec78], {
+}), _descriptor45 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "description", [_dec79], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor45 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "errorLevel", [_dec79], {
+}), _descriptor46 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "errorLevel", [_dec80], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor46 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "expression", [_dec80], {
+}), _descriptor47 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class97.prototype, "expression", [_dec81], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class97)) || _class96);
-let ConditionsNode = (_dec81 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec82 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec81(_class99 = (_class100 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let ConditionsNode = (_dec82 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("conditions", `TODO`), _dec83 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("condition", [ConditionNode]), _dec82(_class99 = (_class100 = class ConditionsNode extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor47, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "items", _descriptor48, this);
   }
 
-}, (_descriptor47 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "items", [_dec82], {
+}, (_descriptor48 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class100.prototype, "items", [_dec83], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 })), _class100)) || _class99);
-let MathContainer = (_dec83 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec84 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec85 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec83(_class102 = (_class103 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
+let MathContainer = (_dec84 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("math", `TODO`), _dec85 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("formulas", [Formulas]), _dec86 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("conditions", [ConditionsNode]), _dec84(_class102 = (_class103 = class MathContainer extends _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor48, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "formulas", _descriptor49, this);
 
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor49, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "conditions", _descriptor50, this);
   }
 
-}, (_descriptor48 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "formulas", [_dec84], {
+}, (_descriptor49 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "formulas", [_dec85], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor49 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "conditions", [_dec85], {
+}), _descriptor50 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class103.prototype, "conditions", [_dec86], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -131883,6 +131931,11 @@ class NormalizationRulesGenerator {
       return this.castOperandToStringIfNeed(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.AbsExpression(this.castOperandToDecimalIfNeed(this.compileExpressionToFlashExpression(expression.expression, prefix, target, addPrecalculationRule))));
     }
 
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_3__.FormulaXAbsExpression) {
+      const expr = this.castOperandToDecimalIfNeed(this.compileExpressionToFlashExpression(expression.expression, prefix, target, addPrecalculationRule));
+      return this.castOperandToStringIfNeed(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.LtExpression(this.castOperandToDecimalIfNeed(expr), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.DecimalLiteralExpression(0), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.AbsExpression(expr)));
+    }
+
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_3__.FormulaRoundExpression) {
       return this.castOperandToStringIfNeed(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.RoundExpression(this.castOperandToDecimalIfNeed(this.compileExpressionToFlashExpression(expression.expression, prefix, target, addPrecalculationRule)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.IntegerLiteralExpression(expression.fractionalDigits)));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.261.0-optional-nested-units.1",
+  "version": "4.261.0-optional-nested-units.2",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,