remult 3.3.0-next.1 → 3.3.0

package/src/remult3/RepositoryImplementation.js

@@ -453,22 +453,22 @@ var RepositoryImplementation = /** @class */ (function () {
             finally { if (e_5) throw e_5.error; }
         }
     };
-    RepositoryImplementation.prototype.insert = function (entity) {
+    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, _c, r, entity_2, entity_2_1, item, _d, _e, e_7_1, ref;
-            var e_6, _f, e_7, _g;
-            return tslib_1.__generator(this, function (_h) {
-                switch (_h.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*/, 23];
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 13];
                         refs_1 = [];
                         raw = [];
-                        _h.label = 1;
+                        _g.label = 1;
                     case 1:
-                        _h.trys.push([1, 9, 10, 11]);
+                        _g.trys.push([1, 9, 10, 11]);
                         entity_1 = tslib_1.__values(entity), entity_1_1 = entity_1.next();
-                        _h.label = 2;
+                        _g.label = 2;
                     case 2:
                         if (!!entity_1_1.done) return [3 /*break*/, 8];
                         item = entity_1_1.value;
@@ -480,76 +480,92 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 3: return [4 /*yield*/, this.getEntityRef(this.create(item))];
                     case 4:
-                        ref = (_h.sent());
-                        _h.label = 5;
+                        ref = (_g.sent());
+                        _g.label = 5;
                     case 5:
                         refs_1.push(ref);
                         _b = (_a = raw).push;
                         return [4 /*yield*/, ref.buildDtoForInsert()];
                     case 6:
-                        _b.apply(_a, [_h.sent()]);
-                        _h.label = 7;
+                        _b.apply(_a, [_g.sent()]);
+                        _g.label = 7;
                     case 7:
                         entity_1_1 = entity_1.next();
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_6_1 = _h.sent();
+                        e_6_1 = _g.sent();
                         e_6 = { error: e_6_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (entity_1_1 && !entity_1_1.done && (_f = entity_1.return)) _f.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 11:
-                        _c = promiseAll;
-                        return [4 /*yield*/, this._edp.insertMany(raw)];
-                    case 12: return [2 /*return*/, _c.apply(void 0, [_h.sent(), function (item, i) { return refs_1[i].processInsertResponseDto(item); }])];
+                    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 13:
                         r = [];
-                        _h.label = 14;
+                        _g.label = 14;
                     case 14:
-                        _h.trys.push([14, 19, 20, 21]);
+                        _g.trys.push([14, 19, 20, 21]);
                         entity_2 = tslib_1.__values(entity), entity_2_1 = entity_2.next();
-                        _h.label = 15;
+                        _g.label = 15;
                     case 15:
                         if (!!entity_2_1.done) return [3 /*break*/, 18];
                         item = entity_2_1.value;
-                        _e = (_d = r).push;
-                        return [4 /*yield*/, this.insert(item)];
+                        _d = (_c = r).push;
+                        return [4 /*yield*/, this.insert(item, options)];
                     case 16:
-                        _e.apply(_d, [_h.sent()]);
-                        _h.label = 17;
+                        _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 = _h.sent();
+                        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 && (_g = entity_2.return)) _g.call(entity_2);
+                            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: return [2 /*return*/, r];
-                    case 22: return [3 /*break*/, 27];
+                    case 21:
+                        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                            return [2 /*return*/, undefined];
+                        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*/, 25];
                         if (!ref.isNew())
                             throw 'Item is not new';
-                        return [4 /*yield*/, ref.save()];
-                    case 24: return [2 /*return*/, _h.sent()];
+                        return [4 /*yield*/, ref.save(options)];
+                    case 24:
+                        result = _g.sent();
+                        return [3 /*break*/, 27];
                     case 25:
                         this.__cleanupPartialObject(entity);
-                        return [4 /*yield*/, this.getEntityRef(this.create(entity)).save()];
-                    case 26: return [2 /*return*/, _h.sent()];
-                    case 27: return [2 /*return*/];
+                        return [4 /*yield*/, this.getEntityRef(this.create(entity)).save(options)];
+                    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*/];
                 }
             });
         });
