remult 0.9.16 → 0.9.20

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.Field = exports.ValueListFieldType = exports.IntegerField = exports.DateOnlyField = exports.JsonField = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.Field = exports.ValueListFieldType = exports.IntegerField = exports.DateOnlyField = exports.JsonField = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
@@ -531,7 +531,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 1:
                         r = _a.sent();
                         if (!(r && !this.dataProvider.supportsCustomFilter)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, filter_interfaces_1.Filter.translateCustomWhere(r, this.metadata, this.metadata, this.remult)];
+                        return [4 /*yield*/, filter_interfaces_1.Filter.translateCustomWhere(r, this.metadata, this.remult)];
                     case 2:
                         r = _a.sent();
                         _a.label = 3;
@@ -653,18 +653,36 @@ var rowHelperBase = /** @class */ (function () {
                 var lookup_1 = new column_1.LookupColumn(remult.repo(col.valueType), undefined);
                 this_1.lookups.set(col.key, lookup_1);
                 var val = instance[col.key];
+                var refImpl_1;
                 Object.defineProperty(instance, col.key, {
                     get: function () {
-                        _this._reportObserved();
+                        if (_this._subscribers) {
+                            _this._subscribers.reportObserved();
+                            if (!refImpl_1) {
+                                refImpl_1 = _this.fields.find(col.key);
+                                if (!refImpl_1._subscribers) {
+                                    refImpl_1._subscribers = new SubscribableImp();
+                                }
+                            }
+                            refImpl_1._subscribers.reportObserved();
+                        }
                         return lookup_1.item;
                     },
                     set: function (val) {
+                        var _a;
                         lookup_1.set(val);
-                        _this._reportChanged();
+                        (_a = _this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
+                        if (!refImpl_1) {
+                            refImpl_1 = _this.fields.find(col.key);
+                            if (!refImpl_1._subscribers) {
+                                refImpl_1._subscribers = new SubscribableImp();
+                            }
+                        }
+                        refImpl_1._subscribers.reportChanged();
                     },
                     enumerable: true
                 });
-                instance[col.key] = val;
+                lookup_1.set(val);
             }
             else {
             }
@@ -686,51 +704,46 @@ var rowHelperBase = /** @class */ (function () {
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
         get: function () {
-            this._reportObserved();
+            var _a;
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
             return this._error;
         },
         set: function (val) {
+            var _a;
             this._error = val;
-            this._reportChanged();
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.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) {
+        this.initSubscribers();
+        return this._subscribers.subscribe(listener);
+    };
+    rowHelperBase.prototype.initSubscribers = function () {
         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 = [];
+            this._subscribers = new SubscribableImp();
+            ;
             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];
+                    var refImpl_2 = this_2.fields.find(col.key);
+                    refImpl_2._subscribers = new SubscribableImp();
                     Object.defineProperty(this_2.instance, col.key, {
                         get: function () {
-                            _this._reportObserved();
+                            _this._subscribers.reportObserved();
+                            refImpl_2._subscribers.reportObserved();
                             return val_1;
                         },
                         set: function (value) {
                             val_1 = value;
-                            _this._reportChanged();
+                            _this._subscribers.reportChanged();
+                            refImpl_2._subscribers.reportChanged();
                         },
                         enumerable: true
                     });
@@ -751,17 +764,17 @@ var rowHelperBase = /** @class */ (function () {
                 finally { if (e_11) throw e_11.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();
+            var _a;
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
             return this._isLoading;
         },
         set: function (val) {
+            var _a;
             this._isLoading = val;
-            this._reportChanged();
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
         },
         enumerable: false,
         configurable: true
@@ -830,17 +843,38 @@ var rowHelperBase = /** @class */ (function () {
         }
         throw err;
     };
-    rowHelperBase.prototype.__clearErrors = function () {
+    rowHelperBase.prototype.__clearErrorsAndReportChanged = function () {
         this.errors = undefined;
         this.error = undefined;
-        this._reportChanged();
+        this._reportChangedToEntityAndFields();
+    };
+    rowHelperBase.prototype._reportChangedToEntityAndFields = function () {
+        var e_13, _a;
+        if (this._subscribers) {
+            this._subscribers.reportChanged();
+            try {
+                for (var _b = tslib_1.__values(this.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var field = _c.value;
+                    var ref = field;
+                    ref._subscribers.reportChanged();
+                }
+            }
+            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_13) throw e_13.error; }
+            }
+        }
     };
     rowHelperBase.prototype.hasErrors = function () {
-        this._reportObserved();
+        var _a;
+        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function () {
-        var e_13, _a;
+        var e_14, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -859,12 +893,12 @@ var rowHelperBase = /** @class */ (function () {
                 d[col.key] = val;
             }
         }
-        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 d;
     };
@@ -877,7 +911,7 @@ var rowHelperBase = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.__clearErrors();
+                        this.__clearErrorsAndReportChanged();
                         if (!classValidatorValidate) return [3 /*break*/, 2];
                         return [4 /*yield*/, classValidatorValidate(this.instance, this)];
                     case 1:
@@ -897,7 +931,7 @@ var rowHelperBase = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.__clearErrors();
+                        this.__clearErrorsAndReportChanged();
                         if (!classValidatorValidate) return [3 /*break*/, 2];
                         return [4 /*yield*/, classValidatorValidate(this.instance, this)];
                     case 1:
@@ -920,7 +954,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.toApiJson = function () {
-        var e_14, _a;
+        var e_15, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -945,19 +979,19 @@ 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 (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.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_15, _c;
+            var e_16, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -977,12 +1011,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_16) throw e_16.error; }
                         }
                         return [4 /*yield*/, Promise.all(tslib_1.__spread(this.fields).map(function (x) { return x.load(); }))];
                     case 1:
@@ -997,7 +1031,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_16, _a;
+        var e_17, _a;
         var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
         _this.info = info;
         _this.repository = repository;
@@ -1018,12 +1052,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_16) throw e_16.error; }
+                finally { if (e_17) throw e_17.error; }
             }
         }
         if (_this.info.options.entityRefInit)
@@ -1054,13 +1088,13 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             return this.instance[this.info.idMetadata.field.key];
     };
     rowHelperImplementation.prototype.wasDeleted = function () {
-        this._reportObserved();
+        var _a;
+        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
         return this._wasDeleted;
     };
     rowHelperImplementation.prototype.undoChanges = function () {
         this.loadDataFrom(this.originalValues);
-        this.__clearErrors();
-        this._reportChanged();
+        this.__clearErrorsAndReportChanged();
     };
     rowHelperImplementation.prototype.reload = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -1080,7 +1114,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }); })];
                     case 1:
                         _a.sent();
