remult 0.9.9 → 0.9.13

package/src/remult3/RepositoryImplementation.js

@@ -9,6 +9,34 @@ var sort_1 = require("../sort");
 var valueConverters_1 = require("../../valueConverters");
 var filter_interfaces_2 = require("../filter/filter-interfaces");
 var assign_1 = require("../../assign");
+var classValidatorValidate = undefined;
+Promise.resolve().then(function () { return require("class-validator" + ""); }).then(function (v) {
+    classValidatorValidate = function (item, ref) {
+        return v.validate(item).then(function (errors) {
+            var e_1, _a;
+            try {
+                for (var errors_1 = tslib_1.__values(errors), errors_1_1 = errors_1.next(); !errors_1_1.done; errors_1_1 = errors_1.next()) {
+                    var err = errors_1_1.value;
+                    for (var key in err.constraints) {
+                        if (Object.prototype.hasOwnProperty.call(err.constraints, key)) {
+                            var element = err.constraints[key];
+                            ref.fields.find(err.property).error = element;
+                        }
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (errors_1_1 && !errors_1_1.done && (_a = errors_1.return)) _a.call(errors_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    };
+})
+    .catch(function () {
+});
 var RepositoryImplementation = /** @class */ (function () {
     function RepositoryImplementation(entity, remult, dataProvider) {
         this.entity = entity;
@@ -21,7 +49,7 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.createAfterFilter = function (orderBy, lastRow) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var values, _a, _b, s, existingVal, r, equalToColumn, _c, _d, s, ff, f, equalToColumn_1, equalToColumn_1_1, c;
-            var e_1, _e, e_2, _f, e_3, _g;
+            var e_2, _e, e_3, _f, e_4, _g;
             return tslib_1.__generator(this, function (_h) {
                 values = new Map();
                 try {
@@ -39,12 +67,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         values.set(s.field.key, existingVal);
                     }
                 }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
                         if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
                 r = { $or: [] };
                 equalToColumn = [];
@@ -54,17 +82,17 @@ var RepositoryImplementation = /** @class */ (function () {
                         ff = new filter_interfaces_2.filterHelper(s.field);
                         f = {};
                         try {
-                            for (equalToColumn_1 = (e_3 = void 0, tslib_1.__values(equalToColumn)), equalToColumn_1_1 = equalToColumn_1.next(); !equalToColumn_1_1.done; equalToColumn_1_1 = equalToColumn_1.next()) {
+                            for (equalToColumn_1 = (e_4 = void 0, tslib_1.__values(equalToColumn)), equalToColumn_1_1 = equalToColumn_1.next(); !equalToColumn_1_1.done; equalToColumn_1_1 = equalToColumn_1.next()) {
                                 c = equalToColumn_1_1.value;
                                 f[c.key] = values.get(c.key);
                             }
                         }
-                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
                                 if (equalToColumn_1_1 && !equalToColumn_1_1.done && (_g = equalToColumn_1.return)) _g.call(equalToColumn_1);
                             }
-                            finally { if (e_3) throw e_3.error; }
+                            finally { if (e_4) throw e_4.error; }
                         }
                         equalToColumn.push(s.field);
                         if (s.isDescending) {
@@ -75,12 +103,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         r.$or.push(f);
                     }
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                     }
-                    finally { if (e_2) throw e_2.error; }
+                    finally { if (e_3) throw e_3.error; }
                 }
                 return [2 /*return*/, r];
             });
@@ -223,8 +251,8 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            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 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_5_1, result;
+            var e_5, _d, e_6, _e, _f, e_7, _g;
             var _this = this;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
@@ -266,7 +294,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         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()) {
+                            for (rawRows_1 = (e_6 = 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)) {
@@ -274,29 +302,29 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_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; }
+                            finally { if (e_6) throw e_6.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()) {
+                            for (rows_1 = (e_7 = 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 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_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; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         _h.label = 6;
                     case 6:
@@ -304,14 +332,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_4_1 = _h.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _h.sent();
+                        e_5 = { error: e_5_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; }
+                        finally { if (e_5) throw e_5.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) {
@@ -446,7 +474,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_7, _c;
+            var e_8, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -459,12 +487,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         if (!newRow) return [3 /*break*/, 2];
                         r = this.create();
@@ -568,7 +596,7 @@ function createOldEntity(entity, remult) {
     var key = getEntityKey(entity);
     var base = Object.getPrototypeOf(entity);
     var _loop_1 = function () {
-        var e_8, _a;
+        var e_9, _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; }); })));
@@ -588,17 +616,17 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var _b = (e_8 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_9 = 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 }; }
+            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; }
             }
         }
         base = Object.getPrototypeOf(base);
@@ -611,12 +639,12 @@ function createOldEntity(entity, remult) {
 exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
     function rowHelperBase(columnsInfo, instance, remult) {
-        var e_9, _a;
+        var e_10, _a;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.instance = instance;
         this.remult = remult;
-        this.isLoading = false;
+        this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
         var _loop_3 = function (col) {
@@ -627,11 +655,12 @@ 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) {
                         lookup_1.set(val);
-                        _this._fire();
+                        _this._reportChanged();
                     },
                     enumerable: true
                 });
@@ -647,30 +676,45 @@ var rowHelperBase = /** @class */ (function () {
                 _loop_3(col);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_a = columnsInfo_1.return)) _a.call(columnsInfo_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
-        get: function () { return this._error; },
+        get: function () {
+            this._reportObserved();
+            return this._error;
+        },
         set: function (val) {
             this._error = val;
-            this._fire();
+            this._reportChanged();
         },
         enumerable: false,
         configurable: true
     });
-    rowHelperBase.prototype._fire = function () {
+    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(); });
+            this._subscribers.forEach(function (x) { return x.reportObserved(); });
     };
     rowHelperBase.prototype.subscribe = function (listener) {
-        var e_10, _a;
+        var e_11, _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) {
@@ -681,11 +725,12 @@ var rowHelperBase = /** @class */ (function () {
                     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._fire();
+                            _this._reportChanged();
                         },
                         enumerable: true
                     });
