@kontur.candy/generator 5.26.0-fs8433.0 → 5.27.0-fix-forced-revalidation.1

package/dist/index.js

@@ -75336,6 +75336,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../KCXmlGenerator/KCXmlGeneratorBase */ "./Generator/src/generators/KCXmlGenerator/KCXmlGeneratorBase.ts");
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
+/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../Common/Errors */ "./Common/Errors.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
+
 
 
 
@@ -75345,9 +75349,9 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     this.dataDeclarationHelper = void 0;
     this.dataDeclarationHelper = dataDeclarationHelper;
   }
-  generate(formulas) {
+  generate(formulas, options) {
     var _ref;
-    const compiledFormulas = (_ref = formulas !== null && formulas !== void 0 ? formulas : []) === null || _ref === void 0 ? void 0 : _ref.map(x => this.compileFormula(x));
+    const compiledFormulas = (_ref = formulas !== null && formulas !== void 0 ? formulas : []) === null || _ref === void 0 ? void 0 : _ref.map(x => this.compileFormula(x, options)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_4__.isNotNullOrUndefined);
     const compiledAggregationFunctions = this.compileAggregationDependencies(compiledFormulas.map(x => x.dependencies).flat());
     const indent = "                ";
     const allItemsText = compiledFormulas.map(x => x.compiledFunction).concat(compiledAggregationFunctions).map(x => `${indent}form.calculator2.addCalculationFunction(${x});`).join("\n");
@@ -75364,11 +75368,18 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const compiledBlock = `(${compiledArgumentsCondition} ? undefined : ${innerExpression})`;
     return compiledBlock;
   }
-  compileFormula(formula) {
+  compileFormula(formula, options) {
     const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(formula.match), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each).toAbsolute();
     const target = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeAttributePrefix(formula.target), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
     const dependencies = [];
-    const compiledExpression = this.compileExpression(prefix, target, formula.expression, dependencies);
+    const compiledExpression = this.compileExpressionWithUnsupportedHandled(prefix, target, formula.expression, dependencies);
+    if (compiledExpression instanceof _Common_Errors__WEBPACK_IMPORTED_MODULE_3__.NotSupportedError) {
+      if (options.skipNotSupportedFunction) {
+        return undefined;
+      } else {
+        throw compiledExpression;
+      }
+    }
     const defaultValue = this.dataDeclarationHelper.getDefaultValue(target.toLegacyPath());
     const autoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(target.toLegacyPath());
     const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
@@ -79272,6 +79283,16 @@ class KCXmlGeneratorBase {
     });
     return [...sumCompiledFunctions];
   }
+  compileExpressionWithUnsupportedHandled(prefix, targetFullPath, expression, deps) {
+    try {
+      return this.compileExpression(prefix, targetFullPath, expression, deps);
+    } catch (e) {
+      if (e instanceof _Common_Errors__WEBPACK_IMPORTED_MODULE_5__.NotSupportedError) {
+        return e;
+      }
+      throw e;
+    }
+  }
 
   /* eslint-disable @typescript-eslint/unbound-method */
   compileExpression(prefix, targetFullPath, expression, deps) {
@@ -79535,7 +79556,7 @@ class KCXmlGeneratorBase {
     }
     // -----
 
-    throw new Error(`Unsupported node type: ${expression.constructor.name}`);
+    throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_5__.NotSupportedError(`Unsupported node type: ${expression.constructor.name}`);
   }
   /* eslint-enable @typescript-eslint/unbound-method */
 
@@ -79611,6 +79632,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../KCXmlGenerator/KCXmlGeneratorBase */ "./Generator/src/generators/KCXmlGenerator/KCXmlGeneratorBase.ts");
 /* harmony import */ var _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaParsingDescription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaParsingDescription */ "./Generator/src/generators/AutoCalculationsGenerator/AutoCalculationsFromFormulas/KCXmlContract/FormulaParsingDescription.ts");
