remult 3.3.19-next.2 → 3.4.0-next.2

package/src/remult3/RepositoryImplementation.js

@@ -399,7 +399,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             return [2 /*return*/, ref.delete()];
                         if (!(typeof item === 'string' || typeof item === 'number')) return [3 /*break*/, 4];
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 1];
-                        return [2 /*return*/, this._edp.delete([item])];
+                        return [2 /*return*/, this._edp.delete(item)];
                     case 1: return [4 /*yield*/, this.findId(item)];
                     case 2:
                         ref2_1 = _a.sent();
@@ -459,82 +459,117 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.insert = function (entity, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_6_1, inserted, result, ref, result;
-            var e_6, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_6_1, inserted, r, entity_2, entity_2_1, item, _c, _d, e_7_1, ref, result;
+            var e_6, _e, e_7, _f;
+            return tslib_1.__generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
-                        if (!Array.isArray(entity)) return [3 /*break*/, 11];
+                        if (!Array.isArray(entity)) return [3 /*break*/, 23];
+                        if (!this._dataProvider.isProxy) return [3 /*break*/, 13];
                         refs_1 = [];
                         raw = [];
-                        _d.label = 1;
+                        _g.label = 1;
                     case 1:
-                        _d.trys.push([1, 6, 7, 8]);
+                        _g.trys.push([1, 9, 10, 11]);
                         entity_1 = tslib_1.__values(entity), entity_1_1 = entity_1.next();
-                        _d.label = 2;
+                        _g.label = 2;
                     case 2:
-                        if (!!entity_1_1.done) return [3 /*break*/, 5];
+                        if (!!entity_1_1.done) return [3 /*break*/, 8];
                         item = entity_1_1.value;
                         this.__cleanupPartialObject(item);
-                        ref = (0, getEntityRef_js_1.getEntityRef)(item, false);
-                        if (ref) {
-                            if (!ref.isNew())
-                                throw 'Item is not new';
-                        }
-                        else {
-                            ref = this.getEntityRef(this.create(item));
-                        }
+                        ref = (0, getEntityRef_js_1.getEntityRef)(entity, false);
+                        if (!ref) return [3 /*break*/, 3];
+                        if (!ref.isNew())
+                            throw 'Item is not new';
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, this.getEntityRef(this.create(item))];
+                    case 4:
+                        ref = (_g.sent());
+                        _g.label = 5;
+                    case 5:
                         refs_1.push(ref);
                         _b = (_a = raw).push;
                         return [4 /*yield*/, ref.buildDtoForInsert()];
-                    case 3:
-                        _b.apply(_a, [_d.sent()]);
-                        _d.label = 4;
-                    case 4:
+                    case 6:
+                        _b.apply(_a, [_g.sent()]);
+                        _g.label = 7;
+                    case 7:
                         entity_1_1 = entity_1.next();
                         return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
-                        e_6_1 = _d.sent();
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        e_6_1 = _g.sent();
                         e_6 = { error: e_6_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
+                        return [3 /*break*/, 11];
+                    case 10:
                         try {
-                            if (entity_1_1 && !entity_1_1.done && (_c = entity_1.return)) _c.call(entity_1);
+                            if (entity_1_1 && !entity_1_1.done && (_e = entity_1.return)) _e.call(entity_1);
                         }
                         finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [4 /*yield*/, this._edp.insert(raw, options)];
-                    case 9:
-                        inserted = _d.sent();
-                        return [4 /*yield*/, promiseAll(inserted, function (row, i) {
-                                return refs_1[i].processInsertResponseDto(row);
+                    case 11: return [4 /*yield*/, this._edp.insertMany(raw, options)];
+                    case 12:
+                        inserted = _g.sent();
+                        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                            return [2 /*return*/, undefined];
+                        return [2 /*return*/, promiseAll(inserted, function (item, i) {
+                                return refs_1[i].processInsertResponseDto(item);
                             })];
-                    case 10:
-                        result = _d.sent();
+                    case 13:
+                        r = [];
+                        _g.label = 14;
+                    case 14:
+                        _g.trys.push([14, 19, 20, 21]);
+                        entity_2 = tslib_1.__values(entity), entity_2_1 = entity_2.next();
+                        _g.label = 15;
+                    case 15:
+                        if (!!entity_2_1.done) return [3 /*break*/, 18];
+                        item = entity_2_1.value;
+                        _d = (_c = r).push;
+                        return [4 /*yield*/, this.insert(item, options)];
+                    case 16:
+                        _d.apply(_c, [_g.sent()]);
+                        _g.label = 17;
+                    case 17:
+                        entity_2_1 = entity_2.next();
+                        return [3 /*break*/, 15];
+                    case 18: return [3 /*break*/, 21];
+                    case 19:
+                        e_7_1 = _g.sent();
+                        e_7 = { error: e_7_1 };
+                        return [3 /*break*/, 21];
+                    case 20:
+                        try {
+                            if (entity_2_1 && !entity_2_1.done && (_f = entity_2.return)) _f.call(entity_2);
+                        }
+                        finally { if (e_7) throw e_7.error; }
+                        return [7 /*endfinally*/];
+                    case 21:
                         if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
                             return [2 /*return*/, undefined];
-                        return [2 /*return*/, result];
-                    case 11:
+                        return [2 /*return*/, r];
+                    case 22: return [3 /*break*/, 28];
+                    case 23:
                         ref = (0, getEntityRef_js_1.getEntityRef)(entity, false);
                         result = undefined;
-                        if (!ref) return [3 /*break*/, 13];
+                        if (!ref) return [3 /*break*/, 25];
                         if (!ref.isNew())
                             throw 'Item is not new';
                         return [4 /*yield*/, ref.save(options)];
-                    case 12:
-                        result = _d.sent();
-                        return [3 /*break*/, 15];
-                    case 13:
+                    case 24:
+                        result = _g.sent();
+                        return [3 /*break*/, 27];
+                    case 25:
                         this.__cleanupPartialObject(entity);
                         return [4 /*yield*/, this.getEntityRef(this.create(entity)).save(options)];
-                    case 14:
-                        result = _d.sent();
-                        _d.label = 15;
-                    case 15:
+                    case 26:
+                        result = _g.sent();
+                        _g.label = 27;
+                    case 27:
                         if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
                             return [2 /*return*/, undefined];
                         return [2 /*return*/, result];
+                    case 28: return [2 /*return*/];
                 }
             });
         });