@@ -698,17 +743,29 @@ var rowHelperBase = /** @class */ (function () {
                     _loop_4(col);
                 }
             }
-            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._subscribers.push(listener);
+        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) {
@@ -722,7 +779,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.__assertValidity = function () {
-        var e_11, _a;
+        var e_12, _a;
         if (!this.hasErrors()) {
             var error = {
                 modelState: Object.assign({}, this.errors),
@@ -739,12 +796,12 @@ var rowHelperBase = /** @class */ (function () {
                         }
                     }
                 }
-                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; }
                 }
             }
             throw error;
@@ -776,12 +833,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_12, _a;
+        var e_13, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -800,12 +859,12 @@ var rowHelperBase = /** @class */ (function () {
                 d[col.key] = val;
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_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_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         return d;
     };
@@ -819,8 +878,13 @@ var rowHelperBase = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.__clearErrors();
-                        return [4 /*yield*/, this.__performColumnAndEntityValidations()];
+                        if (!classValidatorValidate) return [3 /*break*/, 2];
+                        return [4 /*yield*/, classValidatorValidate(this.instance, this)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.__performColumnAndEntityValidations()];
+                    case 3:
                         _a.sent();
                         r = this.hasErrors();
                         return [2 /*return*/, r];
@@ -834,8 +898,13 @@ var rowHelperBase = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.__clearErrors();
-                        return [4 /*yield*/, this.__performColumnAndEntityValidations()];
+                        if (!classValidatorValidate) return [3 /*break*/, 2];
+                        return [4 /*yield*/, classValidatorValidate(this.instance, this)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.__performColumnAndEntityValidations()];
+                    case 3:
                         _a.sent();
                         this.__assertValidity();
                         return [2 /*return*/];
@@ -851,7 +920,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.toApiJson = function () {
-        var e_13, _a;
+        var e_14, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -876,19 +945,19 @@ var rowHelperBase = /** @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 (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.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_14, _c;
+            var e_15, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -908,12 +977,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_14) throw e_14.error; }
+                            finally { if (e_15) throw e_15.error; }
                         }
                         return [4 /*yield*/, Promise.all(tslib_1.__spread(this.fields).map(function (x) { return x.load(); }))];
                     case 1:
@@ -928,7 +997,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_15, _a;
+        var e_16, _a;
         var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
         _this.info = info;
         _this.repository = repository;
@@ -949,14 +1018,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_16) throw e_16.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", {
@@ -981,11 +1054,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 () {
@@ -1005,6 +1080,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }); })];
                     case 1:
                         _a.sent();
