remult 0.27.21-next.8 → 0.27.21

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.ValueListInfo = exports.columnDefsImpl = exports.CaptionTransformer = exports.FieldRefImplementation = exports.controllerRefImpl = exports.rowHelperImplementation = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.ValueListInfo = exports.columnDefsImpl = exports.CaptionTransformer = exports.fieldOptionsEnricher = exports.FieldRefImplementation = exports.controllerRefImpl = exports.rowHelperImplementation = exports.RepositoryImplementation = void 0;
 exports.createOldEntity = createOldEntity;
 exports.getFields = getFields;
 exports.getControllerRef = getControllerRef;
@@ -1030,7 +1030,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     });
                 });
             }
-            var loadFields, _a, _b, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_13_1, result, fields;
+            var loadFields, _a, _b, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_13_1, excludeRelationMembers, result, fields;
             var e_13, _c, e_14, _d;
             var _this = this;
             return tslib_1.__generator(this, function (_e) {
@@ -1095,12 +1095,22 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [4 /*yield*/, promiseAll(rawRows, function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this._mapRawDataToResult(r, loadFields)];
-                                case 1: return [2 /*return*/, _a.sent()];
-                            }
-                        }); }); })];
+                    case 8:
+                        excludeRelationMembers = new Set(this.fields
+                            .toArray()
+                            .map(function (f) {
+                            var i = _this.__getRelationAndInclude(f, loadOptions);
+                            if (i.rel && !i.incl)
+                                return f.key;
+                            return undefined;
+                        })
+                            .filter(function (x) { return x !== undefined; }));
+                        return [4 /*yield*/, promiseAll(rawRows, function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this._mapRawDataToResult(r, loadFields, excludeRelationMembers)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            }); }); })];
                     case 9:
                         result = _e.sent();
                         fields = this.metadata.fields.toArray();
