remult 0.9.28 → 0.10.3

package/src/remult3/RepositoryImplementation.js

@@ -11,33 +11,23 @@ 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".toString()); }).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 () {
-});
+// import("class-validator".toString())
+//     .then((v) => {
+//         classValidatorValidate = (item, ref) => {
+//             return v.validate(item).then(errors => {
+//                 for (const err of errors) {
+//                     for (const key in err.constraints) {
+//                         if (Object.prototype.hasOwnProperty.call(err.constraints, key)) {
+//                             const element = err.constraints[key];
+//                             ref.fields.find(err.property).error = element;
+//                         }
+//                     }
+//                 }
+//             });
+//         }
+//     })
+//     .catch(() => {
+//     });
 var RepositoryImplementation = /** @class */ (function () {
     function RepositoryImplementation(entity, remult, dataProvider) {
         this.entity = entity;
@@ -50,7 +40,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_2, _e, e_3, _f, e_4, _g;
+            var e_1, _e, e_2, _f, e_3, _g;
             return tslib_1.__generator(this, function (_h) {
                 values = new Map();
                 try {
@@ -68,12 +58,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         values.set(s.field.key, existingVal);
                     }
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
                         if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                     }
-                    finally { if (e_2) throw e_2.error; }
+                    finally { if (e_1) throw e_1.error; }
                 }
                 r = { $or: [] };
                 equalToColumn = [];
@@ -83,17 +73,17 @@ var RepositoryImplementation = /** @class */ (function () {
                         ff = new filter_interfaces_2.filterHelper(s.field);
                         f = {};
                         try {
-                            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()) {
+                            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()) {
                                 c = equalToColumn_1_1.value;
                                 f[c.key] = values.get(c.key);
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
                                 if (equalToColumn_1_1 && !equalToColumn_1_1.done && (_g = equalToColumn_1.return)) _g.call(equalToColumn_1);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                         equalToColumn.push(s.field);
                         if (s.isDescending) {
@@ -104,12 +94,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         r.$or.push(f);
                     }
                 }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
                 return [2 /*return*/, r];
             });
@@ -252,8 +242,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_5_1, result;
-            var e_5, _d, e_6, _e, _f, e_7, _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_4_1, result;
+            var e_4, _d, e_5, _e, _f, e_6, _g;
             var _this = this;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
@@ -295,7 +285,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         repo = this.remult.repo(col.valueType);
                         toLoad = [];
                         try {
-                            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()) {
+                            for (rawRows_1 = (e_5 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
                                 r = rawRows_1_1.value;
                                 val = r[col.key];
                                 if (val !== undefined && val !== null && !toLoad.includes(val) && !repo.idCache.has(val)) {
@@ -303,29 +293,29 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (rawRows_1_1 && !rawRows_1_1.done && (_e = rawRows_1.return)) _e.call(rawRows_1);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         if (!(toLoad.length > 0)) return [3 /*break*/, 6];
                         return [4 /*yield*/, repo.find({ where: (_f = repo.metadata.idMetadata).getIdFilter.apply(_f, tslib_1.__spread(toLoad)) })];
                     case 5:
                         rows = _h.sent();
                         try {
-                            for (rows_1 = (e_7 = 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_6 = void 0, tslib_1.__values(rows)), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
                                 r = rows_1_1.value;
                                 repo.addToCache(r);
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
                                 if (rows_1_1 && !rows_1_1.done && (_g = rows_1.return)) _g.call(rows_1);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_6) throw e_6.error; }
                         }
                         _h.label = 6;
                     case 6:
@@ -333,14 +323,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_5_1 = _h.sent();
-                        e_5 = { error: e_5_1 };
+                        e_4_1 = _h.sent();
+                        e_4 = { error: e_4_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 10: return [4 /*yield*/, Promise.all(rawRows.map(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
@@ -475,7 +465,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_8, _c;
+            var e_7, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -488,12 +478,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_8) throw e_8.error; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         if (!newRow) return [3 /*break*/, 2];
                         r = this.create();
@@ -597,7 +587,7 @@ function createOldEntity(entity, remult) {
     var key = getEntityKey(entity);
     var base = Object.getPrototypeOf(entity);
     var _loop_1 = function () {
-        var e_9, _a;
+        var e_8, _a;
         var baseCols = exports.columnsOfType.get(base);
         if (baseCols) {
             r.unshift.apply(r, tslib_1.__spread(baseCols.filter(function (x) { return !r.find(function (y) { return y.key == x.key; }); })));
@@ -617,17 +607,17 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var _b = (e_9 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_8 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key_1 = _c.value;
                     _loop_2(key_1);
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_8) throw e_8.error; }
             }
         }
         base = Object.getPrototypeOf(base);
@@ -640,7 +630,7 @@ function createOldEntity(entity, remult) {
 exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
     function rowHelperBase(columnsInfo, instance, remult) {
-        var e_10, _a;
+        var e_9, _a;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.instance = instance;
@@ -695,12 +685,12 @@ var rowHelperBase = /** @class */ (function () {
                 _loop_3(col);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_a = columnsInfo_1.return)) _a.call(columnsInfo_1);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_9) throw e_9.error; }
         }
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
@@ -722,7 +712,7 @@ var rowHelperBase = /** @class */ (function () {
         return this._subscribers.subscribe(listener);
     };
     rowHelperBase.prototype.initSubscribers = function () {
-        var e_11, _a;
+        var e_10, _a;
         var _this = this;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
@@ -757,12 +747,12 @@ var rowHelperBase = /** @class */ (function () {
                     _loop_4(col);
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_10) throw e_10.error; }
             }
         }
     };
@@ -793,7 +783,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.__assertValidity = function () {
-        var e_12, _a;
+        var e_11, _a;
         if (!this.hasErrors()) {
             var error = {
                 modelState: Object.assign({}, this.errors),
@@ -810,12 +800,12 @@ var rowHelperBase = /** @class */ (function () {
                         }
                     }
                 }
-                catch (e_12_1) { e_12 = { error: e_12_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_12) throw e_12.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
             }
             throw error;
@@ -850,7 +840,7 @@ var rowHelperBase = /** @class */ (function () {
         this._reportChangedToEntityAndFields();
     };
     rowHelperBase.prototype._reportChangedToEntityAndFields = function () {
-        var e_13, _a;
+        var e_12, _a;
         if (this._subscribers) {
             this._subscribers.reportChanged();
             try {
@@ -860,12 +850,12 @@ var rowHelperBase = /** @class */ (function () {
                     ref._subscribers.reportChanged();
                 }
             }
-            catch (e_13_1) { e_13 = { error: e_13_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_13) throw e_13.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
     };
@@ -875,7 +865,7 @@ var rowHelperBase = /** @class */ (function () {
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function () {
-        var e_14, _a;
+        var e_13, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -888,18 +878,18 @@ var rowHelperBase = /** @class */ (function () {
                     val = this.instance[col.key];
                 if (val !== undefined) {
                     val = col.valueConverter.toJson(val);
-                    if (val !== undefined)
+                    if (val !== undefined && val !== null)
                         val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
                 }
                 d[col.key] = val;
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_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_14) throw e_14.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         return d;
     };
@@ -955,7 +945,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.toApiJson = function () {
-        var e_15, _a;
+        var e_14, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -980,19 +970,19 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_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_15) throw e_15.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_16, _c;
+            var e_15, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1012,12 +1002,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_16_1) { e_16 = { error: e_16_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_16) throw e_16.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:
@@ -1032,13 +1022,14 @@ var rowHelperBase = /** @class */ (function () {
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
     function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
-        var e_17, _a;
+        var e_16, _a;
         var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
         _this.info = info;
         _this.repository = repository;
         _this.edp = edp;
         _this._isNew = _isNew;
         _this._wasDeleted = false;
+        _this._saving = false;
         _this.metadata = info;
         if (_isNew) {
             try {
@@ -1053,12 +1044,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_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_17) throw e_17.error; }
+                finally { if (e_16) throw e_16.error; }
             }
         }
         if (_this.info.options.entityRefInit)
@@ -1123,13 +1114,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_18, _b;
+            var _a, e_17, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
                         find: function (c) { return r_1[typeof c === "string" ? c : c.key]; }
                     },
                     _a[Symbol.iterator] = function () { return _items_1[Symbol.iterator](); },
+                    _a.toArray = function () { return _items_1; },
                     _a);
                 try {
                     for (var _c = tslib_1.__values(this.info.columnsInfo), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -1137,12 +1129,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_18_1) { e_18 = { error: e_18_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_18) throw e_18.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
                 this._columns = r_1;
             }
@@ -1154,29 +1146,62 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.save = function () {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            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) {
+            var doNotSave_1, _b, _c, col, e_18_1, d, ignoreKeys, _d, _e, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
+            var e_18, _f, e_19, _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        _e.trys.push([0, , 17, 18]);
+                        _h.trys.push([0, , 25, 26]);
+                        if (this._saving)
+                            throw new Error("cannot save while entity is already saving");
+                        this._saving = true;
+                        if (this.wasDeleted())
+                            throw new Error("cannot save a deleted row");
                         this.isLoading = true;
                         return [4 /*yield*/, this.__validateEntity()];
                     case 1:
-                        _e.sent();
+                        _h.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; })];
+                        _h.label = 2;
                     case 2:
-                        _e.sent();
-                        _e.label = 3;
+                        _h.trys.push([2, 7, 8, 9]);
+                        _b = tslib_1.__values(this.fields), _c = _b.next();
+                        _h.label = 3;
                     case 3:
+                        if (!!_c.done) return [3 /*break*/, 6];
+                        col = _c.value;
+                        if (!col.metadata.options.saving) return [3 /*break*/, 5];
+                        return [4 /*yield*/, col.metadata.options.saving(this.instance, col)];
+                    case 4:
+                        _h.sent();
+                        _h.label = 5;
+                    case 5:
+                        _c = _b.next();
+                        return [3 /*break*/, 3];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_18_1 = _h.sent();
+                        e_18 = { error: e_18_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
+                        try {
+                            if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
+                        }
+                        finally { if (e_18) throw e_18.error; }
+                        return [7 /*endfinally*/];
+                    case 9:
+                        if (!this.info.entityInfo.saving) return [3 /*break*/, 11];
+                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return doNotSave_1 = true; })];
+                    case 10:
+                        _h.sent();
+                        _h.label = 11;
+                    case 11:
                         this.__assertValidity();
                         d = this.copyDataToObject();
                         ignoreKeys = [];
                         try {
-                            for (_b = tslib_1.__values(this.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                field = _c.value;
+                            for (_d = tslib_1.__values(this.metadata.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
+                                field = _e.value;
                                 if (field.dbReadOnly || field == this.metadata.idMetadata.field && this.metadata.options.dbAutoIncrementId) {
                                     d[field.key] = undefined;
                                     ignoreKeys.push(field.key);
@@ -1188,29 +1213,29 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         catch (e_19_1) { e_19 = { error: e_19_1 }; }
                         finally {
                             try {
-                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+                                if (_e && !_e.done && (_g = _d.return)) _g.call(_d);
                             }
                             finally { if (e_19) throw e_19.error; }
                         }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
-                            d.id = undefined;
+                            delete (d.id);
                         updatedRow = void 0;
-                        _e.label = 4;
-                    case 4:
-                        _e.trys.push([4, 14, , 16]);
+                        _h.label = 12;
+                    case 12:
+                        _h.trys.push([12, 22, , 24]);
                         (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
-                        if (!this.isNew()) return [3 /*break*/, 6];
+                        if (!this.isNew()) return [3 /*break*/, 14];
                         return [4 /*yield*/, this.edp.insert(d)];
-                    case 5:
-                        updatedRow = _e.sent();
-                        return [3 /*break*/, 10];
-                    case 6:
+                    case 13:
+                        updatedRow = _h.sent();
+                        return [3 /*break*/, 18];
+                    case 14:
                         changesOnly = {};
                         wasChanged = false;
                         for (key in d) {
                             if (Object.prototype.hasOwnProperty.call(d, key)) {
                                 element = d[key];
-                                if (element !== this.originalValues[key] && !ignoreKeys.includes(key)) {
+                                if (this.fields.find(key).valueChanged() && !ignoreKeys.includes(key)) {
                                     changesOnly[key] = element;
                                     wasChanged = true;
                                 }
@@ -1218,39 +1243,40 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         if (!wasChanged)
                             return [2 /*return*/, this.instance];
-                        if (!doNotSave_1) return [3 /*break*/, 8];
+                        if (!doNotSave_1) return [3 /*break*/, 16];
                         return [4 /*yield*/, this.edp.find({ where: this.getIdFilter() })];
-                    case 7:
-                        updatedRow = (_e.sent())[0];
-                        return [3 /*break*/, 10];
-                    case 8: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
-                    case 9:
-                        updatedRow = _e.sent();
-                        _e.label = 10;
-                    case 10: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
-                    case 11:
-                        _e.sent();
-                        if (!this.info.entityInfo.saved) return [3 /*break*/, 13];
+                    case 15:
+                        updatedRow = (_h.sent())[0];
+                        return [3 /*break*/, 18];
+                    case 16: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
+                    case 17:
+                        updatedRow = _h.sent();
+                        _h.label = 18;
+                    case 18: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
+                    case 19:
+                        _h.sent();
+                        if (!this.info.entityInfo.saved) return [3 /*break*/, 21];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance)];
-                    case 12:
-                        _e.sent();
-                        _e.label = 13;
-                    case 13:
+                    case 20:
+                        _h.sent();
+                        _h.label = 21;
+                    case 21:
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
-                    case 14:
-                        err_1 = _e.sent();
+                    case 22:
+                        err_1 = _h.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
-                    case 15:
-                        _e.sent();
-                        return [3 /*break*/, 16];
-                    case 16: return [3 /*break*/, 18];
-                    case 17:
+                    case 23:
+                        _h.sent();
+                        return [3 /*break*/, 24];
+                    case 24: return [3 /*break*/, 26];
+                    case 25:
                         this.isLoading = false;
                         this._reportChangedToEntityAndFields();
+                        this._saving = false;
                         return [7 /*endfinally*/];
-                    case 18: return [2 /*return*/];
+                    case 26: return [2 /*return*/];
                 }
             });
         });
@@ -1570,6 +1596,7 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 find: function (c) { return r[typeof c === "string" ? c : c.key]; }
             },
             _a[Symbol.iterator] = function () { return _items[Symbol.iterator](); },
+            _a.toArray = function () { return _items; },
             _a);
         try {
             for (var columnsInfo_2 = tslib_1.__values(columnsInfo), columnsInfo_2_1 = columnsInfo_2.next(); !columnsInfo_2_1.done; columnsInfo_2_1 = columnsInfo_2.next()) {
@@ -1742,6 +1769,9 @@ var FieldRefImplementation = /** @class */ (function () {
     FieldRefImplementation.prototype.rawOriginalValue = function () {
         return this.rowBase.originalValues[this.metadata.key];
     };
+    FieldRefImplementation.prototype.setId = function (id) {
+        this.value = id;
+    };
     Object.defineProperty(FieldRefImplementation.prototype, "inputValue", {
         get: function () {
             this.reportObserved();
@@ -1993,6 +2023,7 @@ var EntityFullInfo = /** @class */ (function () {
                 find: function (c) { return r[typeof c === "string" ? c : c.key]; }
             },
             _a[Symbol.iterator] = function () { return _items[Symbol.iterator](); },
+            _a.toArray = function () { return _items; },
             _a);
         try {
             for (var columnsInfo_3 = tslib_1.__values(columnsInfo), columnsInfo_3_1 = columnsInfo_3.next(); !columnsInfo_3_1.done; columnsInfo_3_1 = columnsInfo_3.next()) {
@@ -2115,15 +2146,17 @@ function IntegerField() {
         }], options));
 }
 exports.IntegerField = IntegerField;
-function ValueListFieldType(type) {
+function ValueListFieldType() {
     var options = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        options[_i - 1] = arguments[_i];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        options[_i] = arguments[_i];
     }
-    return FieldType.apply(void 0, tslib_1.__spread([{
-            valueConverter: new valueConverters_1.ValueListValueConverter(type),
-            displayValue: function (item, val) { return val.caption; }
-        }], options));
+    return function (type) {
+        return FieldType.apply(void 0, tslib_1.__spread([{
+                valueConverter: new valueConverters_1.ValueListValueConverter(type),
+                displayValue: function (item, val) { return val.caption; }
+            }], options))(type);
+    };
 }
 exports.ValueListFieldType = ValueListFieldType;
 function UuidField() {