@@ -552,8 +587,8 @@ var RepositoryImplementation = /** @class */ (function () {
             fields[_i - 1] = arguments[_i];
         }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var ref, hasError, fields_1, fields_1_1, f, e_7_1;
-            var e_7, _a;
+            var ref, hasError, fields_1, fields_1_1, f, e_8_1;
+            var e_8, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -584,14 +619,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_7_1 = _b.sent();
-                        e_7 = { error: e_7_1 };
+                        e_8_1 = _b.sent();
+                        e_8 = { error: e_8_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         if (!hasError)
@@ -602,7 +637,7 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype.__createDto = function (basedOn) {
-        var e_8, _a;
+        var e_9, _a;
         this.__cleanupPartialObject(basedOn);
         var ref = this.getEntityRef(tslib_1.__assign({}, basedOn));
         var r = ref.copyDataToObject(false);
@@ -614,19 +649,19 @@ var RepositoryImplementation = /** @class */ (function () {
                     delete r[element.key];
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         return r;
     };
     RepositoryImplementation.prototype.updateMany = function (_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
-            var _c, _d, _e, updated, _f, _g, _h, item, e_9_1;
-            var _j, e_9, _k, _l;
+            var _c, _d, _e, updated, _f, _g, _h, item, e_10_1;
+            var _j, e_10, _k, _l;
             var where = _b.where, set = _b.set;
             return tslib_1.__generator(this, function (_m) {
                 switch (_m.label) {
@@ -669,8 +704,8 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 6];
                     case 10: return [3 /*break*/, 17];
                     case 11:
-                        e_9_1 = _m.sent();
-                        e_9 = { error: e_9_1 };
+                        e_10_1 = _m.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 17];
                     case 12:
                         _m.trys.push([12, , 15, 16]);
@@ -681,7 +716,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         _m.label = 14;
                     case 14: return [3 /*break*/, 16];
                     case 15:
-                        if (e_9) throw e_9.error;
+                        if (e_10) throw e_10.error;
                         return [7 /*endfinally*/];
                     case 16: return [7 /*endfinally*/];
                     case 17: return [2 /*return*/, updated];
@@ -808,7 +843,7 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype._getRefForExistingRow = function (entity, id) {
-        var e_10, _a;
+        var e_11, _a;
         var ref = (0, getEntityRef_js_1.getEntityRef)(entity, false);
         if (!ref) {
             var instance = new this._entity(this._remult);
@@ -819,12 +854,12 @@ var RepositoryImplementation = /** @class */ (function () {
                     instance[key] = entity[key];
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_11) throw e_11.error; }
             }
             this._fixTypes(instance);
             var row_1 = new rowHelperImplementation(this._info, instance, this, this._edp, this._remult, false);
@@ -997,7 +1032,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 0:
                         loader = new relation_loader_js_1.RelationLoader();
                         return [4 /*yield*/, this._loadManyToOneForManyRows(jsonItems.map(function (row) {
-                                var e_11, _a;
+                                var e_12, _a;
                                 var result = {};
                                 try {
                                     for (var _b = tslib_1.__values(_this.metadata.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1005,12 +1040,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                         result[col.key] = col.valueConverter.fromJson(row[col.key]);
                                     }
                                 }
-                                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                                catch (e_12_1) { e_12 = { error: e_12_1 }; }
                                 finally {
                                     try {
                                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                     }
-                                    finally { if (e_11) throw e_11.error; }
+                                    finally { if (e_12) throw e_12.error; }
                                 }
                                 return result;
                             }), loadOptions, loader)];
@@ -1029,7 +1064,7 @@ var RepositoryImplementation = /** @class */ (function () {
             function loadManyToOne(repo, toLoad) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var rows, rows_1, rows_1_1, r;
-                    var _a, e_14, _b;
+                    var _a, e_15, _b;
                     return tslib_1.__generator(this, function (_c) {
                         switch (_c.label) {
                             case 0: return [4 /*yield*/, repo.find({ where: (_a = repo.metadata.idMetadata).getIdFilter.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(toLoad), false)) }, true)];
@@ -1041,20 +1076,20 @@ var RepositoryImplementation = /** @class */ (function () {
                                         repo._addToCache(r);
                                     }
                                 }
-                                catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                                catch (e_15_1) { e_15 = { error: e_15_1 }; }
                                 finally {
                                     try {
                                         if (rows_1_1 && !rows_1_1.done && (_b = rows_1.return)) _b.call(rows_1);
                                     }
-                                    finally { if (e_14) throw e_14.error; }
+                                    finally { if (e_15) throw e_15.error; }
                                 }
                                 return [2 /*return*/];
                         }
                     });
                 });
             }
-            var loadFields, _a, _b, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_12_1, excludeRelationMembers, result, fields;
-            var e_12, _c, e_13, _d;
+            var loadFields, _a, _b, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_13_1, excludeRelationMembers, result, fields;
+            var e_13, _c, e_14, _d;
             var _this = this;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
@@ -1081,7 +1116,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         repo = this._remult.repo(col.valueType);
                         toLoad = [];
                         try {
-                            for (rawRows_1 = (e_13 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
+                            for (rawRows_1 = (e_14 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
                                 r = rawRows_1_1.value;
                                 val = r[col.key];
                                 if (val !== undefined &&
@@ -1092,12 +1127,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                         finally {
                             try {
                                 if (rawRows_1_1 && !rawRows_1_1.done && (_d = rawRows_1.return)) _d.call(rawRows_1);
                             }
-                            finally { if (e_13) throw e_13.error; }
+                            finally { if (e_14) throw e_14.error; }
                         }
                         if (!(toLoad.length > 0)) return [3 /*break*/, 4];
                         return [4 /*yield*/, loadManyToOne(repo, toLoad)];
@@ -1109,14 +1144,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _e.sent();
-                        e_12 = { error: e_12_1 };
+                        e_13_1 = _e.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         excludeRelationMembers = new Set(this.fields
@@ -1144,9 +1179,9 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype._populateRelationsForFields = function (fields, loadOptions, result, loader) {
-        var e_15, _a;
+        var e_16, _a;
         var _loop_1 = function (col) {
-            var e_16, _b, e_17, _c;
+            var e_17, _b, e_18, _c;
             var _d = this_1.__getRelationAndInclude(col, loadOptions), rel = _d.rel, incl = _d.incl;
             if (rel)
                 if (incl) {
@@ -1184,32 +1219,32 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                     };
                     try {
-                        for (var result_1 = (e_16 = void 0, tslib_1.__values(result)), result_1_1 = result_1.next(); !result_1_1.done; result_1_1 = result_1.next()) {
+                        for (var result_1 = (e_17 = void 0, tslib_1.__values(result)), result_1_1 = result_1.next(); !result_1_1.done; result_1_1 = result_1.next()) {
                             var row = result_1_1.value;
                             _loop_2(row);
                         }
                     }
-                    catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
                     finally {
                         try {
                             if (result_1_1 && !result_1_1.done && (_b = result_1.return)) _b.call(result_1);
                         }
-                        finally { if (e_16) throw e_16.error; }
+                        finally { if (e_17) throw e_17.error; }
                     }
                 }
                 else {
                     try {
-                        for (var result_2 = (e_17 = void 0, tslib_1.__values(result)), result_2_1 = result_2.next(); !result_2_1.done; result_2_1 = result_2.next()) {
+                        for (var result_2 = (e_18 = void 0, tslib_1.__values(result)), result_2_1 = result_2.next(); !result_2_1.done; result_2_1 = result_2.next()) {
                             var row = result_2_1.value;
                             Reflect.deleteProperty(row, col.key);
                         }
                     }
-                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                    catch (e_18_1) { e_18 = { error: e_18_1 }; }
                     finally {
                         try {
                             if (result_2_1 && !result_2_1.done && (_c = result_2.return)) _c.call(result_2);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_18) throw e_18.error; }
                     }
                 }
         };
@@ -1220,12 +1255,12 @@ var RepositoryImplementation = /** @class */ (function () {
                 _loop_1(col);
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (fields_2_1 && !fields_2_1.done && (_a = fields_2.return)) _a.call(fields_2);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_16) throw e_16.error; }
         }
     };
     RepositoryImplementation.prototype.__getRelationAndInclude = function (col, loadOptions) {
@@ -1241,7 +1276,7 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     /*@internal */
     RepositoryImplementation.prototype._findOptionsBasedOnRelation = function (rel, field, moreFindOptions, row, otherRepo) {
-        var e_18, _a, e_19, _b, _c, _d;
+        var e_19, _a, e_20, _b, _c, _d;
         var returnNull = false;
         var returnUndefined = false;
         var where = [];
@@ -1261,7 +1296,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 if (source.where)
                     where.push(source.where);
                 try {
-                    for (var _e = (e_19 = void 0, tslib_1.__values([
+                    for (var _e = (e_20 = void 0, tslib_1.__values([
                         'limit',
                         'include',
                         'orderBy',
@@ -1273,21 +1308,21 @@ var RepositoryImplementation = /** @class */ (function () {
                             findOptions[key] = source[key];
                     }
                 }
-                catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                catch (e_20_1) { e_20 = { error: e_20_1 }; }
                 finally {
                     try {
                         if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                     }
-                    finally { if (e_19) throw e_19.error; }
+                    finally { if (e_20) throw e_20.error; }
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (findOptionsSources_1_1 && !findOptionsSources_1_1.done && (_a = findOptionsSources_1.return)) _a.call(findOptionsSources_1);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         var relFields = rel.getFields();
         var getFieldValue = function (key) {
@@ -1364,7 +1399,7 @@ var RepositoryImplementation = /** @class */ (function () {
         return this.getEntityRef(item).toApiJson(true);
     };
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
-        var e_20, _a;
+        var e_21, _a;
         var _this = this;
         if (json === null || json === undefined)
             return json;
@@ -1390,12 +1425,12 @@ var RepositoryImplementation = /** @class */ (function () {
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         this._fixTypes(result);
         if (newRow) {
@@ -1428,12 +1463,11 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.deleteMany = function (_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
-            var _c, _d, _e, prepared, _f, _g, _h, item, ref, _j, _k, _l, e_21_1, ids, prepared_1, prepared_1_1, x, e_22_1;
-            var e_22, _m;
-            var _o, e_21, _p, _q;
+            var _c, _d, _e, deleted, _f, _g, _h, item, e_22_1;
+            var _j, e_22, _k, _l;
             var where = _b.where;
-            return tslib_1.__generator(this, function (_r) {
-                switch (_r.label) {
+            return tslib_1.__generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
                         filter_interfaces_js_1.Filter.throwErrorIfFilterIsEmpty(where, 'deleteMany');
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 4];
@@ -1443,84 +1477,50 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, this._translateWhereToFilter(where)];
                     case 2:
-                        _e = _r.sent();
-                        _r.label = 3;
+                        _e = _m.sent();
+                        _m.label = 3;
                     case 3: return [2 /*return*/, _d.apply(_c, [_e])];
                     case 4:
+                        deleted = 0;
                         if (where === 'all')
                             where = undefined;
-                        prepared = [];
-                        _r.label = 5;
+                        _m.label = 5;
                     case 5:
-                        _r.trys.push([5, 11, 12, 17]);
+                        _m.trys.push([5, 11, 12, 17]);
                         _f = true, _g = tslib_1.__asyncValues(this.query({ where: where, aggregate: undefined }));
-                        _r.label = 6;
+                        _m.label = 6;
                     case 6: return [4 /*yield*/, _g.next()];
                     case 7:
-                        if (!(_h = _r.sent(), _o = _h.done, !_o)) return [3 /*break*/, 10];
-                        _q = _h.value;
+                        if (!(_h = _m.sent(), _j = _h.done, !_j)) return [3 /*break*/, 10];
+                        _l = _h.value;
                         _f = false;
-                        item = _q;
-                        ref = (0, getEntityRef_js_1.getEntityRef)(item);
-                        _k = (_j = prepared).push;
-                        _l = [{ ref: ref }];
-                        return [4 /*yield*/, ref.__prepareDelete()];
+                        item = _l;
+                        return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(item).delete()];
                     case 8:
-                        _k.apply(_j, [tslib_1.__assign.apply(void 0, _l.concat([(_r.sent())]))]);
-                        _r.label = 9;
+                        _m.sent();
+                        deleted++;
+                        _m.label = 9;
                     case 9:
                         _f = true;
                         return [3 /*break*/, 6];
                     case 10: return [3 /*break*/, 17];
                     case 11:
-                        e_21_1 = _r.sent();
-                        e_21 = { error: e_21_1 };
+                        e_22_1 = _m.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 17];
                     case 12:
-                        _r.trys.push([12, , 15, 16]);
-                        if (!(!_f && !_o && (_p = _g.return))) return [3 /*break*/, 14];
-                        return [4 /*yield*/, _p.call(_g)];
+                        _m.trys.push([12, , 15, 16]);
+                        if (!(!_f && !_j && (_k = _g.return))) return [3 /*break*/, 14];
+                        return [4 /*yield*/, _k.call(_g)];
                     case 13:
-                        _r.sent();
-                        _r.label = 14;
+                        _m.sent();
+                        _m.label = 14;
                     case 14: return [3 /*break*/, 16];
                     case 15:
-                        if (e_21) throw e_21.error;
+                        if (e_22) throw e_22.error;
                         return [7 /*endfinally*/];
                     case 16: return [7 /*endfinally*/];
-                    case 17:
-                        ids = prepared.filter(function (x) { return x.doDelete; }).map(function (x) { return x.ref.id; });
-                        if (!ids.length) return [3 /*break*/, 19];
-                        return [4 /*yield*/, this._edp.delete(ids)];
-                    case 18:
-                        _r.sent();
-                        _r.label = 19;
-                    case 19:
-                        _r.trys.push([19, 24, 25, 26]);
-                        prepared_1 = tslib_1.__values(prepared), prepared_1_1 = prepared_1.next();
-                        _r.label = 20;
-                    case 20:
-                        if (!!prepared_1_1.done) return [3 /*break*/, 23];
-                        x = prepared_1_1.value;
-                        return [4 /*yield*/, x.ref.__finishDelete(x.event)];
-                    case 21:
-                        _r.sent();
-                        _r.label = 22;
-                    case 22:
-                        prepared_1_1 = prepared_1.next();
-                        return [3 /*break*/, 20];
-                    case 23: return [3 /*break*/, 26];
-                    case 24:
-                        e_22_1 = _r.sent();
-                        e_22 = { error: e_22_1 };
-                        return [3 /*break*/, 26];
-                    case 25:
-                        try {
-                            if (prepared_1_1 && !prepared_1_1.done && (_m = prepared_1.return)) _m.call(prepared_1);
-                        }
-                        finally { if (e_22) throw e_22.error; }
-                        return [7 /*endfinally*/];
-                    case 26: return [2 /*return*/, prepared.length];
+                    case 17: return [2 /*return*/, deleted];
                 }
             });
         });
@@ -2574,9 +2574,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 15:
                         updatedRow = (updatedRow = _t.sent())[0];
                         return [3 /*break*/, 18];
-                    case 16: return [4 /*yield*/, this.edp.insert([d], options)];
+                    case 16: return [4 /*yield*/, this.edp.insert(d, options)];
                     case 17:
-                        updatedRow = (_t.sent())[0];
+                        updatedRow = _t.sent();
                         _t.label = 18;
                     case 18: return [3 /*break*/, 25];
                     case 19:
@@ -2676,119 +2676,32 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.processInsertResponseDto = function (updatedRow) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _a, _b, listener, e_39_1, err_2;
-            var e_39, _c;
-            var _d;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        _e.trys.push([0, 13, , 15]);
-                        if (!updatedRow) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.loadDataFrom(updatedRow)];
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 1:
-                        _e.sent();
-                        _e.label = 2;
-                    case 2:
-                        e = this.buildLifeCycleEvent();
-                        e.id = this.getId();
-                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 12];
-                        if (!this.info.entityInfo.saved) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
-                    case 3:
-                        _e.sent();
-                        _e.label = 4;
-                    case 4:
-                        if (!this.repo.listeners) return [3 /*break*/, 12];
-                        _e.label = 5;
-                    case 5:
-                        _e.trys.push([5, 10, 11, 12]);
-                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
-                        _e.label = 6;
-                    case 6:
-                        if (!!_b.done) return [3 /*break*/, 9];
-                        listener = _b.value;
-                        return [4 /*yield*/, ((_d = listener.saved) === null || _d === void 0 ? void 0 : _d.call(listener, this.instance, true))];
-                    case 7:
-                        _e.sent();
-                        _e.label = 8;
-                    case 8:
-                        _b = _a.next();
-                        return [3 /*break*/, 6];
-                    case 9: return [3 /*break*/, 12];
-                    case 10:
-                        e_39_1 = _e.sent();
-                        e_39 = { error: e_39_1 };
-                        return [3 /*break*/, 12];
-                    case 11:
-                        try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                        }
-                        finally { if (e_39) throw e_39.error; }
-                        return [7 /*endfinally*/];
-                    case 12:
-                        this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
+                        _a.sent();
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
-                    case 13:
-                        err_2 = _e.sent();
-                        return [4 /*yield*/, this.catchSaveErrors(err_2)];
-                    case 14: throw _e.sent();
-                    case 15: return [2 /*return*/];
                 }
             });
         });
     };
     rowHelperImplementation.prototype.buildDtoForInsert = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _a, _b, col, e_40_1, d, _c, _d, field, f;
-            var e_40, _e, e_41, _f;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            var d, _a, _b, field, f;
+            var e_39, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.__validateEntity()];
                     case 1:
-                        _g.sent();
-                        e = this.buildLifeCycleEvent();
-                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 11];
-                        _g.label = 2;
-                    case 2:
-                        _g.trys.push([2, 7, 8, 9]);
-                        _a = tslib_1.__values(this.fields), _b = _a.next();
-                        _g.label = 3;
-                    case 3:
-                        if (!!_b.done) return [3 /*break*/, 6];
-                        col = _b.value;
-                        if (!col.metadata.options.saving) return [3 /*break*/, 5];
-                        return [4 /*yield*/, col.metadata.options.saving(this.instance, col, e)];
-                    case 4:
-                        _g.sent();
-                        _g.label = 5;
-                    case 5:
-                        _b = _a.next();
-                        return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_40_1 = _g.sent();
-                        e_40 = { error: e_40_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                        }
-                        finally { if (e_40) throw e_40.error; }
-                        return [7 /*endfinally*/];
-                    case 9:
-                        if (!this.info.entityInfo.saving) return [3 /*break*/, 11];
-                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, e)];
-                    case 10:
-                        _g.sent();
-                        _g.label = 11;
-                    case 11:
+                        _d.sent();
                         this.__assertValidity();
                         d = this.copyDataToObject(this.isNew());
                         try {
-                            for (_c = tslib_1.__values(this.metadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                field = _d.value;
+                            for (_a = tslib_1.__values(this.metadata.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                field = _b.value;
                                 if (field.dbReadOnly) {
                                     d[field.key] = undefined;
                                     f = this.fields.find(field);
@@ -2796,12 +2709,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_41_1) { e_41 = { error: e_41_1 }; }
+                        catch (e_39_1) { e_39 = { error: e_39_1 }; }
                         finally {
                             try {
-                                if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_41) throw e_41.error; }
+                            finally { if (e_39) throw e_39.error; }
                         }
                         return [2 /*return*/, d];
                 }
@@ -2834,114 +2747,87 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, doDelete, event_1, err_3;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, , 7]);
-                        return [4 /*yield*/, this.__prepareDelete()];
-                    case 1:
-                        _a = _b.sent(), doDelete = _a.doDelete, event_1 = _a.event;
-                        if (!doDelete) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.edp.delete([this.id])];
-                    case 2:
-                        _b.sent();
-                        _b.label = 3;
-                    case 3: return [4 /*yield*/, this.__finishDelete(event_1)];
-                    case 4:
-                        _b.sent();
-                        return [3 /*break*/, 7];
-                    case 5:
-                        err_3 = _b.sent();
-                        return [4 /*yield*/, this.catchSaveErrors(err_3)];
-                    case 6: throw _b.sent();
-                    case 7: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    //@internal
-    rowHelperImplementation.prototype.__prepareDelete = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doDelete, event;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.__clearErrorsAndReportChanged();
-                        doDelete = true;
-                        event = this.buildLifeCycleEvent(function () { return (doDelete = false); });
-                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 2];
-                        if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, event)];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        this.__assertValidity();
-                        if (doDelete && this.id === undefined)
-                            throw new Error('Invalid operation, id is undefined');
-                        return [2 /*return*/, { doDelete: doDelete, event: event }];
-                }
-            });
-        });
-    };
-    //@internal
-    rowHelperImplementation.prototype.__finishDelete = function (e) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, listener, e_42_1;
-            var e_42, _c;
+            var doDelete, e, _a, _b, listener, e_40_1, err_2;
+            var e_40, _c;
             var _d;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        this.__clearErrorsAndReportChanged();
+                        doDelete = true;
+                        e = this.buildLifeCycleEvent(function () { return (doDelete = false); });
                         if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 2];
