@kontur.candy/generator 5.107.0 → 5.108.0

package/dist/index.js

@@ -72476,7 +72476,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function processSugar(formSugarContent, additionalContent, generationOptions) {
   try {
-    var _sugarRoot$schemaVali, _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _mathContainerFromSug, _mathContainerFromSug2, _additionalContent$fo, _additionalContent$fo2, _additionalContent$fo3, _additionalContent$fo4, _Iterator$from$map$fl, _mathContainerFromSug3, _mathContainerFromSug4, _generationOptions$in, _generationOptions$in2, _generationOptions$re, _additionalContent$fo5, _additionalContent$fo6, _additionalContent$fo7, _additionalContent$fo8, _additionalContent$fo9, _additionalContent$fo10, _additionalContent$fo11, _additionalContent$fo12;
+    var _sugarRoot$schemaVali, _kxXmlMathContainer$f, _kxXmlMathContainer$f2, _kcLangMathContainer$, _kcLangMathContainer$2, _mathContainerFromSug, _mathContainerFromSug2, _additionalContent$fo, _additionalContent$fo2, _additionalContent$fo3, _additionalContent$fo4, _Iterator$from$map$fl, _mathContainerFromSug3, _mathContainerFromSug4, _generationOptions$in, _generationOptions$in2, _additionalContent$fo5, _generationOptions$re, _additionalContent$fo6, _additionalContent$fo7, _additionalContent$fo8, _additionalContent$fo9, _additionalContent$fo10, _additionalContent$fo11, _additionalContent$fo12, _additionalContent$fo13;
     const sugarAst = (0,_common_SugarXmlParser_SugarParser__WEBPACK_IMPORTED_MODULE_4__.parseSugar)(formSugarContent, additionalContent.preprocessor || {});
     const serializer = (0,_markupGenerator_SugarNodes_DefaultSugarSerializer__WEBPACK_IMPORTED_MODULE_15__.createDefaultSugarSerializer)();
     const sugarRoot = (0,_markupGenerator_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_16__.strictCastNode)(serializer.deserializeFromSugarXmlNode(sugarAst), _markupGenerator_ElementProcessors_FormParts_Form_FormNode__WEBPACK_IMPORTED_MODULE_13__.FormNode);
@@ -72488,10 +72488,6 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const kxXmlMathContainer = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaReader__WEBPACK_IMPORTED_MODULE_19__.FormulaReader().readFormulas(additionalContent.kcJsXmlContent);
     const kcLangFromSugar = extractKCLangFromSugar(sugarRoot, formSchemaRng, new _ServerSideFLangNormalization_NodeTypeInfoHelper__WEBPACK_IMPORTED_MODULE_49__.NodeTypeInfoHelper(formSchemaRng, typeRegistry, useSchemaValidations)).map(x => x.toString()).join("\n");
     const builder = new _FormSourcesBuilder_FormSourcesBuilder__WEBPACK_IMPORTED_MODULE_23__.FormSourcesBuilder(additionalContent.formSourcesPath);
-    builder.addBuildOutput("Sugar.generated.kclang", kcLangFromSugar);
-    const kclangValidatios = Iterator.from(getImportedKclangValidations(sugarRoot, additionalContent)).toArray().join("\n");
-    const fullKcLangContent = ["// KCLang User Formulas\n\n", additionalContent.kcLangContent, "// KCLang User Validations\n\n", kclangValidatios, "// KCLang Generated Sugar Rules\n\n", kcLangFromSugar].join("\n");
-    builder.addServerSideResource("All.kclang", fullKcLangContent);
     const mathContainerFromSugar = _common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_6__.KCLangToXmlTranspiler.transpileAsMathContainer(kcLangFromSugar);
     const formulas = ((_kxXmlMathContainer$f = kxXmlMathContainer === null || kxXmlMathContainer === 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 || (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : _kcLangMathContainer$2.items) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : []).concat((_mathContainerFromSug = mathContainerFromSugar === null || mathContainerFromSugar === void 0 || (_mathContainerFromSug2 = mathContainerFromSugar.formulas) === null || _mathContainerFromSug2 === void 0 ? void 0 : _mathContainerFromSug2.items) !== null && _mathContainerFromSug !== void 0 ? _mathContainerFromSug : []);
     const useServerCalculations = (_additionalContent$fo = (_additionalContent$fo2 = additionalContent.formJsonSettings) === null || _additionalContent$fo2 === void 0 ? void 0 : _additionalContent$fo2.useServerSideCalculations) !== null && _additionalContent$fo !== void 0 ? _additionalContent$fo : false;
@@ -72517,14 +72513,20 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const extendedSchemaInfo = (0,_ExtendedSchema_ExtendedSchemaInfoUtils__WEBPACK_IMPORTED_MODULE_50__.buildExtendedSchemaInfo)(dataDeclarationHelper);
     const markupBuilderContext = new _markupGenerator_IMarkupBuildingContext__WEBPACK_IMPORTED_MODULE_52__.MarkupBuildingContext(new _markupGenerator_ElementProcessors_Commons_NodePathsContext__WEBPACK_IMPORTED_MODULE_51__.NodePathsContext(), additionalContent.formSourcesPath, additionalContent.helpersContent, additionalContent.tourSteps, controlCustomizationContext, typeRegistry, formSchemaRng, dataDeclarationHelper, useSchemaValidations);
     const validationGenerator = new _validationGenerator_ValidationGenerator__WEBPACK_IMPORTED_MODULE_18__.ValidationGenerator(sugarRoot, typeRegistry, markupBuilderContext, controlCustomizationContext, formSchemaRng, useSchemaValidations, additionalContent.validationsContent, additionalContent.formJsonSettings);
+    if ((_additionalContent$fo5 = additionalContent.formJsonSettings) !== null && _additionalContent$fo5 !== void 0 && _additionalContent$fo5.useServerSideFLangNormalization) {
+      const kclangValidatios = Iterator.from(getImportedKclangValidations(sugarRoot, additionalContent)).toArray().join("\n");
+      const fullKcLangContent = ["// KCLang User Formulas\n\n", additionalContent.kcLangContent, "// KCLang User Validations\n\n", kclangValidatios, "// KCLang Generated Sugar Rules\n\n", kcLangFromSugar].join("\n");
+      builder.addServerSideResource("All.kclang", fullKcLangContent);
+      builder.addServerSideResource("extendedSchema.json", JSON.stringify(extendedSchemaInfo, _Common_SerializationUtils__WEBPACK_IMPORTED_MODULE_7__.excludeUndefinedOrEmptyObjectJsonReplacer));
+    }
     const lazyLoadGenerator = new _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_31__.LazyLoadDeclarationGenerator(sugarRoot, formSchemaRng);
     const lazyLoadGeneratorResult = lazyLoadGenerator.generate();
     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 formulaExprConverter = new _ServerSideFLangNormalization_FormulaExpressionToFlangExpressionConverter__WEBPACK_IMPORTED_MODULE_36__.FormulaExpressionToFlangExpressionConverter(path => (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_37__.adjustPathMultiplicityComplex)(path, dataDeclarationHelper), {
-      enableGroupSumAutoConversion: (_additionalContent$fo5 = (_additionalContent$fo6 = additionalContent.formJsonSettings) === null || _additionalContent$fo6 === void 0 ? void 0 : _additionalContent$fo6.useServerSideCalculations) !== null && _additionalContent$fo5 !== void 0 ? _additionalContent$fo5 : false
+      enableGroupSumAutoConversion: (_additionalContent$fo6 = (_additionalContent$fo7 = additionalContent.formJsonSettings) === null || _additionalContent$fo7 === void 0 ? void 0 : _additionalContent$fo7.useServerSideCalculations) !== null && _additionalContent$fo6 !== void 0 ? _additionalContent$fo6 : false
     });
     const formulaRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_FormulaRulesBuilder__WEBPACK_IMPORTED_MODULE_38__.FormulaRulesBuilder(formSchemaRng, formulas, dataDeclarationHelper, formulaExprConverter, {
-      enableTypedFlang: (_additionalContent$fo7 = (_additionalContent$fo8 = additionalContent.formJsonSettings) === null || _additionalContent$fo8 === void 0 ? void 0 : _additionalContent$fo8.useServerSideCalculations) !== null && _additionalContent$fo7 !== void 0 ? _additionalContent$fo7 : false
+      enableTypedFlang: (_additionalContent$fo8 = (_additionalContent$fo9 = additionalContent.formJsonSettings) === null || _additionalContent$fo9 === void 0 ? void 0 : _additionalContent$fo9.useServerSideCalculations) !== null && _additionalContent$fo8 !== void 0 ? _additionalContent$fo8 : false
     });
     const initializationRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_InitializationRulesBuilder__WEBPACK_IMPORTED_MODULE_39__.InitializationRulesBuilder(sugarRoot, resourcesHash);
     const lazyLoadingRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_LazyLoadingRulesBuilder__WEBPACK_IMPORTED_MODULE_40__.LazyLoadingRulesBuilder(sugarRoot, lazyLoadGeneratorResult.declaration);
@@ -72535,7 +72537,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const optionalBlocksRulesBuilder = new _ServerSideFLangNormalization_RuleBuilders_OptionalBlocksRulesBuilder__WEBPACK_IMPORTED_MODULE_54__.OptionalBlocksRulesBuilder(dataDeclarationHelper);
     const normalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_NormalizationRulesGenerator__WEBPACK_IMPORTED_MODULE_27__.NormalizationRulesGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng, optionalElementsRulesBuilder, optionalBlocksRulesBuilder, false);
     const formulaOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_FormulaOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_32__.FormulaOnlyNormalizationRuleGenerator(dataDeclarationHelper, formSchemaRng, formulas, optionalSectionRuleBuilder, formulaExprConverter, validationRulesBuilder, optionalElementsRulesBuilder, optionalBlocksRulesBuilder, {
-      enableTypedFlang: (_additionalContent$fo9 = (_additionalContent$fo10 = additionalContent.formJsonSettings) === null || _additionalContent$fo10 === void 0 ? void 0 : _additionalContent$fo10.useServerSideCalculations) !== null && _additionalContent$fo9 !== void 0 ? _additionalContent$fo9 : false
+      enableTypedFlang: (_additionalContent$fo10 = (_additionalContent$fo11 = additionalContent.formJsonSettings) === null || _additionalContent$fo11 === void 0 ? void 0 : _additionalContent$fo11.useServerSideCalculations) !== null && _additionalContent$fo10 !== void 0 ? _additionalContent$fo10 : false
     });
     const formulaAndInitOnlyNormalizationRulesGenerator = new _ServerSideFLangNormalization_Normalizers_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_43__.FormulaAndInitOnlyNormalizationRuleGenerator(sugarRulesBuilder, formulaRulesBuilder, formSchemaRng, optionalSectionRuleBuilder, optionalElementsRulesBuilder, optionalBlocksRulesBuilder);
     const autoValueForValueByDefaultNormalizationRuleGenerator = new _ServerSideFLangNormalization_Normalizers_AutoValueForValueByDefaultNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_47__.AutoValueForValueByDefaultNormalizationRuleGenerator(optionalSectionRuleBuilder, validationRulesBuilder, lazyLoadingRulesBuilder, sugarRulesBuilder, initializationRulesBuilder, formulaRulesBuilder, formSchemaRng, optionalElementsRulesBuilder, optionalBlocksRulesBuilder, dataDeclarationHelper);
@@ -72547,21 +72549,20 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const formulasForCalculator = useOldCalculator ? formulas : [];
     builder.addResource("calculationFunctions.js", autocalcGenerator.generate(sugarRoot, additionalContent.autocalcsContent, formulasForCalculator));
     builder.addResource("dataDeclaration.js", dataDeclarationContent);
-    builder.addServerSideResource("extendedSchema.json", JSON.stringify(extendedSchemaInfo, _Common_SerializationUtils__WEBPACK_IMPORTED_MODULE_7__.excludeUndefinedOrEmptyObjectJsonReplacer, 4));
     let finalLazyLoadDeclaration = lazyLoadGeneratorResult.declaration;
-    if ((_additionalContent$fo11 = (_additionalContent$fo12 = additionalContent.formJsonSettings) === null || _additionalContent$fo12 === void 0 ? void 0 : _additionalContent$fo12.useServerSideFLangNormalization) !== null && _additionalContent$fo11 !== void 0 ? _additionalContent$fo11 : false) {
-      var _additionalContent$fo13, _additionalContent$fo14, _additionalContent$fo15;
+    if ((_additionalContent$fo12 = (_additionalContent$fo13 = additionalContent.formJsonSettings) === null || _additionalContent$fo13 === void 0 ? void 0 : _additionalContent$fo13.useServerSideFLangNormalization) !== null && _additionalContent$fo12 !== void 0 ? _additionalContent$fo12 : false) {
+      var _additionalContent$fo14, _additionalContent$fo15, _additionalContent$fo16;
       const defaultNormalizationRules = normalizationRulesGenerator.generateRules();
       finalLazyLoadDeclaration = mixLazyLoadingDeclarationWithServerOnlyPaths(lazyLoadGeneratorResult.declaration, defaultNormalizationRules.serverOnlyPaths);
       const customNormalizers = [{
         normalizerId: "formulas",
-        content: (_additionalContent$fo13 = additionalContent.formJsonSettings) !== null && _additionalContent$fo13 !== void 0 && _additionalContent$fo13.disableFlangRulesForEnableAutoFieldFeature ? "" : formulaOnlyNormalizationRulesGenerator.generateRules()
+        content: (_additionalContent$fo14 = additionalContent.formJsonSettings) !== null && _additionalContent$fo14 !== void 0 && _additionalContent$fo14.disableFlangRulesForEnableAutoFieldFeature ? "" : formulaOnlyNormalizationRulesGenerator.generateRules()
       }, {
         normalizerId: "formulasWithInitializers",
-        content: (_additionalContent$fo14 = additionalContent.formJsonSettings) !== null && _additionalContent$fo14 !== void 0 && _additionalContent$fo14.disableFlangRulesForFormulaAndInitNormalizer ? "" : formulaAndInitOnlyNormalizationRulesGenerator.generateRules()
+        content: (_additionalContent$fo15 = additionalContent.formJsonSettings) !== null && _additionalContent$fo15 !== void 0 && _additionalContent$fo15.disableFlangRulesForFormulaAndInitNormalizer ? "" : formulaAndInitOnlyNormalizationRulesGenerator.generateRules()
       }, {
         normalizerId: "autoValueForValueByDefault",
-        content: (_additionalContent$fo15 = additionalContent.formJsonSettings) !== null && _additionalContent$fo15 !== void 0 && _additionalContent$fo15.enableFlangRulesForAutoValueForValueByDefaultNormalizer ? autoValueForValueByDefaultNormalizationRuleGenerator.generateRules() : ""
+        content: (_additionalContent$fo16 = additionalContent.formJsonSettings) !== null && _additionalContent$fo16 !== void 0 && _additionalContent$fo16.enableFlangRulesForAutoValueForValueByDefaultNormalizer ? autoValueForValueByDefaultNormalizationRuleGenerator.generateRules() : ""
       }].filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrEmpty)(x.content));
       const additionalNormalizationRules = additionalContent.additionalNormalizers ? additionalContent.additionalNormalizers.map(additionalNormalizer => {
         switch (additionalNormalizer.extension) {

package/package.json

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