remult 0.9.6 → 0.9.10

package/src/remult3/RepositoryImplementation.js

@@ -94,6 +94,7 @@ var RepositoryImplementation = /** @class */ (function () {
         configurable: true
     });
     RepositoryImplementation.prototype.getCachedById = function (id) {
+        id = id + '';
         this.getCachedByIdAsync(id);
         var r = this.idCache.get(id);
         if (r instanceof Promise)
@@ -107,6 +108,7 @@ var RepositoryImplementation = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        id = id + '';
                         r = this.idCache.get(id);
                         if (!(r instanceof Promise)) return [3 /*break*/, 2];
                         return [4 /*yield*/, r];
@@ -134,7 +136,7 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.addToCache = function (item) {
         if (item)
-            this.idCache.set(this.getEntityRef(item).getId(), item);
+            this.idCache.set(this.getEntityRef(item).getId() + '', item);
     };
     Object.defineProperty(RepositoryImplementation.prototype, "metadata", {
         get: function () { return this._info; },
@@ -221,10 +223,11 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var opt, _a, rawRows, loadFields, result;
+            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, rows, rows_1, rows_1_1, r, e_4_1, result;
+            var e_4, _d, e_5, _e, _f, e_6, _g;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         opt = {};
                         if (!options)
@@ -236,24 +239,88 @@ var RepositoryImplementation = /** @class */ (function () {
                         _a = opt;
                         return [4 /*yield*/, this.translateWhereToFilter(options.where)];
                     case 1:
-                        _a.where = _b.sent();
+                        _a.where = _h.sent();
                         opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
                         opt.limit = options.limit;
                         opt.page = options.page;
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
-                        rawRows = _b.sent();
+                        rawRows = _h.sent();
                         loadFields = undefined;
                         if (options.load)
                             loadFields = options.load(this.metadata.fields);
-                        return [4 /*yield*/, Promise.all(rawRows.map(function (r) { 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.mapRawDataToResult(r, loadFields)];
-                                    case 1: return [2 /*return*/, _a.sent()];
-                                }
-                            }); }); }))];
+                        _h.label = 3;
                     case 3:
-                        result = _b.sent();
+                        _h.trys.push([3, 8, 9, 10]);
+                        _b = tslib_1.__values(this.metadata.fields), _c = _b.next();
+                        _h.label = 4;
+                    case 4:
+                        if (!!_c.done) return [3 /*break*/, 7];
+                        col = _c.value;
+                        ei = getEntitySettings(col.valueType, false);
+                        if (!ei) return [3 /*break*/, 6];
+                        load = !col.options.lazy;
+                        if (loadFields !== undefined)
+                            load = loadFields.includes(col);
+                        if (!load) return [3 /*break*/, 6];
+                        repo = this.remult.repo(col.valueType);
+                        toLoad = [];
+                        try {
+                            for (rawRows_1 = (e_5 = 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 && val !== null && !toLoad.includes(val) && !repo.idCache.has(val)) {
+                                    toLoad.push(val);
+                                }
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (rawRows_1_1 && !rawRows_1_1.done && (_e = rawRows_1.return)) _e.call(rawRows_1);
+                            }
+                            finally { if (e_5) throw e_5.error; }
+                        }
+                        if (!(toLoad.length > 0)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, repo.find({ where: (_f = repo.metadata.idMetadata).getIdFilter.apply(_f, tslib_1.__spread(toLoad)) })];
+                    case 5:
+                        rows = _h.sent();
+                        try {
+                            for (rows_1 = (e_6 = void 0, tslib_1.__values(rows)), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
+                                r = rows_1_1.value;
+                                repo.addToCache(r);
+                            }
+                        }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        finally {
+                            try {
+                                if (rows_1_1 && !rows_1_1.done && (_g = rows_1.return)) _g.call(rows_1);
+                            }
+                            finally { if (e_6) throw e_6.error; }
+                        }
+                        _h.label = 6;
+                    case 6:
+                        _c = _b.next();
+                        return [3 /*break*/, 4];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_4_1 = _h.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
+                        try {
+                            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 10: return [4 /*yield*/, Promise.all(rawRows.map(function (r) { 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.mapRawDataToResult(r, loadFields)];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        }); }); }))];
+                    case 11:
+                        result = _h.sent();
                         return [2 /*return*/, result];
                 }
             });