+                        this._reportChanged();
                         return [2 /*return*/, this.instance];
                 }
             });
@@ -1012,7 +1088,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_16, _b;
+            var _a, e_17, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -1026,12 +1102,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_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
                 this._columns = r_1;
             }
@@ -1043,7 +1119,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.save = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var doNotSave_1, d, ignoreKeys, _a, _b, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
-            var e_17, _c;
+            var e_18, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1073,12 +1149,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_17) throw e_17.error; }
+                            finally { if (e_18) throw e_18.error; }
                         }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
                             d.id = undefined;
@@ -1086,7 +1162,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _d.label = 4;
                     case 4:
                         _d.trys.push([4, 14, , 16]);
-                        this._fire();
+                        this._reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.edp.insert(d)];
                     case 5:
@@ -1136,7 +1212,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 16: return [3 /*break*/, 18];
                     case 17:
                         this.isLoading = false;
-                        this._fire();
+                        this._reportChanged();
                         return [7 /*endfinally*/];
                     case 18: return [2 /*return*/];
                 }
@@ -1148,8 +1224,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_18_1, err_2;
-            var e_18, _c;
+            var _a, _b, listener, e_19_1, err_2;
+            var e_19, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1191,14 +1267,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 8];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_18_1 = _d.sent();
-                        e_18 = { error: e_18_1 };
+                        e_19_1 = _d.sent();
+                        e_19 = { error: e_19_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_19) throw e_19.error; }
                         return [7 /*endfinally*/];
                     case 14:
                         this._wasDeleted = true;
