@kontur.candy/generator 4.248.0-lazy-loading.26 → 4.248.0-lazy-loading.27

package/dist/index.js

@@ -129114,6 +129114,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _AttachmentPaths_AttachmentPathsGenerator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./AttachmentPaths/AttachmentPathsGenerator */ "./Generator/src/generators/AttachmentPaths/AttachmentPathsGenerator.ts");
 /* harmony import */ var _AutoCalculationsGenerator_AutoCalculationsFromFormulas_Calculator2_AutoCalculationsCalculator2Generator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./AutoCalculationsGenerator/AutoCalculationsFromFormulas/Calculator2/AutoCalculationsCalculator2Generator */ "./Generator/src/generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/Calculator2/AutoCalculationsCalculator2Generator.ts");
 /* harmony import */ var _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ./LazyLoadDeclarationGenerator/LazyLoadDeclarationGenerator */ "./Generator/src/generators/LazyLoadDeclarationGenerator/LazyLoadDeclarationGenerator.ts");
+/* harmony import */ var _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ./ServerSideFLangNormalization/FormulaOnlyNormalizationRuleGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/FormulaOnlyNormalizationRuleGenerator.ts");
+
 
 
 
@@ -129146,7 +129148,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function processSugar(formSugarContent, additionalContent, generationOptions) {
   try {
-    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _generationOptions$re, _sugarRoot$schemaVali3, _additionalContent$fo, _additionalContent$fo2;
+    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _sugarRoot$schemaVali3, _generationOptions$re, _sugarRoot$schemaVali4, _additionalContent$fo, _additionalContent$fo2;
 
     const sugarAst = (0,_common_SugarXmlParser_SugarParser__WEBPACK_IMPORTED_MODULE_4__.parseSugar)(formSugarContent, additionalContent.preprocessor || {});
     const serializer = (0,_markupGenerator_SugarNodes_DefaultSugarSerializer__WEBPACK_IMPORTED_MODULE_13__.createDefaultSugarSerializer)();
@@ -129180,9 +129182,10 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const lazyLoadGenerator = new _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_29__.LazyLoadDeclarationGenerator(formSchemaRng);
     const lazyLoadGeneratorResult = lazyLoadGenerator.generate();
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_25__.NormalizationRulesGenerator(sugarRoot, dataDeclarationHelper, formSchemaRng, formulas, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali2 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali2 !== void 0 ? _sugarRoot$schemaVali2 : false, controlCustomizationContext, lazyLoadGeneratorResult.declaration);
+    const formlulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_30__.FormulaOnlyNormalizationRuleGenerator(sugarRoot, dataDeclarationHelper, formSchemaRng, formulas, kcXmlConditions, typeRegistry, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false, controlCustomizationContext, lazyLoadGeneratorResult.declaration);
     const resourcesHash = (_generationOptions$re = generationOptions === null || generationOptions === void 0 ? void 0 : generationOptions.resourcesHash) !== null && _generationOptions$re !== void 0 ? _generationOptions$re : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)("Current generator version requires resources hash");
     const builder = new _FormSourcesBuilder_FormSourcesBuilder__WEBPACK_IMPORTED_MODULE_21__.FormSourcesBuilder(additionalContent.formSourcesPath);
-    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali3 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali3 !== void 0 ? _sugarRoot$schemaVali3 : false);
+    const markupGenerator = new _markupGenerator_MarkupGenerator__WEBPACK_IMPORTED_MODULE_12__.MarkupGenerator(additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, (_sugarRoot$schemaVali4 = sugarRoot.schemaValidations) !== null && _sugarRoot$schemaVali4 !== void 0 ? _sugarRoot$schemaVali4 : false);
     markupGenerator.generate(sugarRoot, builder);
     builder.addResource("settings.js", (0,_markupGenerator_getSettings__WEBPACK_IMPORTED_MODULE_9__.getSettings)(sugarRoot, additionalContent.gfv, additionalSettings));
     builder.addResource("requisiteList.js", (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_24__.getRequisiteList)(sugarRoot, fetchFunctions));