@@ -640,80 +656,92 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.updateMany = function (_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
-            var _c, _d, updated, _e, _f, _g, item, e_10_1;
-            var _h, e_10, _j, _k;
+            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 (_l) {
-                switch (_l.label) {
+            return tslib_1.__generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
                         this.__cleanupPartialObject(set);
                         filter_interfaces_js_1.Filter.throwErrorIfFilterIsEmpty(where, 'updateMany');
-                        if (!this._dataProvider.isProxy) return [3 /*break*/, 2];
+                        if (!this._dataProvider.isProxy) return [3 /*break*/, 4];
                         _d = (_c = this._edp).updateMany;
-                        return [4 /*yield*/, this._translateWhereToFilter(where)];
-                    case 1: return [2 /*return*/, _d.apply(_c, [_l.sent(), this.__createDto(tslib_1.__assign({}, set))])];
+                        if (!(where === 'all')) return [3 /*break*/, 1];
+                        _e = 'all';
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this._translateWhereToFilter(where)];
                     case 2:
+                        _e = _m.sent();
+                        _m.label = 3;
+                    case 3: return [2 /*return*/, _d.apply(_c, [_e, this.__createDto(tslib_1.__assign({}, set))])];
+                    case 4:
                         updated = 0;
-                        _l.label = 3;
-                    case 3:
-                        _l.trys.push([3, 9, 10, 15]);
-                        _e = true, _f = tslib_1.__asyncValues(this.query({ where: where, aggregate: undefined }));
-                        _l.label = 4;
-                    case 4: return [4 /*yield*/, _f.next()];
+                        _m.label = 5;
                     case 5:
-                        if (!(_g = _l.sent(), _h = _g.done, !_h)) return [3 /*break*/, 8];
-                        _k = _g.value;
-                        _e = false;
-                        item = _k;
+                        _m.trys.push([5, 11, 12, 17]);
+                        _f = true, _g = tslib_1.__asyncValues(this.query({ where: where, aggregate: undefined }));
+                        _m.label = 6;
+                    case 6: return [4 /*yield*/, _g.next()];
+                    case 7:
+                        if (!(_h = _m.sent(), _j = _h.done, !_j)) return [3 /*break*/, 10];
+                        _l = _h.value;
+                        _f = false;
+                        item = _l;
                         (0, assign_js_1.assign)(item, set);
                         return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(item).save()];
-                    case 6:
-                        _l.sent();
+                    case 8:
+                        _m.sent();
                         updated++;
-                        _l.label = 7;
-                    case 7:
-                        _e = true;
-                        return [3 /*break*/, 4];
-                    case 8: return [3 /*break*/, 15];
+                        _m.label = 9;
                     case 9:
-                        e_10_1 = _l.sent();
-                        e_10 = { error: e_10_1 };
-                        return [3 /*break*/, 15];
-                    case 10:
-                        _l.trys.push([10, , 13, 14]);
-                        if (!(!_e && !_h && (_j = _f.return))) return [3 /*break*/, 12];
-                        return [4 /*yield*/, _j.call(_f)];
+                        _f = true;
+                        return [3 /*break*/, 6];
+                    case 10: return [3 /*break*/, 17];
                     case 11:
-                        _l.sent();
-                        _l.label = 12;
-                    case 12: return [3 /*break*/, 14];
+                        e_10_1 = _m.sent();
+                        e_10 = { error: e_10_1 };
+                        return [3 /*break*/, 17];
+                    case 12:
+                        _m.trys.push([12, , 15, 16]);
+                        if (!(!_f && !_j && (_k = _g.return))) return [3 /*break*/, 14];
+                        return [4 /*yield*/, _k.call(_g)];
                     case 13:
+                        _m.sent();
+                        _m.label = 14;
+                    case 14: return [3 /*break*/, 16];
+                    case 15:
                         if (e_10) throw e_10.error;
                         return [7 /*endfinally*/];
-                    case 14: return [7 /*endfinally*/];
-                    case 15: return [2 /*return*/, updated];
+                    case 16: return [7 /*endfinally*/];
+                    case 17: return [2 /*return*/, updated];
                 }
             });
         });
     };
