@kontur.candy/generator 5.55.1 → 5.56.0-fix-port.0

package/dist/index.js

@@ -47196,9 +47196,13 @@ function isMatchAbbreviation(abbreviation, value) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   ensureIsKnownViewModelFieldName: () => (/* binding */ ensureIsKnownViewModelFieldName),
 /* harmony export */   getKnownViewModelFieldNames: () => (/* binding */ getKnownViewModelFieldNames),
 /* harmony export */   nonRegularFieldName: () => (/* binding */ nonRegularFieldName)
 /* harmony export */ });
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 // Эту модель, которая лежит в redux-состоянии в поле viewModel, каждый узел кроме . является ViewModel
@@ -47207,6 +47211,9 @@ function nonRegularFieldName(fieldName) {
   // @ts-ignore
   return fieldName;
 }
+function ensureIsKnownViewModelFieldName(fieldName) {
+  return getKnownViewModelFieldNames().includes(fieldName) ? fieldName : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)(`[${fieldName}] is not known ViewModelFieldName`);
+}
 function getKnownViewModelFieldNames() {
   const names = ["children", "error", "warning", "description", "id", "disabled", "visible", "disabledSending", "value", "autoValue", "autoFlag", "resourcesHash", "errorsCount", "warningsCount", "code", "picklist", "normalized", "emptyUnitsVisible", "pencilOpened", "ignoreAutoFlag", "disableValueAutoInit", "index", "regionCode", "district", "city", "settlement", "street", "house", "building", "room", "bossValue", "agentValue", "senderInn", "nameorg", "sum", "count", "normalizationSource", "referencedId"];
   return names;
@@ -70275,7 +70282,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_types__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
 /* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
-/* harmony import */ var _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./FLang/FLangCodeDom */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FLangCodeDom.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
+/* harmony import */ var _Engine_src_Engine_Core_CoreTypes__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../Engine/src/Engine/Core/CoreTypes */ "./Engine/src/Engine/Core/CoreTypes.ts");
+/* harmony import */ var _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./FLang/FLangCodeDom */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FLangCodeDom.ts");
+/* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
+
+
+
 
 
 
@@ -70342,8 +70355,8 @@ class FetchFunctionToFlangConverter {
       const innerCondition = this.traverse(node.test);
       const then = this.traverse(node.consequent);
       const elseThen = this.traverse(node.alternate);
-      const condition = innerCondition instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.LogicalExpression ? innerCondition : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(innerCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullLiteralExpression());
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.ConditionalExpression(condition, then, elseThen);
+      const condition = innerCondition instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.LogicalExpression ? innerCondition : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NotEqExpression(innerCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullLiteralExpression());
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.ConditionalExpression(condition, then, elseThen);
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isBinaryExpression(node)) {
       const left = this.traverse(node.left);
@@ -70351,12 +70364,12 @@ class FetchFunctionToFlangConverter {
       switch (node.operator) {
         case "==":
         case "===":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.EqExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.EqExpression(left, right);
         case "!=":
         case "!==":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NotEqExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NotEqExpression(left, right);
         case "+":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.SumBinaryExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.SumBinaryExpression(left, right);
         default:
           throw new JsToFlangConvertError("Not supported!");
       }
@@ -70366,38 +70379,57 @@ class FetchFunctionToFlangConverter {
       const right = this.traverse(node.right);
       switch (node.operator) {
         case "||":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.OrBinaryExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.OrBinaryExpression(left, right);
         case "&&":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.AndBinaryExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.AndBinaryExpression(left, right);
         case "??":
-          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullCoalesceExpression(left, right);
+          return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullCoalesceExpression(left, right);
         default:
           throw new JsToFlangConvertError("Not supported!");
       }
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isStringLiteral(node)) {
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.StringLiteralExpression(node.value);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.StringLiteralExpression(node.value);
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isNumericLiteral(node)) {
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.DecimalLiteralExpression(node.value);
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.DecimalLiteralExpression(node.value);
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isNullLiteral(node)) {
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullLiteralExpression();
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullLiteralExpression();
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isIdentifier(node) && node.name === "undefined") {
-      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.NullLiteralExpression();
+      return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.NullLiteralExpression();
     }
     if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isMemberExpression(node)) {
       return this.convertMemberExpression(node);
     }
+    if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isCallExpression(node)) {
+      return this.convertCallExpression(node);
+    }
     throw new JsToFlangConvertError("Unknown code node.\n" + JSON.stringify(node, null, 4));
   }
+  convertCallExpression(node) {
+    const obj = node.callee;
+    const args = node.arguments;
+    const isModelCall = _babel_types__WEBPACK_IMPORTED_MODULE_1__.isMemberExpression(obj) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isMemberExpression(obj.object) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isThisExpression(obj.object.object) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isIdentifier(obj.object.property) && obj.object.property.name === "model" && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isIdentifier(obj.property) && obj.property.name === "getCached";
+    if (isModelCall) {
+      var _extractedArgs$, _extractedArgs$2;
+      const extractedArgs = args.map(x => _babel_types__WEBPACK_IMPORTED_MODULE_1__.isStringLiteral(x) ? x.value : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.reject)("Arguments of [getCached] MUST be strings"));
+      if (extractedArgs.length != 2) {
+        return (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.reject)("[getCached] MUST have 2 arguments!");
+      }
+      const path = (_extractedArgs$ = extractedArgs[0]) !== null && _extractedArgs$ !== void 0 ? _extractedArgs$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.reject)();
+      const fieldName = (_extractedArgs$2 = extractedArgs[1]) !== null && _extractedArgs$2 !== void 0 ? _extractedArgs$2 : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_3__.reject)();
+      return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.makeStringValueReference)((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.createAbsolute)(path), (0,_Engine_src_Engine_Core_CoreTypes__WEBPACK_IMPORTED_MODULE_5__.ensureIsKnownViewModelFieldName)(fieldName));
+    }
+    throw new JsToFlangConvertError("Unknown call to model!");
+  }
   convertMemberExpression(node) {
     const obj = node.object;
-    const check = _babel_types__WEBPACK_IMPORTED_MODULE_1__.isMemberExpression(obj) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isThisExpression(obj.object) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isIdentifier(obj.property) && obj.property.name === "requisites";
-    if (check) {
+    const isRequisitesCall = _babel_types__WEBPACK_IMPORTED_MODULE_1__.isMemberExpression(obj) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isThisExpression(obj.object) && _babel_types__WEBPACK_IMPORTED_MODULE_1__.isIdentifier(obj.property) && obj.property.name === "requisites";
+    if (isRequisitesCall) {
       if (_babel_types__WEBPACK_IMPORTED_MODULE_1__.isStringLiteral(node.property)) {
-        return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_4__.GetExternalInfoExpression(node.property.value.endsWith(".value") ? node.property.value : `${node.property.value}.value`);
+        return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_6__.GetExternalInfoExpression(node.property.value.endsWith(".value") ? node.property.value : `${node.property.value}.value`);
       }
       throw new JsToFlangConvertError("Unsuported call to requisites!");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.55.1",
+  "version": "5.56.0-fix-port.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,