@@ -129193,7 +129196,12 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
 
     if ((_additionalContent$fo = (_additionalContent$fo2 = additionalContent.formJsonSettings) === null || _additionalContent$fo2 === void 0 ? void 0 : _additionalContent$fo2.useServerSideFLangNormalization) !== null && _additionalContent$fo !== void 0 ? _additionalContent$fo : false) {
       const normalizationRules = normalizationRulesGenerator.generateRules(resourcesHash);
-      builder.addServerSideResource("ServerSide.normalize", normalizationRules);
+      const formulaNormalizationRules = formlulaOnlyNormalizationRulesGenerator.generateRules(resourcesHash);
+      const resultRules = combineFlangRules(normalizationRules, {
+        content: formulaNormalizationRules,
+        normalizerId: "formulas"
+      });
+      builder.addServerSideResource("ServerSide.normalize", resultRules);
     }
 
     const attachmentPathsGenerator = new _AttachmentPaths_AttachmentPathsGenerator__WEBPACK_IMPORTED_MODULE_27__.AttachmentPathsGenerator();
@@ -129232,6 +129240,10 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
   }
 }
 
+function combineFlangRules(baseRules, ...rules) {
+  return baseRules + rules.map(x => `\n--${x.normalizerId}--\n${x.content}`).join("");
+}
+
 function getReferencedFetchFunctions(fetchFunctionSources) {
   const registries = fetchFunctionSources.map(evalFetchFunctionModule);
   return mergeFetchFunctionRegistries(registries);
@@ -130385,6 +130397,58 @@ class SetStatement extends FLangStatement {
 
 /***/ }),
 
+/***/ "./Generator/src/generators/ServerSideFLangNormalization/FormulaOnlyNormalizationRuleGenerator.ts":
+/*!********************************************************************************************************!*\
+  !*** ./Generator/src/generators/ServerSideFLangNormalization/FormulaOnlyNormalizationRuleGenerator.ts ***!
+  \********************************************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "FormulaOnlyNormalizationRuleGenerator": () => (/* binding */ FormulaOnlyNormalizationRuleGenerator)
+/* harmony export */ });
+/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
+/* harmony import */ var _DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../DataSchema/DataSchemaUtils */ "./Generator/src/generators/DataSchema/DataSchemaUtils.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./FLang/FLangCodeDom */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FLangCodeDom.ts");
+/* harmony import */ var _NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./NormalizationRulesGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/NormalizationRulesGenerator.ts");
+
+
+
+
+
+class FormulaOnlyNormalizationRuleGenerator extends _NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_4__.NormalizationRulesGenerator {
+  generateRules(resourcesHash) {
+    const formulaFLangRules = this.buildFormulaFLangRules();
+    return Iterator.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.distinctBy(formulaFLangRules, x => x instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.SetStatement ? x.left.convertToString() : x.convertToString())).map(x => x.convertToString()).reduce((x, y) => x + (x ? "\n" : "") + y, "");
+  }
+
+  buildFormulaFlashRule(formula) {
+    const prefix = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.ModelPath.createFromString(formula.match.replace(/\@/g, ""), true).normalize();
+    const target = _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_2__.ModelPath.createFromString(formula.target.replace(/\@/g, ""), false);
+    const fullTarget = (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_1__.adjustPathMultiplicityComplex)(prefix.joinWith(target).normalize(), this.formSchemaRng, this.dataDeclarationHelper);
+    const precalculationRules = [];
+    const isTargetAutoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(fullTarget.toAbsolute());
+    const result = [];
+    result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget, "value"), this.compileExpressionToFlashExpression(formula.expression, prefix, fullTarget, x => precalculationRules.push(x))));
+    result.push(...precalculationRules);
+
+    if (isTargetAutoField) {
+      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget, "autoValue"), this.compileExpressionToFlashExpression(formula.expression, prefix, fullTarget, x => precalculationRules.push(x))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), "string")));
+      result.push(...precalculationRules);
+    } else {
+      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_3__.ValueReferenceExpression(fullTarget, "value"), this.compileExpressionToFlashExpression(formula.expression, prefix, fullTarget, x => precalculationRules.push(x))));
+      result.push(...precalculationRules);
+    }
+
+    return result;
+  }
+
+}
+
+/***/ }),
+
 /***/ "./Generator/src/generators/ServerSideFLangNormalization/NormalizationRulesGenerator.ts":
 /*!**********************************************************************************************!*\
   !*** ./Generator/src/generators/ServerSideFLangNormalization/NormalizationRulesGenerator.ts ***!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.248.0-lazy-loading.26",
+  "version": "4.248.0-lazy-loading.27",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,