@kontur.candy/generator 4.282.0-keapiSS.1 → 4.282.0

package/dist/index.js

@@ -123430,23 +123430,7 @@ class EvaluateTemplateVisitor {
 
         node.attributes[attributeName] = updatedValue;
       } else if (typeof attribute === "object" && !Array.isArray(attribute) && attribute !== null) {
-        const newValue = {};
-        Object.keys(attribute).forEach(key => {
-          const value = attribute[key];
-
-          if (typeof value === "string") {
-            let updatedValue = value;
-
-            for (const parameter of stringParameters) {
-              updatedValue = this.applyStringParameter(parameter, updatedValue);
-            }
-
-            newValue[key] = updatedValue;
-          } else if (typeof value === "number") {
-            newValue[key] = value;
-          }
-        });
-        node.attributes[attributeName] = newValue;
+        node.attributes[attributeName] = this.parseObjectAttribute(attribute, stringParameters);
       }
     }
 
@@ -123522,6 +123506,33 @@ class EvaluateTemplateVisitor {
     return node;
   }
 
+  parseObjectAttribute(attribute, stringParameters) {
+    const result = {};
+
+    if (attribute === undefined) {
+      return result;
+    }
+
+    for (const [key, value] of Object.entries(attribute)) {
+      if (typeof value === "string") {
+        let updatedValue = value;
+
+        for (const parameter of stringParameters) {
+          updatedValue = this.applyStringParameter(parameter, updatedValue);
+        }
+
+        result[key] = updatedValue;
+      } else if (typeof value === "number") {
+        result[key] = value;
+      } else if (typeof value === "object") {
+        const typedValue = value;
+        result[key] = this.parseObjectAttribute(typedValue, stringParameters);
+      }
+    }
+
+    return result;
+  }
+
   applyStringParameter(parameter, sourceAttributeValue) {
     if (parameter.parameterInfo.type !== _SugarTemplateInfo__WEBPACK_IMPORTED_MODULE_5__.SugarTemplateParameterType.String) {
       throw new Error("Parameter type should be String");
@@ -131142,6 +131153,8 @@ __webpack_require__.r(__webpack_exports__);
 /* 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");
 /* harmony import */ var _HelperFunctionsGenerator_CommonHelperFunctionsGenerator__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ./HelperFunctionsGenerator/CommonHelperFunctionsGenerator */ "./Generator/src/generators/HelperFunctionsGenerator/CommonHelperFunctionsGenerator.ts");
+/* harmony import */ var _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./ServerSideFLangNormalization/AdditionalNormalizerFile */ "./Generator/src/generators/ServerSideFLangNormalization/AdditionalNormalizerFile.ts");
+
 
 
 
@@ -131229,11 +131242,22 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
 
       const normalizationRules = normalizationRulesGenerator.generateRules(resourcesHash);
       const formulaNormalizationRules = (_additionalContent$fo5 = additionalContent.formJsonSettings) !== null && _additionalContent$fo5 !== void 0 && _additionalContent$fo5.disableFlangRulesForEnableAutoFieldFeature ? "" : formlulaOnlyNormalizationRulesGenerator.generateRules(resourcesHash);
-      const customNormalizationRules = formulaNormalizationRules != "" ? [{
+      const additionalNormalizationRules = formulaNormalizationRules != "" ? [{
         content: formulaNormalizationRules,
         normalizerId: "formulas"
       }] : [];
-      const resultRules = combineFlangRules(normalizationRules, ...customNormalizationRules);
+
+      if (additionalContent.additionalNormalizers) {
+        for (const additionalNormalizer of additionalContent.additionalNormalizers) {
+          const isDefault = additionalNormalizer.filenameWithoutExtension.toLowerCase() === _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__.defaultNormalizerFilename.toLowerCase();
+          additionalNormalizationRules.push({
+            content: additionalNormalizer.content,
+            normalizerId: isDefault ? undefined : additionalNormalizer.filenameWithoutExtension
+          });
+        }
+      }
+
+      const resultRules = combineFlangRules(normalizationRules, ...additionalNormalizationRules);
       builder.addServerSideResource("ServerSide.normalize", resultRules);
     }
 
@@ -131280,7 +131304,9 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
 }
 
 function combineFlangRules(baseRules, ...rules) {
-  return baseRules + rules.map(x => `\n--${x.normalizerId}--\n${x.content}`).join("");
+  const customNormalizeRules = rules.filter(r => r.normalizerId).map(x => `--${x.normalizerId}--\n${x.content}`);
+  const additionalBaseRules = rules.filter(r => !r.normalizerId).map(r => r.content);
+  return [baseRules].concat(additionalBaseRules).concat(customNormalizeRules).join("\n");
 }
 
 function getReferencedFetchFunctions(fetchFunctionSources) {
@@ -131412,7 +131438,8 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       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))),
       localization: await connectJSFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "localization")),
-      importedFiles: await readImportedFiles(formSourcesPath)
+      importedFiles: await readImportedFiles(formSourcesPath),
+      additionalNormalizers: await readAdditionalNormalizersFiles(formSourcesPath)
     }
   };
 
@@ -131583,6 +131610,29 @@ async function readImportedFiles(rootPath) {
   }
 }
 
+async function readAdditionalNormalizersFiles(rootPath) {
+  try {
+    const normalizersDirectoryName = "normalizers";
+    const files = await readdirAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(rootPath, normalizersDirectoryName));
+    const normalizerFiles = [];
+
+    for (const filename of files) {
+      const content = await readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(rootPath, normalizersDirectoryName, filename), "utf-8");
+      const normalizerFile = {
+        filenameWithoutExtension: path__WEBPACK_IMPORTED_MODULE_1___default().parse(filename).name,
+        content: content
+      };
+      normalizerFiles.push(normalizerFile);
+    }
+
+    return normalizerFiles;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn(chalk__WEBPACK_IMPORTED_MODULE_3___default().yellow(`Error while reading normalizers at ${rootPath}`, error));
+    return [];
+  }
+}
+
 async function readJavaScriptFilesWithNames(formJavaScriptFilesPath) {
   try {
     const files = await readdirAsync(formJavaScriptFilesPath);
@@ -131703,6 +131753,21 @@ function getRequisitesFromEvaluableProps(...evaluablePropValues) {
 
 /***/ }),
 
+/***/ "./Generator/src/generators/ServerSideFLangNormalization/AdditionalNormalizerFile.ts":
+/*!*******************************************************************************************!*\
+  !*** ./Generator/src/generators/ServerSideFLangNormalization/AdditionalNormalizerFile.ts ***!
+  \*******************************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "defaultNormalizerFilename": () => (/* binding */ defaultNormalizerFilename)
+/* harmony export */ });
+const defaultNormalizerFilename = "defaultNormalizeRules";
+
+/***/ }),
+
 /***/ "./Generator/src/generators/ServerSideFLangNormalization/FLangValidationBuildContext.ts":
 /*!**********************************************************************************************!*\
   !*** ./Generator/src/generators/ServerSideFLangNormalization/FLangValidationBuildContext.ts ***!

package/package.json

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