@kontur.candy/generator 5.102.0 → 5.103.0

package/dist/index.js

@@ -67846,7 +67846,8 @@ class FormulaProcessor {
     if (this.isStringExpression(leftExpression) && this.isStringExpression(rightExpression)) {
       this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.binaryExpression("===", leftExpression, rightExpression));
     } else {
-      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightExpression]));
+      const rightArgument = _babel_types__WEBPACK_IMPORTED_MODULE_0__.isStringLiteral(rightExpression) ? _babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("wrapDecimalOperand"), [rightExpression]) : rightExpression;
+      this.returnExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.callExpression(_babel_types__WEBPACK_IMPORTED_MODULE_0__.memberExpression(leftExpression, _babel_types__WEBPACK_IMPORTED_MODULE_0__.identifier("eq")), [rightArgument]));
     }
   }
   beforeChooseExpression() {
@@ -72065,6 +72066,10 @@ class KCXmlGeneratorBase {
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaPropertyByNameExpression) {
       return gcf(x => x.getProperty, JSON.stringify(expression.name));
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaCastExpression) {
+      const compiledExpression = this.compileExpression(prefix, targetFullPath, expression.expression, deps);
+      return compiledExpression;
+    }
     // -- не работает в рантайм калькуляторе
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaFirstOrDefaultExpression) {
       return "null";
@@ -72830,12 +72835,17 @@ async function readFormSources(formSourcesPath, farmDirectory) {
     const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
     sugarReferences.fetchFunctionFiles = (await readdirAsync(legacyfetchfunctionsDirectory)).map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(legacyfetchfunctionsDirectory, x));
   }
