@kontur.candy/generator 5.7.0-fix-lazy-loading.2 → 5.7.0-fix-lazy-loading.3

package/dist/index.js

@@ -78478,6 +78478,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 /* harmony import */ var _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../markupGenerator/Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
 /* harmony import */ var _markupGenerator_AllConverters__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../markupGenerator/AllConverters */ "./Generator/src/generators/markupGenerator/AllConverters.ts");
+/* harmony import */ var _Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../../Common/TypingUtils */ "./Common/TypingUtils.ts");
+
 
 
 
@@ -78525,15 +78527,19 @@ class LazyLoadDeclarationGenerator {
   }
   *processElement(path, element) {
     if (element.lazyLoadMode != undefined) {
-      const currentPath = element.multiple ? path.joinWith(element.name) : path.joinWith(element.name + ".value");
-      const item = {
-        path: this.formSchemaRng.adjustPathMultiplicity(currentPath),
-        lazyLoadMode: element.lazyLoadMode
-      };
-      yield element.lazyLoadingThreshold != undefined ? {
+      const adjustedPath = this.formSchemaRng.adjustPathMultiplicity(path.joinWith(element.name));
+      const currentPaths = element.multiple ? [element.lazyLoadMode === "deferred" ? adjustedPath : adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each)] : [adjustedPath.joinWith(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_3__.PathTokens.each)];
+      const items = currentPaths.map(currentPath => {
+        var _element$lazyLoadMode;
+        return {
+          path: currentPath,
+          lazyLoadMode: (_element$lazyLoadMode = element.lazyLoadMode) !== null && _element$lazyLoadMode !== void 0 ? _element$lazyLoadMode : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)()
+        };
+      }).map(item => element.lazyLoadingThreshold != undefined ? {
         ...item,
         thresholdValue: element.lazyLoadingThreshold
-      } : item;
+      } : item);
+      yield* items;
       if (element.multiple) {
         const additionalFields = ["children", "errorsCount", "warningsCount"];
         const additionalItems = additionalFields.map(field => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.7.0-fix-lazy-loading.2",
+  "version": "5.7.0-fix-lazy-loading.3",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,