@kontur.candy/generator 5.2.0-server-side-calculations.1 → 5.2.0-server-side-calculations.2

package/dist/index.js

@@ -60205,6 +60205,33 @@ function assertIs(value) {
 
 /***/ }),
 
+/***/ "./Common/getRngSchemaFilename.ts":
+/*!****************************************!*\
+  !*** ./Common/getRngSchemaFilename.ts ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "getRngSchemaFilename": () => (/* binding */ getRngSchemaFilename)
+/* harmony export */ });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ "fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ "path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+
+
+const getRngSchemaFilename = (formSchemasDirPath, gfv) => {
+  const maxSubversion = (0,fs__WEBPACK_IMPORTED_MODULE_0__.readdirSync)(formSchemasDirPath).map(fileName => fileName.includes(".rng.xml") && !fileName.includes("схема.rng.xml")).filter(i => i === true).length - 1;
+  if (maxSubversion === undefined || !(0,fs__WEBPACK_IMPORTED_MODULE_0__.existsSync)(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSchemasDirPath, `${gfv}.${maxSubversion}.rng.xml`))) {
+    return ".rng.xml";
+  }
+  return `.${maxSubversion}.rng.xml`;
+};
+
+/***/ }),
+
 /***/ "./Common/hashUtils.ts":
 /*!*****************************!*\
   !*** ./Common/hashUtils.ts ***!
@@ -78899,6 +78926,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var recursive_readdir__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! recursive-readdir */ "./node_modules/recursive-readdir/index.js");
 /* harmony import */ var recursive_readdir__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(recursive_readdir__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _common_ExtractSugarReferences__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../common/ExtractSugarReferences */ "./Generator/src/common/ExtractSugarReferences.ts");
+/* harmony import */ var _Common_getRngSchemaFilename__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../Common/getRngSchemaFilename */ "./Common/getRngSchemaFilename.ts");
+
 
 
 
@@ -79137,7 +79166,7 @@ async function connectJSFilesWithNames(formJavaScriptFilesPath) {
   }
 }
 function readSchemaRngFile(formSchemasPath, gfv) {
-  return readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSchemasPath, `${gfv}.rng.xml`), "utf-8");
+  return readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSchemasPath, `${gfv}${(0,_Common_getRngSchemaFilename__WEBPACK_IMPORTED_MODULE_9__.getRngSchemaFilename)(formSchemasPath, gfv)}`), "utf-8");
 }
 function readHooksFile(formDirectoryPath) {
   return readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(formDirectoryPath, "hooks.js"), "utf-8").catch(() => "");
@@ -79145,7 +79174,7 @@ function readHooksFile(formDirectoryPath) {
 async function readFileSource(filePath, filename, defaultValue) {
   try {
     return await readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(filePath, filename), "utf-8");
-  } catch (ingoreError) {
+  } catch (ignoreError) {
     return defaultValue;
   }
 }
@@ -81777,22 +81806,29 @@ class ValidationRulesBuilder {
   getReadErrorCountValueExpression(path, countFieldName, readOldValues) {
     return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.CastExpression(readOldValues ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.GetOldExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(path.toCurrentIteration(), countFieldName)) : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.ValueReferenceExpression(path.toCurrentIteration(), countFieldName), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.BuildInTypeExpression.decimal, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.DecimalLiteralExpression(0));
   }
+  buildChainOfErrorCountRules(path, countFieldName, fieldName) {
+    const reduceResult = Iterator.from((0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_4__.reverseArray)([...this.splitModelPathIfErrorCountRequired(path)])).flatMap(iterationPath => this.dataDeclarationHelper.isNodeHasChildrenEntry(iterationPath) ? [iterationPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each), iterationPath] : [iterationPath]).reduce((result, iterationPath) => {
+      const nextResultCountExpression = oldValues => this.getReadErrorCountValueExpression(iterationPath, countFieldName, oldValues);
+      const info = {
+        target: iterationPath,
+        getExpressionFunc: result.resultCountExpression
+      };
+      return {
+        resultCountExpression: nextResultCountExpression,
+        items: result.items.concat(info)
+      };
+    }, {
+      resultCountExpression: oldValues => this.getErrorWarningCountExpression(path.toCurrentIteration(), fieldName, oldValues),
+      items: []
+    });
+    return reduceResult.items;
+  }
   buildErrorWarningCountRules(allPathsWithValidations, fieldName) {
     const countFieldName = `${fieldName}sCount`;
-    const errorCountByTarget = new _Common_ModelPath_Map_AbsoluteModelPathMap__WEBPACK_IMPORTED_MODULE_5__.AbsoluteModelPathMap(_Common_ModelPath_EachCurrentCollision__WEBPACK_IMPORTED_MODULE_6__.EachCurrentCollision.AreDifferent);
-    for (const path of allPathsWithValidations) {
-      const iterationSequence = [...(0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_4__.reverseArray)([...this.splitModelPathIfErrorCountRequired(path)])];
-      let resultCountExpression = oldValues => this.getErrorWarningCountExpression(path.toCurrentIteration(), fieldName, oldValues);
-      for (const iterationPath of iterationSequence) {
-        if (this.dataDeclarationHelper.isNodeHasChildrenEntry(iterationPath)) {
-          const multipleTarget = iterationPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each);
-          errorCountByTarget.getOrSet(multipleTarget, () => []).push(resultCountExpression);
-          resultCountExpression = oldValues => this.getReadErrorCountValueExpression(multipleTarget, countFieldName, oldValues);
-        }
-        errorCountByTarget.getOrSet(iterationPath, () => []).push(resultCountExpression);
-        resultCountExpression = oldValues => this.getReadErrorCountValueExpression(iterationPath, countFieldName, oldValues);
-      }
-    }
+    const errorCountByTarget = Iterator.from(allPathsWithValidations).flatMap(path => this.buildChainOfErrorCountRules(path, countFieldName, fieldName)).reduce((result, current) => {
+      result.getOrSet(current.target, () => []).push(current.getExpressionFunc);
+      return result;
+    }, new _Common_ModelPath_Map_AbsoluteModelPathMap__WEBPACK_IMPORTED_MODULE_5__.AbsoluteModelPathMap(_Common_ModelPath_EachCurrentCollision__WEBPACK_IMPORTED_MODULE_6__.EachCurrentCollision.AreDifferent));
     const rules = Iterator.from(errorCountByTarget.entries()).map(([iterable, getExpressionFunctions]) => {
       const getAllItemsSumExpression = readOldValues => Iterator.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_4__.IterUtils.distinctBy(getExpressionFunctions.map(x => x(readOldValues)), x => x.convertToString())).reduce((result, currentExpr) => result instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression ? currentExpr : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.SumBinaryExpression(result, currentExpr), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_1__.NullLiteralExpression());
       const isTargetRequiredReduce = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_4__.IterUtils.last(iterable.getPathParts()) !== _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each && this.dataDeclarationHelper.isNodeHasChildrenEntry(iterable);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.2.0-server-side-calculations.1",
+  "version": "5.2.0-server-side-calculations.2",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,