@kontur.candy/generator 5.111.0 → 5.111.1-fetch-fn-in-kclang.0

package/dist/index.js

@@ -72532,8 +72532,10 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     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) {
+      var _additionalContent$fe;
       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");
+      const fetchFunctionsKClangContent = (_additionalContent$fe = additionalContent.fetchFunctionKClangSources) === null || _additionalContent$fe === void 0 ? void 0 : _additionalContent$fe.join("\n\n");
+      const fullKcLangContent = ["// KCLang Fetch Functions\n\n", fetchFunctionsKClangContent, "// 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));
     }
@@ -72606,6 +72608,9 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
       }) : [];
       const resultRules = combineFlangRules(defaultNormalizationRules.content, ...additionalNormalizationRules, ...customNormalizers);
       builder.addServerSideResource("ServerSide.normalize", resultRules);
+      for (const normalizerInfo of additionalNormalizationRules.filter(x => x.normalizerId != undefined)) {
+        builder.addServerSideResource(`${normalizerInfo.normalizerId}.flang`, normalizerInfo.content);
+      }
     }
     builder.addResource("lazyLoadDeclaration.js", _LazyLoadDeclarationGenerator_LazyLoadDeclarationGenerator__WEBPACK_IMPORTED_MODULE_31__.LazyLoadDeclarationGenerator.convertDeclarationToContent(finalLazyLoadDeclaration));
     const attachmentPathsGenerator = new _AttachmentPaths_AttachmentPathsGenerator__WEBPACK_IMPORTED_MODULE_29__.AttachmentPathsGenerator(markupBuilderContext);
@@ -72813,7 +72818,8 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       tourSteps: await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(rootPath, "tour"), "tour.js", "{}"),
       hooksContent: await readHooksFile(formSourcesPath),
       customControlsContent: await readCustomControlsFiles(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "controls")),
-      fetchFunctionSources: await readFiles(sugarReferences.fetchFunctionFiles.map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x))),
+      fetchFunctionSources: await readFiles(sugarReferences.fetchFunctionFiles.filter(x => path__WEBPACK_IMPORTED_MODULE_1___default().extname(x) == ".js").map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x))),
+      fetchFunctionKClangSources: await readFiles(sugarReferences.fetchFunctionFiles.filter(x => path__WEBPACK_IMPORTED_MODULE_1___default().extname(x) == ".kclang").map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x))),
       localization: await connectJSFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "localization")),
       importedFiles: await readImportedFiles(formSourcesPath),
       additionalNormalizers: additionalNormalizers
@@ -73508,7 +73514,7 @@ class MinusBinaryExpression extends BinaryExpression {
 }
 class MultiplicativeBinaryExpression extends BinaryExpression {
   needAddBraces(child) {
-    return !(child instanceof NegateUnaryExpression || child instanceof ValueReferenceExpression || child instanceof ArgumentReferenceExpression || child instanceof SumBinaryExpression || child instanceof MinusBinaryExpression || child instanceof CastExpression || child instanceof ConstExpression);
+    return !(child instanceof NegateUnaryExpression || child instanceof ValueReferenceExpression || child instanceof ArgumentReferenceExpression || child instanceof CastExpression || child instanceof ConstExpression);
   }
   getType() {
     return BuildInTypeExpression.decimal;
@@ -75771,7 +75777,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
+    return result;
   }
   compileConcatExpression(expression, prefix, target, addPrecalculationRule) {
     const result = expression.arguments.reduce((acc, curr) => {
@@ -75811,7 +75817,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
+    return result;
   }
   compileDivisionExpression(expression, prefix, target, addPrecalculationRule) {
     const makeDivision = (numerator, denominator) => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.NotEqExpression(denominator, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.DecimalLiteralExpression(0)), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.DivisionBinaryExpression(numerator, denominator), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.NullLiteralExpression());
@@ -75822,7 +75828,7 @@ class FormulaExpressionToFlangExpressionConverter {
     if (result == undefined) {
       throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.InvalidProgramStateError();
     }
-    return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.wrapWithArgumentsCondition)(result);
+    return result;
   }
   preparePathAndAdjustMultiplicity(prefix, path) {
     const resultPath = this.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createModelPath)(path.replace(/\@/g, ""), "auto")).normalize());
@@ -76574,8 +76580,8 @@ class OptionalElementsRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MO
     return this.rules;
   }
   selectPrimaryElements() {
-    const optionalBlocksPaths = this.dataDeclarationHelper.getOptionalBlocksPaths();
-    const primaryElements = optionalBlocksPaths.map(path => this.formSchemaRng.getElementByPath(path)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrUndefined).filter(_common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_3__.isFormSchemaRngElement);
+    const optionalBlocksPaths = Iterator.from(this.dataDeclarationHelper.getAllPaths());
+    const primaryElements = optionalBlocksPaths.map(path => this.formSchemaRng.getElementByPath(path)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.isNotNullOrUndefined).filter(_common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_3__.isFormSchemaRngElement).toArray();
     return primaryElements;
   }
   buildRulesForElement(element) {
@@ -76737,8 +76743,8 @@ class OptionalElementsRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MO
   }
   createIsMultipleChildExistsExpression(element) {
     const childrenPath = this.formSchemaRng.getPath(element).trimLastStarIfLastToken();
-    const childrenFieldRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ValueReferenceExpression(childrenPath, "children"), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.BuildInTypeExpression.array);
-    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.GtExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ArrayLengthExpression(childrenFieldRef), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.DecimalLiteralExpression(0));
+    const childrenFieldRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ValueReferenceExpression(childrenPath, "children"), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.BuildInTypeExpression.string);
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(childrenFieldRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.StringLiteralExpression("[]")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(childrenFieldRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullLiteralExpression()));
   }
   createElementExistenceValueRefForLeftPart(element) {
     const elementPath = this.formSchemaRng.getPath(element).toEachIteration();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.111.0",
+  "version": "5.111.1-fetch-fn-in-kclang.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,