remult 0.23.0-exp.2 → 0.23.0-exp.21

package/src/remult3/RepositoryImplementation.js

@@ -8,7 +8,6 @@ var context_1 = require("../context");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
 var sort_1 = require("../sort");
 var assign_1 = require("../../assign");
-var filter_interfaces_2 = require("../filter/filter-interfaces");
 var valueConverters_1 = require("../valueConverters");
 var rest_data_provider_1 = require("../data-providers/rest-data-provider");
 var remult_proxy_1 = require("../remult-proxy");
@@ -16,6 +15,7 @@ var getEntityRef_1 = require("./getEntityRef");
 var __updateEntityBasedOnWhere_1 = require("./__updateEntityBasedOnWhere");
 var relationInfoMember_1 = require("./relationInfoMember");
 var relation_loader_1 = require("./relation-loader");
+var repository_internals_1 = require("./repository-internals");
 //import  { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -45,9 +45,12 @@ var RepositoryImplementation = /** @class */ (function () {
         this.idCache = new Map();
         this.cache = new Map();
     }
+    RepositoryImplementation.prototype[repository_internals_1.getInternalKey] = function () {
+        return this;
+    };
     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 values, _a, _b, s, existingVal, r, equalToColumn, _c, _d, s, f, equalToColumn_1, equalToColumn_1_1, c;
             var e_1, _e, e_2, _f, e_3, _g;
             return tslib_1.__generator(this, function (_h) {
                 values = new Map();
@@ -80,7 +83,6 @@ var RepositoryImplementation = /** @class */ (function () {
                     for (_c = tslib_1.__values(sort_1.Sort.translateOrderByToSort(this.metadata, orderBy)
                         .Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
                         s = _d.value;
-                        ff = new filter_interfaces_2.filterHelper(s.field);
                         f = {};
                         try {
                             for (equalToColumn_1 = (e_3 = void 0, tslib_1.__values(equalToColumn)), equalToColumn_1_1 = equalToColumn_1.next(); !equalToColumn_1_1.done; equalToColumn_1_1 = equalToColumn_1.next()) {
@@ -385,6 +387,8 @@ var RepositoryImplementation = /** @class */ (function () {
                         for (key in entity) {
                             if (Object.prototype.hasOwnProperty.call(entity, key)) {
                                 f = ref.fields[key];
+                                if (entity[key] === undefined && (0, relationInfoMember_1.getRelationInfo)(f.metadata.options))
+                                    continue;
                                 if (f)
                                     r[key] = entity[key];
                             }
@@ -490,7 +494,6 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 0:
                         if (!options)
                             options = {};
-                        context_1.Remult.onFind(this._info, options);
                         if (this.defaultFindOptions) {
                             options = tslib_1.__assign(tslib_1.__assign({}, this.defaultFindOptions), options);
                         }
@@ -501,6 +504,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             delete opt.orderBy;
                             delete opt.limit;
                         }
+                        context_1.Remult.onFind(this._info, options);
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
                         rawRows = _a.sent();
@@ -546,9 +550,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [4 /*yield*/, this.translateWhereToFilter(options.where)];
                     case 1:
                         _a.where = _b.sent();
-                        opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
-                        opt.limit = options.limit;
-                        opt.page = options.page;
+                        if (options.orderBy !== undefined)
+                            opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
+                        if (options.limit !== undefined)
+                            opt.limit = options.limit;
+                        if (options.page !== undefined)
+                            opt.page = options.page;
                         return [2 /*return*/, opt];
                 }
             });
@@ -641,13 +648,9 @@ var RepositoryImplementation = /** @class */ (function () {
                         if (!ei) return [3 /*break*/, 5];
                         isRelation = (_a = col.options) === null || _a === void 0 ? void 0 : _a[relationInfoMember_1.relationInfoMember];
                         if (!!isRelation) return [3 /*break*/, 4];
-                        load = isRelation
-                            ? (_b = col.options) === null || _b === void 0 ? void 0 : _b.defaultIncluded
-                            : !col.options.lazy;
+                        load = !col.options.lazy;
                         if (loadFields !== undefined)
                             load = loadFields.includes(col);
-                        if (loadOptions.include)
-                            load = loadOptions.include[col.key];
                         if (!load) return [3 /*break*/, 4];
                         repo = this.remult.repo(col.valueType);
                         toLoad = [];
@@ -658,7 +661,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                 if (val !== undefined &&
                                     val !== null &&
                                     !toLoad.includes(val) &&
-                                    !repo.idCache.has(val)) {
+                                    !repo.idCache.has(val + '')) {
                                     toLoad.push(val);
                                 }
                             }
@@ -709,7 +712,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             var rel = (0, relationInfoMember_1.getRelationInfo)(col.options);
                             var incl = col.options
                                 .defaultIncluded;
-                            if (loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) {
+                            if (((_b = loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) === null || _b === void 0 ? void 0 : _b[col.key]) !== undefined) {
                                 incl = loadOptions.include[col.key];
                             }
                             if (rel && incl) {
@@ -731,7 +734,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                             row[col.key] =
                                                 rel.type !== 'toMany'
                                                     ? result.length == 0
-                                                        ? undefined
+                                                        ? null
                                                         : result[0]
                                                     : result;
                                         });
@@ -773,7 +776,7 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     /*@internal */
     RepositoryImplementation.prototype.findOptionsBasedOnRelation = function (rel, field, moreFindOptions, row, otherRepo) {
-        var e_13, _a, e_14, _b, _c, _d;
+        var e_13, _a, e_14, _b, e_15, _c, _d, _e;
         var returnNull = false;
         var where = [];
         var findOptions = {};
@@ -793,12 +796,12 @@ var RepositoryImplementation = /** @class */ (function () {
                 if (source.where)
                     where.push(source.where);
                 try {
-                    for (var _e = (e_14 = void 0, tslib_1.__values([
+                    for (var _f = (e_14 = void 0, tslib_1.__values([
                         'limit',
                         'include',
                         'orderBy',
-                    ])), _f = _e.next(); !_f.done; _f = _e.next()) {
-                        var key = _f.value;
+                    ])), _g = _f.next(); !_g.done; _g = _f.next()) {
+                        var key = _g.value;
                         //@ts-ignore
                         if (source[key])
                             findOptions[key] = source[key];
@@ -807,7 +810,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 catch (e_14_1) { e_14 = { error: e_14_1 }; }
                 finally {
                     try {
-                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                        if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                     }
                     finally { if (e_14) throw e_14.error; }
                 }
@@ -820,26 +823,81 @@ var RepositoryImplementation = /** @class */ (function () {
             }
             finally { if (e_13) throw e_13.error; }
         }
+        function buildError(what) {
+            return Error("Error for relation: \"".concat(field.key, "\" to \"").concat(otherRepo.metadata.key, "\": ") +
+                what);
+        }
+        var hasFields = function () { return options.field || options.fields; };
+        if (rel.type === 'toMany' && !hasFields()) {
+            try {
+                for (var _h = tslib_1.__values(otherRepo.fields.toArray()), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var fieldInOtherRepo = _j.value;
+                    if (!hasFields()) {
+                        var reverseRel = (0, relationInfoMember_1.getRelationInfo)(fieldInOtherRepo.options);
+                        var relOp = fieldInOtherRepo.options;
+                        if (reverseRel)
+                            if (reverseRel.toType() === this.entity)
+                                if (reverseRel.type === 'reference') {
+                                    options = tslib_1.__assign(tslib_1.__assign({}, findOptions), { field: fieldInOtherRepo.key });
+                                }
+                                else if (reverseRel.type === 'toOne') {
+                                    if (relOp.field) {
+                                        options = tslib_1.__assign(tslib_1.__assign({}, options), { field: relOp.field });
+                                    }
+                                    else if (relOp.fields) {
+                                        var fields = {};
+                                        for (var key in relOp.fields) {
+                                            if (Object.prototype.hasOwnProperty.call(relOp.fields, key)) {
+                                                var keyInMyTable = relOp.fields[key];
+                                                fields[keyInMyTable] = key;
+                                            }
+                                        }
+                                        options = tslib_1.__assign(tslib_1.__assign({}, options), { fields: fields });
+                                    }
+                                }
+                    }
+                }
+            }
+            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            finally {
+                try {
+                    if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                }
+                finally { if (e_15) throw e_15.error; }
+            }
+            if (!hasFields())
+                throw buildError("No matching field found on target. Please specify field/fields");
+        }
+        function requireField(field, meta) {
+            var result = meta.fields.find(field);
+            if (!result)
+                throw buildError("Field \"".concat(field, "\" was not found in \"").concat(meta.key, "\"."));
+            return result;
+        }
         if (options.field) {
             if (rel.type === 'toOne') {
+                requireField(options.field, this.metadata);
                 where.push(otherRepo.metadata.idMetadata.getIdFilter(row[options.field]));
             }
             else {
-                where.push((_c = {},
-                    _c[options.field] = this.metadata.idMetadata.getId(row),
-                    _c));
+                requireField(options.field, otherRepo.metadata);
+                where.push((_d = {},
+                    _d[options.field] = this.metadata.idMetadata.getId(row),
+                    _d));
             }
         }
         else if (options.fields) {
             for (var key in options.fields) {
                 if (Object.prototype.hasOwnProperty.call(options.fields, key)) {
-                    where.push((_d = {}, _d[key] = row[options.fields[key]], _d));
+                    requireField(options.fields[key], this.metadata);
+                    requireField(key, otherRepo.metadata);
+                    where.push((_e = {}, _e[key] = row[options.fields[key]], _e));
                 }
             }
         }
         else if (rel.type === 'toOne' || rel.type === 'reference') {
             var val = rel.type === 'reference'
-                ? (0, getEntityRef_1.getEntityRef)(row).fields.find(field.key).getId()
+                ? (0, getEntityRef_1.getEntityRef)(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
             if (val === null)
                 returnNull = true;
@@ -889,7 +947,7 @@ var RepositoryImplementation = /** @class */ (function () {
         return this.getEntityRef(item).toApiJson(true);
     };
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
-        var e_15, _a;
+        var e_16, _a;
         var _this = this;
         if (json === null || json === undefined)
             return json;
@@ -912,12 +970,12 @@ var RepositoryImplementation = /** @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 (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         this.fixTypes(result);
         if (newRow) {
@@ -1019,7 +1077,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_16, _a;
+        var e_17, _a;
         var _b;
         var r = new this.entity(this.remult);
         if (item) {
@@ -1029,12 +1087,12 @@ var RepositoryImplementation = /** @class */ (function () {
                     r[field.key] = item[field.key];
                 }
             }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_16) throw e_16.error; }
+                finally { if (e_17) throw e_17.error; }
             }
             this.fixTypes(r);
         }
@@ -1048,7 +1106,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_17, _f, e_18, _g;
+            var e_18, _f, e_19, _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()) {
@@ -1059,7 +1117,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                 item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                             else
                                 try {
-                                    for (_c = (e_18 = void 0, tslib_1.__values([
+                                    for (_c = (e_19 = void 0, tslib_1.__values([
                                         [String, 'string'],
                                         [Number, 'number'],
                                         [Boolean, 'boolean'],
@@ -1069,22 +1127,22 @@ var RepositoryImplementation = /** @class */ (function () {
                                             item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                                     }
                                 }
-                                catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                                catch (e_19_1) { e_19 = { error: e_19_1 }; }
                                 finally {
                                     try {
                                         if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                                     }
-                                    finally { if (e_18) throw e_18.error; }
+                                    finally { if (e_19) throw e_19.error; }
                                 }
                         }
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
                         if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
                 return [2 /*return*/, item];
             });
@@ -1149,7 +1207,7 @@ function createOldEntity(entity, remult) {
     var key = (0, getEntityRef_1.getEntityKey)(entity);
     var base = Object.getPrototypeOf(entity);
     var _loop_3 = function () {
-        var e_19, _a;
+        var e_20, _a;
         var baseCols = exports.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));
@@ -1184,17 +1242,17 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var _b = (e_19 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_20 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key_1 = _c.value;
                     _loop_4(key_1);
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+            catch (e_20_1) { e_20 = { error: e_20_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_19) throw e_19.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         }
         base = Object.getPrototypeOf(base);
@@ -1206,12 +1264,14 @@ function createOldEntity(entity, remult) {
 }
 exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
-    function rowHelperBase(columnsInfo, instance, remult) {
-        var e_20, _a;
+    function rowHelperBase(columnsInfo, instance, remult, isNewRow) {
+        var e_21, _a;
         var _this = this;
+        var _b;
         this.columnsInfo = columnsInfo;
         this.instance = instance;
         this.remult = remult;
+        this.isNewRow = isNewRow;
         this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
@@ -1258,7 +1318,38 @@ var rowHelperBase = /** @class */ (function () {
                 });
                 lookup_1.set(val);
             }
-            else {
+            else if (((_b = (0, relationInfoMember_1.getRelationInfo)(col)) === null || _b === void 0 ? void 0 : _b.type) === 'toOne') {
+                var hasVal = instance.hasOwnProperty(col.key);
+                var val_1 = instance[col.key];
+                if (isNewRow && !val_1)
+                    hasVal = false;
+                Object.defineProperty(instance, col.key, {
+                    get: function () {
+                        return val_1;
+                    },
+                    set: function (newVal) {
+                        val_1 = newVal;
+                        if (newVal === undefined)
+                            return;
+                        var op = col;
+                        if (op.field) {
+                            _this.instance[op.field] = _this.remult
+                                .repo((0, relationInfoMember_1.getRelationInfo)(col).toType())
+                                .metadata.idMetadata.getId(newVal);
+                        }
+                        if (op.fields) {
+                            for (var key in op.fields) {
+                                if (Object.prototype.hasOwnProperty.call(op.fields, key)) {
+                                    var element = op.fields[key];
+                                    _this.instance[element] = newVal[key];
+                                }
+                            }
+                        }
+                    },
+                    enumerable: true,
+                });
+                if (hasVal)
+                    instance[col.key] = val_1;
             }
         };
         var this_2 = this;
@@ -1268,12 +1359,12 @@ var rowHelperBase = /** @class */ (function () {
                 _loop_5(col);
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_a = columnsInfo_1.return)) _a.call(columnsInfo_1);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_21) throw e_21.error; }
         }
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
@@ -1295,7 +1386,7 @@ var rowHelperBase = /** @class */ (function () {
         return this._subscribers.subscribe(listener);
     };
     rowHelperBase.prototype.initSubscribers = function () {
-        var e_21, _a;
+        var e_22, _a;
         var _this = this;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
@@ -1306,15 +1397,15 @@ var rowHelperBase = /** @class */ (function () {
                 if (ei && this_3.remult) {
                 }
                 else {
-                    var val_1 = this_3.instance[col.key];
+                    var val_2 = this_3.instance[col.key];
                     Object.defineProperty(this_3.instance, col.key, {
                         get: function () {
                             _this._subscribers.reportObserved();
                             refImpl._subscribers.reportObserved();
-                            return val_1;
+                            return val_2;
                         },
                         set: function (value) {
-                            val_1 = value;
+                            val_2 = value;
                             _this._subscribers.reportChanged();
                             refImpl._subscribers.reportChanged();
                         },
@@ -1329,12 +1420,12 @@ var rowHelperBase = /** @class */ (function () {
                     _loop_6(col);
                 }
             }
-            catch (e_21_1) { e_21 = { error: e_21_1 }; }
+            catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_21) throw e_21.error; }
+                finally { if (e_22) throw e_22.error; }
             }
         }
     };
@@ -1369,7 +1460,7 @@ var rowHelperBase = /** @class */ (function () {
             throw this.buildErrorInfoObject();
     };
     rowHelperBase.prototype.buildErrorInfoObject = function () {
-        var e_22, _a;
+        var e_23, _a;
         var error = {
             modelState: Object.assign({}, this.errors),
             message: this.error,
@@ -1386,12 +1477,12 @@ var rowHelperBase = /** @class */ (function () {
                     }
                 }
             }
-            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);
                 }
-                finally { if (e_22) throw e_22.error; }
+                finally { if (e_23) throw e_23.error; }
             }
         }
         return error;
@@ -1425,7 +1516,7 @@ var rowHelperBase = /** @class */ (function () {
         this._reportChangedToEntityAndFields();
     };
     rowHelperBase.prototype._reportChangedToEntityAndFields = function () {
-        var e_23, _a;
+        var e_24, _a;
         if (this._subscribers) {
             this._subscribers.reportChanged();
             try {
@@ -1435,12 +1526,12 @@ var rowHelperBase = /** @class */ (function () {
                     ref._subscribers.reportChanged();
                 }
             }
-            catch (e_23_1) { e_23 = { error: e_23_1 }; }
+            catch (e_24_1) { e_24 = { error: e_24_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_23) throw e_23.error; }
+                finally { if (e_24) throw e_24.error; }
             }
         }
     };
@@ -1450,7 +1541,7 @@ var rowHelperBase = /** @class */ (function () {
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function () {
-        var e_24, _a;
+        var e_25, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1466,15 +1557,17 @@ var rowHelperBase = /** @class */ (function () {
                     if (val !== undefined && val !== null)
                         val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
                 }
-                d[col.key] = val;
+                var rel = (0, relationInfoMember_1.getRelationInfo)(col);
+                if (!rel || rel.type === 'reference')
+                    d[col.key] = val;
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_25) throw e_25.error; }
         }
         return d;
     };
@@ -1534,7 +1627,7 @@ var rowHelperBase = /** @class */ (function () {
         }); });
     };
     rowHelperBase.prototype.toApiJson = function (includeRelatedEntities) {
-        var e_25, _a;
+        var e_26, _a;
         if (includeRelatedEntities === void 0) { includeRelatedEntities = false; }
         var result = {};
         try {
@@ -1542,7 +1635,7 @@ var rowHelperBase = /** @class */ (function () {
                 var col = _c.value;
                 if (!this.remult ||
                     col.includeInApi === undefined ||
-                    this.remult.isAllowed(col.includeInApi)) {
+                    this.remult.isAllowedForInstance(this.instance, col.includeInApi)) {
                     var val = void 0;
                     var lu = this.lookups.get(col.key);
                     var disable = false;
@@ -1570,19 +1663,20 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_26) throw e_26.error; }
         }
         return result;
     };
-    rowHelperBase.prototype._updateEntityBasedOnApi = function (body) {
+    rowHelperBase.prototype._updateEntityBasedOnApi = function (body, ignoreApiAllowed) {
+        if (ignoreApiAllowed === void 0) { ignoreApiAllowed = false; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var keys, _a, _b, col, lu;
-            var e_26, _c;
+            var e_27, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1592,8 +1686,9 @@ var rowHelperBase = /** @class */ (function () {
                                 col = _b.value;
                                 if (keys.includes(col.key))
                                     if (col.includeInApi === undefined ||
-                                        this.remult.isAllowed(col.includeInApi)) {
+                                        this.remult.isAllowedForInstance(this.instance, col.includeInApi)) {
                                         if (!this.remult ||
+                                            ignoreApiAllowed ||
                                             col.allowApiUpdate === undefined ||
                                             this.remult.isAllowedForInstance(this.instance, col.allowApiUpdate)) {
                                             lu = this.lookups.get(col.key);
@@ -1605,12 +1700,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+                        catch (e_27_1) { e_27 = { error: e_27_1 }; }
                         finally {
                             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 [4 /*yield*/, Promise.all(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false).map(function (x) { return x.load(); }))];
                     case 1:
@@ -1625,8 +1720,8 @@ var rowHelperBase = /** @class */ (function () {
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
     function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
-        var e_27, _a;
-        var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
+        var e_28, _a;
+        var _this = _super.call(this, info.columnsInfo, instance, remult, _isNew) || this;
         _this.info = info;
         _this.repository = repository;
         _this.edp = edp;
@@ -1647,12 +1742,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            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; }
             }
         }
         if (_this.info.options.entityRefInit)
@@ -1661,6 +1756,13 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             context_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
+    Object.defineProperty(rowHelperImplementation.prototype, "relations", {
+        get: function () {
+            return this.repository.relations(this.instance);
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(rowHelperImplementation.prototype, "apiUpdateAllowed", {
         get: function () {
             return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
@@ -1732,7 +1834,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_28, _b;
+            var _a, e_29, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -1749,12 +1851,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_28_1) { e_28 = { error: e_28_1 }; }
+                catch (e_29_1) { e_29 = { error: e_29_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_28) throw e_28.error; }
+                    finally { if (e_29) throw e_29.error; }
                 }
                 this._columns = r_1;
             }
@@ -1766,8 +1868,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.save = function (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave_1, _b, _c, col, e_29_1, d, ignoreKeys, _d, _e, field, f, updatedRow, isNew, changesOnly, wasChanged, key, element, _f, _g, listener, e_30_1, err_1;
-            var e_29, _h, e_31, _j, e_30, _k;
+            var doNotSave_1, e, _b, _c, col, e_30_1, d, ignoreKeys, _d, _e, field, f, updatedRow, isNew, changesOnly, wasChanged, key, element, _f, _g, listener, e_31_1, err_1;
+            var e_30, _h, e_32, _j, e_31, _k;
             return tslib_1.__generator(this, function (_l) {
                 switch (_l.label) {
                     case 0:
@@ -1788,6 +1890,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _l.label = 2;
                     case 2:
                         doNotSave_1 = false;
+                        e = this.buildLifeCycleEvent(function () { return (doNotSave_1 = true); });
+                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 12];
                         _l.label = 3;
                     case 3:
                         _l.trys.push([3, 8, 9, 10]);
@@ -1797,7 +1901,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         if (!!_c.done) return [3 /*break*/, 7];
                         col = _c.value;
                         if (!col.metadata.options.saving) return [3 /*break*/, 6];
-                        return [4 /*yield*/, col.metadata.options.saving(this.instance, col)];
+                        return [4 /*yield*/, col.metadata.options.saving(this.instance, e, col)];
                     case 5:
                         _l.sent();
                         _l.label = 6;
@@ -1806,18 +1910,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_29_1 = _l.sent();
-                        e_29 = { error: e_29_1 };
+                        e_30_1 = _l.sent();
+                        e_30 = { error: e_30_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_c && !_c.done && (_h = _b.return)) _h.call(_b);
                         }
-                        finally { if (e_29) throw e_29.error; }
+                        finally { if (e_30) throw e_30.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 12];
-                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return (doNotSave_1 = true); })];
+                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, e)];
                     case 11:
                         _l.sent();
                         _l.label = 12;
@@ -1839,15 +1943,13 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_31_1) { e_31 = { error: e_31_1 }; }
+                        catch (e_32_1) { e_32 = { error: e_32_1 }; }
                         finally {
                             try {
                                 if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
                             }
-                            finally { if (e_31) throw e_31.error; }
+                            finally { if (e_32) throw e_32.error; }
                         }
-                        if (this.info.idMetadata.field instanceof CompoundIdField_1.CompoundIdField)
-                            delete d.id;
                         updatedRow = void 0;
                         isNew = this.isNew();
                         _l.label = 13;
@@ -1886,8 +1988,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 19: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 20:
                         _l.sent();
+                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 30];
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 22];
-                        return [4 /*yield*/, this.info.entityInfo.saved(this.instance)];
+                        return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
                     case 21:
                         _l.sent();
                         _l.label = 22;
@@ -1910,14 +2013,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 24];
                     case 27: return [3 /*break*/, 30];
                     case 28:
-                        e_30_1 = _l.sent();
-                        e_30 = { error: e_30_1 };
+                        e_31_1 = _l.sent();
+                        e_31 = { error: e_31_1 };
                         return [3 /*break*/, 30];
                     case 29:
                         try {
                             if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
                         }
-                        finally { if (e_30) throw e_30.error; }
+                        finally { if (e_31) throw e_31.error; }
                         return [7 /*endfinally*/];
                     case 30: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
                     case 31:
@@ -1942,19 +2045,35 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             });
         });
     };
+    rowHelperImplementation.prototype.buildLifeCycleEvent = function (preventDefault) {
+        if (preventDefault === void 0) { preventDefault = function () { }; }
+        var self = this;
+        return {
+            isNew: self.isNew(),
+            fields: self.fields,
+            id: self.getId(),
+            originalId: self.getOriginalId(),
+            metadata: self.repository.metadata,
+            repository: self.repository,
+            preventDefault: function () { return preventDefault(); },
+            relations: self.repository.relations(self.instance),
+        };
+    };
     rowHelperImplementation.prototype.getIdFilter = function () {
         return filter_interfaces_1.Filter.fromEntityFilter(this.metadata, this.repository.metadata.idMetadata.getIdFilter(this.id));
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, listener, e_32_1, err_2;
-            var e_32, _c;
+            var e, _a, _b, listener, e_33_1, err_2;
+            var e_33, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         this.__clearErrorsAndReportChanged();
+                        e = this.buildLifeCycleEvent();
+                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 2];
                         if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.info.entityInfo.deleting(this.instance)];
+                        return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, e)];
                     case 1:
                         _d.sent();
                         _d.label = 2;
@@ -1966,8 +2085,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.edp.delete(this.id)];
                     case 4:
                         _d.sent();
+                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 6];
                         if (!this.info.entityInfo.deleted) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.info.entityInfo.deleted(this.instance)];
+                        return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
                     case 5:
                         _d.sent();
                         _d.label = 6;
@@ -1990,14 +2110,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 8];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_32_1 = _d.sent();
-                        e_32 = { error: e_32_1 };
+                        e_33_1 = _d.sent();
+                        e_33 = { error: e_33_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         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 [7 /*endfinally*/];
                     case 14: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
                     case 15:
@@ -2017,8 +2137,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_33_1;
-            var e_33, _c;
+            var _a, _b, col, lu, e_34_1;
+            var e_34, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2054,14 +2174,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_33_1 = _d.sent();
-                        e_33 = { error: e_33_1 };
+                        e_34_1 = _d.sent();
+                        e_34 = { error: e_34_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_33) throw e_33.error; }
+                        finally { if (e_34) throw e_34.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -2077,8 +2197,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_34_1;
-            var e_34, _e;
+            var _a, _b, col, _c, _d, e_35_1;
+            var e_35, _e;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -2103,14 +2223,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_34_1 = _f.sent();
-                        e_34 = { error: e_34_1 };
+                        e_35_1 = _f.sent();
+                        e_35 = { error: e_35_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_34) throw e_34.error; }
+                        finally { if (e_35) throw e_35.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -2123,7 +2243,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_35, _a;
+        var e_36, _a;
         var _b;
         (_b = this._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
         try {
@@ -2133,19 +2253,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     return true;
             }
         }
-        catch (e_35_1) { e_35 = { error: e_35_1 }; }
+        catch (e_36_1) { e_36 = { error: e_36_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_35) throw e_35.error; }
+            finally { if (e_36) throw e_36.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_36_1, _c, _d, listener, e_37_1;
-            var e_36, _e, e_37, _f;
+            var _a, _b, c, col, e_37_1, e, _c, _d, listener, e_38_1;
+            var e_37, _e, e_38, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -2166,18 +2286,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_36_1 = _g.sent();
-                        e_36 = { error: e_36_1 };
+                        e_37_1 = _g.sent();
+                        e_37 = { error: e_37_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_36) throw e_36.error; }
+                        finally { if (e_37) throw e_37.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this.info.entityInfo.validation(this.instance, this)];
+                        e = this.buildLifeCycleEvent(function () { });
+                        return [4 /*yield*/, this.info.entityInfo.validation(this.instance, e)];
                     case 8:
                         _g.sent();
                         _g.label = 9;
@@ -2200,14 +2321,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_37_1 = _g.sent();
-                        e_37 = { error: e_37_1 };
+                        e_38_1 = _g.sent();
+                        e_38 = { error: e_38_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_37) throw e_37.error; }
+                        finally { if (e_38) throw e_38.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -2250,8 +2371,8 @@ exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_38, _b;
-        var _this = _super.call(this, columnsInfo, instance, remult) || this;
+        var _a, e_39, _b;
+        var _this = _super.call(this, columnsInfo, instance, remult, false) || this;
         var _items = [];
         var r = (_a = {
                 find: function (c) {
@@ -2267,20 +2388,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push((r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this)));
             }
         }
-        catch (e_38_1) { e_38 = { error: e_38_1 }; }
+        catch (e_39_1) { e_39 = { error: e_39_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_38) throw e_38.error; }
+            finally { if (e_39) throw e_39.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_39_1;
-            var e_39, _c;
+            var _a, _b, col, e_40_1;
+            var e_40, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2300,14 +2421,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_39_1 = _d.sent();
-                        e_39 = { error: e_39_1 };
+                        e_40_1 = _d.sent();
+                        e_40 = { error: e_40_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         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 7: return [2 /*return*/];
                 }
@@ -2487,8 +2608,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_40_1, error_1;
-            var e_40, _c;
+            var x, _a, _b, v, e_41_1, error_1;
+            var e_41, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2512,14 +2633,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        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*/, 8];
                     case 7:
                         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 8: return [3 /*break*/, 11];
                     case 9:
@@ -2605,15 +2726,11 @@ var columnDefsImpl = /** @class */ (function () {
             .getEntityMetadataWithoutBreakingTheEntity(item)
             .fields.find(this.key).displayValue;
     };
-    Object.defineProperty(columnDefsImpl.prototype, "includedInApi", {
-        get: function () {
-            if (this.options.includeInApi === undefined)
-                return true;
-            return this.remult.isAllowed(this.options.includeInApi); //TODO 2- consolidate other code paths to go through here
-        },
-        enumerable: false,
-        configurable: true
-    });
+    columnDefsImpl.prototype.includedInApi = function (item) {
+        if (this.options.includeInApi === undefined)
+            return true;
+        return this.remult.isAllowedForInstance(item, this.options.includeInApi);
+    };
     columnDefsImpl.prototype.toInput = function (value, inputType) {
         return this.valueConverter.toInput(value, inputType);
     };
@@ -2677,7 +2794,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_41, _b;
+        var _a, e_42, _b;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.entityInfo = entityInfo;
@@ -2686,6 +2803,8 @@ var EntityFullInfo = /** @class */ (function () {
         this.key = key;
         this.idMetadata = {
             getId: function (item) {
+                if (item === undefined || item === null)
+                    return item;
                 var ref = (0, getEntityRef_1.getEntityRef)(item, false);
                 if (ref)
                     return ref.getId();
@@ -2765,17 +2884,19 @@ var EntityFullInfo = /** @class */ (function () {
                 _items.push((r[x.key] = new columnDefsImpl(x, this, remult)));
             }
         }
-        catch (e_41_1) { e_41 = { error: e_41_1 }; }
+        catch (e_42_1) { e_42 = { error: e_42_1 }; }
         finally {
             try {
                 if (columnsInfo_3_1 && !columnsInfo_3_1.done && (_b = columnsInfo_3.return)) _b.call(columnsInfo_3);
             }
-            finally { if (e_41) throw e_41.error; }
+            finally { if (e_42) throw e_42.error; }
         }
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult);
         if (entityInfo.id) {
-            var r_2 = entityInfo.id(this.fields);
+            var r_2 = typeof entityInfo.id === 'function'
+                ? entityInfo.id(this.fields)
+                : Object.keys(entityInfo.id).map(function (x) { return _this.fields.find(x); });
             if (Array.isArray(r_2)) {
                 if (r_2.length > 1)
                     this.idMetadata.field = new (CompoundIdField_1.CompoundIdField.bind.apply(CompoundIdField_1.CompoundIdField, tslib_1.__spreadArray([void 0], tslib_1.__read(r_2), false)))();
@@ -2889,7 +3010,7 @@ function ValueListFieldType() {
 exports.ValueListFieldType = ValueListFieldType;
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
-        var e_42, _a, _b;
+        var e_43, _a, _b;
         var _this = this;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
@@ -2927,12 +3048,12 @@ var ValueListInfo = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_42_1) { e_42 = { error: e_42_1 }; }
+            catch (e_43_1) { e_43 = { error: e_43_1 }; }
             finally {
                 try {
                     if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
                 }
-                finally { if (e_42) throw e_42.error; }
+                finally { if (e_43) throw e_43.error; }
             }
             if (this.values.find(function (s) { return s.id === undefined; }))
                 throw new Error("ValueType ".concat(this.valueListType, " has values without an id"));
@@ -3003,7 +3124,7 @@ function getValueList(type) {
 exports.getValueList = getValueList;
 exports.storableMember = Symbol('storableMember');
 function buildOptions(options, remult) {
-    var e_43, _a;
+    var e_44, _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()) {
@@ -3016,12 +3137,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+    catch (e_44_1) { e_44 = { error: e_44_1 }; }
     finally {
         try {
             if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
         }
-        finally { if (e_43) throw e_43.error; }
+        finally { if (e_44) throw e_44.error; }
     }
     return r;
 }
@@ -3064,7 +3185,7 @@ function decorateColumnSettings(settings, remult) {
             };
             settings.valueConverter = new Proxy(settings.valueConverter, {
                 get: function (target, property) {
-                    var e_44, _a;
+                    var e_45, _a;
                     if (target[property] === undefined) {
                         if (isIdNumeric_1 === undefined) {
                             if (property === 'inputType')
@@ -3087,12 +3208,12 @@ function decorateColumnSettings(settings, remult) {
                                         : valueConverters_1.ValueConverters.String[key];
                                 }
                             }
-                            catch (e_44_1) { e_44 = { error: e_44_1 }; }
+                            catch (e_45_1) { e_45 = { error: e_45_1 }; }
                             finally {
                                 try {
                                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                 }
-                                finally { if (e_44) throw e_44.error; }
+                                finally { if (e_45) throw e_45.error; }
                             }
                         }
                     }
@@ -3211,6 +3332,7 @@ var QueryResultImpl = /** @class */ (function () {
                         limit: this.options.pageSize,
                         page: page,
                         load: this.options.load,
+                        include: this.options.include,
                     })];
             });
         });
@@ -3233,9 +3355,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var _a, e_45, _b, _c;
+        var _a, e_46, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _d, _e, _f, x, e_45_1;
+            var i, _d, _e, _f, x, e_46_1;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -3261,8 +3383,8 @@ var QueryResultImpl = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_45_1 = _g.sent();
-                        e_45 = { error: e_45_1 };
+                        e_46_1 = _g.sent();
+                        e_46 = { error: e_46_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _g.trys.push([8, , 11, 12]);
@@ -3273,7 +3395,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _g.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_45) throw e_45.error;
+                        if (e_46) throw e_46.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];
@@ -3296,6 +3418,7 @@ var QueryResultImpl = /** @class */ (function () {
                                 orderBy: this.options.orderBy,
                                 limit: this.options.pageSize,
                                 load: this.options.load,
+                                include: this.options.include,
                             })];
                     case 1:
                         items = _a.sent();