-                        if (!this.info.entityInfo.deleted) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
+                        if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, e)];
                     case 1:
                         _e.sent();
                         _e.label = 2;
                     case 2:
-                        if (!this.repo.listeners) return [3 /*break*/, 10];
+                        this.__assertValidity();
                         _e.label = 3;
                     case 3:
-                        _e.trys.push([3, 8, 9, 10]);
-                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
-                        _e.label = 4;
+                        _e.trys.push([3, 16, , 18]);
+                        if (!doDelete) return [3 /*break*/, 5];
+                        if (this.id === undefined)
+                            throw new Error('Invalid operation, id is undefined');
+                        return [4 /*yield*/, this.edp.delete(this.id)];
                     case 4:
-                        if (!!_b.done) return [3 /*break*/, 7];
-                        listener = _b.value;
-                        return [4 /*yield*/, ((_d = listener.deleted) === null || _d === void 0 ? void 0 : _d.call(listener, this.instance))];
-                    case 5:
                         _e.sent();
-                        _e.label = 6;
+                        _e.label = 5;
+                    case 5:
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 7];
+                        if (!this.info.entityInfo.deleted) return [3 /*break*/, 7];
+                        return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
                     case 6:
-                        _b = _a.next();
-                        return [3 /*break*/, 4];
-                    case 7: return [3 /*break*/, 10];
+                        _e.sent();
+                        _e.label = 7;
+                    case 7:
+                        if (!this.repo.listeners) return [3 /*break*/, 15];
+                        _e.label = 8;
                     case 8:
-                        e_42_1 = _e.sent();
-                        e_42 = { error: e_42_1 };
-                        return [3 /*break*/, 10];
+                        _e.trys.push([8, 13, 14, 15]);
+                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
+                        _e.label = 9;
                     case 9:
+                        if (!!_b.done) return [3 /*break*/, 12];
+                        listener = _b.value;
+                        return [4 /*yield*/, ((_d = listener.deleted) === null || _d === void 0 ? void 0 : _d.call(listener, this.instance))];
+                    case 10:
+                        _e.sent();
+                        _e.label = 11;
+                    case 11:
+                        _b = _a.next();
+                        return [3 /*break*/, 9];
+                    case 12: return [3 /*break*/, 15];
+                    case 13:
+                        e_40_1 = _e.sent();
+                        e_40 = { error: e_40_1 };
+                        return [3 /*break*/, 15];
+                    case 14:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_42) throw e_42.error; }
+                        finally { if (e_40) throw e_40.error; }
                         return [7 /*endfinally*/];
-                    case 10:
+                    case 15:
                         this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
                             { id: this.getId(), oldId: this.getOriginalId(), deleted: true },
                         ]);
                         this._wasDeleted = true;
-                        return [2 /*return*/];
+                        return [3 /*break*/, 18];
+                    case 16:
+                        err_2 = _e.sent();
+                        return [4 /*yield*/, this.catchSaveErrors(err_2)];
+                    case 17: throw _e.sent();
+                    case 18: return [2 /*return*/];
                 }
             });
         });
     };
     rowHelperImplementation.prototype.loadDataFrom = function (data, loadItems) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, lu, e_43_1;
