@kontur.candy/generator 4.296.0-react-ui4.2 → 4.296.0-react-ui4.3

package/dist/index.js

@@ -70016,10 +70016,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 /* harmony import */ var _Common_IndentString__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/IndentString */ "./Common/IndentString.ts");
 /* harmony import */ var _StringUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../StringUtils */ "./Generator/src/common/StringUtils.ts");
-/* harmony import */ var _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./IKCLangExpressionVisitor */ "./Generator/src/common/KCLang/IKCLangExpressionVisitor.ts");
-/* harmony import */ var _KCLangDescriptionParser__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./KCLangDescriptionParser */ "./Generator/src/common/KCLang/KCLangDescriptionParser.ts");
-/* harmony import */ var _KCLangNodes__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./KCLangNodes */ "./Generator/src/common/KCLang/KCLangNodes.ts");
-/* harmony import */ var _Antlr_KCLangAntlrParser__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Antlr/KCLangAntlrParser */ "./Generator/src/common/KCLang/Antlr/KCLangAntlrParser.ts");
+/* harmony import */ var _generators_AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader */ "./Generator/src/generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaReader.ts");
+/* harmony import */ var _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./IKCLangExpressionVisitor */ "./Generator/src/common/KCLang/IKCLangExpressionVisitor.ts");
+/* harmony import */ var _KCLangDescriptionParser__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./KCLangDescriptionParser */ "./Generator/src/common/KCLang/KCLangDescriptionParser.ts");
+/* harmony import */ var _KCLangNodes__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./KCLangNodes */ "./Generator/src/common/KCLang/KCLangNodes.ts");
+/* harmony import */ var _Antlr_KCLangAntlrParser__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Antlr/KCLangAntlrParser */ "./Generator/src/common/KCLang/Antlr/KCLangAntlrParser.ts");
+
 
 
 
@@ -70118,7 +70120,7 @@ function generateKCXmlExpression(expression) {
   }
 }
 function formatDescribeStatement(ast, matchPath, describe) {
-  return _KCLangDescriptionParser__WEBPACK_IMPORTED_MODULE_5__.KCLangDescriptionParser.parse(describe.text).map(item => {
+  return _KCLangDescriptionParser__WEBPACK_IMPORTED_MODULE_6__.KCLangDescriptionParser.parse(describe.text).map(item => {
     if (typeof item === "string") {
       return item;
     } else {
@@ -70144,20 +70146,20 @@ function generateBlockKCXmlFormulas(block, parents) {
   const result = [];
   let lastDescribeStatement;
   for (const statement of block.statements) {
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isFormulaStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isFormulaStatement)(statement)) {
       result.push(generateKCXmlFormula(statement, matchPath, lastDescribeStatement));
       lastDescribeStatement = undefined;
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isEnsureStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isEnsureStatement)(statement)) {
       lastDescribeStatement = undefined;
     }
     if (lastDescribeStatement != undefined) {
       throw new Error("Describe should be placed before assign of ensure statements");
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isDescribeStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isDescribeStatement)(statement)) {
       lastDescribeStatement = statement;
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isBlockStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isBlockStatement)(statement)) {
       result.push(generateBlockKCXmlFormulas(statement, [...(parents !== null && parents !== void 0 ? parents : []), block]));
     }
   }
@@ -70165,7 +70167,7 @@ function generateBlockKCXmlFormulas(block, parents) {
 }
 function guessConditionTarget(condition) {
   let result;
-  class GuessConditionTargetVisitor extends _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_4__.DefaultKCLangExpressionVisitor {
+  class GuessConditionTargetVisitor extends _IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.DefaultKCLangExpressionVisitor {
     visitExistsKCLangNode(node) {
       if (result == undefined) {
         result = node.select;
@@ -70202,7 +70204,7 @@ function guessConditionTarget(condition) {
       }
     }
   }
-  (0,_IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_4__.traverseKCLangExpression)(condition.expression, new GuessConditionTargetVisitor());
+  (0,_IKCLangExpressionVisitor__WEBPACK_IMPORTED_MODULE_5__.traverseKCLangExpression)(condition.expression, new GuessConditionTargetVisitor());
   return result;
 }
 function generateKCXmlCondition(ast, matchPath, parentConditions, describe) {
@@ -70213,7 +70215,7 @@ function generateKCXmlCondition(ast, matchPath, parentConditions, describe) {
   const targetAttr = guessedTarget != undefined ? ` target="${guessedTarget}"` : "";
   if (parentConditions != undefined && (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.arrayIsNotEmpty)(parentConditions)) {
     var _parentConditions$map;
-    const condition = parentConditions.length === 1 ? parentConditions[0].condition : (0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.andKCLangNode)(...((_parentConditions$map = parentConditions === null || parentConditions === void 0 ? void 0 : parentConditions.map(z => z.condition)) !== null && _parentConditions$map !== void 0 ? _parentConditions$map : []));
+    const condition = parentConditions.length === 1 ? parentConditions[0].condition : (0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.andKCLangNode)(...((_parentConditions$map = parentConditions === null || parentConditions === void 0 ? void 0 : parentConditions.map(z => z.condition)) !== null && _parentConditions$map !== void 0 ? _parentConditions$map : []));
     return `<m:condition match="${matchPath}"${descriptionAttr}${levelAttr}${targetAttr}>\n` + `  <m:when>\n` + (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(condition), 2) + "\n" + (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(ast.expression), 2) + "\n" + `  </m:when>\n` + `</m:condition>`;
   }
   return `<m:condition match="${matchPath}"${descriptionAttr}${levelAttr}${targetAttr}>\n` + (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(ast.expression), 1) + "\n" + `</m:condition>`;
@@ -70223,23 +70225,23 @@ function generateBlockKCXmlConditions(block, parents, parentConditions) {
   const result = [];
   let lastDescribeStatement;
   for (const statement of block.statements) {
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isFormulaStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isFormulaStatement)(statement)) {
       lastDescribeStatement = undefined;
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isEnsureStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isEnsureStatement)(statement)) {
       result.push(generateKCXmlCondition(statement, matchPath, parentConditions, lastDescribeStatement));
       lastDescribeStatement = undefined;
     }
     if (lastDescribeStatement != undefined) {
       throw new Error("Describe should be placed before assign of ensure statements");
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isDescribeStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isDescribeStatement)(statement)) {
       lastDescribeStatement = statement;
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isConditionalStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isConditionalStatement)(statement)) {
       result.push(generateConditionalConditions(statement, [...(parents !== null && parents !== void 0 ? parents : []), block], parentConditions));
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isBlockStatement)(statement)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isBlockStatement)(statement)) {
       result.push(generateBlockKCXmlConditions(statement, [...(parents !== null && parents !== void 0 ? parents : []), block], parentConditions));
     }
   }