@@ -379,7 +446,7 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var obj, _a, _b, col, r, helper;
-            var e_4, _c;
+            var e_7, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -392,12 +459,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         if (!newRow) return [3 /*break*/, 2];
                         r = this.create();
@@ -497,28 +564,62 @@ function createOldEntity(entity, remult) {
     var r = exports.columnsOfType.get(entity);
     if (!r)
         exports.columnsOfType.set(entity, r = []);
-    var info = getEntitySettings(entity);
+    var info = getEntitySettings(entity)(remult);
     var key = getEntityKey(entity);
     var base = Object.getPrototypeOf(entity);
-    while (base != null) {
+    var _loop_1 = function () {
+        var e_8, _a;
         var baseCols = exports.columnsOfType.get(base);
         if (baseCols) {
             r.unshift.apply(r, tslib_1.__spread(baseCols.filter(function (x) { return !r.find(function (y) { return y.key == x.key; }); })));
         }
+        var baseSettingsFactory = getEntitySettings(base, false);
+        if (baseSettingsFactory) {
+            var baseSettings_1 = baseSettingsFactory(remult);
+            info = tslib_1.__assign(tslib_1.__assign({}, baseSettings_1), info);
+            var functions = ["saving", "saved", "deleting", "deleted", "validation"];
+            var _loop_2 = function (key_1) {
+                if (baseSettings_1[key_1]) {
+                    var x_1 = info[key_1];
+                    info[key_1] = function (a, b) {
+                        x_1(a, b);
+                        baseSettings_1[key_1](a, b);
+                    };
+                }
+            };
+            try {
+                for (var _b = (e_8 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var key_1 = _c.value;
+                    _loop_2(key_1);
+                }
+            }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_8) throw e_8.error; }
+            }
+        }
         base = Object.getPrototypeOf(base);
+    };
+    while (base != null) {
+        _loop_1();
     }
-    return new EntityFullInfo(prepareColumnInfo(r, remult), info(remult), remult, entity, key);
+    return new EntityFullInfo(prepareColumnInfo(r, remult), info, remult, entity, key);
 }
 exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
     function rowHelperBase(columnsInfo, instance, remult) {
-        var e_5, _a;
+        var e_9, _a;
+        var _this = this;
         this.columnsInfo = columnsInfo;
         this.instance = instance;
         this.remult = remult;
+        this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
-        var _loop_1 = function (col) {
+        var _loop_3 = function (col) {
             var ei = getEntitySettings(col.valueType, false);
             if (ei && remult) {
                 var lookup_1 = new column_1.LookupColumn(remult.repo(col.valueType), undefined);
@@ -526,31 +627,117 @@ var rowHelperBase = /** @class */ (function () {
                 var val = instance[col.key];
                 Object.defineProperty(instance, col.key, {
                     get: function () {
+                        _this._reportObserved();
                         return lookup_1.item;
                     },
                     set: function (val) {
-                        return lookup_1.set(val);
+                        lookup_1.set(val);
+                        _this._reportChanged();
                     },
                     enumerable: true
                 });
                 instance[col.key] = val;
             }
+            else {
+            }
         };
         var this_1 = this;
         try {
             for (var columnsInfo_1 = tslib_1.__values(columnsInfo), columnsInfo_1_1 = columnsInfo_1.next(); !columnsInfo_1_1.done; columnsInfo_1_1 = columnsInfo_1.next()) {
                 var col = columnsInfo_1_1.value;
-                _loop_1(col);
+                _loop_3(col);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_a = columnsInfo_1.return)) _a.call(columnsInfo_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_9) throw e_9.error; }
         }
     }
+    Object.defineProperty(rowHelperBase.prototype, "error", {
+        get: function () {
+            this._reportObserved();
+            return this._error;
+        },
+        set: function (val) {
+            this._error = val;
+            this._reportChanged();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    rowHelperBase.prototype._reportChanged = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportChanged(); });
+    };
+    rowHelperBase.prototype._reportObserved = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportObserved(); });
+    };
+    rowHelperBase.prototype.subscribe = function (listener) {
+        var e_10, _a;
+        var _this = this;
+        var list;
+        if (typeof listener === "function")
+            list = {
+                reportChanged: function () { return listener(); },
+                reportObserved: function () { }
+            };
+        else
+            list = listener;
+        if (!this._subscribers) {
+            this._subscribers = [];
+            var _loop_4 = function (col) {
+                var ei = getEntitySettings(col.valueType, false);
+                if (ei && this_2.remult) {
+                }
+                else {
+                    var val_1 = this_2.instance[col.key];
+                    Object.defineProperty(this_2.instance, col.key, {
+                        get: function () {
+                            _this._reportObserved();
+                            return val_1;
+                        },
+                        set: function (value) {
+                            val_1 = value;
+                            _this._reportChanged();
+                        },
+                        enumerable: true
+                    });
+                }
+            };
+            var this_2 = this;
+            try {
+                for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var col = _c.value;
+                    _loop_4(col);
+                }
+            }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_10) throw e_10.error; }
+            }
+        }
+        this._subscribers.push(list);
+        return function () { return _this._subscribers = _this._subscribers.filter(function (x) { return x != listener; }); };
+    };
+    Object.defineProperty(rowHelperBase.prototype, "isLoading", {
+        get: function () {
+            this._reportObserved();
+            return this._isLoading;
+        },
+        set: function (val) {
+            this._isLoading = val;
+            this._reportChanged();
+        },
+        enumerable: false,
+        configurable: true
+    });
     rowHelperBase.prototype.waitLoad = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