-    RepositoryImplementation.prototype.update = function (id, entity) {
+    RepositoryImplementation.prototype.update = function (id, entity, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var ref_1, ref_2, ref, r, key, f;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            function returnResult(result) {
+                if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                    return undefined;
+                return result;
+            }
+            var ref_1, _a, ref_2, _b, ref, _c, r, key, f, _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         ref_1 = (0, getEntityRef_js_1.getEntityRef)(entity, false);
                         if (!ref_1) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ref_1.save()];
-                    case 1: return [2 /*return*/, (_a.sent())];
+                        _a = returnResult;
+                        return [4 /*yield*/, ref_1.save(options)];
+                    case 1: return [2 /*return*/, _a.apply(void 0, [(_e.sent())])];
                     case 2:
-                        {
-                            ref_2 = (0, getEntityRef_js_1.getEntityRef)(id, false);
-                            if (ref_2) {
-                                (0, assign_js_1.assign)(id, entity);
-                                return [2 /*return*/, ref_2.save()];
-                            }
-                        }
+                        ref_2 = (0, getEntityRef_js_1.getEntityRef)(id, false);
+                        if (!ref_2) return [3 /*break*/, 4];
+                        (0, assign_js_1.assign)(id, entity);
+                        _b = returnResult;
+                        return [4 /*yield*/, ref_2.save(options)];
+                    case 3: return [2 /*return*/, _b.apply(void 0, [_e.sent()])];
+                    case 4:
                         this.__cleanupPartialObject(entity);
                         if (typeof id === 'object') {
                             ref = this._getRefForExistingRow(id, this.metadata.idMetadata.getId(id));
@@ -721,12 +749,13 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         else
                             ref = this._getRefForExistingRow(entity, id);
-                        if (!this._dataProvider.isProxy) return [3 /*break*/, 4];
-                        return [4 /*yield*/, ref.save(Object.keys(entity))];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4: return [4 /*yield*/, ref.reload()];
-                    case 5:
-                        r = _a.sent();
+                        if (!this._dataProvider.isProxy) return [3 /*break*/, 6];
+                        _c = returnResult;
+                        return [4 /*yield*/, ref.save(options, Object.keys(entity))];
+                    case 5: return [2 /*return*/, _c.apply(void 0, [_e.sent()])];
+                    case 6: return [4 /*yield*/, ref.reload()];
+                    case 7:
+                        r = _e.sent();
                         if (!r)
                             throw this._notFoundError(ref.id);
                         for (key in entity) {
@@ -740,10 +769,11 @@ var RepositoryImplementation = /** @class */ (function () {
                             }
                         }
                         return [4 /*yield*/, this._fixTypes(r)];
-                    case 6:
-                        _a.sent();
-                        return [4 /*yield*/, ref.save()];
-                    case 7: return [2 /*return*/, _a.sent()];
+                    case 8:
+                        _e.sent();
+                        _d = returnResult;
+                        return [4 /*yield*/, ref.save(options)];
+                    case 9: return [2 /*return*/, _d.apply(void 0, [_e.sent()])];
                 }
             });
         });
@@ -1419,56 +1449,62 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.deleteMany = function (_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
-            var _c, _d, deleted, _e, _f, _g, item, e_22_1;
-            var _h, e_22, _j, _k;
+            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 (_l) {
-                switch (_l.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*/, 2];
+                        if (!this._dataProvider.isProxy) return [3 /*break*/, 4];
                         _d = (_c = this._edp).deleteMany;
-                        return [4 /*yield*/, this._translateWhereToFilter(where)];
-                    case 1: return [2 /*return*/, _d.apply(_c, [_l.sent()])];
+                        if (!(where === 'all')) return [3 /*break*/, 1];
+                        _e = 'all';
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this._translateWhereToFilter(where)];
                     case 2:
+                        _e = _m.sent();
+                        _m.label = 3;
+                    case 3: return [2 /*return*/, _d.apply(_c, [_e])];
+                    case 4:
                         deleted = 0;
-                        _l.label = 3;
-                    case 3:
-                        _l.trys.push([3, 9, 10, 15]);
-                        _e = true, _f = tslib_1.__asyncValues(this.query({ where: where, aggregate: undefined }));
-                        _l.label = 4;
-                    case 4: return [4 /*yield*/, _f.next()];
+                        _m.label = 5;
                     case 5:
-                        if (!(_g = _l.sent(), _h = _g.done, !_h)) return [3 /*break*/, 8];
-                        _k = _g.value;
-                        _e = false;
-                        item = _k;
+                        _m.trys.push([5, 11, 12, 17]);
+                        _f = true, _g = tslib_1.__asyncValues(this.query({ where: where, aggregate: undefined }));
+                        _m.label = 6;
+                    case 6: return [4 /*yield*/, _g.next()];
+                    case 7:
+                        if (!(_h = _m.sent(), _j = _h.done, !_j)) return [3 /*break*/, 10];
+                        _l = _h.value;
+                        _f = false;
+                        item = _l;
                         return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(item).delete()];