@@ -1112,62 +1122,71 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype._populateRelationsForFields = function (fields, loadOptions, result, loader) {
         var e_16, _a;
-        var _b;
         var _loop_1 = function (col) {
-            var e_17, _c;
-            var rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(col);
-            var incl = col.options
-                .defaultIncluded;
-            var include = (_b = loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) === null || _b === void 0 ? void 0 : _b[col.key];
-            if (include !== undefined) {
-                incl = include;
-            }
-            if (rel && incl) {
-                var otherRepo = rel.toRepo;
-                var _loop_2 = function (row) {
-                    var _d = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _d.findOptions, returnNull = _d.returnNull;
-                    var colKey = col.key;
-                    if (returnNull)
-                        row[colKey] = null;
-                    else {
-                        var entityType = rel.toEntity;
-                        var toRepo_1 = otherRepo;
-                        loader
-                            .load({
-                            entityType: entityType,
-                            find: function (options) {
-                                return toRepo_1._rawFind(options, false, loader, function (o) {
-                                    return toRepo_1._edp.find(o);
-                                });
-                            },
-                            metadata: toRepo_1.metadata,
-                        }, findOptions)
-                            .then(function (result) {
-                            if (result.length == 0 && rel.type == 'toOne')
-                                return;
-                            row[colKey] =
-                                rel.type !== 'toMany'
-                                    ? result.length == 0
-                                        ? null
-                                        : result[0]
-                                    : result;
-                        });
+            var e_17, _b, e_18, _c;
+            var _d = this_1.__getRelationAndInclude(col, loadOptions), rel = _d.rel, incl = _d.incl;
+            if (rel)
+                if (incl) {
+                    var otherRepo = rel.toRepo;
+                    var _loop_2 = function (row) {
+                        var _e = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _e.findOptions, returnNull = _e.returnNull;
+                        var colKey = col.key;
+                        if (returnNull)
+                            row[colKey] = null;
+                        else {
+                            var entityType = rel.toEntity;
+                            var toRepo_1 = otherRepo;
+                            loader
+                                .load({
+                                entityType: entityType,
+                                find: function (options) {
+                                    return toRepo_1._rawFind(options, false, loader, function (o) {
+                                        return toRepo_1._edp.find(o);
+                                    });
+                                },
+                                metadata: toRepo_1.metadata,
+                            }, findOptions)
+                                .then(function (result) {
+                                if (result.length == 0 && rel.type == 'toOne')
+                                    return;
+                                row[colKey] =
+                                    rel.type !== 'toMany'
+                                        ? result.length == 0
+                                            ? null
+                                            : result[0]
+                                        : result;
+                            });
+                        }
+                    };
+                    try {
+                        for (var result_1 = (e_17 = void 0, tslib_1.__values(result)), result_1_1 = result_1.next(); !result_1_1.done; result_1_1 = result_1.next()) {
+                            var row = result_1_1.value;
+                            _loop_2(row);
+                        }
                     }
-                };
-                try {
-                    for (var result_1 = (e_17 = void 0, tslib_1.__values(result)), result_1_1 = result_1.next(); !result_1_1.done; result_1_1 = result_1.next()) {
-                        var row = result_1_1.value;
-                        _loop_2(row);
+                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                    finally {
+                        try {
+                            if (result_1_1 && !result_1_1.done && (_b = result_1.return)) _b.call(result_1);
+                        }
+                        finally { if (e_17) throw e_17.error; }
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
-                finally {
+                else {
                     try {
-                        if (result_1_1 && !result_1_1.done && (_c = result_1.return)) _c.call(result_1);
+                        for (var result_2 = (e_18 = void 0, tslib_1.__values(result)), result_2_1 = result_2.next(); !result_2_1.done; result_2_1 = result_2.next()) {
+                            var row = result_2_1.value;
+                            Reflect.deleteProperty(row, col.key);
+                        }
+                    }
+                    catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                    finally {
+                        try {
+                            if (result_2_1 && !result_2_1.done && (_c = result_2.return)) _c.call(result_2);
+                        }
+                        finally { if (e_18) throw e_18.error; }
                     }
-                    finally { if (e_17) throw e_17.error; }
                 }
-            }
         };
         var this_1 = this;
         try {
@@ -1184,9 +1203,20 @@ var RepositoryImplementation = /** @class */ (function () {
             finally { if (e_16) throw e_16.error; }
         }
     };
+    RepositoryImplementation.prototype.__getRelationAndInclude = function (col, loadOptions) {
+        var _a;
+        var rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(col);
+        var incl = col.options
+            .defaultIncluded;
+        var include = (_a = loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) === null || _a === void 0 ? void 0 : _a[col.key];
+        if (include !== undefined) {
+            incl = include;
+        }
+        return { rel: rel, incl: incl };
+    };
     /*@internal */
     RepositoryImplementation.prototype._findOptionsBasedOnRelation = function (rel, field, moreFindOptions, row, otherRepo) {
-        var e_18, _a, e_19, _b, _c, _d;
+        var e_19, _a, e_20, _b, _c, _d;
         var returnNull = false;
         var returnUndefined = false;
         var where = [];
@@ -1206,7 +1236,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 if (source.where)
                     where.push(source.where);
                 try {
-                    for (var _e = (e_19 = void 0, tslib_1.__values([
+                    for (var _e = (e_20 = void 0, tslib_1.__values([
                         'limit',
                         'include',
                         'orderBy',
@@ -1217,21 +1247,21 @@ var RepositoryImplementation = /** @class */ (function () {
                             findOptions[key] = source[key];
                     }
                 }
-                catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                catch (e_20_1) { e_20 = { error: e_20_1 }; }
                 finally {
                     try {
                         if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                     }
-                    finally { if (e_19) throw e_19.error; }
+                    finally { if (e_20) throw e_20.error; }
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (findOptionsSources_1_1 && !findOptionsSources_1_1.done && (_a = findOptionsSources_1.return)) _a.call(findOptionsSources_1);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         var relFields = rel.getFields();
         var getFieldValue = function (key) {
@@ -1270,14 +1300,14 @@ var RepositoryImplementation = /** @class */ (function () {
             findOptions.limit = 1;
         return { findOptions: findOptions, returnNull: returnNull, returnUndefined: returnUndefined };
     };
-    RepositoryImplementation.prototype._mapRawDataToResult = function (r, loadFields) {
+    RepositoryImplementation.prototype._mapRawDataToResult = function (r, loadFields, excludeRelationMembers) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var x, helper;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         x = new this._entity(this._remult);
-                        helper = new rowHelperImplementation(this._info, x, this, this._edp, this._remult, false);
+                        helper = new rowHelperImplementation(this._info, x, this, this._edp, this._remult, false, excludeRelationMembers);
                         Object.defineProperty(x, getEntityRef_js_1.entityMember, {
                             //I've used define property to hide this member from console.lo g
                             get: function () { return helper; },
@@ -1302,7 +1332,7 @@ var RepositoryImplementation = /** @class */ (function () {
         return this.getEntityRef(item).toApiJson(true);
     };
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
-        var e_20, _a;
+        var e_21, _a;
         var _this = this;
         if (json === null || json === undefined)
             return json;
@@ -1328,12 +1358,12 @@ var RepositoryImplementation = /** @class */ (function () {
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         this._fixTypes(result);
         if (newRow) {
@@ -1366,8 +1396,8 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.deleteMany = function (_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
-            var _c, _d, deleted, _e, _f, _g, item, e_21_1;
-            var _h, e_21, _j, _k;
+            var _c, _d, deleted, _e, _f, _g, item, e_22_1;
+            var _h, e_22, _j, _k;
             var where = _b.where;
             return tslib_1.__generator(this, function (_l) {
                 switch (_l.label) {
@@ -1400,8 +1430,8 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 8: return [3 /*break*/, 15];
                     case 9:
-                        e_21_1 = _l.sent();
-                        e_21 = { error: e_21_1 };
+                        e_22_1 = _l.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 15];
                     case 10:
                         _l.trys.push([10, , 13, 14]);
@@ -1412,7 +1442,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         _l.label = 12;
                     case 12: return [3 /*break*/, 14];
                     case 13:
-                        if (e_21) throw e_21.error;
+                        if (e_22) throw e_22.error;
                         return [7 /*endfinally*/];
                     case 14: return [7 /*endfinally*/];
                     case 15: return [2 /*return*/, deleted];
@@ -1503,7 +1533,7 @@ var RepositoryImplementation = /** @class */ (function () {
         return this.metadata.fields.toArray().filter(function (x) { return keys.includes(x.key); });
     };
     RepositoryImplementation.prototype.create = function (item) {
-        var e_22, _a;
+        var e_23, _a;
         var _b;
         var r = new this._entity(this._remult);
         if (item) {
@@ -1514,12 +1544,12 @@ var RepositoryImplementation = /** @class */ (function () {
                     r[key] = item[key];
                 }
             }
-            catch (e_22_1) { e_22 = { error: e_22_1 }; }
+            catch (e_23_1) { e_23 = { error: e_23_1 }; }
             finally {
                 try {
                     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; }
             }
             this._fixTypes(r);
         }
@@ -1533,7 +1563,7 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype._fixTypes = function (item) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, field, val, _c, _d, _e, type, typeName;
-            var e_23, _f, e_24, _g;
+            var e_24, _f, e_25, _g;
             return tslib_1.__generator(this, function (_h) {
                 try {
                     for (_a = tslib_1.__values(this._fieldsOf(item)), _b = _a.next(); !_b.done; _b = _a.next()) {
@@ -1544,7 +1574,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                 item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                             else
                                 try {
-                                    for (_c = (e_24 = void 0, tslib_1.__values([
+                                    for (_c = (e_25 = void 0, tslib_1.__values([
                                         [String, 'string'],
                                         [Number, 'number'],
                                         [Boolean, 'boolean'],
@@ -1554,22 +1584,22 @@ var RepositoryImplementation = /** @class */ (function () {
                                             item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                                     }
                                 }
-                                catch (e_24_1) { e_24 = { error: e_24_1 }; }
+                                catch (e_25_1) { e_25 = { error: e_25_1 }; }
                                 finally {
                                     try {
                                         if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                                     }
-                                    finally { if (e_24) throw e_24.error; }
+                                    finally { if (e_25) throw e_25.error; }
                                 }
                         }
                     }
                 }
-                catch (e_23_1) { e_23 = { error: e_23_1 }; }
+                catch (e_24_1) { e_24 = { error: e_24_1 }; }
                 finally {
                     try {
                         if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
                     }
-                    finally { if (e_23) throw e_23.error; }
+                    finally { if (e_24) throw e_24.error; }
                 }
                 return [2 /*return*/, item];
             });
@@ -1646,7 +1676,7 @@ function createOldEntity(entity, remult) {
     var key = (0, getEntityRef_js_1.getEntityKey)(entity);
     var base = Object.getPrototypeOf(entity);
     var _loop_3 = function () {
-        var e_25, _a;
+        var e_26, _a;
         var baseCols = remult_static_js_1.remultStatic.columnsOfType.get(base);
         if (baseCols) {
             r.unshift.apply(r, tslib_1.__spreadArray([], tslib_1.__read(baseCols.filter(function (x) { return !r.find(function (y) { return y.key == x.key; }); })), false));
@@ -1689,17 +1719,17 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var functions_1 = (e_25 = void 0, tslib_1.__values(functions)), functions_1_1 = functions_1.next(); !functions_1_1.done; functions_1_1 = functions_1.next()) {
+                for (var functions_1 = (e_26 = void 0, tslib_1.__values(functions)), functions_1_1 = functions_1.next(); !functions_1_1.done; functions_1_1 = functions_1.next()) {
                     var key_1 = functions_1_1.value;
                     _loop_4(key_1);
                 }
             }
-            catch (e_25_1) { e_25 = { error: e_25_1 }; }
+            catch (e_26_1) { e_26 = { error: e_26_1 }; }
             finally {
                 try {
                     if (functions_1_1 && !functions_1_1.done && (_a = functions_1.return)) _a.call(functions_1);
                 }
-                finally { if (e_25) throw e_25.error; }
+                finally { if (e_26) throw e_26.error; }
             }
         }
         base = Object.getPrototypeOf(base);
@@ -1710,8 +1740,8 @@ function createOldEntity(entity, remult) {
     return new EntityFullInfo(prepareColumnInfo(r, remult), info, remult, entity, key);
 }
 var rowHelperBase = /** @class */ (function () {
-    function rowHelperBase(fieldsMetadata, instance, remult, isNewRow) {
-        var e_26, _a;
+    function rowHelperBase(fieldsMetadata, instance, remult, isNewRow, excludeRelationMembers) {
+        var e_27, _a;
         var _this = this;
         this.fieldsMetadata = fieldsMetadata;
         this.instance = instance;
@@ -1759,7 +1789,7 @@ var rowHelperBase = /** @class */ (function () {
                         }
                         refImpl_1._subscribers.reportChanged();
                     },
-                    enumerable: true,
+                    enumerable: !(excludeRelationMembers === null || excludeRelationMembers === void 0 ? void 0 : excludeRelationMembers.has(col.key)),
                 });
                 lookup_1.set(val);
             }
@@ -1793,7 +1823,7 @@ var rowHelperBase = /** @class */ (function () {
                                 }
                             }
                         },
-                        enumerable: true,
+                        enumerable: !(excludeRelationMembers === null || excludeRelationMembers === void 0 ? void 0 : excludeRelationMembers.has(col.key)),
                     });
                     if (hasVal)
                         instance[col.key] = val_1;
@@ -1807,12 +1837,12 @@ var rowHelperBase = /** @class */ (function () {
                 _loop_5(col);
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (fieldsMetadata_1_1 && !fieldsMetadata_1_1.done && (_a = fieldsMetadata_1.return)) _a.call(fieldsMetadata_1);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_27) throw e_27.error; }
         }
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
@@ -1834,7 +1864,7 @@ var rowHelperBase = /** @class */ (function () {
         return this._subscribers.subscribe(listener);
     };
     rowHelperBase.prototype.initSubscribers = function () {
-        var e_27, _a;
+        var e_28, _a;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
             var safeSubscribers_1 = this._subscribers;
@@ -1868,12 +1898,12 @@ var rowHelperBase = /** @class */ (function () {
                     _loop_6(col);
                 }
             }
-            catch (e_27_1) { e_27 = { error: e_27_1 }; }
+            catch (e_28_1) { e_28 = { error: e_28_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_27) throw e_27.error; }
+                finally { if (e_28) throw e_28.error; }
             }
         }
     };
@@ -1908,7 +1938,7 @@ var rowHelperBase = /** @class */ (function () {
             throw this.buildErrorInfoObject();
     };
     rowHelperBase.prototype.buildErrorInfoObject = function () {
-        var e_28, _a;
+        var e_29, _a;
         var _b;
         var error = {
             modelState: Object.assign({}, this.errors),
@@ -1928,12 +1958,12 @@ var rowHelperBase = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_28_1) { e_28 = { error: e_28_1 }; }
+            catch (e_29_1) { e_29 = { error: e_29_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_28) throw e_28.error; }
+                finally { if (e_29) throw e_29.error; }
             }
         }
         return error;
@@ -1967,7 +1997,7 @@ var rowHelperBase = /** @class */ (function () {
         this._reportChangedToEntityAndFields();
     };
     rowHelperBase.prototype._reportChangedToEntityAndFields = function () {
-        var e_29, _a;
+        var e_30, _a;
         if (this._subscribers) {
             this._subscribers.reportChanged();
             try {
@@ -1977,12 +2007,12 @@ var rowHelperBase = /** @class */ (function () {
                     ref._subscribers.reportChanged();
                 }
             }
-            catch (e_29_1) { e_29 = { error: e_29_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_29) throw e_29.error; }
+                finally { if (e_30) throw e_30.error; }
             }
         }
     };
@@ -1992,7 +2022,7 @@ var rowHelperBase = /** @class */ (function () {
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function (isNew) {
-        var e_30, _a;
+        var e_31, _a;
         if (isNew === void 0) { isNew = false; }
         var d = {};
         try {
@@ -2024,12 +2054,12 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_30_1) { e_30 = { error: e_30_1 }; }
+        catch (e_31_1) { e_31 = { error: e_31_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_30) throw e_30.error; }
+            finally { if (e_31) throw e_31.error; }
         }
         return d;
     };
@@ -2089,7 +2119,7 @@ var rowHelperBase = /** @class */ (function () {
         }); });
     };
     rowHelperBase.prototype.toApiJson = function (includeRelatedEntities, notJustApi) {
-        var e_31, _a;
+        var e_32, _a;
         if (includeRelatedEntities === void 0) { includeRelatedEntities = false; }
         if (notJustApi === void 0) { notJustApi = false; }
         var result = {};
@@ -2129,19 +2159,19 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_31_1) { e_31 = { error: e_31_1 }; }
+        catch (e_32_1) { e_32 = { error: e_32_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_31) throw e_31.error; }
+            finally { if (e_32) throw e_32.error; }
         }
         return result;
     };
     rowHelperBase.prototype._updateEntityBasedOnApi = function (body_1) {
         return tslib_1.__awaiter(this, arguments, void 0, function (body, ignoreApiAllowed) {
             var keys, _a, _b, col, lu;
-            var e_32, _c;
+            var e_33, _c;
             if (ignoreApiAllowed === void 0) { ignoreApiAllowed = false; }
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -2164,12 +2194,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                        catch (e_33_1) { e_33 = { error: e_33_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_32) throw e_32.error; }
+                            finally { if (e_33) throw e_33.error; }
                         }
                         return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false).filter(function (f) { return !(0, relationInfoMember_js_1.getRelationFieldInfo)(f.metadata); }), function (x) { return x.load(); })];
                     case 1:
@@ -2183,9 +2213,9 @@ var rowHelperBase = /** @class */ (function () {
 }());
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
-    function rowHelperImplementation(info, instance, repo, edp, remult, _isNew) {
-        var e_33, _a;
-        var _this = _super.call(this, info.fieldsMetadata, instance, remult, _isNew) || this;
+    function rowHelperImplementation(info, instance, repo, edp, remult, _isNew, excludeRelationMembers) {
+        var e_34, _a;
+        var _this = _super.call(this, info.fieldsMetadata, instance, remult, _isNew, excludeRelationMembers) || this;
         _this.info = info;
         _this.repo = repo;
         _this.edp = edp;
@@ -2208,12 +2238,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_33_1) { e_33 = { error: e_33_1 }; }
+            catch (e_34_1) { e_34 = { error: e_34_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_33) throw e_33.error; }
+                finally { if (e_34) throw e_34.error; }
             }
         }
         if (_this.info.entityInfo.entityRefInit)
@@ -2315,7 +2345,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_34, _b;
+            var _a, e_35, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -2336,12 +2366,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         (r_1[c.key] = new FieldRefImplementation(c.options, c, this.instance, this, this)));
                     }
                 }
-                catch (e_34_1) { e_34 = { error: e_34_1 }; }
+                catch (e_35_1) { e_35 = { error: e_35_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_34) throw e_34.error; }
+                    finally { if (e_35) throw e_35.error; }
                 }
                 this._columns = r_1;
             }
@@ -2352,8 +2382,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     });
     rowHelperImplementation.prototype.save = function (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave_1, e, _a, _b, col, e_35_1, d, ignoreKeys, _c, _d, field, f, updatedRow, isNew, _e, _f, changesOnly, wasChanged, key, element, _g, _h, _j, _k, listener, e_36_1, err_1;
-            var e_35, _l, e_37, _m, _o, _p, e_36, _q;
+            var doNotSave_1, e, _a, _b, col, e_36_1, d, ignoreKeys, _c, _d, field, f, updatedRow, isNew, _e, _f, changesOnly, wasChanged, key, element, _g, _h, _j, _k, listener, e_37_1, err_1;
+            var e_36, _l, e_38, _m, _o, _p, e_37, _q;
             var _r, _s;
             return tslib_1.__generator(this, function (_t) {
                 switch (_t.label) {
@@ -2395,14 +2425,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_35_1 = _t.sent();
-                        e_35 = { error: e_35_1 };
+                        e_36_1 = _t.sent();
+                        e_36 = { error: e_36_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_l = _a.return)) _l.call(_a);
                         }
-                        finally { if (e_35) throw e_35.error; }
+                        finally { if (e_36) throw e_36.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 12];
@@ -2428,12 +2458,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_37_1) { e_37 = { error: e_37_1 }; }
+                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
                         finally {
                             try {
                                 if (_d && !_d.done && (_m = _c.return)) _m.call(_c);
                             }
-                            finally { if (e_37) throw e_37.error; }
+                            finally { if (e_38) throw e_38.error; }
                         }
                         updatedRow = void 0;
                         isNew = this.isNew();
@@ -2519,14 +2549,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 30];
                     case 33: return [3 /*break*/, 36];
                     case 34:
-                        e_36_1 = _t.sent();
-                        e_36 = { error: e_36_1 };
+                        e_37_1 = _t.sent();
+                        e_37 = { error: e_37_1 };
                         return [3 /*break*/, 36];
                     case 35:
                         try {
                             if (_k && !_k.done && (_q = _j.return)) _q.call(_j);
                         }
-                        finally { if (e_36) throw e_36.error; }
+                        finally { if (e_37) throw e_37.error; }
                         return [7 /*endfinally*/];
                     case 36:
                         this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
@@ -2565,7 +2595,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.buildDtoForInsert = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var d, _a, _b, field, f;
-            var e_38, _c;
+            var e_39, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.__validateEntity()];
@@ -2583,12 +2613,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_38_1) { e_38 = { error: e_38_1 }; }
+                        catch (e_39_1) { e_39 = { error: e_39_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_38) throw e_38.error; }
+                            finally { if (e_39) throw e_39.error; }
                         }
                         return [2 /*return*/, d];
                 }
@@ -2621,8 +2651,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doDelete, e, _a, _b, listener, e_39_1, err_2;
-            var e_39, _c;
+            var doDelete, e, _a, _b, listener, e_40_1, err_2;
+            var e_40, _c;
             var _d;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
@@ -2674,14 +2704,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 9];
                     case 12: return [3 /*break*/, 15];
                     case 13:
-                        e_39_1 = _e.sent();
-                        e_39 = { error: e_39_1 };
+                        e_40_1 = _e.sent();
+                        e_40 = { error: e_40_1 };
                         return [3 /*break*/, 15];
                     case 14:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_39) throw e_39.error; }
+                        finally { if (e_40) throw e_40.error; }
                         return [7 /*endfinally*/];
                     case 15:
                         this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
@@ -2700,8 +2730,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_40_1;
-            var e_40, _c;
+            var _a, _b, col, lu, e_41_1;
+            var e_41, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2730,21 +2760,24 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         if (!(0, relationInfoMember_js_1.getRelationFieldInfo)(col))
-                            this.instance[col.key] = data[col.key];
+                            if (data[col.key] === undefined)
+                                delete this.instance[col.key];
+                            else
+                                this.instance[col.key] = data[col.key];
                         _d.label = 8;
                     case 8:
                         _b = _a.next();
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_40_1 = _d.sent();
-                        e_40 = { error: e_40_1 };
+                        e_41_1 = _d.sent();
+                        e_41 = { error: e_41_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_40) throw e_40.error; }
+                        finally { if (e_41) throw e_41.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -2760,41 +2793,40 @@ 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_41_1;
-            var e_41, _e;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+            var _a, _b, col, result, e_42_1;
+            var e_42, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        if (!(0, context_js_1.isBackend)()) return [3 /*break*/, 8];
-                        _f.label = 1;
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 8];
+                        _d.label = 1;
                     case 1:
-                        _f.trys.push([1, 6, 7, 8]);
+                        _d.trys.push([1, 6, 7, 8]);
                         _a = tslib_1.__values(this.info.fieldsMetadata), _b = _a.next();
-                        _f.label = 2;
+                        _d.label = 2;
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 5];
                         col = _b.value;
                         if (!col.options.serverExpression) return [3 /*break*/, 4];
-                        _c = this.instance;
-                        _d = col.key;
                         return [4 /*yield*/, col.options.serverExpression(this.instance)];
                     case 3:
-                        _c[_d] =
-                            (_f.sent());
-                        _f.label = 4;
+                        result = (_d.sent());
+                        if (result !== undefined)
+                            this.instance[col.key] = result;
+                        _d.label = 4;
                     case 4:
                         _b = _a.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_41_1 = _f.sent();
-                        e_41 = { error: e_41_1 };
+                        e_42_1 = _d.sent();
+                        e_42 = { error: e_42_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_41) throw e_41.error; }
+                        finally { if (e_42) throw e_42.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -2807,7 +2839,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_42, _a;
+        var e_43, _a;
         var _b;
         (_b = this._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
         try {
@@ -2819,19 +2851,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return true;
             }
         }
-        catch (e_42_1) { e_42 = { error: e_42_1 }; }
+        catch (e_43_1) { e_43 = { error: e_43_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_42) throw e_42.error; }
+            finally { if (e_43) throw e_43.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_43_1, e, _c, _d, listener, e_44_1;
-            var e_43, _e, e_44, _f;
+            var _a, _b, c, col, e_44_1, e, _c, _d, listener, e_45_1;
+            var e_44, _e, e_45, _f;
             var _g;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
@@ -2853,14 +2885,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_43_1 = _h.sent();
-                        e_43 = { error: e_43_1 };
+                        e_44_1 = _h.sent();
+                        e_44 = { error: e_44_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_43) throw e_43.error; }
+                        finally { if (e_44) throw e_44.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
@@ -2888,14 +2920,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_44_1 = _h.sent();
-                        e_44 = { error: e_44_1 };
+                        e_45_1 = _h.sent();
+                        e_45 = { error: e_45_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_44) throw e_44.error; }
+                        finally { if (e_45) throw e_45.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -2942,7 +2974,7 @@ function getControllerRef(container, remultArg) {
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_45, _b;
+        var _a, e_46, _b;
         var _this = _super.call(this, columnsInfo, instance, remult, false) || this;
         var _items = [];
         var r = (_a = {
@@ -2959,20 +2991,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push((r[col.key] = new FieldRefImplementation(col.options, col, instance, undefined, _this)));
             }
         }
-        catch (e_45_1) { e_45 = { error: e_45_1 }; }
+        catch (e_46_1) { e_46 = { error: e_46_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_b = columnsInfo_1.return)) _b.call(columnsInfo_1);
             }
-            finally { if (e_45) throw e_45.error; }
+            finally { if (e_46) throw e_46.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_46_1;
-            var e_46, _c;
+            var _a, _b, col, e_47_1;
+            var e_47, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2992,14 +3024,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_46_1 = _d.sent();
-                        e_46 = { error: e_46_1 };
+                        e_47_1 = _d.sent();
+                        e_47 = { error: e_47_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_46) throw e_46.error; }
+                        finally { if (e_47) throw e_47.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -3196,8 +3228,8 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var processValidation, self_1, event_1, _a, _b, v, _c, e_47_1, _d, error_1;
-            var e_47, _e;
+            var processValidation, self_1, event_1, _a, _b, v, _c, e_48_1, _d, error_1;
+            var e_48, _e;
             var _this = this;
             var _f, _g;
             return tslib_1.__generator(this, function (_h) {
@@ -3251,14 +3283,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_47_1 = _h.sent();
-                        e_47 = { error: e_47_1 };
+                        e_48_1 = _h.sent();
+                        e_48 = { error: e_48_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_47) throw e_47.error; }
+                        finally { if (e_48) throw e_48.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
@@ -3299,6 +3331,9 @@ exports.FieldRefImplementation = FieldRefImplementation;
 var tempCaptionTransformer = {
     transformCaption: function (remult, key, caption, entityMetaData) { return caption; },
 };
+exports.fieldOptionsEnricher = remult_static_js_1.remultStatic.fieldOptionsEnricher || {
+    enrichFieldOptions: function (options) { return options; },
+};
 exports.CaptionTransformer = remult_static_js_1.remultStatic.captionTransformer ||
     (remult_static_js_1.remultStatic.captionTransformer = tempCaptionTransformer);
 function buildCaption(caption, key, remult, metaData) {
@@ -3409,7 +3444,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_48, _b;
+        var _a, e_49, _b;
         var _this = this;
         this.entityInfo = entityInfo;
         this.remult = remult;
@@ -3513,12 +3548,12 @@ var EntityFullInfo = /** @class */ (function () {
                 this.fieldsMetadata.push((r[x.key] = new columnDefsImpl(x, this, remult)));
             }
         }
-        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+        catch (e_49_1) { e_49 = { error: e_49_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_48) throw e_48.error; }
+            finally { if (e_49) throw e_49.error; }
         }
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult, this);
@@ -3628,7 +3663,7 @@ function ValueListFieldType() {
 }
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
-        var e_49, _a, _b;
+        var e_50, _a, _b;
         var _this = this;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
@@ -3666,12 +3701,12 @@ var ValueListInfo = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_49_1) { e_49 = { error: e_49_1 }; }
+            catch (e_50_1) { e_50 = { error: e_50_1 }; }
             finally {
                 try {
                     if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
                 }
-                finally { if (e_49) throw e_49.error; }
+                finally { if (e_50) throw e_50.error; }
             }
             if (this.values.find(function (s) { return s.id === undefined; }))
                 throw new Error("ValueType ".concat(this.valueListType, " has values without an id"));
@@ -3743,7 +3778,8 @@ function getValueList(type) {
 exports.storableMember = Symbol.for('storableMember');
 exports.fieldOptionalValuesFunctionKey = Symbol.for('fieldOptionalValues');
 function buildOptions(options, remult) {
-    var e_50, _a;
+    var e_51, _a;
+    var _b;
     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()) {
@@ -3759,13 +3795,14 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_50_1) { e_50 = { error: e_50_1 }; }
+    catch (e_51_1) { e_51 = { error: e_51_1 }; }
     finally {
         try {
             if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
         }
-        finally { if (e_50) throw e_50.error; }
+        finally { if (e_51) throw e_51.error; }
     }
+    (_b = exports.fieldOptionsEnricher.enrichFieldOptions) === null || _b === void 0 ? void 0 : _b.call(exports.fieldOptionsEnricher, r);
     return r;
 }
 function decorateColumnSettings(settings, remult) {
@@ -3806,7 +3843,7 @@ function decorateColumnSettings(settings, remult) {
             };
             settings.valueConverter = new Proxy(settings.valueConverter, {
                 get: function (target, property) {
-                    var e_51, _a;
+                    var e_52, _a;
                     if (target[property] === undefined) {
                         if (isIdNumeric_1 === undefined) {
                             if (property === 'inputType')
@@ -3829,12 +3866,12 @@ function decorateColumnSettings(settings, remult) {
                                         : valueConverters_js_1.ValueConverters.String[key];
                                 }
                             }
-                            catch (e_51_1) { e_51 = { error: e_51_1 }; }
+                            catch (e_52_1) { e_52 = { error: e_52_1 }; }
                             finally {
                                 try {
                                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                 }
-                                finally { if (e_51) throw e_51.error; }
+                                finally { if (e_52) throw e_52.error; }
                             }
                         }
                     }