@@ -564,7 +751,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.__assertValidity = function () {
-        var e_6, _a;
+        var e_11, _a;
         if (!this.hasErrors()) {
             var error = {
                 modelState: Object.assign({}, this.errors),
@@ -581,12 +768,12 @@ var rowHelperBase = /** @class */ (function () {
                         }
                     }
                 }
-                catch (e_6_1) { e_6 = { error: e_6_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_6) throw e_6.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
             }
             throw error;
@@ -618,12 +805,14 @@ var rowHelperBase = /** @class */ (function () {
     rowHelperBase.prototype.__clearErrors = function () {
         this.errors = undefined;
         this.error = undefined;
+        this._reportChanged();
     };
     rowHelperBase.prototype.hasErrors = function () {
+        this._reportObserved();
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function () {
-        var e_7, _a;
+        var e_12, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -642,12 +831,12 @@ var rowHelperBase = /** @class */ (function () {
                 d[col.key] = val;
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_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_7) throw e_7.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return d;
     };
@@ -693,7 +882,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.toApiJson = function () {
-        var e_8, _a;
+        var e_13, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -718,19 +907,19 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         return result;
     };
     rowHelperBase.prototype._updateEntityBasedOnApi = function (body) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var keys, _a, _b, col, lu;
-            var e_9, _c;
+            var e_14, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -750,12 +939,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_9) throw e_9.error; }
+                            finally { if (e_14) throw e_14.error; }
                         }
                         return [4 /*yield*/, Promise.all(tslib_1.__spread(this.fields).map(function (x) { return x.load(); }))];
                     case 1:
@@ -770,7 +959,7 @@ var rowHelperBase = /** @class */ (function () {
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
     function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
-        var e_10, _a;
+        var e_15, _a;
         var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
         _this.info = info;
         _this.repository = repository;
@@ -791,14 +980,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_15_1) { e_15 = { error: e_15_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_15) throw e_15.error; }
             }
         }
+        if (_this.info.options.entityRefInit)
+            _this.info.options.entityRefInit(_this, instance);
+        if (context_1.Remult.entityRefInit)
+            context_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
     Object.defineProperty(rowHelperImplementation.prototype, "apiUpdateAllowed", {
@@ -823,11 +1016,13 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             return this.instance[this.info.idMetadata.field.key];
     };
     rowHelperImplementation.prototype.wasDeleted = function () {
+        this._reportObserved();
         return this._wasDeleted;
     };
     rowHelperImplementation.prototype.undoChanges = function () {
         this.loadDataFrom(this.originalValues);
         this.__clearErrors();
+        this._reportChanged();
     };
     rowHelperImplementation.prototype.reload = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -847,6 +1042,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }); })];
                     case 1:
                         _a.sent();
+                        this._reportChanged();
                         return [2 /*return*/, this.instance];
                 }
             });
@@ -854,7 +1050,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_11, _b;
+            var _a, e_16, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -868,12 +1064,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _items_1.push(r_1[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this));
                     }
                 }
