@kontur.candy/generator 4.283.0-zeroReporting.0 → 4.283.0-zeroReporting.1

package/dist/index.js

@@ -131300,6 +131300,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ServerSideFLangNormalization_RuleBuilders_SugarRulesBuilder__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./ServerSideFLangNormalization/RuleBuilders/SugarRulesBuilder */ "./Generator/src/generators/ServerSideFLangNormalization/RuleBuilders/SugarRulesBuilder.ts");
 /* harmony import */ var _ServerSideFLangNormalization_RuleBuilders_ValidationRulesBuilder__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./ServerSideFLangNormalization/RuleBuilders/ValidationRulesBuilder */ "./Generator/src/generators/ServerSideFLangNormalization/RuleBuilders/ValidationRulesBuilder.ts");
 /* harmony import */ var _ServerSideFLangNormalization_FormulaAndInitOnlyNormalizationRuleGenerator__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./ServerSideFLangNormalization/FormulaAndInitOnlyNormalizationRuleGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/FormulaAndInitOnlyNormalizationRuleGenerator.ts");
+/* harmony import */ var _ServerSideFLangNormalization_CustomKCLangToFlangRuleGenerator__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator */ "./Generator/src/generators/ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator.ts");
+
 
 
 
@@ -131403,7 +131405,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     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, _additionalContent$fo6;
 
-      const normalizationRules = normalizationRulesGenerator.generateRules();
+      const defaultNormalizationRules = normalizationRulesGenerator.generateRules();
       const customNormalizers = [{
         normalizerId: "formulas",
         content: (_additionalContent$fo5 = additionalContent.formJsonSettings) !== null && _additionalContent$fo5 !== void 0 && _additionalContent$fo5.disableFlangRulesForEnableAutoFieldFeature ? "" : formulaOnlyNormalizationRulesGenerator.generateRules()
@@ -131412,13 +131414,30 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
         content: (_additionalContent$fo6 = additionalContent.formJsonSettings) !== null && _additionalContent$fo6 !== void 0 && _additionalContent$fo6.disableFlangRulesForFormulaAndInitNormalizer ? "" : formulaAndInitOnlyNormalizationRulesGenerator.generate()
       }].filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrEmpty)(x.content));
       const additionalNormalizationRules = additionalContent.additionalNormalizers ? additionalContent.additionalNormalizers.map(additionalNormalizer => {
-        const isDefault = additionalNormalizer.filenameWithoutExtension.toLowerCase() === _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__.defaultNormalizerFilename.toLowerCase();
-        return {
-          content: additionalNormalizer.content,
-          normalizerId: isDefault ? undefined : additionalNormalizer.filenameWithoutExtension
-        };
+        switch (additionalNormalizer.extension) {
+          case _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__.NormalizerFileExtension.FLANG:
+            {
+              const isDefault = additionalNormalizer.filename.toLowerCase() === _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__.defaultNormalizerFilename.toLowerCase();
+              return {
+                content: additionalNormalizer.content,
+                normalizerId: isDefault ? undefined : additionalNormalizer.filename
+              };
+            }
+
+          case _ServerSideFLangNormalization_AdditionalNormalizerFile__WEBPACK_IMPORTED_MODULE_32__.NormalizerFileExtension.KCLANG:
+            {
+              const customNormalizationRules = new _ServerSideFLangNormalization_CustomKCLangToFlangRuleGenerator__WEBPACK_IMPORTED_MODULE_42__.CustomKCLangToFlangRuleGenerator(additionalNormalizer.content, formulaReader, dataDeclarationHelper, formSchemaRng, formulaExprConverter);
+              return {
+                content: customNormalizationRules.generateRules(),
+                normalizerId: additionalNormalizer.filename
+              };
+            }
+
+          default:
+            throw new Error(`Cannot transform normalization file with ${additionalNormalizer.extension} extension`);
+        }
       }) : [];
-      const resultRules = combineFlangRules(normalizationRules, ...additionalNormalizationRules, ...customNormalizers);
+      const resultRules = combineFlangRules(defaultNormalizationRules, ...additionalNormalizationRules, ...customNormalizers);
       builder.addServerSideResource("ServerSide.normalize", resultRules);
     }
 
@@ -131533,6 +131552,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getAllDependencies": () => (/* binding */ getAllDependencies),
 /* harmony export */   "getAllDependenciesHash": () => (/* binding */ getAllDependenciesHash),
 /* harmony export */   "readSugarFiles": () => (/* binding */ readSugarFiles),
+/* harmony export */   "readAdditionalNormalizersFiles": () => (/* binding */ readAdditionalNormalizersFiles),
 /* harmony export */   "connectJSFilesWithNames": () => (/* binding */ connectJSFilesWithNames)
 /* harmony export */ });
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ "fs");
@@ -131780,8 +131800,9 @@ async function readAdditionalNormalizersFiles(rootPath) {
     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
+        filename: path__WEBPACK_IMPORTED_MODULE_1___default().parse(filename).name,
+        content: content,
+        extension: path__WEBPACK_IMPORTED_MODULE_1___default().parse(filename).ext
       };
       normalizerFiles.push(normalizerFile);
     }