-            var e_43, _c;
+            var _a, _b, col, lu, e_41_1;
+            var e_41, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2982,14 +2868,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_43_1 = _d.sent();
-                        e_43 = { error: e_43_1 };
+                        e_41_1 = _d.sent();
+                        e_41 = { error: e_41_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_43) throw e_43.error; }
+                        finally { if (e_41) throw e_41.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -3005,8 +2891,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.calcServerExpression = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, result, e_44_1;
-            var e_44, _c;
+            var _a, _b, col, result, e_42_1;
+            var e_42, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -3031,14 +2917,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_44_1 = _d.sent();
-                        e_44 = { error: e_44_1 };
+                        e_42_1 = _d.sent();
+                        e_42 = { error: e_42_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_44) throw e_44.error; }
+                        finally { if (e_42) throw e_42.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -3051,7 +2937,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_45, _a;
+        var e_43, _a;
         var _b;
         (_b = this._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
         try {
@@ -3063,19 +2949,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return true;
             }
         }
-        catch (e_45_1) { e_45 = { error: e_45_1 }; }
+        catch (e_43_1) { e_43 = { error: e_43_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_45) throw e_45.error; }
+            finally { if (e_43) throw e_43.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_46_1, e, _c, _d, listener, e_47_1;
-            var e_46, _e, e_47, _f;
+            var _a, _b, c, col, e_44_1, e, _c, _d, listener, e_45_1;
+            var e_44, _e, e_45, _f;
             var _g;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
@@ -3097,14 +2983,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_46_1 = _h.sent();
-                        e_46 = { error: e_46_1 };
+                        e_44_1 = _h.sent();
+                        e_44 = { error: e_44_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_46) throw e_46.error; }
+                        finally { if (e_44) throw e_44.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
@@ -3132,14 +3018,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_47_1 = _h.sent();
-                        e_47 = { error: e_47_1 };
+                        e_45_1 = _h.sent();
+                        e_45 = { error: e_45_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_47) throw e_47.error; }
+                        finally { if (e_45) throw e_45.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -3186,7 +3072,7 @@ function getControllerRef(container, remultArg) {
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_48, _b;
+        var _a, e_46, _b;
         var _this = _super.call(this, columnsInfo, instance, remult, false) || this;
         var _items = [];
         var r = (_a = {
@@ -3203,20 +3089,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push((r[col.key] = new FieldRefImplementation(col.options, col, instance, undefined, _this)));
             }
         }
-        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+        catch (e_46_1) { e_46 = { error: e_46_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_b = columnsInfo_1.return)) _b.call(columnsInfo_1);
             }
-            finally { if (e_48) throw e_48.error; }
+            finally { if (e_46) throw e_46.error; }
         }
         _this.fields = r;
         return _this;
     }
     controllerRefImpl.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, e_49_1;