@@ -70250,20 +70252,20 @@ function generateConditionalConditions(conditionalStatement, parents, parentCond
   const result = [];
   let lastDescribeStatement;
   for (const x of conditionalStatement.statements) {
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isEnsureStatement)(x)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isEnsureStatement)(x)) {
       result.push(generateKCXmlCondition(x, matchPath, [...(parentConditions !== null && parentConditions !== void 0 ? parentConditions : []), conditionalStatement], lastDescribeStatement));
       lastDescribeStatement = undefined;
     }
     if (lastDescribeStatement != undefined) {
       throw new Error("Describe should be placed before assign of ensure statements");
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isDescribeStatement)(x)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isDescribeStatement)(x)) {
       lastDescribeStatement = x;
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isConditionalStatement)(x)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isConditionalStatement)(x)) {
       result.push(generateConditionalConditions(x, parents, [...(parentConditions !== null && parentConditions !== void 0 ? parentConditions : []), conditionalStatement]));
     }
-    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_6__.isBlockStatement)(x)) {
+    if ((0,_KCLangNodes__WEBPACK_IMPORTED_MODULE_7__.isBlockStatement)(x)) {
       result.push(generateBlockKCXmlConditions(x, parents, [...(parentConditions !== null && parentConditions !== void 0 ? parentConditions : []), conditionalStatement]));
     }
   }
@@ -70290,10 +70292,14 @@ function generateKCXml(blocks) {
 }
 class KCLangToXmlTranspiler {
   static transpile(kcLang, customParser) {
-    const parser = customParser !== null && customParser !== void 0 ? customParser : _Antlr_KCLangAntlrParser__WEBPACK_IMPORTED_MODULE_7__.KCLangAntlrParser.parse;
+    const parser = customParser !== null && customParser !== void 0 ? customParser : _Antlr_KCLangAntlrParser__WEBPACK_IMPORTED_MODULE_8__.KCLangAntlrParser.parse;
     const kcxml = generateKCXml(parser(kcLang).blocks);
     return kcxml;
   }
+  static transpileAsMathContainer(kcLang, customParser) {
+    const formulaReader = new _generators_AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_4__.FormulaReader();
+    return formulaReader.readFormulas(KCLangToXmlTranspiler.transpile(kcLang, customParser));
+  }
 }
 function kclang(str) {
   return KCLangToXmlTranspiler.transpile(str.join(""));
@@ -78532,7 +78538,8 @@ class LazyLoadDeclarationGenerator {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "processSugar": () => (/* binding */ processSugar)
+/* harmony export */   "processSugar": () => (/* binding */ processSugar),
+/* harmony export */   "extractFormulasFromSugarKCLang": () => (/* binding */ extractFormulasFromSugarKCLang)
 /* harmony export */ });
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 /* harmony import */ var _common_Errors_ProcessSugarErrors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../common/Errors/ProcessSugarErrors */ "./Generator/src/common/Errors/ProcessSugarErrors.ts");
@@ -78577,6 +78584,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./ServerSideFLangNormalization/RuleBuilders/ValidationRulesBuilder */ "./Generator/src/generators/ServerSideFLangNormalization/RuleBuilders/ValidationRulesBuilder.ts");
 /* harmony import */ var _ServerSideFLangNormalization_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./ServerSideFLangNormalization/FormulaAndInitOnlyNormalizationRuleGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/FormulaAndInitOnlyNormalizationRuleGenerator.ts");
 /* harmony import */ var _ServerSideFLangNormalization_CustomKCLangToFlangRuleGenerator__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator.ts");