@@ -131923,12 +131944,106 @@ function getRequisitesFromEvaluableProps(...evaluablePropValues) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "NormalizerFileExtension": () => (/* binding */ NormalizerFileExtension),
 /* harmony export */   "defaultNormalizerFilename": () => (/* binding */ defaultNormalizerFilename)
 /* harmony export */ });
+let NormalizerFileExtension;
+
+(function (NormalizerFileExtension) {
+  NormalizerFileExtension["FLANG"] = ".flang";
+  NormalizerFileExtension["KCLANG"] = ".kclang";
+})(NormalizerFileExtension || (NormalizerFileExtension = {}));
+
 const defaultNormalizerFilename = "defaultNormalizeRules";
 
 /***/ }),
 
+/***/ "./Generator/src/generators/ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator.ts":
+/*!***************************************************************************************************!*\
+  !*** ./Generator/src/generators/ServerSideFLangNormalization/CustomKCLangToFlangRuleGenerator.ts ***!
+  \***************************************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "CustomKCLangToFlangRuleGenerator": () => (/* binding */ CustomKCLangToFlangRuleGenerator)
+/* harmony export */ });
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
+/* harmony import */ var _DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../DataSchema/DataSchemaUtils */ "./Generator/src/generators/DataSchema/DataSchemaUtils.ts");
+/* harmony import */ var _common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../common/KCLang/KCLangToXmlTranspiler */ "./Generator/src/common/KCLang/KCLangToXmlTranspiler.ts");
+/* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
+/* harmony import */ var _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./FLang/FLangCodeDom */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FLangCodeDom.ts");
+
+
+
+
+
+
+class CustomKCLangToFlangRuleGenerator {
+  constructor(kclangContent, formulaReader, dataDeclarationHelper, formSchemaRng, formulaExprConverter) {
+    this.kclangContent = void 0;
+    this.formulaReader = void 0;
+    this.dataDeclarationHelper = void 0;
+    this.formSchemaRng = void 0;
+    this.formulaExprConverter = void 0;
+    this.kclangContent = kclangContent;
+    this.formulaReader = formulaReader;
+    this.dataDeclarationHelper = dataDeclarationHelper;
+    this.formulaExprConverter = formulaExprConverter;
+    this.formSchemaRng = formSchemaRng;
+  }
+
+  generateRules() {
+    const formulas = this.extractKclangFormulas();
+    const allCustomRules = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.concat(this.buildFormulaFLangRules(formulas));
+    const flangnormalizationRules = Iterator.from(allCustomRules).map(x => x.convertToString()).reduce((x, y) => x + (x ? "\n" : "") + y, "");
+    return flangnormalizationRules;
+  }
+
+  extractKclangFormulas() {
+    var _customNormalizationM, _customNormalizationM2;
+
+    const customNormalizationMathContainer = this.formulaReader.readFormulas(_common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_3__.KCLangToXmlTranspiler.transpile(this.kclangContent));
+    return (_customNormalizationM = customNormalizationMathContainer === null || customNormalizationMathContainer === void 0 ? void 0 : (_customNormalizationM2 = customNormalizationMathContainer.formulas) === null || _customNormalizationM2 === void 0 ? void 0 : _customNormalizationM2.items) !== null && _customNormalizationM !== void 0 ? _customNormalizationM : [];
+  }
+
+  *buildFormulaFLangRules(formulas) {
+    for (const formula of formulas !== null && formulas !== void 0 ? formulas : []) {
+      yield* this.buildFormulaFlashRule(formula);
+    }
+  }
+
+  buildFormulaFlashRule(formula) {
+    const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(formula.match.replace(/\@/g, ""), true).normalize();
+    const target = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(formula.target.replace(/\@/g, ""), false);
+    const fullTarget = this.adjustPathMultiplicity(prefix.joinWith(target).normalize());
+    const precalculationRules = [];
+    const defaultValue = this.dataDeclarationHelper.getDefaultValue(fullTarget.toLegacyPath());
+    const isTargetAutoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(fullTarget.toAbsolute());
+    const result = [];
+
+    const getFormulaExpression = field => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.NullCoalesceExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_4__.wrapWithArgumentsCondition)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_4__.castOperandToStringIfNeed)(this.formulaExprConverter.compileExpressionToFlangExpression(formula.expression, prefix, new _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.AbsoluteModelFieldPath(fullTarget, field), x => precalculationRules.push(x)), "G29")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.StringLiteralExpression(defaultValue));
+
+    if (isTargetAutoField) {
+      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget, "autoValue"), getFormulaExpression("autoValue")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.BuildInTypeExpression.string)));
+    } else {
+      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_5__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value")));
+    }
+
+    result.push(...precalculationRules);
+    return result;
+  }
+
+  adjustPathMultiplicity(path) {
+    return (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__.adjustPathMultiplicityComplex)(path, this.formSchemaRng, this.dataDeclarationHelper);
+  }
+
+}
+
+/***/ }),
+
 /***/ "./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.283.0-zeroReporting.0",
+  "version": "4.283.0-zeroReporting.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,