-                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_16) throw e_16.error; }
                 }
                 this._columns = r_1;
             }
@@ -884,30 +1080,55 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     });
     rowHelperImplementation.prototype.save = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave, d, updatedRow, changesOnly, wasChanged, key, element, err_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.__validateEntity()];
+            var doNotSave_1, d, ignoreKeys, _a, _b, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
+            var e_17, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, , 17, 18]);
+                        this.isLoading = true;
+                        return [4 /*yield*/, this.__validateEntity()];
                     case 1:
-                        _a.sent();
-                        doNotSave = false;
+                        _d.sent();
+                        doNotSave_1 = false;
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return doNotSave = true; })];
+                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return doNotSave_1 = true; })];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _d.sent();
+                        _d.label = 3;
                     case 3:
                         this.__assertValidity();
                         d = this.copyDataToObject();
+                        ignoreKeys = [];
+                        try {
+                            for (_a = tslib_1.__values(this.metadata.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                field = _b.value;
+                                if (field.dbReadOnly || field == this.metadata.idMetadata.field && this.metadata.options.dbAutoIncrementId) {
+                                    d[field.key] = undefined;
+                                    ignoreKeys.push(field.key);
+                                    f = this.fields.find(field);
+                                    f.value = f.originalValue;
+                                }
+                            }
+                        }
+                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_17) throw e_17.error; }
+                        }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
                             d.id = undefined;
-                        _a.label = 4;
+                        updatedRow = void 0;
+                        _d.label = 4;
                     case 4:
-                        _a.trys.push([4, 14, , 16]);
+                        _d.trys.push([4, 14, , 16]);
+                        this._reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.edp.insert(d)];
                     case 5:
-                        updatedRow = _a.sent();
+                        updatedRow = _d.sent();
                         return [3 /*break*/, 10];
                     case 6:
                         changesOnly = {};
@@ -915,7 +1136,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         for (key in d) {
                             if (Object.prototype.hasOwnProperty.call(d, key)) {
                                 element = d[key];
-                                if (element !== this.originalValues[key]) {
+                                if (element !== this.originalValues[key] && !ignoreKeys.includes(key)) {
                                     changesOnly[key] = element;
                                     wasChanged = true;
                                 }
@@ -923,34 +1144,39 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         if (!wasChanged)
                             return [2 /*return*/, this.instance];
-                        if (!doNotSave) return [3 /*break*/, 8];
+                        if (!doNotSave_1) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.edp.find({ where: this.getIdFilter() })];
                     case 7:
-                        updatedRow = (_a.sent())[0];
+                        updatedRow = (_d.sent())[0];
                         return [3 /*break*/, 10];
                     case 8: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
                     case 9:
-                        updatedRow = _a.sent();
-                        _a.label = 10;
+                        updatedRow = _d.sent();
+                        _d.label = 10;
                     case 10: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 11:
-                        _a.sent();
+                        _d.sent();
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance)];
                     case 12:
-                        _a.sent();
-                        _a.label = 13;
+                        _d.sent();
+                        _d.label = 13;
                     case 13:
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
                     case 14:
-                        err_1 = _a.sent();
+                        err_1 = _d.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
                     case 15:
-                        _a.sent();
+                        _d.sent();
                         return [3 /*break*/, 16];
-                    case 16: return [2 /*return*/];
+                    case 16: return [3 /*break*/, 18];
+                    case 17:
+                        this.isLoading = false;
+                        this._reportChanged();
+                        return [7 /*endfinally*/];
+                    case 18: return [2 /*return*/];
                 }
             });
         });
@@ -960,8 +1186,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, listener, e_12_1, err_2;
-            var e_12, _c;
+            var _a, _b, listener, e_18_1, err_2;
+            var e_18, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1003,14 +1229,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 8];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_12_1 = _d.sent();
-                        e_12 = { error: e_12_1 };
+                        e_18_1 = _d.sent();
+                        e_18 = { error: e_18_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_18) throw e_18.error; }
                         return [7 /*endfinally*/];
                     case 14:
                         this._wasDeleted = true;