+  const additionalNormalizers = await readAdditionalNormalizersFiles(formSourcesPath);
+  const formJsonSettings = (_JSON$parse$settings = JSON.parse(await readFileSource(formSourcesPath, "form.json", "{}"))["settings"]) !== null && _JSON$parse$settings !== void 0 ? _JSON$parse$settings : {};
+  if (additionalNormalizers.length > 0 && !formJsonSettings.useServerSideFLangNormalization) {
+    throw new Error("[ERROR] Не проставлен флаг useServerSideFLangNormalization, но папка normalizers не пустая");
+  }
   const result = {
     sugarContent: sugarContent,
     resources: {
       gfv: gfv,
       formSourcesPath: formSourcesPath,
-      formJsonSettings: (_JSON$parse$settings = JSON.parse(await readFileSource(formSourcesPath, "form.json", "{}"))["settings"]) !== null && _JSON$parse$settings !== void 0 ? _JSON$parse$settings : {},
+      formJsonSettings: formJsonSettings,
       additionalSettings: await readFileSource(formSourcesPath, "settings.json", "{}"),
       autocalcsContent: await readAutoCalcFiles(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc")),
       helpersContent: await readJavaScriptFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "helpers")),
@@ -72850,7 +72860,7 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       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),
-      additionalNormalizers: await readAdditionalNormalizersFiles(formSourcesPath)
+      additionalNormalizers: additionalNormalizers
     }
   };
   if (gfv.startsWith("4")) {
@@ -73326,9 +73336,11 @@ __webpack_require__.r(__webpack_exports__);
 /* 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_hashUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../../../Common/hashUtils */ "./Common/hashUtils.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
 var _BuildInTypeExpression;
 
 
+
 class FLangNode {
   toString() {
     return this.convertToString();
@@ -73606,6 +73618,33 @@ class BuildInTypeExpression extends TypeReferenceExpression {
   convertToString() {
     return this.buildInTypeName;
   }
+  static getByName(typeName) {
+    switch (typeName) {
+      case "string":
+        return BuildInTypeExpression.string;
+      case "decimal":
+        return BuildInTypeExpression.decimal;
+      case "dict":
+        return BuildInTypeExpression.dict;
+      case "bool":
+        return BuildInTypeExpression.bool;
+      case "null":
+        return BuildInTypeExpression.null;
+      case "dateTime":
+        return BuildInTypeExpression.dateTime;
+      case "int":
+        return BuildInTypeExpression.int;
+      case "array":
+        return BuildInTypeExpression.array;
+      case "hashSet":
+        return BuildInTypeExpression.hashSet;
+      case "object":
+        return BuildInTypeExpression.object;
+      default:
+        (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.ensureNever)(typeName);
+        return (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)();
+    }
+  }
 }
 _BuildInTypeExpression = BuildInTypeExpression;
 BuildInTypeExpression.object = new _BuildInTypeExpression("object");
@@ -74734,7 +74773,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   dictFieldNameSuffix: () => (/* binding */ dictFieldNameSuffix),
 /* harmony export */   ensureCorrectFieldNameByExpressionType: () => (/* binding */ ensureCorrectFieldNameByExpressionType),
 /* harmony export */   ensureOperandsOfTypeOrNull: () => (/* binding */ ensureOperandsOfTypeOrNull),
+/* harmony export */   extractOriginalStringValueOrCastToStringIfNeeded: () => (/* binding */ extractOriginalStringValueOrCastToStringIfNeeded),
 /* harmony export */   extractValueReferenceFromCast: () => (/* binding */ extractValueReferenceFromCast),
+/* harmony export */   extractValueReferenceFromCastSafe: () => (/* binding */ extractValueReferenceFromCastSafe),
 /* harmony export */   getAllExpressionChildren: () => (/* binding */ getAllExpressionChildren),
 /* harmony export */   getSelectorIdFromRule: () => (/* binding */ getSelectorIdFromRule),
 /* harmony export */   hashSetFieldNameSuffix: () => (/* binding */ hashSetFieldNameSuffix),
@@ -74945,6 +74986,26 @@ function extractValueReferenceFromCast(expression) {
   }
   return (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)(`Cannot extract ValueReferenceExpression! ${(0,util__WEBPACK_IMPORTED_MODULE_0__.inspect)(expression)}`);
 }
+function extractValueReferenceFromCastSafe(expression) {
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression];
+  }
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.CastExpression && expression.targetExpression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression.targetExpression];
+  }
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.CastExpression && expression.targetExpression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NoDepsExpression && expression.targetExpression.expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ValueReferenceExpression) {
+    return [true, expression.targetExpression.expression];
+  }
+  return [false];
+}
+function extractOriginalStringValueOrCastToStringIfNeeded(expression) {
+  if (expression instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.DecimalLiteralExpression) {
+    return new _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(expression.value.toString());
+  }
+  const [success, extractedExpr] = extractValueReferenceFromCastSafe(expression);
+  const exprToCast = success ? extractedExpr : expression;
+  return castOperandToStringIfNeed(exprToCast);
+}
 function ensureCorrectFieldNameByExpressionType(statement) {
   if (statement instanceof _FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.SetStatement) {
     const lastPart = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.last(statement.left.modePath.getPathParts());
@@ -75431,8 +75492,8 @@ class FormulaExpressionToFlangExpressionConverter {
       return this.compileGetSumByKeysExpression(prefix, target, expression, addPrecalculationRule);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaOneOfExpression) {
-      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(expression.argument, prefix, target, addPrecalculationRule));
-      const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
+      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(this.compileExpressionToFlangExpressionInternal(expression.argument, prefix, target, addPrecalculationRule));
+      const items = expression.items.expressions.map(item => (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.extractOriginalStringValueOrCastToStringIfNeeded)(this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule)));
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.OneOfExpression(arg, items);
     }
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaHasAutoFlagExpression) {
@@ -75468,6 +75529,11 @@ class FormulaExpressionToFlangExpressionConverter {
     if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaPropertyByNameExpression) {
       return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.StringLiteralExpression("");
     }
+    if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaCastExpression) {
+      const targetType = _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.BuildInTypeExpression.getByName(expression.type);
+      const arg = (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandToStringIfNeed)(this.compileExpressionToFlangExpressionInternal(expression.expression, prefix, target, addPrecalculationRule));
+      return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandIfNeed)(arg, targetType);
+    }
     throw new Error(`Unsupported type of node: ${expression.constructor.name}, ${expression.sourceXmlNode.name}`);
   }
   castOperandForComparisonExpression(formulaExpression, flangExpression) {

package/package.json

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