@@ -1216,8 +1292,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_19_1;
-            var e_19, _c;
+            var _a, _b, col, lu, e_20_1;
+            var e_20, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1252,14 +1328,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_19_1 = _d.sent();
-                        e_19 = { error: e_19_1 };
+                        e_20_1 = _d.sent();
+                        e_20 = { error: e_20_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_19) throw e_19.error; }
+                        finally { if (e_20) throw e_20.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -1279,8 +1355,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_20_1;
-            var e_20, _e;
+            var _a, _b, col, _c, _d, e_21_1;
+            var e_21, _e;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -1305,14 +1381,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_20_1 = _f.sent();
-                        e_20 = { error: e_20_1 };
+                        e_21_1 = _f.sent();
+                        e_21 = { error: e_21_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_21) throw e_21.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1320,10 +1396,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         });
     };
     rowHelperImplementation.prototype.isNew = function () {
+        this._reportObserved();
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_21, _a;
+        var e_22, _a;
+        this._reportObserved();
         try {
             for (var _b = tslib_1.__values(this.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
@@ -1331,19 +1409,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     return true;
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_22) throw e_22.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_22_1, _c, _d, listener, e_23_1;
-            var e_22, _e, e_23, _f;
+            var _a, _b, c, col, e_23_1, _c, _d, listener, e_24_1;
+            var e_23, _e, e_24, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -1364,18 +1442,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_22_1 = _g.sent();
-                        e_22 = { error: e_22_1 };
+                        e_23_1 = _g.sent();
+                        e_23 = { error: e_23_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_22) throw e_22.error; }
+                        finally { if (e_23) throw e_23.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this.info.entityInfo.validation(this.instance)];
+                        return [4 /*yield*/, this.info.entityInfo.validation(this.instance, this)];
                     case 8:
                         _g.sent();
                         _g.label = 9;
@@ -1398,14 +1476,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_23_1 = _g.sent();
-                        e_23 = { error: e_23_1 };
+                        e_24_1 = _g.sent();
+                        e_24 = { error: e_24_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_23) throw e_23.error; }
+                        finally { if (e_24) throw e_24.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -1447,7 +1525,7 @@ exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_24, _b;
+        var _a, e_25, _b;
         var _this = _super.call(this, columnsInfo, instance, remult) || this;
         var _items = [];
         var r = (_a = {
@@ -1461,20 +1539,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push(r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this));
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_25) throw e_25.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_25_1;
-            var e_25, _c;
+            var _a, _b, col, e_26_1;
+            var e_26, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1494,14 +1572,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_25_1 = _d.sent();
-                        e_25 = { error: e_25_1 };
+                        e_26_1 = _d.sent();
+                        e_26 = { error: e_26_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_25) throw e_25.error; }
+                        finally { if (e_26) throw e_26.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1522,6 +1600,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;
@@ -1529,6 +1608,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;
     };
@@ -1554,6 +1634,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];
@@ -1562,13 +1643,14 @@ var FieldRefImplementation = /** @class */ (function () {
             if (!this.rowBase.errors)
                 this.rowBase.errors = {};
             this.rowBase.errors[this.metadata.key] = error;
-            this.rowBase._fire();
+            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);
@@ -1593,6 +1675,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());
@@ -1607,6 +1690,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;
@@ -1625,6 +1709,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) {
@@ -1634,8 +1719,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_26_1;
-            var e_26, _c;
+            var x, _a, _b, v, e_27_1;
+            var e_27, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1658,14 +1743,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_26_1 = _d.sent();
-                        e_26 = { error: e_26_1 };
+                        e_27_1 = _d.sent();
+                        e_27 = { error: e_27_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_26) throw e_26.error; }
+                        finally { if (e_27) throw e_27.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
@@ -1792,7 +1877,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_27, _b;
+        var _a, e_28, _b;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.entityInfo = entityInfo;
@@ -1861,12 +1946,12 @@ var EntityFullInfo = /** @class */ (function () {
                 _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
             }
         }
-        catch (e_27_1) { e_27 = { error: e_27_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
                 if (columnsInfo_3_1 && !columnsInfo_3_1.done && (_b = columnsInfo_3.return)) _b.call(columnsInfo_3);
             }
-            finally { if (e_27) throw e_27.error; }
+            finally { if (e_28) throw e_28.error; }
         }
         this.fields = r;
         this.dbAutoIncrementId = entityInfo.dbAutoIncrementId;
@@ -2033,7 +2118,7 @@ function Field() {
 exports.Field = Field;
 var storableMember = Symbol("storableMember");
 function buildOptions(options, remult) {
-    var e_28, _a;
+    var e_29, _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()) {
@@ -2046,12 +2131,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_28_1) { e_28 = { error: e_28_1 }; }
+    catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
             if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
         }
-        finally { if (e_28) throw e_28.error; }
+        finally { if (e_29) throw e_29.error; }
     }
     return r;
 }
@@ -2134,7 +2219,7 @@ function Entity(key) {
             }
         }
         var factory = function (remult) {
-            var e_29, _a;
+            var e_30, _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()) {
@@ -2147,12 +2232,12 @@ function Entity(key) {
                     }
                 }
             }
-            catch (e_29_1) { e_29 = { error: e_29_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
                     if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
                 }
-                finally { if (e_29) throw e_29.error; }
+                finally { if (e_30) throw e_30.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -2241,9 +2326,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_30, _a;
+        var e_31, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_30_1;
+            var i, _b, _c, x, e_31_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2265,8 +2350,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_30_1 = _d.sent();
-                        e_30 = { error: e_30_1 };
+                        e_31_1 = _d.sent();
+                        e_31 = { error: e_31_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -2277,7 +2362,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_30) throw e_30.error;
+                        if (e_31) throw e_31.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];