@kontur.candy/generator 4.257.0-lazy-loading.45 → 4.257.0-lazy-loading.48

package/dist/index.js

@@ -130382,7 +130382,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, _sugarRoot$schemaVali3, _sugarRoot$schemaVali4, _generationOptions$re, _sugarRoot$schemaVali5, _additionalContent$fo, _additionalContent$fo2, _additionalContent$fo3, _additionalContent$fo4;
+    var _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _additionalContent$fo, _additionalContent$fo2, _Iterator$from$map$fl, _generationOptions$in, _generationOptions$in2, _sugarRoot$schemaVali, _sugarRoot$schemaVali2, _sugarRoot$schemaVali3, _sugarRoot$schemaVali4, _generationOptions$re, _sugarRoot$schemaVali5, _additionalContent$fo3, _additionalContent$fo4;
 
     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)();
@@ -130391,6 +130391,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     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 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;
 
@@ -130425,13 +130426,15 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     builder.addResource("requisiteList.js", (0,_RequisiteLIst_requisiteList__WEBPACK_IMPORTED_MODULE_24__.getRequisiteList)(sugarRoot, fetchFunctions));
     builder.addResource("lazyLoadDeclaration.js", lazyLoadGeneratorResult.content);
     const autocalcGenerator = new _AutoCalculationsGenerator_AutoCalculationsGenerator__WEBPACK_IMPORTED_MODULE_18__.AutoCalculationsGenerator(dataDeclarationHelper, schemaRng);
-    const formulasForCalculator = ((_additionalContent$fo = additionalContent.formJsonSettings) === null || _additionalContent$fo === void 0 ? void 0 : _additionalContent$fo.autoCalculationCalculatorImpl) !== "calculator2" ? formulas : [];
+    const formulasForCalculator = !useCalculator2 ? formulas : [];
     builder.addResource("calculationFunctions.js", autocalcGenerator.generate(sugarRoot, additionalContent.autocalcsContent, formulasForCalculator));
     builder.addResource("dataDeclaration.js", dataDeclarationContent);
 
-    if ((_additionalContent$fo2 = (_additionalContent$fo3 = additionalContent.formJsonSettings) === null || _additionalContent$fo3 === void 0 ? void 0 : _additionalContent$fo3.useServerSideFLangNormalization) !== null && _additionalContent$fo2 !== void 0 ? _additionalContent$fo2 : false) {
+    if ((_additionalContent$fo3 = (_additionalContent$fo4 = additionalContent.formJsonSettings) === null || _additionalContent$fo4 === void 0 ? void 0 : _additionalContent$fo4.useServerSideFLangNormalization) !== null && _additionalContent$fo3 !== void 0 ? _additionalContent$fo3 : false) {
+      var _additionalContent$fo5;
+
       const normalizationRules = normalizationRulesGenerator.generateRules(resourcesHash);
-      const formulaNormalizationRules = formlulaOnlyNormalizationRulesGenerator.generateRules(resourcesHash);
+      const formulaNormalizationRules = (_additionalContent$fo5 = additionalContent.formJsonSettings) !== null && _additionalContent$fo5 !== void 0 && _additionalContent$fo5.disableFlangRulesForEnableAutoFieldFeature ? "" : formlulaOnlyNormalizationRulesGenerator.generateRules(resourcesHash);
       const customNormalizationRules = formulaNormalizationRules != "" ? [{
         content: formulaNormalizationRules,
         normalizerId: "formulas"
@@ -130447,7 +130450,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     builder.addResource("validationFunctions.js", validationFunctionsContent);
     const rngSchemaValidationConfigurator = validationGenerator.generateRngSchemaValidationConfigurator();
     builder.addResource("rngSchemaValidationConfigurator.js", rngSchemaValidationConfigurator);
-    const formulasForCalculator2 = ((_additionalContent$fo4 = additionalContent.formJsonSettings) === null || _additionalContent$fo4 === void 0 ? void 0 : _additionalContent$fo4.autoCalculationCalculatorImpl) === "calculator2" ? formulas : [];
+    const formulasForCalculator2 = useCalculator2 ? formulas : [];
     const kcXmlAutoCalcGenerator = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_Calculator2_AutoCalculationsCalculator2Generator__WEBPACK_IMPORTED_MODULE_28__.AutoCalculationsCalculator2Generator(formSchemaRng, dataDeclarationHelper);
     builder.addResource("kcXmlAutoCalculationConfigurator.js", kcXmlAutoCalcGenerator.generate(formulasForCalculator2));
     const kcXmlValidationGenerator = new _KCXmlValidationGenerator_KCXmlValidationGenerator__WEBPACK_IMPORTED_MODULE_23__.KCXmlValidationGenerator(formSchemaRng);
@@ -131955,6 +131958,10 @@ class NormalizationRulesGenerator {
       return this.compiledArgumentExpression(prefix, target, expression, addPrecalculationRule, "Count");
     }
 
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_3__.FormulaLengthExpression) {
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_13__.LenExpression(this.castOperandToStringIfNeed(this.compileExpressionToFlashExpression(expression.argument, prefix, target, addPrecalculationRule)));
+    }
+
     throw new Error(`Unsupported type of node: ${expression.constructor.name}`);
   }
 

package/package.json

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