-            var e_49, _c;
+            var _a, _b, col, e_47_1;
+            var e_47, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -3236,14 +3122,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_49_1 = _d.sent();
-                        e_49 = { error: e_49_1 };
+                        e_47_1 = _d.sent();
+                        e_47 = { error: e_47_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_49) throw e_49.error; }
+                        finally { if (e_47) throw e_47.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -3440,8 +3326,8 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var processValidation, self_1, event_2, _a, _b, v, _c, e_50_1, _d, error_1;
-            var e_50, _e;
+            var processValidation, self_1, event_1, _a, _b, v, _c, e_48_1, _d, error_1;
+            var e_48, _e;
             var _this = this;
             var _f, _g;
             return tslib_1.__generator(this, function (_h) {
@@ -3458,7 +3344,7 @@ var FieldRefImplementation = /** @class */ (function () {
                         };
                         if (!this.settings.validate) return [3 /*break*/, 11];
                         self_1 = this;
-                        event_2 = {
+                        event_1 = {
                             entityRef: this.entityRef,
                             get error() {
                                 return self_1.error;
@@ -3486,7 +3372,7 @@ var FieldRefImplementation = /** @class */ (function () {
                         if (!!_b.done) return [3 /*break*/, 5];
                         v = _b.value;
                         _c = processValidation;
-                        return [4 /*yield*/, v(this.container, event_2)];
+                        return [4 /*yield*/, v(this.container, event_1)];
                     case 3:
                         _c.apply(void 0, [_h.sent()]);
                         _h.label = 4;
@@ -3495,20 +3381,20 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_50_1 = _h.sent();
-                        e_50 = { error: e_50_1 };
+                        e_48_1 = _h.sent();
+                        e_48 = { error: e_48_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_50) throw e_50.error; }
+                        finally { if (e_48) throw e_48.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
                         if (!(typeof this.settings.validate === 'function')) return [3 /*break*/, 11];
                         _d = processValidation;
-                        return [4 /*yield*/, this.settings.validate(this.container, event_2)];
+                        return [4 /*yield*/, this.settings.validate(this.container, event_1)];
                     case 10:
                         _d.apply(void 0, [_h.sent()]);
                         _h.label = 11;
@@ -3667,7 +3553,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_51, _b;
+        var _a, e_49, _b;
         var _this = this;
         var _c;
         this.entityInfo = entityInfo;
@@ -3772,12 +3658,12 @@ var EntityFullInfo = /** @class */ (function () {
                 this.fieldsMetadata.push((r[x.key] = new columnDefsImpl(x, this, remult)));
             }
         }
-        catch (e_51_1) { e_51 = { error: e_51_1 }; }
+        catch (e_49_1) { e_49 = { error: e_49_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_51) throw e_51.error; }
+            finally { if (e_49) throw e_49.error; }
         }
         this.fields = r;
         this.label = buildLabel((_c = entityInfo.label) !== null && _c !== void 0 ? _c : entityInfo.caption, this.key, remult, this);
@@ -3894,7 +3780,7 @@ function ValueListFieldType() {
 }
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
-        var e_52, _a, _b;
+        var e_50, _a, _b;
         var _this = this;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
@@ -3930,12 +3816,12 @@ var ValueListInfo = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_52_1) { e_52 = { error: e_52_1 }; }
+            catch (e_50_1) { e_50 = { error: e_50_1 }; }
             finally {
                 try {
                     if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
                 }
-                finally { if (e_52) throw e_52.error; }
+                finally { if (e_50) throw e_50.error; }
             }
             if (this.values.find(function (s) { return s.id === undefined; }))
                 throw new Error("ValueType ".concat(this.valueListType, " has values without an id"));
@@ -4017,7 +3903,7 @@ function getValueList(type) {
 exports.storableMember = Symbol.for('storableMember');
 exports.fieldOptionalValuesFunctionKey = Symbol.for('fieldOptionalValues');
 function buildOptions(options, remult) {
-    var e_53, _a;
+    var e_51, _a;
     var _b;
     var r = {};
     try {
@@ -4034,12 +3920,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_53_1) { e_53 = { error: e_53_1 }; }
+    catch (e_51_1) { e_51 = { error: e_51_1 }; }
     finally {
         try {
             if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
         }
-        finally { if (e_53) throw e_53.error; }
+        finally { if (e_51) throw e_51.error; }
     }
     (_b = exports.fieldOptionsEnricher.enrichFieldOptions) === null || _b === void 0 ? void 0 : _b.call(exports.fieldOptionsEnricher, r);
     return r;
@@ -4082,7 +3968,7 @@ function decorateColumnSettings(settings, remult) {
             };
             settings.valueConverter = new Proxy(settings.valueConverter, {
                 get: function (target, property) {
-                    var e_54, _a;
+                    var e_52, _a;
                     if (target[property] === undefined) {
                         if (isIdNumeric_1 === undefined) {
                             if (property === 'inputType')
@@ -4105,12 +3991,12 @@ function decorateColumnSettings(settings, remult) {
                                         : valueConverters_js_1.ValueConverters.String[key];
                                 }
                             }
-                            catch (e_54_1) { e_54 = { error: e_54_1 }; }
+                            catch (e_52_1) { e_52 = { error: e_52_1 }; }
                             finally {
                                 try {
                                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                 }
-                                finally { if (e_54) throw e_54.error; }
+                                finally { if (e_52) throw e_52.error; }
                             }
                         }
                     }