-                    case 6:
-                        _l.sent();
+                    case 8:
+                        _m.sent();
                         deleted++;
-                        _l.label = 7;
-                    case 7:
-                        _e = true;
-                        return [3 /*break*/, 4];
-                    case 8: return [3 /*break*/, 15];
+                        _m.label = 9;
                     case 9:
-                        e_22_1 = _l.sent();
-                        e_22 = { error: e_22_1 };
-                        return [3 /*break*/, 15];
-                    case 10:
-                        _l.trys.push([10, , 13, 14]);
-                        if (!(!_e && !_h && (_j = _f.return))) return [3 /*break*/, 12];
-                        return [4 /*yield*/, _j.call(_f)];
+                        _f = true;
+                        return [3 /*break*/, 6];
+                    case 10: return [3 /*break*/, 17];
                     case 11:
-                        _l.sent();
-                        _l.label = 12;
-                    case 12: return [3 /*break*/, 14];
+                        e_22_1 = _m.sent();
+                        e_22 = { error: e_22_1 };
+                        return [3 /*break*/, 17];
+                    case 12:
+                        _m.trys.push([12, , 15, 16]);
+                        if (!(!_f && !_j && (_k = _g.return))) return [3 /*break*/, 14];
+                        return [4 /*yield*/, _k.call(_g)];
                     case 13:
+                        _m.sent();
+                        _m.label = 14;
+                    case 14: return [3 /*break*/, 16];
+                    case 15:
                         if (e_22) throw e_22.error;
                         return [7 /*endfinally*/];
-                    case 14: return [7 /*endfinally*/];
-                    case 15: return [2 /*return*/, deleted];
+                    case 16: return [7 /*endfinally*/];
+                    case 17: return [2 /*return*/, deleted];
                 }
             });
         });
@@ -2275,6 +2311,24 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             context_js_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
+    rowHelperImplementation.prototype._updateResultsFromServerAction = function (rowInfo) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._updateEntityBasedOnApi(rowInfo.data, true)];
+                    case 1:
+                        _a.sent();
+                        if (this._isNew != rowInfo.isNewRow) {
+                            this._isNew = rowInfo.isNewRow;
+                            this.originalId = rowInfo.id;
+                        }
+                        if (!rowInfo.wasChanged)
+                            this.originalValues = this.copyDataToObject();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     rowHelperImplementation.prototype.clone = function () {
         var data = this.toApiJson(true, true);
         return this.repo.fromJson(data, this.isNew());
@@ -2403,7 +2457,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    rowHelperImplementation.prototype.save = function (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
+    rowHelperImplementation.prototype.save = function (options, onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var doNotSave_1, e, _a, _b, col, e_36_1, d, ignoreKeys, _c, _d, field, f, updatedRow, isNew, _e, _f, changesOnly, wasChanged, key, element, _g, _h, _j, _k, listener, e_37_1, err_1;
             var e_36, _l, e_38, _m, _o, _p, e_37, _q;
@@ -2411,7 +2465,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_t) {
                 switch (_t.label) {
                     case 0:
-                        _t.trys.push([0, , 40, 41]);
+                        _t.trys.push([0, , 41, 42]);
                         if (this._saving)
                             throw new Error('cannot save while entity is already saving');
                         this._saving = true;
@@ -2492,10 +2546,10 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         isNew = this.isNew();
                         _t.label = 13;
                     case 13:
-                        _t.trys.push([13, 37, , 39]);
+                        _t.trys.push([13, 38, , 40]);
                         (_r = this._subscribers) === null || _r === void 0 ? void 0 : _r.reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 19];
-                        if (!doNotSave_1) return [3 /*break*/, 16];
+                        if (!(doNotSave_1 && (options === null || options === void 0 ? void 0 : options.select) !== 'none')) return [3 /*break*/, 16];
                         _f = (_e = this.edp).find;
                         _o = {};
                         return [4 /*yield*/, this.getIdFilter()];
@@ -2504,11 +2558,11 @@ 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)];
+                    case 16: return [4 /*yield*/, this.edp.insert(d, options)];
                     case 17:
                         updatedRow = _t.sent();
                         _t.label = 18;
-                    case 18: return [3 /*break*/, 24];
+                    case 18: return [3 /*break*/, 25];
                     case 19:
                         changesOnly = {};
                         wasChanged = false;
@@ -2525,79 +2579,81 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         if (!wasChanged)
                             return [2 /*return*/, this.instance];
-                        if (!doNotSave_1) return [3 /*break*/, 22];
+                        if (!doNotSave_1) return [3 /*break*/, 23];
+                        if (!((options === null || options === void 0 ? void 0 : options.select) !== 'none')) return [3 /*break*/, 22];
                         _h = (_g = this.edp).find;
                         _p = {};
                         return [4 /*yield*/, this.getIdFilter()];
                     case 20: return [4 /*yield*/, _h.apply(_g, [(_p.where = _t.sent(), _p)])];
                     case 21:
                         updatedRow = (_t.sent())[0];
-                        return [3 /*break*/, 24];
-                    case 22:
+                        _t.label = 22;
+                    case 22: return [3 /*break*/, 25];
+                    case 23:
                         if (this.id === undefined)
                             throw new Error('Invalid operation, id is undefined');
-                        return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
-                    case 23:
-                        updatedRow = _t.sent();
-                        _t.label = 24;
+                        return [4 /*yield*/, this.edp.update(this.id, changesOnly, options)];
                     case 24:
-                        if (!updatedRow) return [3 /*break*/, 26];
-                        return [4 /*yield*/, this.loadDataFrom(updatedRow)];
+                        updatedRow = _t.sent();
+                        _t.label = 25;
                     case 25:
-                        _t.sent();
-                        _t.label = 26;
+                        if (!updatedRow) return [3 /*break*/, 27];
+                        return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 26:
+                        _t.sent();
+                        _t.label = 27;
+                    case 27:
                         e.id = this.getId();
-                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 36];
-                        if (!this.info.entityInfo.saved) return [3 /*break*/, 28];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 37];
+                        if (!this.info.entityInfo.saved) return [3 /*break*/, 29];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
-                    case 27:
-                        _t.sent();
-                        _t.label = 28;
                     case 28:
-                        if (!this.repo.listeners) return [3 /*break*/, 36];
+                        _t.sent();
                         _t.label = 29;
                     case 29:
-                        _t.trys.push([29, 34, 35, 36]);
-                        _j = tslib_1.__values(this.repo.listeners), _k = _j.next();
+                        if (!this.repo.listeners) return [3 /*break*/, 37];
                         _t.label = 30;
                     case 30:
-                        if (!!_k.done) return [3 /*break*/, 33];
+                        _t.trys.push([30, 35, 36, 37]);
+                        _j = tslib_1.__values(this.repo.listeners), _k = _j.next();
+                        _t.label = 31;
+                    case 31:
+                        if (!!_k.done) return [3 /*break*/, 34];
                         listener = _k.value;
                         return [4 /*yield*/, ((_s = listener.saved) === null || _s === void 0 ? void 0 : _s.call(listener, this.instance, isNew))];
-                    case 31:
-                        _t.sent();
-                        _t.label = 32;
                     case 32:
+                        _t.sent();
+                        _t.label = 33;
+                    case 33:
                         _k = _j.next();
-                        return [3 /*break*/, 30];
-                    case 33: return [3 /*break*/, 36];
-                    case 34:
+                        return [3 /*break*/, 31];
+                    case 34: return [3 /*break*/, 37];
+                    case 35:
                         e_37_1 = _t.sent();
                         e_37 = { error: e_37_1 };
-                        return [3 /*break*/, 36];
-                    case 35:
+                        return [3 /*break*/, 37];
+                    case 36:
                         try {
                             if (_k && !_k.done && (_q = _j.return)) _q.call(_j);
                         }
                         finally { if (e_37) throw e_37.error; }
                         return [7 /*endfinally*/];
-                    case 36:
+                    case 37:
                         this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
-                    case 37:
+                    case 38:
                         err_1 = _t.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
-                    case 38: throw _t.sent();
-                    case 39: return [3 /*break*/, 41];
-                    case 40:
+                    case 39: throw _t.sent();
+                    case 40: return [3 /*break*/, 42];
+                    case 41:
                         this.isLoading = false;
                         this._reportChangedToEntityAndFields();
                         this._saving = false;
                         return [7 /*endfinally*/];
-                    case 41: return [2 /*return*/];
+                    case 42: return [2 /*return*/];
                 }
             });
         });