@kontur.candy/generator 5.19.1 → 5.20.0-fs-8321-server-side-calculations.2

package/dist/index.js

@@ -59188,7 +59188,7 @@ class AbsoluteModelFieldPath {
     return `${this.path.toLegacyPath()}.${this.field}`;
   }
   toLegacyPath() {
-    const isLastTokenAnInstance = _ModelPath__WEBPACK_IMPORTED_MODULE_5__.PathTokens.isInstanceToken(_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.last(this.path.getPathParts()));
+    const isLastTokenAnInstance = _ModelPath__WEBPACK_IMPORTED_MODULE_5__.PathTokens.isInstanceTokenOrInstancesSpec(_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.last(this.path.getPathParts()));
     const slashIfRequired = isLastTokenAnInstance ? "/" : "";
     return `${this.path.toLegacyPath()}${slashIfRequired}.${this.field}`;
   }
@@ -59207,7 +59207,8 @@ AbsoluteModelFieldPath.fieldExtractRegex = new RegExp(`^(.*)\\.(${AbsoluteModelF
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "buildIterationSequence": () => (/* binding */ buildIterationSequence)
+/* harmony export */   "buildIterationSequence": () => (/* binding */ buildIterationSequence),
+/* harmony export */   "buildIterationSequenceWithInstances": () => (/* binding */ buildIterationSequenceWithInstances)
 /* harmony export */ });
 /* harmony import */ var _ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ModelPath */ "./Common/ModelPath/ModelPath.ts");
 
@@ -59225,6 +59226,24 @@ function buildIterationSequence(modelPath) {
   }
   return result;
 }
+function buildIterationSequenceWithInstances(modelPath) {
+  const result = [];
+  const tokens = modelPath.getPathPartsAsArray();
+  const createPathFunc = modelPath.isAbsolute() ? _ModelPath__WEBPACK_IMPORTED_MODULE_0__.createAbsoluteFromTokens : _ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens;
+  let currentInstances = [];
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    if (token === _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each || _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isInstanceToken(token)) {
+      currentInstances = currentInstances.concat(token);
+      result.push({
+        iterable: createPathFunc(tokens.slice(0, i).map(x => _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.isInstanceToken(x) ? _ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each : x)),
+        suffix: (0,_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createRelativeFromTokens)(tokens.slice(i + 1)),
+        instances: currentInstances
+      });
+    }
+  }
+  return result;
+}
 
 /***/ }),
 
@@ -59290,6 +59309,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "Map2": () => (/* binding */ Map2)
 /* harmony export */ });
 /* harmony import */ var _TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _IterableUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../IterableUtils */ "./Common/IterableUtils.ts");
+
 
 class Map2 {
   constructor() {
@@ -59308,6 +59329,18 @@ class Map2 {
   has(key) {
     return this.getEntryOrUndefined(key) != undefined;
   }
+  remove(key) {
+    const hash = this.getKeyHash(key);
+    const list = this.hashMap.get(hash);
+    if (list != undefined) {
+      const removingEntry = Iterator.from(_IterableUtils__WEBPACK_IMPORTED_MODULE_1__.IterUtils.iterateEntries(list)).find(([index, [itemKey, itemValue]]) => this.areKeyEqual(itemKey, key));
+      if (removingEntry != undefined) {
+        list.splice(removingEntry[0], 1);
+        return true;
+      }
+    }
+    return false;
+  }
   get isEmpty() {
     return this.hashMap.size === 0;
   }
@@ -59414,6 +59447,9 @@ class PathTokens {
   static isInstanceToken(part) {
     return typeof part === "string" && /^\d+$/i.test(part);
   }
+  static isInstanceTokenOrInstancesSpec(part) {
+    return typeof part === "string" && (/^\d+$/i.test(part) || /^\[(\d+\,?)+\]$/i.test(part));
+  }
 }
 PathTokens.each = EachSymbol;
 PathTokens.current = CurrentSymbol;
@@ -59527,6 +59563,7 @@ class ModelPathImpl {
     this.tokens = void 0;
     this.absolute = void 0;
     this.legacyPath = void 0;
+    this.cachedHash = void 0;
     this.tokens = pathParts.filter(x => x !== "");
     this.absolute = absolute;
   }
@@ -59623,32 +59660,35 @@ class ModelPathImpl {
    * Всегда целое положительное беззнаковое 32-битное число
    */
   getHash(eachCurrentCollision = _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_2__.EachCurrentCollision.AreSame) {
-    let hash = 5381;
-    for (const token of (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.reverseArray)(this.tokens)) {
-      let currentStr;
-      if (PathTokens.isSimpleToken(token)) {
-        currentStr = token;
-      } else {
-        if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_2__.EachCurrentCollision.AreDifferent) {
-          currentStr = token === PathTokens.each ? "*" : "!";
+    if (this.cachedHash == undefined) {
+      let hash = 5381;
+      for (const token of (0,_IterableUtils__WEBPACK_IMPORTED_MODULE_0__.reverseArray)(this.tokens)) {
+        let currentStr;
+        if (PathTokens.isSimpleToken(token)) {
+          currentStr = token;
         } else {
-          currentStr = "*";
+          if (eachCurrentCollision === _EachCurrentCollision__WEBPACK_IMPORTED_MODULE_2__.EachCurrentCollision.AreDifferent) {
+            currentStr = token === PathTokens.each ? "*" : "!";
+          } else {
+            currentStr = "*";
+          }
+        }
+        let stringIndex = currentStr.length;
+        while (stringIndex) {
+          // tslint:disable-next-line:no-bitwise
+          hash = hash * 33 ^ currentStr.charCodeAt(--stringIndex);
         }
       }
-      let stringIndex = currentStr.length;
-      while (stringIndex) {
-        // tslint:disable-next-line:no-bitwise
-        hash = hash * 33 ^ currentStr.charCodeAt(--stringIndex);
-      }
-    }
 
-    /*
-        tslint:disable-next-line:no-bitwise
-        JavaScript does bitwise operations (like XOR, above) on 32-bit signed
-        integers. Since we want the results to be always positive, convert the
-        signed int to an unsigned by doing an unsigned bitshift.
-    */
-    return hash >>> 0;
+      /*
+          tslint:disable-next-line:no-bitwise
+          JavaScript does bitwise operations (like XOR, above) on 32-bit signed
+          integers. Since we want the results to be always positive, convert the
+          signed int to an unsigned by doing an unsigned bitshift.
+      */
+      this.cachedHash = hash >>> 0;
+    }
+    return this.cachedHash;
   }
   isIncludes(modelPath) {
     const targetTokens = modelPath.getPathPartsAsArray();
@@ -59788,7 +59828,7 @@ class ModelPathImpl {
     // @ts-expect-error
     return result.toPath();
   }
-  applyInstancesDirty(instances) {
+  applyInstancesDirty(instances, fillWithMultiplicityIfHasNoInstance) {
     if (this.isResolved() || instances.length === 0) {
       return this;
     }
@@ -59797,7 +59837,8 @@ class ModelPathImpl {
     for (const token of this.getPathParts()) {
       if (PathTokens.isMultiToken(token) && instanceCounter < instances.length) {
         var _instances$instanceCo;
-        result.append((_instances$instanceCo = instances[instanceCounter]) !== null && _instances$instanceCo !== void 0 ? _instances$instanceCo : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)());
+        const instanceOrEach = (_instances$instanceCo = instances[instanceCounter]) !== null && _instances$instanceCo !== void 0 ? _instances$instanceCo : fillWithMultiplicityIfHasNoInstance == true ? PathTokens.each : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.reject)();
+        result.append(instanceOrEach);
         instanceCounter++;
       } else {
         result.append(token);
@@ -83110,6 +83151,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../DataSchema/DataSchemaUtils */ "./Generator/src/generators/DataSchema/DataSchemaUtils.ts");
 /* harmony import */ var _FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../FLang/FlangUtils */ "./Generator/src/generators/ServerSideFLangNormalization/FLang/FlangUtils.ts");
 /* harmony import */ var _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../Common/ModelPath/AbsoluteModelFieldPath */ "./Common/ModelPath/AbsoluteModelFieldPath.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
 
 
 
@@ -83141,20 +83184,27 @@ class FormulaRulesBuilder {
     const isTargetAutoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(fullTarget.toAbsolute());
     const isDisabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(fullTarget.toAbsolute());
     const getFormulaExpression = targetField => new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.wrapWithArgumentsCondition)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.castOperandToStringIfNeed)(this.formulaExprConverter.compileExpressionToFlangExpression(formula.expression, prefix, new _Common_ModelPath_AbsoluteModelFieldPath__WEBPACK_IMPORTED_MODULE_4__.AbsoluteModelFieldPath(fullTarget, targetField), x => precalculationRules.push(x)), "G29")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue));
-    const result = [];
-    if (isTargetAutoField) {
-      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoValue"), getFormulaExpression("autoValue")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false"))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.string), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")))));
-      if (isDisabled) {
-        result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value")));
-      } else {
-        result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue)))));
-      }
-    } else {
-      result.push(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value")));
-    }
-    result.push(...precalculationRules);
+    const valueRule = isTargetAutoField ? isDisabled ? this.createValueRuleForDisabledAutoField(fullTarget, getFormulaExpression) : this.createValueRuleForAutoField(fullTarget, defaultValue, getFormulaExpression) : this.createRegularValueRule(fullTarget, getFormulaExpression);
+    const autoValueRule = isTargetAutoField ? this.createAutoValueRule(fullTarget, getFormulaExpression) : undefined;
+    const autoFlagRule = isTargetAutoField ? this.createAutoFlagRule(fullTarget) : undefined;
+    const result = [autoValueRule, autoFlagRule, valueRule].concat(...precalculationRules).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_5__.isNotNullOrUndefined);
     return result;
   }
+  createAutoValueRule(fullTarget, getFormulaExpression) {
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoValue"), getFormulaExpression("autoValue"));
+  }
+  createRegularValueRule(fullTarget, getFormulaExpression) {
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value"));
+  }
+  createAutoFlagRule(fullTarget) {
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("false"))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.CastExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoValue")), _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.BuildInTypeExpression.string), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag"))));
+  }
+  createValueRuleForDisabledAutoField(fullTarget, getFormulaExpression) {
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value"));
+  }
+  createValueRuleForAutoField(fullTarget, defaultValue, getFormulaExpression) {
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NoDepsExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))));
+  }
   adjustPathMultiplicity(path) {
     return (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__.adjustPathMultiplicityComplex)(path, this.formSchemaRng, this.dataDeclarationHelper);
   }

package/package.json

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