+/* harmony import */ var _Common_Errors__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../../../Common/Errors */ "./Common/Errors.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
+
 
 
 
@@ -79620,8 +79645,8 @@ const emptyResult = `
             export default function kcXmlValidationConfigurator ({ form, ModelPath, ValidationFunction, KCCondition }) {}
         `;
 class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPACK_IMPORTED_MODULE_2__.KCXmlGeneratorBase {
-  generate(kcXmlConditions) {
-    const compiledConditions = Iterator.from(kcXmlConditions).map(condition => this.compileCondition(condition)).toArray();
+  generate(kcXmlConditions, options) {
+    const compiledConditions = Iterator.from(kcXmlConditions).map(condition => this.compileCondition(condition, options)).filter(_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.isNotNullOrUndefined).toArray();
     if (compiledConditions.length === 0) {
       // NOTE Просто, чтоб не падали аппрувал тесты
       return emptyResult;
@@ -79632,12 +79657,19 @@ class KCXmlValidationGenerator extends _KCXmlGenerator_KCXmlGeneratorBase__WEBPA
         `;
     return result;
   }
-  compileCondition(condition) {
+  compileCondition(condition, options) {
     var _condition$descriptio, _condition$errorLevel;
     const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeMultiplicity(this.removeAttributePrefix(condition.match)), true, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each).toAbsolute();
     const target = this.schema.adjustPathMultiplicity(prefix.joinWith((0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createFromMask)(this.removeMultiplicity(this.removeAttributePrefix(condition.target)), false, _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.PathTokens.each)).normalize());
     const deps = [];
-    const compiledExpression = this.compileExpression(prefix, target, condition.expression, deps);
+    const compiledExpression = this.compileExpressionWithUnsupportedHandled(prefix, target, condition.expression, deps);
+    if (compiledExpression instanceof _Common_Errors__WEBPACK_IMPORTED_MODULE_5__.NotSupportedError) {
+      if (options.skipNotSupportedFunction) {
+        return undefined;
+      } else {
+        throw compiledExpression;
+      }
+    }
     const compiledDescriptionParts = (0,_AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_FormulaParsingDescription__WEBPACK_IMPORTED_MODULE_4__.splitConditionDescriptionToParts)((_condition$descriptio = condition.description) !== null && _condition$descriptio !== void 0 ? _condition$descriptio : "Error Message");
     let concatDescription;
     if (compiledDescriptionParts.length > 1) {
@@ -79925,7 +79957,7 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     const formulasFromSugar = extractFormulasFromSugarKCLang(sugarRoot);
     const formulas = ((_kxXmlMathContainer$f = kxXmlMathContainer === null || kxXmlMathContainer === void 0 ? void 0 : (_kxXmlMathContainer$f2 = kxXmlMathContainer.formulas) === null || _kxXmlMathContainer$f2 === void 0 ? void 0 : _kxXmlMathContainer$f2.items) !== null && _kxXmlMathContainer$f !== void 0 ? _kxXmlMathContainer$f : []).concat((_kcLangMathContainer$ = kcLangMathContainer === null || kcLangMathContainer === void 0 ? void 0 : (_kcLangMathContainer$2 = kcLangMathContainer.formulas) === null || _kcLangMathContainer$2 === void 0 ? void 0 : _kcLangMathContainer$2.items) !== null && _kcLangMathContainer$ !== void 0 ? _kcLangMathContainer$ : []).concat([...formulasFromSugar]);
     const useServerCalculations = (_additionalContent$fo = (_additionalContent$fo2 = additionalContent.formJsonSettings) === null || _additionalContent$fo2 === void 0 ? void 0 : _additionalContent$fo2.useServerSideCalculations) !== null && _additionalContent$fo !== void 0 ? _additionalContent$fo : false;
-    const useCalculator2 = !useServerCalculations && (((_additionalContent$fo3 = additionalContent.formJsonSettings) === null || _additionalContent$fo3 === void 0 ? void 0 : _additionalContent$fo3.autoCalculationCalculatorImpl) === "calculator2" || ((_additionalContent$fo4 = additionalContent.formJsonSettings) === null || _additionalContent$fo4 === void 0 ? void 0 : _additionalContent$fo4.useServerSideFLangNormalization));
+    const useCalculator2 = ((_additionalContent$fo3 = additionalContent.formJsonSettings) === null || _additionalContent$fo3 === void 0 ? void 0 : _additionalContent$fo3.autoCalculationCalculatorImpl) === "calculator2" || ((_additionalContent$fo4 = additionalContent.formJsonSettings) === null || _additionalContent$fo4 === void 0 ? void 0 : _additionalContent$fo4.useServerSideFLangNormalization);
     const useOldCalculator = !useCalculator2 && !useServerCalculations;
     const kcXmlConditions = (_Iterator$from$map$fl = Iterator.from(getImportedKcXmlValidations(sugarRoot, additionalContent)).map(x => {
       var _container$conditions, _container$conditions2;
@@ -80015,10 +80047,14 @@ function processSugar(formSugarContent, additionalContent, generationOptions) {
     builder.addResource("rngSchemaValidationConfigurator.js", rngSchemaValidationConfigurator);
     const formulasForCalculator2 = useCalculator2 ? formulas : [];
     const kcXmlAutoCalcGenerator = new _AutoCalculationsGenerator_AutoCalculationsFromFormulas_Calculator2_AutoCalculationsCalculator2Generator__WEBPACK_IMPORTED_MODULE_28__.AutoCalculationsCalculator2Generator(formSchemaRng, dataDeclarationHelper);
-    builder.addResource("kcXmlAutoCalculationConfigurator.js", kcXmlAutoCalcGenerator.generate(formulasForCalculator2));
+    builder.addResource("kcXmlAutoCalculationConfigurator.js", kcXmlAutoCalcGenerator.generate(formulasForCalculator2, {
+      skipNotSupportedFunction: useServerCalculations
+    }));
     const kcXmlValidationGenerator = new _KCXmlValidationGenerator_KCXmlValidationGenerator__WEBPACK_IMPORTED_MODULE_23__.KCXmlValidationGenerator(formSchemaRng);
-    const kcXmlConditionsForCalculator2 = !useServerCalculations ? kcXmlConditions : [];
-    builder.addResource("kcXmlValidationConfigurator.js", kcXmlValidationGenerator.generate(kcXmlConditionsForCalculator2));
+    const kcXmlConditionsForCalculator2 = kcXmlConditions;
+    builder.addResource("kcXmlValidationConfigurator.js", kcXmlValidationGenerator.generate(kcXmlConditionsForCalculator2, {
+      skipNotSupportedFunction: useServerCalculations
+    }));
     // const importedAutoCalculations = getImportedAutoCalculations(sugarRoot);
     builder.addResource("autocalculationConfigurators.js", `export default []`);
     builder.addResource("FakeStyles.less", `// empty styles to enforce style files`);
@@ -80069,14 +80105,6 @@ function mergeFetchFunctionRegistries(registries) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return Object.assign({}, ...registries);
 }
-
-// function getImportedAutoCalculations(formNode: FormNode): string[] {
-//     if (formNode.imports != undefined) {
-//         return formNode.imports.autocalculations.map(x => x.from);
-//     }
-//     return [];
-// }
-
 const kclangExtensionRegex = /\.kclang$/;
 function getKcXmlByKclangOrKcXml(fileName, content) {
   return kclangExtensionRegex.test(fileName) ? _common_KCLang_KCLangToXmlTranspiler__WEBPACK_IMPORTED_MODULE_6__.KCLangToXmlTranspiler.transpile(content) : content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.26.0-fs8433.0",
+  "version": "5.27.0-fix-forced-revalidation.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,