@@ -1028,8 +1254,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.loadDataFrom = function (data, loadItems) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, lu, e_13_1;
-            var e_13, _c;
+            var _a, _b, col, lu, e_19_1;
+            var e_19, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1064,14 +1290,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_13_1 = _d.sent();
-                        e_13 = { error: e_13_1 };
+                        e_19_1 = _d.sent();
+                        e_19 = { error: e_19_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_19) throw e_19.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -1091,8 +1317,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.calcServerExpression = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, _c, _d, e_14_1;
-            var e_14, _e;
+            var _a, _b, col, _c, _d, e_20_1;
+            var e_20, _e;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -1117,14 +1343,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_14_1 = _f.sent();
-                        e_14 = { error: e_14_1 };
+                        e_20_1 = _f.sent();
+                        e_20 = { error: e_20_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_14) throw e_14.error; }
+                        finally { if (e_20) throw e_20.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1132,10 +1358,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         });
     };
     rowHelperImplementation.prototype.isNew = function () {
+        this._reportObserved();
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_15, _a;
+        var e_21, _a;
+        this._reportObserved();
         try {
             for (var _b = tslib_1.__values(this.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
@@ -1143,19 +1371,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     return true;
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_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_15) throw e_15.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_16_1, _c, _d, listener, e_17_1;
-            var e_16, _e, e_17, _f;
+            var _a, _b, c, col, e_22_1, _c, _d, listener, e_23_1;
+            var e_22, _e, e_23, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -1176,14 +1404,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_16_1 = _g.sent();
-                        e_16 = { error: e_16_1 };
+                        e_22_1 = _g.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_16) throw e_16.error; }
+                        finally { if (e_22) throw e_22.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
@@ -1210,14 +1438,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_17_1 = _g.sent();
-                        e_17 = { error: e_17_1 };
+                        e_23_1 = _g.sent();
+                        e_23 = { error: e_23_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_23) throw e_23.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -1259,7 +1487,7 @@ exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_18, _b;
+        var _a, e_24, _b;
         var _this = _super.call(this, columnsInfo, instance, remult) || this;
         var _items = [];
         var r = (_a = {
@@ -1273,20 +1501,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push(r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this));
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_24) throw e_24.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_19_1;
-            var e_19, _c;
+            var _a, _b, col, e_25_1;
+            var e_25, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1306,14 +1534,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_19_1 = _d.sent();
-                        e_19 = { error: e_19_1 };
+                        e_25_1 = _d.sent();
+                        e_25 = { error: e_25_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_19) throw e_19.error; }
+                        finally { if (e_25) throw e_25.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1334,6 +1562,7 @@ var FieldRefImplementation = /** @class */ (function () {
         this.entityRef = this.helper;
     }
     FieldRefImplementation.prototype.valueIsNull = function () {
+        this.rowBase._reportObserved();
         var lu = this.rowBase.lookups.get(this.metadata.key);
         if (lu) {
             return lu.id === undefined || lu.id === null;
@@ -1341,6 +1570,7 @@ var FieldRefImplementation = /** @class */ (function () {
         return this.value === null;
     };
     FieldRefImplementation.prototype.originalValueIsNull = function () {
+        this.rowBase._reportObserved();
         var lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     };
@@ -1366,6 +1596,7 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     Object.defineProperty(FieldRefImplementation.prototype, "error", {
         get: function () {
+            this.rowBase._reportObserved();
             if (!this.rowBase.errors)
                 return undefined;
             return this.rowBase.errors[this.metadata.key];
@@ -1374,12 +1605,14 @@ var FieldRefImplementation = /** @class */ (function () {
             if (!this.rowBase.errors)
                 this.rowBase.errors = {};
             this.rowBase.errors[this.metadata.key] = error;
+            this.rowBase._reportChanged();
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(FieldRefImplementation.prototype, "displayValue", {
         get: function () {
+            this.rowBase._reportObserved();
             if (this.value != undefined) {
                 if (this.settings.displayValue)
                     return this.settings.displayValue(this.container, this.value);
@@ -1404,6 +1637,7 @@ var FieldRefImplementation = /** @class */ (function () {
     ;
     Object.defineProperty(FieldRefImplementation.prototype, "originalValue", {
         get: function () {
+            this.rowBase._reportObserved();
             var lu = this.rowBase.lookups.get(this.metadata.key);
             if (lu)
                 return lu.get(this.rawOriginalValue());
@@ -1418,6 +1652,7 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     Object.defineProperty(FieldRefImplementation.prototype, "inputValue", {
         get: function () {
+            this.rowBase._reportObserved();
             var lu = this.rowBase.lookups.get(this.metadata.key);
             if (lu)
                 return lu.id != undefined ? lu.id.toString() : null;
@@ -1436,6 +1671,7 @@ var FieldRefImplementation = /** @class */ (function () {
     });
     ;
     FieldRefImplementation.prototype.valueChanged = function () {
+        this.rowBase._reportObserved();
         var val = this.value;
         var lu = this.rowBase.lookups.get(this.metadata.key);
         if (lu) {
@@ -1445,8 +1681,8 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var x, _a, _b, v, e_20_1;
-            var e_20, _c;
+            var x, _a, _b, v, e_26_1;
+            var e_26, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1469,14 +1705,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_20_1 = _d.sent();
-                        e_20 = { error: e_20_1 };
+                        e_26_1 = _d.sent();
+                        e_26 = { error: e_26_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_26) throw e_26.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
@@ -1603,7 +1839,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_21, _b;
+        var _a, e_27, _b;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.entityInfo = entityInfo;
@@ -1622,14 +1858,26 @@ var EntityFullInfo = /** @class */ (function () {
             isIdField: function (col) {
                 return col.key == _this.idMetadata.field.key;
             },
-            getIdFilter: function (id) {
-                var _a;
-                if (_this.idMetadata.field instanceof column_1.CompoundIdField)
-                    return _this.idMetadata.field.isEqualTo(id);
-                else
+            getIdFilter: function () {
+                var _a, _b;
+                var ids = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    ids[_i] = arguments[_i];
+                }
+                if (_this.idMetadata.field instanceof column_1.CompoundIdField) {
+                    var field_1 = _this.idMetadata.field;
+                    return {
+                        $or: ids.map(function (x) { return field_1.isEqualTo(x); })
+                    };
+                }
+                if (ids.length == 1)
                     return _a = {},
-                        _a[_this.idMetadata.field.key] = id,
+                        _a[_this.idMetadata.field.key] = ids[0],
                         _a;
+                else
+                    return _b = {},
+                        _b[_this.idMetadata.field.key] = ids,
+                        _b;
             }
         };
         if (this.options.allowApiCrud !== undefined) {
@@ -1660,12 +1908,12 @@ var EntityFullInfo = /** @class */ (function () {
                 _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (columnsInfo_3_1 && !columnsInfo_3_1.done && (_b = columnsInfo_3.return)) _b.call(columnsInfo_3);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         this.fields = r;
         this.dbAutoIncrementId = entityInfo.dbAutoIncrementId;
@@ -1832,7 +2080,7 @@ function Field() {
 exports.Field = Field;
 var storableMember = Symbol("storableMember");
 function buildOptions(options, remult) {
-    var e_22, _a;
+    var e_28, _a;
     var r = {};
     try {
         for (var options_1 = tslib_1.__values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
@@ -1845,12 +2093,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_22_1) { e_22 = { error: e_22_1 }; }
+    catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
             if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
         }
-        finally { if (e_22) throw e_22.error; }
+        finally { if (e_28) throw e_28.error; }
     }
     return r;
 }
@@ -1933,7 +2181,7 @@ function Entity(key) {
             }
         }
         var factory = function (remult) {
-            var e_23, _a;
+            var e_29, _a;
             var r = {};
             try {
                 for (var options_2 = tslib_1.__values(options), options_2_1 = options_2.next(); !options_2_1.done; options_2_1 = options_2.next()) {
@@ -1946,12 +2194,12 @@ function Entity(key) {
                     }
                 }
             }
-            catch (e_23_1) { e_23 = { error: e_23_1 }; }
+            catch (e_29_1) { e_29 = { error: e_29_1 }; }
             finally {
                 try {
                     if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
                 }
-                finally { if (e_23) throw e_23.error; }
+                finally { if (e_29) throw e_29.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -2040,9 +2288,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_24, _a;
+        var e_30, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_24_1;
+            var i, _b, _c, x, e_30_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2064,8 +2312,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_24_1 = _d.sent();
-                        e_24 = { error: e_24_1 };
+                        e_30_1 = _d.sent();
+                        e_30 = { error: e_30_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -2076,7 +2324,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_24) throw e_24.error;
+                        if (e_30) throw e_30.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];