+/* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
+/* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
+
+
 
 
 
@@ -78629,7 +78640,8 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const formulaReader = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_17__.FormulaReader();
     const kcLangMathContainer = formulaReader.readFormulas(_common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_6__.KCLangToXmlTranspiler.transpile(additionalContent.kcLangContent));
     const kxXmlMathContainer = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_17__.FormulaReader().readFormulas(additionalContent.kcJsXmlContent);
-    const formulas = ((_kxXmlMathContainer$f = kxXmlMathContainer === null || kxXmlMathContainer === void 0 ? void 0 : (_kxXmlMathContainer$f2 = kxXmlMathContainer.formulas) === null || _kxXmlMathContainer$f2 === void 0 ? void 0 : _kxXmlMathContainer$f2.items) !== null && _kxXmlMathContainer$f !== void 0 ? _kxXmlMathContainer$f : []).concat((_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : _kcLangMathContainer$2.items) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : []);
+    const formulasFromSugar = extractFormulasFromSugarKCLang(sugarRoot);
+    const formulas = ((_kxXmlMathContainer$f = kxXmlMathContainer === null || kxXmlMathContainer === void 0 ? void 0 : (_kxXmlMathContainer$f2 = kxXmlMathContainer.formulas) === null || _kxXmlMathContainer$f2 === void 0 ? void 0 : _kxXmlMathContainer$f2.items) !== null && _kxXmlMathContainer$f !== void 0 ? _kxXmlMathContainer$f : []).concat((_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : _kcLangMathContainer$2.items) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : []).concat([...formulasFromSugar]);
     const useCalculator2 = ((_additionalContent$fo = additionalContent.formJsonSettings) === null || _additionalContent$fo === void 0 ? void 0 : _additionalContent$fo.autoCalculationCalculatorImpl) === "calculator2" || ((_additionalContent$fo2 = additionalContent.formJsonSettings) === null || _additionalContent$fo2 === void 0 ? void 0 : _additionalContent$fo2.useServerSideFLangNormalization);
     const kcXmlConditions = (_Iterator$from$map$fl = Iterator.from(getImportedKcXmlValidations(sugarRoot, additionalContent)).map(x => {
       var _container$conditions, _container$conditions2;
@@ -78792,6 +78804,20 @@ function* getImportedKcXmlValidations(formNode, additionalContent) {
     yield getKcXmlByKclangOrKcXml(importedFilePath, content);
   }
 }
+function* extractFormulasFromSugarKCLang(sugarRoot) {
+  const controlConverterClass = (0,_markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_44__.getConverterByNodeClass)((0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_43__.getNodeClass)(sugarRoot));
+  if (controlConverterClass != undefined) {
+    const converter = new controlConverterClass(sugarRoot);
+    const result = Iterator.from(converter.buildSugarKCLangCalculations()).map(kclangDom => {
+      var _KCLangToXmlTranspile, _KCLangToXmlTranspile2, _KCLangToXmlTranspile3;
+      return (_KCLangToXmlTranspile = (_KCLangToXmlTranspile2 = _common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_6__.KCLangToXmlTranspiler.transpileAsMathContainer(kclangDom.toString())) === null || _KCLangToXmlTranspile2 === void 0 ? void 0 : (_KCLangToXmlTranspile3 = _KCLangToXmlTranspile2.formulas) === null || _KCLangToXmlTranspile3 === void 0 ? void 0 : _KCLangToXmlTranspile3.items) !== null && _KCLangToXmlTranspile !== void 0 ? _KCLangToXmlTranspile : [];
+    }).flatMap(x => x);
+    yield* result;
+    for (const child of converter.traverseChildren()) {
+      yield* extractFormulasFromSugarKCLang(child);
+    }
+  }
+}
 
 /***/ }),
 
@@ -106989,6 +107015,12 @@ class SugarNodeConverterBase {
   buildSugarAutoCalculations() {
     return Iterator.from([]);
   }
+  buildSugarKCLangCalculations() {
+    return [];
+  }
+  buildLazyLoadingDeclaration(schemaRng) {
+    return [];
+  }
   getParentStrictAs(nodeClass) {
     const node = this.node.sourceXmlNode;
     const parent = node.getParentStrict();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.296.0-react-ui4.2",
+  "version": "4.296.0-react-ui4.3",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,