-                        this._reportChanged();
+                        this._reportChangedToEntityAndFields();
                         return [2 /*return*/, this.instance];
                 }
             });
@@ -1088,7 +1122,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_17, _b;
+            var _a, e_18, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -1102,12 +1136,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_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
                 this._columns = r_1;
             }
@@ -1117,30 +1151,31 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.save = function () {
+        var _a;
         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_18, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var doNotSave_1, d, ignoreKeys, _b, _c, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
+            var e_19, _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _d.trys.push([0, , 17, 18]);
+                        _e.trys.push([0, , 17, 18]);
                         this.isLoading = true;
                         return [4 /*yield*/, this.__validateEntity()];
                     case 1:
-                        _d.sent();
+                        _e.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_1 = true; })];
                     case 2:
-                        _d.sent();
-                        _d.label = 3;
+                        _e.sent();
+                        _e.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;
+                            for (_b = tslib_1.__values(this.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                field = _c.value;
                                 if (field.dbReadOnly || field == this.metadata.idMetadata.field && this.metadata.options.dbAutoIncrementId) {
                                     d[field.key] = undefined;
                                     ignoreKeys.push(field.key);
@@ -1149,24 +1184,24 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
                         finally {
                             try {
-                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                             }
-                            finally { if (e_18) throw e_18.error; }
+                            finally { if (e_19) throw e_19.error; }
                         }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
                             d.id = undefined;
                         updatedRow = void 0;
-                        _d.label = 4;
+                        _e.label = 4;
                     case 4:
-                        _d.trys.push([4, 14, , 16]);
-                        this._reportChanged();
+                        _e.trys.push([4, 14, , 16]);
+                        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.edp.insert(d)];
                     case 5:
-                        updatedRow = _d.sent();
+                        updatedRow = _e.sent();
                         return [3 /*break*/, 10];
                     case 6:
                         changesOnly = {};
@@ -1185,34 +1220,34 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         if (!doNotSave_1) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.edp.find({ where: this.getIdFilter() })];
                     case 7:
-                        updatedRow = (_d.sent())[0];
+                        updatedRow = (_e.sent())[0];
                         return [3 /*break*/, 10];
                     case 8: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
                     case 9:
-                        updatedRow = _d.sent();
-                        _d.label = 10;
+                        updatedRow = _e.sent();
+                        _e.label = 10;
                     case 10: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 11:
-                        _d.sent();
+                        _e.sent();
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance)];
                     case 12:
-                        _d.sent();
-                        _d.label = 13;
+                        _e.sent();
+                        _e.label = 13;
                     case 13:
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
                     case 14:
-                        err_1 = _d.sent();
+                        err_1 = _e.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
                     case 15:
-                        _d.sent();
+                        _e.sent();
                         return [3 /*break*/, 16];
                     case 16: return [3 /*break*/, 18];
                     case 17:
                         this.isLoading = false;
-                        this._reportChanged();
+                        this._reportChangedToEntityAndFields();
                         return [7 /*endfinally*/];
                     case 18: return [2 /*return*/];
                 }
@@ -1224,12 +1259,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, listener, e_19_1, err_2;
-            var e_19, _c;
+            var _a, _b, listener, e_20_1, err_2;
+            var e_20, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        this.__clearErrors();
+                        this.__clearErrorsAndReportChanged();
                         if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.info.entityInfo.deleting(this.instance)];
                     case 1:
@@ -1267,14 +1302,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 8];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        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*/, 14];
                     case 13:
                         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 14:
                         this._wasDeleted = true;
@@ -1292,8 +1327,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_20_1;
-            var e_20, _c;
+            var _a, _b, col, lu, e_21_1;
+            var e_21, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1328,14 +1363,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_20_1 = _d.sent();
-                        e_20 = { error: e_20_1 };
+                        e_21_1 = _d.sent();
+                        e_21 = { error: e_21_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_21) throw e_21.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -1355,8 +1390,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_21_1;
-            var e_21, _e;
+            var _a, _b, col, _c, _d, e_22_1;
+            var e_22, _e;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -1381,14 +1416,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_21_1 = _f.sent();
-                        e_21 = { error: e_21_1 };
+                        e_22_1 = _f.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_21) throw e_21.error; }
+                        finally { if (e_22) throw e_22.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1396,32 +1431,34 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         });
     };
     rowHelperImplementation.prototype.isNew = function () {
-        this._reportObserved();
+        var _a;
+        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_22, _a;
-        this._reportObserved();
+        var e_23, _a;
+        var _b;
+        (_b = this._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
         try {
-            for (var _b = tslib_1.__values(this.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var col = _c.value;
+            for (var _c = tslib_1.__values(this.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var col = _d.value;
                 if (col.valueChanged())
                     return true;
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_23_1, _c, _d, listener, e_24_1;
-            var e_23, _e, e_24, _f;
+            var _a, _b, c, col, e_24_1, _c, _d, listener, e_25_1;
+            var e_24, _e, e_25, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -1442,14 +1479,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        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*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_23) throw e_23.error; }
+                        finally { if (e_24) throw e_24.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
@@ -1476,14 +1513,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_24_1 = _g.sent();
-                        e_24 = { error: e_24_1 };
+                        e_25_1 = _g.sent();
+                        e_25 = { error: e_25_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_24) throw e_24.error; }
+                        finally { if (e_25) throw e_25.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -1525,7 +1562,7 @@ exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_25, _b;
+        var _a, e_26, _b;
         var _this = _super.call(this, columnsInfo, instance, remult) || this;
         var _items = [];
         var r = (_a = {
@@ -1539,20 +1576,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push(r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this));
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_26) throw e_26.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_26_1;
-            var e_26, _c;
+            var _a, _b, col, e_27_1;
+            var e_27, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1572,14 +1609,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        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*/, 7];
                     case 6:
                         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 7: return [2 /*return*/];
                 }
@@ -1599,8 +1636,14 @@ var FieldRefImplementation = /** @class */ (function () {
         this.target = this.settings.target;
         this.entityRef = this.helper;
     }
+    FieldRefImplementation.prototype.subscribe = function (listener) {
+        if (!this._subscribers) {
+            this.rowBase.initSubscribers();
+        }
+        return this._subscribers.subscribe(listener);
+    };
     FieldRefImplementation.prototype.valueIsNull = function () {
-        this.rowBase._reportObserved();
+        this.reportObserved();
         var lu = this.rowBase.lookups.get(this.metadata.key);
         if (lu) {
             return lu.id === undefined || lu.id === null;
@@ -1608,7 +1651,7 @@ var FieldRefImplementation = /** @class */ (function () {
         return this.value === null;
     };
     FieldRefImplementation.prototype.originalValueIsNull = function () {
-        this.rowBase._reportObserved();
+        this.reportObserved();
         var lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     };
@@ -1632,9 +1675,19 @@ var FieldRefImplementation = /** @class */ (function () {
             });
         });
     };
+    FieldRefImplementation.prototype.reportObserved = function () {
+        var _a, _b;
+        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
+        (_b = this.rowBase._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
+    };
+    FieldRefImplementation.prototype.reportChanged = function () {
+        var _a, _b;
+        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
+        (_b = this.rowBase._subscribers) === null || _b === void 0 ? void 0 : _b.reportChanged();
+    };
     Object.defineProperty(FieldRefImplementation.prototype, "error", {
         get: function () {
-            this.rowBase._reportObserved();
+            this.reportObserved();
             if (!this.rowBase.errors)
                 return undefined;
             return this.rowBase.errors[this.metadata.key];
@@ -1643,14 +1696,14 @@ var FieldRefImplementation = /** @class */ (function () {
             if (!this.rowBase.errors)
                 this.rowBase.errors = {};
             this.rowBase.errors[this.metadata.key] = error;
-            this.rowBase._reportChanged();
+            this.reportChanged();
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(FieldRefImplementation.prototype, "displayValue", {
         get: function () {
-            this.rowBase._reportObserved();
+            this.reportObserved();
             if (this.value != undefined) {
                 if (this.settings.displayValue)
                     return this.settings.displayValue(this.container, this.value);
@@ -1675,7 +1728,7 @@ var FieldRefImplementation = /** @class */ (function () {
     ;
     Object.defineProperty(FieldRefImplementation.prototype, "originalValue", {
         get: function () {
-            this.rowBase._reportObserved();
+            this.reportObserved();
             var lu = this.rowBase.lookups.get(this.metadata.key);
             if (lu)
                 return lu.get(this.rawOriginalValue());
@@ -1690,7 +1743,7 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     Object.defineProperty(FieldRefImplementation.prototype, "inputValue", {
         get: function () {
-            this.rowBase._reportObserved();
+            this.reportObserved();
             var lu = this.rowBase.lookups.get(this.metadata.key);
             if (lu)
                 return lu.id != undefined ? lu.id.toString() : null;
@@ -1709,7 +1762,7 @@ var FieldRefImplementation = /** @class */ (function () {
     });
     ;
     FieldRefImplementation.prototype.valueChanged = function () {
-        this.rowBase._reportObserved();
+        this.reportObserved();
         var val = this.value;
         var lu = this.rowBase.lookups.get(this.metadata.key);
         if (lu) {
@@ -1719,8 +1772,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_27_1;
-            var e_27, _c;
+            var x, _a, _b, v, e_28_1;
+            var e_28, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1743,14 +1796,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_27_1 = _d.sent();
-                        e_27 = { error: e_27_1 };
+                        e_28_1 = _d.sent();
+                        e_28 = { error: e_28_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_27) throw e_27.error; }
+                        finally { if (e_28) throw e_28.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
@@ -1877,7 +1930,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_28, _b;
+        var _a, e_29, _b;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.entityInfo = entityInfo;
@@ -1946,12 +1999,12 @@ var EntityFullInfo = /** @class */ (function () {
                 _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
             }
         }
-        catch (e_28_1) { e_28 = { error: e_28_1 }; }
+        catch (e_29_1) { e_29 = { error: e_29_1 }; }
         finally {
             try {
                 if (columnsInfo_3_1 && !columnsInfo_3_1.done && (_b = columnsInfo_3.return)) _b.call(columnsInfo_3);
             }
-            finally { if (e_28) throw e_28.error; }
+            finally { if (e_29) throw e_29.error; }
         }
         this.fields = r;
         this.dbAutoIncrementId = entityInfo.dbAutoIncrementId;
@@ -2118,7 +2171,7 @@ function Field() {
 exports.Field = Field;
 var storableMember = Symbol("storableMember");
 function buildOptions(options, remult) {
-    var e_29, _a;
+    var e_30, _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()) {
@@ -2131,12 +2184,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_29_1) { e_29 = { error: e_29_1 }; }
+    catch (e_30_1) { e_30 = { error: e_30_1 }; }
     finally {
         try {
             if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
         }
-        finally { if (e_29) throw e_29.error; }
+        finally { if (e_30) throw e_30.error; }
     }
     return r;
 }
@@ -2219,7 +2272,7 @@ function Entity(key) {
             }
         }
         var factory = function (remult) {
-            var e_30, _a;
+            var e_31, _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()) {
@@ -2232,12 +2285,12 @@ function Entity(key) {
                     }
                 }
             }
-            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+            catch (e_31_1) { e_31 = { error: e_31_1 }; }
             finally {
                 try {
                     if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
                 }
-                finally { if (e_30) throw e_30.error; }
+                finally { if (e_31) throw e_31.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -2282,6 +2335,23 @@ var EntityBase = /** @class */ (function () {
     return EntityBase;
 }());
 exports.EntityBase = EntityBase;
+var ControllerBase = /** @class */ (function () {
+    function ControllerBase(remult) {
+        this.remult = remult;
+    }
+    Object.defineProperty(ControllerBase.prototype, "$", {
+        get: function () { return getFields(this); },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ControllerBase.prototype, "_", {
+        get: function () { return getControllerRef(this); },
+        enumerable: false,
+        configurable: true
+    });
+    return ControllerBase;
+}());
+exports.ControllerBase = ControllerBase;
 var QueryResultImpl = /** @class */ (function () {
     function QueryResultImpl(options, repo) {
         this.options = options;
@@ -2326,9 +2396,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_31, _a;
+        var e_32, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_31_1;
+            var i, _b, _c, x, e_32_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2350,8 +2420,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_31_1 = _d.sent();
-                        e_31 = { error: e_31_1 };
+                        e_32_1 = _d.sent();
+                        e_32 = { error: e_32_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -2362,7 +2432,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_31) throw e_31.error;
+                        if (e_32) throw e_32.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];
@@ -2478,4 +2548,33 @@ var cacheEntityInfo = /** @class */ (function () {
     }
     return cacheEntityInfo;
 }());
+var SubscribableImp = /** @class */ (function () {
+    function SubscribableImp() {
+    }
+    SubscribableImp.prototype.reportChanged = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportChanged(); });
+    };
+    SubscribableImp.prototype.reportObserved = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportObserved(); });
+    };
+    SubscribableImp.prototype.subscribe = function (listener) {
+        var _this = this;
+        var list;
+        if (typeof listener === "function")
+            list = {
+                reportChanged: function () { return listener(); },
+                reportObserved: function () { }
+            };
+        else
+            list = listener;
+        if (!this._subscribers) {
+            this._subscribers = [];
+        }
+        this._subscribers.push(list);
+        return function () { return _this._subscribers = _this._subscribers.filter(function (x) { return x != listener; }); };
+    };
+    return SubscribableImp;
+}());
 //# sourceMappingURL=RepositoryImplementation.js.map